Evaluate params data only in MethodDescription

We are going to need information about action in the Param description
soon.

Author: iNecas

lib/apipie/method_description.rb

@@ -32,10 +32,6 @@ def initialize(method, resource, app, dsl_data)
         Apipie::ErrorDescription.new(args)
       end
 
-      @params_ordered = dsl_data[:params].map do |args|
-        Apipie::ParamDescription.from_dsl_data(args)
-      end
-
       @see = dsl_data[:see].map do |args|
         Apipie::SeeDescription.new(args)
       end
@@ -44,9 +40,8 @@ def initialize(method, resource, app, dsl_data)
       @examples = dsl_data[:examples]
       @examples += load_recorded_examples
 
-      parent = @resource.controller.superclass
-      if parent != ActionController::Base
-        @parent_resource = parent.controller_name
+      @params_ordered = dsl_data[:params].map do |args|
+        Apipie::ParamDescription.from_dsl_data(args)
       end
     end
 
@@ -60,15 +55,14 @@ def params
 
     def params_ordered
       all_params = []
-      # get params from parent resource description
-      if @parent_resource
-        parent = Apipie.get_resource_description(@parent_resource)
-        merge_params(all_params, parent._params_ordered) if parent
-      end
+      parent = Apipie.get_resource_description(@resource.controller.superclass)
 
-      # get params from actual resource description
-      if @resource
-        merge_params(all_params, resource._params_ordered)
+      # get params from parent resource description
+      [parent, @resource].compact.each do |resource|
+        resource_params = resource._params_args.map do |args|
+          Apipie::ParamDescription.from_dsl_data(args)
+        end
+        merge_params(all_params, resource_params)
       end
 
       merge_params(all_params, @params_ordered)
@@ -79,8 +73,12 @@ def errors
       return @merged_errors if @merged_errors
       @merged_errors = []
       if @resource
+        resource_errors = @resource._errors_args.map do |args|
+          Apipie::ErrorDescription.new(args)
+        end
+
         # exclude overwritten parent errors
-        @merged_errors = @resource._errors_ordered.find_all do |err|
+        @merged_errors = resource_errors.find_all do |err|
           !@errors.any? { |e| e.code == err.code }
         end
       end

lib/apipie/resource_description.rb

@@ -12,13 +12,13 @@ module Apipie
   class ResourceDescription
 
     attr_reader :controller, :_short_description, :_full_description, :_methods, :_id,
-      :_path, :_name, :_params_ordered, :_errors_ordered, :_formats, :_parent
+      :_path, :_name, :_params_args, :_errors_args, :_formats, :_parent
 
     def initialize(controller, resource_name, dsl_data = nil, version = nil, &block)
 
       @_methods = ActiveSupport::OrderedHash.new
-      @_params_ordered = []
-      @_errors_ordered = []
+      @_params_args = []
+      @_errors_args = []
 
       @controller = controller
       @_id = resource_name
@@ -35,13 +35,8 @@ def update_from_dsl_data(dsl_data)
       @_short_description = dsl_data[:short_description]
       @_path = dsl_data[:path] || ""
       @_formats = dsl_data[:formats]
-      @_errors_ordered = dsl_data[:errors].map do |args|
-        Apipie::ErrorDescription.new(args)
-      end
-
-      @_params_ordered = dsl_data[:params] = dsl_data[:params].map do |args|
-        Apipie::ParamDescription.from_dsl_data(args)
-      end
+      @_errors_args = dsl_data[:errors]
+      @_params_args = dsl_data[:params]
 
       if dsl_data[:app_info]
         Apipie.configuration.app_info[_version] = dsl_data[:app_info]

spec/controllers/users_controller_spec.rb

@@ -46,20 +46,9 @@ def compare_hashes(h1, h2)
     end
 
     it "should contain params defined on resource level" do
-      subject._params_ordered.count.should == 2
-      p = subject._params_ordered.first
-      p.should_not be(nil)
-      p.name.should eq(:id)
-      p.desc.should eq("\n<p>User ID</p>\n")
-      p.required.should eq(false)
-      p.validator.class.should eq(Apipie::Validator::IntegerValidator)
-
-      p = subject._params_ordered.second
-      p.should_not be(nil)
-      p.name.should eq(:resource_param)
-      p.desc.should eq("\n<p>Param description for all methods</p>\n")
-      p.required.should eq(false)
-      p.validator.class.should eq(Apipie::Validator::HashValidator)
+      subject._params_args.count.should == 2
+      expected = [:id, Fixnum, {:required=>false, :desc=>"User ID"}, {}, nil]
+      subject._params_args.first.should == expected
     end
   end