apipie-rails 0.3.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6fc12663b63923153a8f238fac0c7556257aeb
-  data.tar.gz: 2271e183d1319d0d42df3d909285d7ded70970aa
+  metadata.gz: 8f1836e9d470aab5a5fd2592c5bd020670d7644f
+  data.tar.gz: 915e53c2aed478f60375817066e059dc0b955e66
 SHA512:
-  metadata.gz: 7864fe236a067ce5a0a3068a51d01a53b641ade349f6f5dc8b2d9ebc242e8c078de8601d82e62c4560770e9c537bfe98771e1f24c4b693fb31cb5fc32148d91d
-  data.tar.gz: fb902c9fc943fb6f3067576af5db940b015009810d908ccb02d684e9364e9cb293dc257d73848c7fee42cf356ad9756189734e0e5811e8f3ee07083535f483c2
+  metadata.gz: dc7d88e8c09ada1e11c86ce87e2535876c9c553532eb4ef07b66b862583308352e80ca47c2e656a43e85a9764725cea834c46bc20e5eae6321364509b5f9e21f
+  data.tar.gz: c6580080b5dc965477997baba13787948d2c749657156a02ab771a2890adab3195f04791fa736f832cdc4c1c20b6f4157edddace1441e7e453a87fe23c2126d2

data/.travis.yml

@@ -1,12 +1,22 @@
 language: ruby
 sudo: false
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.7
   - 2.2.3
+  - 2.3.3
 gemfile:
-  - Gemfile.rails32
-  - Gemfile.rails40
   - Gemfile.rails41
   - Gemfile.rails42
+  - Gemfile.rails50 # Min ruby 2.2.2
+  - Gemfile.rails51 # Min ruby 2.2.2
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: Gemfile.rails50
+    - rvm: 2.0.0
+      gemfile: Gemfile.rails51
+    - rvm: 2.1.7
+      gemfile: Gemfile.rails50
+    - rvm: 2.1.7
+      gemfile: Gemfile.rails51

data/CHANGELOG.md

@@ -2,6 +2,39 @@
  Changelog
 ===========
 
