Allow specify additional params outside of param group

Especially useful for hash params. For example:

    def_param_group :user do
      param :user, Hash do
        param :name, String
      end
    end

    param_group :user
    param :user, Hash do
      param :password, String
    end

Author: iNecas

lib/apipie/method_description.rb

@@ -43,6 +43,7 @@ def initialize(method, resource, dsl_data)
       @params_ordered = dsl_data[:params].map do |args|
         Apipie::ParamDescription.from_dsl_data(self, args)
       end
+      @params_ordered = ParamDescription.unify(@params_ordered)
     end
 
     def id

lib/apipie/param_description.rb

@@ -102,6 +102,35 @@ def to_json
       end
     end
 
+    def merge_with(other_param_desc)
+      if self.validator && other_param_desc.validator
+        self.validator.merge_with(other_param_desc.validator)
+      else
+        self.validator ||= other_param_desc.validator
+      end
+      self
+    end
+
+    # merge param descripsiont. Allows defining hash params on more places
+    # (e.g. in param_groups). For example:
+    #
+    #     def_param_group :user do
+    #       param :user, Hash do
+    #         param :name, String
+    #       end
+    #     end
+    #
+    #     param_group :user
+    #     param :user, Hash do
+    #       param :password, String
+    #     end
+    def self.unify(params)
+      ordering = params.map(&:name)
+      params.group_by(&:name).map do |name, param_descs|
+        param_descs.reduce(&:merge_with)
+      end.sort_by { |param| ordering.index(param.name) }
+    end
+
   end
 
 end

lib/apipie/validator.rb

@@ -66,6 +66,10 @@ def expected_type
         'string'
       end
 
+      def merge_with(other_validator)
+        raise NotImplementedError, "Dont know how to merge #{self.inspect} with #{other_validator.inspect}"
+      end
+
     end
 
     # validate arguments type
@@ -181,10 +185,7 @@ def initialize(param_description, argument, param_group)
         @proc = argument
         @param_group = param_group
         self.instance_exec(&@proc)
-        @hash_params = hash_params_ordered.reduce({}) do |h, param|
-          param.parent = self.param_description
-          h.update(param.name.to_sym => param)
-        end
+        prepare_hash_params
       end
 
       def hash_params_ordered
@@ -216,6 +217,21 @@ def _default_param_group_scope
         @param_group && @param_group[:scope]
       end
 
+      def merge_with(other_validator)
+        if other_validator.is_a? HashValidator
+          @hash_params_ordered = ParamDescription.unify(self.hash_params_ordered + other_validator.hash_params_ordered)
+          prepare_hash_params
+        else
+          super
+        end
+      end
+
+      def prepare_hash_params
+        @hash_params = hash_params_ordered.reduce({}) do |h, param|
+          param.parent = self.param_description
+          h.update(param.name.to_sym => param)
+        end
+      end
     end
 
 

spec/controllers/users_controller_spec.rb

@@ -156,7 +156,7 @@ def compare_hashes(h1, h2)
         param.count.should == 1
         param.first.validator.class.should eq(Apipie::Validator::HashValidator)
         hash_params = param.first.validator.hash_params_ordered
-        hash_params.count.should == 3
+        hash_params.count.should == 4
         hash_params[0].name == :name
         hash_params[1].name == :pass
         hash_params[2].name == :membership

spec/dummy/app/controllers/users_controller.rb

@@ -204,6 +204,9 @@ def show
 
   api :POST, "/users", "Create user"
   param_group :user
+  param :user, Hash do
+    param :permalink, String
+  end
   param :facts, Hash, :desc => "Additional optional facts about the user", :allow_nil => true
   def create
     render :text => "OK #{params.inspect}"

spec/lib/param_group_spec.rb

@@ -9,15 +9,22 @@
     user_update_desc = Apipie["users#update"].params[:user]
     user_update_params = user_update_desc.validator.hash_params_ordered.map(&:name)
 
-    user_create_params.sort_by(&:to_s).should == user_update_params.sort_by(&:to_s)
+    common = user_update_params & user_create_params
+    common.sort_by(&:to_s).should == user_update_params.sort_by(&:to_s)
   end
 
   it "allows using groups is nested param descriptions" do
-    user_create_desc = Apipie["users#create"].params[:user]
+    user_create_desc = Apipie["users#update"].params[:user]
     user_create_params = user_create_desc.validator.hash_params_ordered.map(&:name)
     user_create_params.map(&:to_s).sort.should == %w[membership name pass]
   end
 
+  it "should allow adding additional params to group" do
+    user_create_desc = Apipie["users#create"].params[:user]
+    user_create_params = user_create_desc.validator.hash_params_ordered.map(&:name)
+    user_create_params.map(&:to_s).sort.should == %w[membership name pass permalink]
+  end
+
   it "lets you reuse a group definition from different controller" do
     arch_v1_desc = Apipie["1.0#architectures#create"].params[:architecture]
     arch_v1_params = arch_v1_desc.validator.hash_params_ordered.map(&:name)