apipie-rails 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -2,6 +2,14 @@
  Changelog
 ===========
 
+v0.3.1
+------
+
+* Support for ``api!`` keyword in concerns 
+  [#322](https://github.com/Apipie/apipie-rails/pull/322) [@iNecas][]
+* More explicit ordering of the static dispatcher middleware
+  [#315](https://github.com/Apipie/apipie-rails/pull/315) [@iNecas][]
+
 v0.3.0
 ------
 This should be a backward compatible release. However, the number of new

data/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

data/lib/apipie/application.rb

@@ -9,8 +9,8 @@ module Apipie
   class Application
     # we need engine just for serving static assets
     class Engine < Rails::Engine
-      initializer "static assets" do |app|
-        app.middleware.use ::Apipie::StaticDispatcher, "#{root}/app/public", Apipie.configuration.doc_base_url
+      initializer "static assets", :before => :build_middleware_stack do |app|
+        app.middleware.use ::Apipie::StaticDispatcher, "#{root}/app/public"
       end
     end
 

data/lib/apipie/dsl_definition.rb

@@ -376,20 +376,7 @@ module Apipie
         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)

data/lib/apipie/method_description.rb

@@ -23,8 +23,7 @@ module Apipie
       @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 @@ module Apipie
 
     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) }

data/lib/apipie/static_dispatcher.rb

@@ -45,13 +45,13 @@ module Apipie
   class StaticDispatcher
     # Dispatches the static files. Similar to ActionDispatch::Static, but
     # it supports different baseurl configurations
-    def initialize(app, path, baseurl)
+    def initialize(app, path)
       @app = app
-      @baseurl = baseurl
       @file_handler = Apipie::FileHandler.new(path)
     end
 
     def call(env)
+      @baseurl ||= Apipie.configuration.doc_base_url
       case env['REQUEST_METHOD']
       when 'GET', 'HEAD'
         path = env['PATH_INFO'].sub("#{@baseurl}/","/apipie/").chomp('/')

data/lib/apipie/version.rb

@@ -1,3 +1,3 @@
 module Apipie
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/controllers/concerns_controller_spec.rb

@@ -23,7 +23,7 @@ describe ConcernsController do
 
   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'

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apipie-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails