Merge pull request #322 from iNecas/api-from-routes-concerns

Support the api! keyword from concerns.

README.rst

@@ -425,7 +425,7 @@ There are some default substitutions available:
 
 :controller_path
   value of ``controller.controller_path``, e.g. ``api/users`` for
-  ``Api::UsersController``
+  ``Api::UsersController``. Only if not using the ``api!`` keyword.
 
 :resource_id
   Apipie identifier of the resource, e.g. ``users`` for
@@ -445,7 +445,7 @@ Example
        # ...
      end
 
-     api :GET, '/:resource_id/:id', 'Show a :resource'
+     api! 'Show a :resource'
      def show
        # ...
      end

lib/apipie/dsl_definition.rb

@@ -376,20 +376,7 @@ def method_added(method_name) #:doc:
         super
         return if !Apipie.active_dsl? || !_apipie_dsl_data[:api]
 
-        if _apipie_dsl_data[:api_from_routes]
-          desc = _apipie_dsl_data[:api_from_routes][:desc]
-          options = _apipie_dsl_data[:api_from_routes][:options]
-
-          api_from_routes = Apipie.routes_for_action(self, method_name, {:desc => desc, :options => options}).map do |route_info|
-            [route_info[:verb],
-             route_info[:path],
-             route_info[:desc],
-             (route_info[:options] || {}).merge(:from_routes => true)]
-          end
-          _apipie_dsl_data[:api_args].concat(api_from_routes)
-        end
-
-        return if _apipie_dsl_data[:api_args].blank?
+        return if _apipie_dsl_data[:api_args].blank? && _apipie_dsl_data[:api_from_routes].blank?
 
         # remove method description if exists and create new one
         Apipie.remove_method_description(self, _apipie_dsl_data[:api_versions], method_name)

lib/apipie/method_description.rb

@@ -23,8 +23,7 @@ def initialize(method, resource, dsl_data)
       @method = method.to_s
       @resource = resource
       @from_concern = dsl_data[:from_concern]
-
-      @apis = dsl_data[:api_args].map do |mthd, path, desc, opts|
+      @apis = api_data(dsl_data).map do |mthd, path, desc, opts|
         MethodDescription::Api.new(mthd, concern_subst(path), concern_subst(desc), opts)
       end
 
@@ -154,6 +153,23 @@ def from_concern?
 
     private
 
+    def api_data(dsl_data)
+      ret = dsl_data[:api_args].dup
+      if dsl_data[:api_from_routes]
+        desc = dsl_data[:api_from_routes][:desc]
+        options = dsl_data[:api_from_routes][:options]
+
+        api_from_routes = Apipie.routes_for_action(resource.controller, method, {:desc => desc, :options => options}).map do |route_info|
+          [route_info[:verb],
+           route_info[:path],
+           route_info[:desc],
+           (route_info[:options] || {}).merge(:from_routes => true)]
+        end
+        ret.concat(api_from_routes)
+      end
+      ret
+    end
+
     def merge_params(params, new_params)
       new_param_names = Set.new(new_params.map(&:name))
       params.delete_if { |p| new_param_names.include?(p.name) }

spec/controllers/concerns_controller_spec.rb

@@ -23,7 +23,7 @@
 
   it "replaces a placeholder doc specified in concern with a real path" do
     path = Apipie["concern_resources#index"].apis.first.path
-    path.should == '/concerns'
+    path.should == '/api/concerns'
 
     path = Apipie["concern_resources#show"].apis.first.path
     path.should == '/concern_resources/:id'

spec/dummy/app/controllers/concerns/sample_controller.rb

@@ -2,7 +2,7 @@ module Concerns
   module SampleController
     extend Apipie::DSL::Concern
 
-    api :GET, '/:controller_path'
+    api!
     def index
       render :text => "OK #{params.inspect}"
     end