+v0.5.0
+------
+
+- Fix Rails 5.1 deprecations [\#530](https://github.com/Apipie/apipie-rails/pull/530) ([@Onumis](https://github.com/Onumis) [@sedx](https://github.com/sedx))
+  - **This release is no longer compatible with Ruby 1.9.x**
+- Do not mutate strings passed as config options, fixes \#461 [\#537](https://github.com/Apipie/apipie-rails/pull/537) ([samphilipd](https://github.com/samphilipd))
+- Added recursion for documentation, fixed bug in examples with paperclip [\#531](https://github.com/Apipie/apipie-rails/pull/531) ([blddmnd](https://github.com/blddmnd))
+- Added locales/ja.yml for Japanese [\#529](https://github.com/Apipie/apipie-rails/pull/529) ([kikuchi0808](https://github.com/kikuchi0808))
+
+
+v0.4.0
+------
+
+- Rails 5 compatibility [\#527](https://github.com/Apipie/apipie-rails/pull/527) ([iNecas](https://github.com/iNecas)) [\#420](https://github.com/Apipie/apipie-rails/pull/420) ([buren](https://github.com/buren)) [\#473](https://github.com/Apipie/apipie-rails/pull/473)([domcleal](https://github.com/domcleal))
+  - **This release is no longer compatible with Rails 3.x**
+- Include delete request parmeters in generated documentation [\#524](https://github.com/Apipie/apipie-rails/pull/524) ([johnnaegle](https://github.com/johnnaegle))
+- Allow a blank, not just nil, base\_url. [\#521](https://github.com/Apipie/apipie-rails/pull/521) ([johnnaegle](https://github.com/johnnaegle))
+- Adds allow\_blank option [\#508](https://github.com/Apipie/apipie-rails/pull/508) ([MrLeebo](https://github.com/MrLeebo))
+- Boolean Validator uses \<code\> instead of ' [\#502](https://github.com/Apipie/apipie-rails/pull/502) ([berfarah](https://github.com/berfarah))
+- Fix type validator message [\#501](https://github.com/Apipie/apipie-rails/pull/501) ([cindygu-itglue](https://github.com/cindygu-itglue))
+- Add IT locale [\#496](https://github.com/Apipie/apipie-rails/pull/496) ([alepore](https://github.com/alepore))
+- Fix small typo on dsl\_definition data init [\#494](https://github.com/Apipie/apipie-rails/pull/494) ([begault](https://github.com/begault))
+- Localize app info message [\#491](https://github.com/Apipie/apipie-rails/pull/491) ([belousovAV](https://github.com/belousovAV))
+- Fix travis build [\#489](https://github.com/Apipie/apipie-rails/pull/489) ([mtparet](https://github.com/mtparet))
+- Handle blank data when parsing a example's response [\#453](https://github.com/Apipie/apipie-rails/pull/453) ([stbenjam](https://github.com/stbenjam))
+- Allow layouts to be overridable. Fixes a regression introduced in \#425. [\#447](https://github.com/Apipie/apipie-rails/pull/447) ([nilsojes](https://github.com/nilsojes))
+
+v0.3.7
+------
+
+- Handle blank data when parsing a example's response [\#453](https://github.com/Apipie/apipie-rails/pull/453) ([stbenjam](https://github.com/stbenjam))
+- Allow layouts to be overridable. Fixes a regression introduced in \#425. [\#447](https://github.com/Apipie/apipie-rails/pull/447) ([nilseriksson](https://github.com/nilseriksson))
+
 v0.3.6
 ------
 

data/Gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-# load local gemfile
-local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local')
-self.instance_eval(Bundler.read_file(local_gemfile)) if File.exist?(local_gemfile)
+gem 'rails', '~> 5.0'
+gem 'mime-types', '~> 2.99.3'
+gem 'rails-controller-testing'

data/Gemfile.rails41

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rails', '~> 4.1.0'
+gem 'mime-types', '~> 2.99.3'

data/Gemfile.rails42

@@ -2,4 +2,10 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rails', '~> 4.2.5.1'
+gem 'rails', '~> 4.2.5'
+gem 'mime-types', '~> 2.99.3'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
+  gem 'nokogiri', '~> 1.6.8'
+  gem 'rdoc', '~> 4.2.2'
+end

data/Gemfile.rails50

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.0'
+gem 'mime-types', '~> 2.99.3'
+gem 'rails-controller-testing'

data/Gemfile.rails51

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem 'rails', '~> 5.1.0.rc1'
+gem 'mime-types', '~> 2.99.3'
+gem 'rails-controller-testing'

data/README.rst

@@ -2,9 +2,9 @@
  API Documentation Tool
 ========================
 
-.. image:: https://travis-ci.org/Apipie/apipie-rails.png?branch=master
+.. image:: https://travis-ci.org/Apipie/apipie-rails.svg?branch=master
     :target: https://travis-ci.org/Apipie/apipie-rails
-.. image:: https://codeclimate.com/github/Apipie/apipie-rails.png
+.. image:: https://codeclimate.com/github/Apipie/apipie-rails.svg
     :target: https://codeclimate.com/github/Apipie/apipie-rails
 .. image:: https://badges.gitter.im/Apipie/apipie-rails.svg
    :alt: Join the chat at https://gitter.im/Apipie/apipie-rails
@@ -288,6 +288,9 @@ required
 allow_nil
   Setting this to true means that ``nil`` can be passed.
 
+allow_blank
+  Like ``allow_nil``, but for blank values. ``false``, ``""``, ``' '``, ``nil``, ``[]``, and ``{}`` are all blank.
+
 as
   Used by the processing functionality to change the name of a key params.
 
@@ -528,7 +531,7 @@ default_version
 validate
   Parameters validation is turned off when set to false. When set to
   ``:explicitly``, you must invoke parameter validation yourself by calling
-  controller method ``apipie_validations`` (typically in a before_filter).
+  controller method ``apipie_validations`` (typically in a before_action).
   When set to ``:implicitly`` (or just true), your controller's action
   methods are wrapped with generated methods which call ``apipie_validations``,
   and then call the action method. (``:implicitly`` by default)
@@ -726,17 +729,17 @@ is raised and can be rescued and processed. It contains a description
 of the parameter value expectations. Validations can be turned off
 in the configuration file.
 
-Parameter validation normally happens after before_filters, just before
+Parameter validation normally happens after before_actions, just before
 your controller method is invoked. If you prefer to control when parameter
 validation occurs, set the configuration parameter ``validate`` to ``:explicitly``.
 You must then call the ``apipie_validations`` method yourself, e.g.:
 
 .. code:: ruby
 
-   before_filter: :apipie_validations
+   before_action: :apipie_validations
 
-This is useful if you have before_filters which use parameter values: just add them
-after the ``apipie_validations`` before_filter.
+This is useful if you have before_actions which use parameter values: just add them
+after the ``apipie_validations`` before_action.
 
 TypeValidator
 -------------
@@ -1068,11 +1071,8 @@ When your project use I18n, localization related configuration could appear as f
     config.default_locale = 'en'
     config.locale = lambda { |loc| loc ? I18n.locale = loc : I18n.locale }
     config.translate = lambda do |str, loc|
-      old_loc = I18n.locale
-      I18n.locale = loc
-      trans = I18n.t(str)
-      I18n.locale = old_loc
-      trans
+      return '' if str.blank?
+      I18n.t str, locale: loc, scope: 'doc'
     end
    end
 

data/apipie-rails.gemspec

@@ -10,14 +10,13 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/Apipie/apipie-rails"
   s.summary     = %q{Rails REST API documentation tool}
   s.description = %q{Rails REST API documentation tool}
-
+  s.required_ruby_version = '>= 2.0.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rails", ">= 3.0.20"
-  s.add_dependency 'json'
+  s.add_dependency "rails", ">= 4.1"
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "minitest"

data/app/controllers/apipie/apipies_controller.rb

@@ -5,8 +5,8 @@ module Apipie
 
     layout Apipie.configuration.layout
 
-    around_filter :set_script_name
-    before_filter :authenticate
+    around_action :set_script_name
+    before_action :authenticate
 
     def authenticate
       if Apipie.configuration.authenticate
@@ -93,7 +93,7 @@ module Apipie
     end
 
     def authorized_doc
-
+      return if @doc.nil?
       return @doc unless Apipie.configuration.authorize
 
       new_doc = { :docs => @doc[:docs].clone }
@@ -114,9 +114,13 @@ module Apipie
 
     def get_format
       [:resource, :method, :version].each do |par|
-        if params[par]
-          params[:format] = :html unless params[par].sub!('.html', '').nil?
-          params[:format] = :json unless params[par].sub!('.json', '').nil?
+        next unless params[par]
+        [:html, :json].each do |format|
+          extension = ".#{format}"
+          if params[par].include?(extension)
+            params[par] = params[par].sub(extension, '')
+            params[:format] = format
+          end
         end
       end
       request.format = params[:format] if params[:format]

data/config/locales/it.yml

@@ -0,0 +1,31 @@
+it:
+  apipie:
+    resources: Risorse
+    resource: Risorsa
+    description: Descrizione
+    no_docs_found: Nessuna documentazione trovata
+    no_docs_found_descr: Non abbiamo trovato nessuna documentazione per la tua API.
+    follow_instructions_html: Leggi su %{href} come descrivere i tuoi controller.
+    follow_instructions_href: ulteriori istruzioni
+    oops: Ops!!
+    resource_not_found_html: Risorsa %{resource} non trovata.
+    method_not_found_html: Metodo %{method} non trovato per la risorsa %{resource}.
+    goto_homepage_html: Prova ad andare su %{href}
+    goto_homepage_href: "%{app_name} Homepage della documentazione API"
+    required: richiesto
+    optional: opzionale
+    nil_allowed: consentito nil
+    param_name: Nome parametro
+    params: Parametri
+    examples: Esempi
+    metadata: Metadata
+    errors: Errori
+    error_code: Codice
+    error_description: Descrizione
+    error_metadata: Metadata
+    supported_formats: Formati supportati
+    enable_javascript_html: Abilita i JavaScript per vedere %{comments_href}.
+    comments_powered_by_disqus: commenti forniti da %{disqus}
+    api_documentation: Documentazione API
+    headers: Header
+    header_name: Nome Header

data/config/locales/ja.yml

@@ -0,0 +1,31 @@
+ja:
+  apipie:
+    resources: "リソース"
+    resource: "リソース"
+    description: "記述"
+    no_docs_found: "ドキュメントが見つかりませんでした。"
+    no_docs_found_descr: "あなたのAPIにあう資料が見つかりませんでした。"
+    follow_instructions_html: "コントローラーをどう説明するのか%{href}を参考にしてください。"
+    follow_instructions_href: "具体的な説明"
+    oops: "おっと！"
+    resource_not_found_html: "リソース%{resource}が見つかりませんでした。"
+    method_not_found_html: "リソース%{resource}のためのメソッド%{method}が見つかりませんでした。 ."
+    goto_homepage_html: "%{href}へ移ります。"
+    goto_homepage_href: "%{app_name}APIドキュメントのホームページ"
+    required: "必須"
+    optional: "任意"
+    nil_allowed: "nil可"
+    param_name: "パラメーター名"
+    params: "パラメーター"
+    examples: "例"
+    metadata: "メタデータ"
+    errors: "エラー"
+    error_code: "エラーコード"
+    error_description: "エラー説明"
+    error_metadata: "エラーメタデータ"
+    supported_formats: "サポートフォーマット"
+    enable_javascript_html: "%{comments_href}のJavaScriptをオンにしてください。"
+    comments_powered_by_disqus: "%{disqus}によるコメント"
+    api_documentation: "APIドキュメント"
+    headers: "ヘッダー"
+    header_name: "ヘッダー名"

data/lib/apipie/apipie_module.rb

@@ -31,14 +31,16 @@ module Apipie
   end
 
   # get application description for given or default version
-  def self.app_info(version = nil)
-    if app_info_version_valid? version
-      Apipie.markup_to_html(self.configuration.app_info[version])
+  def self.app_info(version = nil, lang = nil)
+    info = if app_info_version_valid? version
+      translate(self.configuration.app_info[version], lang)
     elsif app_info_version_valid? Apipie.configuration.default_version
-      Apipie.markup_to_html(self.configuration.app_info[Apipie.configuration.default_version])
+      translate(self.configuration.app_info[Apipie.configuration.default_version], lang)
     else
       "Another API description"
     end
+
+    Apipie.markup_to_html info
   end
 
   def self.api_base_url(version = nil)

data/lib/apipie/application.rb

@@ -54,14 +54,9 @@ module Apipie
     # the app might be nested when using contraints, namespaces etc.
     # this method does in depth search for the route controller
     def route_app_controller(app, route, visited_apps = [])
-      visited_apps << app
-      if app.respond_to?(:controller)
-        return app.controller(route.defaults)
-      elsif app.respond_to?(:app) && !visited_apps.include?(app.app)
-        return route_app_controller(app.app, route, visited_apps)
+      if route.defaults[:controller]
+        (route.defaults[:controller].camelize + "Controller").constantize
       end
-    rescue ActionController::RoutingError
-      # some errors in the routes will not stop us here: just ignoring
     end
 
     def routes_for_action(controller, method, args)
@@ -278,7 +273,7 @@ module Apipie
       {
         :docs => {
           :name => Apipie.configuration.app_name,
-          :info => translate(Apipie.app_info(version), lang),
+          :info => Apipie.app_info(version, lang),
           :copyright => Apipie.configuration.copyright,
           :doc_url => Apipie.full_url(url_args),
           :api_url => Apipie.api_base_url(version),
@@ -392,7 +387,7 @@ module Apipie
     def version_prefix(klass)
       version = controller_versions(klass).first
       base_url = get_base_url(version)
-      return "/" if base_url.nil?
+      return "/" if base_url.blank?
       base_url[1..-1] + "/"
     end
 
@@ -429,10 +424,10 @@ module Apipie
     # as this would break loading of the controllers.
     def rails_mark_classes_for_reload
       unless Rails.application.config.cache_classes
-        ActionDispatch::Reloader.cleanup!
+        Rails.application.reloader.reload!
         init_env
         reload_examples
-        ActionDispatch::Reloader.prepare!
+        Rails.application.reloader.prepare!
       end
     end
 

data/lib/apipie/dsl_definition.rb

@@ -26,7 +26,7 @@ module Apipie
          :errors            => [],
          :params            => [],
          :headers           => [],
-         :resouce_id        => nil,
+         :resource_id        => nil,
          :short_description => nil,
          :description       => nil,
          :examples          => [],
@@ -237,7 +237,7 @@ module Apipie
               # Only allow params passed in that are defined keys in the api
               # Auto skip the default params (format, controller, action)
               if Apipie.configuration.validate_key?
-                params.reject{|k,_| %w[format controller action].include?(k.to_s) }.each_key do |param|
+                params.reject{|k,_| %w[format controller action].include?(k.to_s) }.each_pair do |param, _|
                   # params allowed
                   raise UnknownParam.new(param) if method_params.select {|_,p| p.name.to_s == param.to_s}.empty?
                 end

data/lib/apipie/extractor/recorder.rb

@@ -38,7 +38,7 @@ module Apipie
         @verb = request.request_method.to_sym
         @path = request.path
         @params = request.request_parameters
-        if [:POST, :PUT, :PATCH].include?(@verb)
+        if [:POST, :PUT, :PATCH, :DELETE].include?(@verb)
           @request_data = @params
         else
           @query = request.query_string
@@ -48,9 +48,9 @@ module Apipie
       end
 
       def parse_data(data)
-        return nil if data.to_s =~ /^\s*$/
+        return nil if data.strip.blank?
         JSON.parse(data)
-      rescue StandardError => e
+      rescue StandardError
         data
       end
 
@@ -145,12 +145,8 @@ module Apipie
       end
 
       module FunctionalTestRecording
-        def self.included(base)
-          base.alias_method_chain :process, :api_recording
-        end
-
-        def process_with_api_recording(*args) # action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
-          ret = process_without_api_recording(*args)
+        def process(*args) # action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
+          ret = super(*args)
           if Apipie.configuration.record
             Apipie::Extractor.call_recorder.analyze_functional_test(self)
             Apipie::Extractor.call_finished

data/lib/apipie/extractor/writer.rb

@@ -78,21 +78,26 @@ module Apipie
         %w[title verb path versions query request_data response_data code show_in_doc recorded].each do |k|
           next unless call.has_key?(k)
           ordered_call[k] = case call[k]
-                       when ActiveSupport::HashWithIndifferentAccess
-                         # UploadedFiles break the to_json call, turn them into a string so they don't break
-                         call[k].each do |pkey, pval|
-                           if (pval.is_a?(Rack::Test::UploadedFile) || pval.is_a?(ActionDispatch::Http::UploadedFile))
-                             call[k][pkey] = "<FILE CONTENT '#{pval.original_filename}'>"
-                           end
-                         end
-                         JSON.parse(call[k].to_json) # to_hash doesn't work recursively and I'm too lazy to write the recursion:)
-                       else
-                         call[k]
-                       end
-        end
+                     when ActiveSupport::HashWithIndifferentAccess
+                       convert_file_value(call[k]).to_hash
+                     else
+                       call[k]
+                     end
+      end
         return ordered_call
       end
 
+      def convert_file_value hash
+        hash.each do |k, v|
+          if (v.is_a?(Rack::Test::UploadedFile) || v.is_a?(ActionDispatch::Http::UploadedFile))
+            hash[k] = "<FILE CONTENT '#{v.original_filename}'>"
+          elsif v.is_a?(Hash)
+            hash[k] = convert_file_value(v)
+          end
+        end
+        hash
+      end
+
       def load_recorded_examples
         self.class.load_recorded_examples
       end
@@ -131,7 +136,7 @@ module Apipie
             new_example[:title] ||= old_example["title"] if old_example["title"].present?
           end
           new_example
-        end 
+        end
       end
 
       def load_new_examples

data/lib/apipie/extractor.rb

@@ -9,7 +9,7 @@ require 'apipie/extractor/collector'
 class Apipie::Railtie
   initializer 'apipie.extractor' do |app|
     ActiveSupport.on_load :action_controller do
-      before_filter do |controller|
+      before_action do |controller|
         if Apipie.configuration.record
           Apipie::Extractor.call_recorder.analyse_controller(controller)
         end
@@ -17,7 +17,7 @@ class Apipie::Railtie
     end
     app.middleware.use ::Apipie::Extractor::Recorder::Middleware
     ActionController::TestCase::Behavior.instance_eval do
-      include Apipie::Extractor::Recorder::FunctionalTestRecording
+      prepend Apipie::Extractor::Recorder::FunctionalTestRecording
     end
   end
 end

data/lib/apipie/param_description.rb

@@ -8,7 +8,7 @@ module Apipie
   # validator - Validator::BaseValidator subclass
   class ParamDescription
 
-    attr_reader :method_description, :name, :desc, :allow_nil, :validator, :options, :metadata, :show, :as, :validations
+    attr_reader :method_description, :name, :desc, :allow_nil, :allow_blank, :validator, :options, :metadata, :show, :as, :validations
     attr_accessor :parent, :required
 
     def self.from_dsl_data(method_description, args)
@@ -56,6 +56,7 @@ module Apipie
       end
 
       @allow_nil = @options[:allow_nil] || false
+      @allow_blank = @options[:allow_blank] || false
 
       action_awareness
 
@@ -71,8 +72,20 @@ module Apipie
       method_description.from_concern? || @from_concern
     end
 
+    def normalized_value(value)
+      if value.is_a?(ActionController::Parameters) && !value.is_a?(Hash)
+        value.to_unsafe_hash
+      elsif value.is_a? Array
+        value.map { |v| normalized_value (v) }
+      else
+        value
+      end
+    end
+
     def validate(value)
       return true if @allow_nil && value.nil?
+      return true if @allow_blank && value.blank?
+      value = normalized_value(value)
       if (!@allow_nil && value.nil?) || !@validator.valid?(value)
         error = @validator.error
         error = ParamError.new(error) unless error.is_a? StandardError
@@ -81,6 +94,7 @@ module Apipie
     end
 
     def process_value(value)
+      value = normalized_value(value)
       if @validator.respond_to?(:process_value)
         @validator.process_value(value)
       else
@@ -111,6 +125,7 @@ module Apipie
                :description => preformat_text(Apipie.app.translate(@options[:desc], lang)),
                :required => required,
                :allow_nil => allow_nil,
+               :allow_blank => allow_blank,
                :validator => validator.to_s,
                :expected_type => validator.expected_type,
                :metadata => metadata,

data/lib/apipie/validator.rb

@@ -96,7 +96,7 @@ module Apipie
       end
 
       def description
-        "Must be #{@type}"
+        "Must be a #{@type}"
       end
 
       def expected_type
@@ -413,7 +413,8 @@ module Apipie
       end
 
       def description
-        "Must be 'true' or 'false' or '1' or '0'"
+        string = %w(true false 1 0).map { |value| "<code>#{value}</code>" }.join(', ')
+        "Must be one of: #{string}"
       end
     end
 
@@ -464,4 +465,3 @@ module Apipie
 
   end
 end
-

data/lib/apipie/version.rb

@@ -1,3 +1,3 @@
 module Apipie
-  VERSION = '0.3.6'
+  VERSION = '0.5.0'
 end

data/lib/apipie-rails.rb

@@ -1,4 +1,5 @@
 require 'i18n'
+require 'json'
 require 'active_support/hash_with_indifferent_access'
 
 require "apipie/routing"

data/lib/tasks/apipie.rake

@@ -105,7 +105,11 @@ namespace :apipie do
                 else
                   File.expand_path("../../../app/views/apipie/apipies", __FILE__)
                 end
-    layouts_path = File.expand_path("../../../app/views/layouts", __FILE__)
+    layouts_path = if File.directory?("#{Rails.root}/app/views/layouts/apipie")
+                     "#{Rails.root}/app/views/layouts"
+                   else
+                     File.expand_path("../../../app/views/layouts", __FILE__)
+                   end
     @apipie_renderer = ActionView::Base.new([base_path, layouts_path])
     @apipie_renderer.singleton_class.send(:include, ApipieHelper)
     return @apipie_renderer