autodoc-grape 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 014e1b1a44ccf074cf3c75c54fdea66446bab6fd
-  data.tar.gz: bbf5715a2249f913c788deb3efa3044cb90181be
+  metadata.gz: 2f2328345c68959c4519ed7af1e6dec88fd62e17
+  data.tar.gz: 083c8e18652abcc4d0b258eb711cbf8f287bf9e5
 SHA512:
-  metadata.gz: b1493f092df2c6d0e1b8362405118c7b0a3701959a3792c12d1aa230220e5bfd93efd7b8d50a278cab325e9d22d4d996fa63b0ace87c68e4353486b0e15fe858
-  data.tar.gz: 33a0a7bf8d306feb662fbffb19e1e488b0d8fba722f8195d7a49283feec492da35e3bc20765af411839ad0cd0c8bdb5766812f2e86862e7c7095f3d1025253eb
+  metadata.gz: c6f55827b7800ec4feb17d8f62ba440cf34c0bb421b4b818d6b4dadf3a618a8f6ebec13130f2b9293babd49279402e599ec03b56274c31954927343ae0693ebe
+  data.tar.gz: f835b675e7fe11f11b9108a6a4d7acb4ed7cf1c5e22add43010646daf7ba203143052588983cc550d2354a25a18c37953ad0d93554a89d89eb482df42943504f

data/.gitignore

@@ -20,3 +20,4 @@ spec/dummy/tmp/
 spec/reports
 tmp
 vendor/bundle
+gemfiles

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'grape-14' do
+  gem 'grape', '~> 0.14.0'
+end
+
+appraise 'grape-15' do
+  gem 'grape', '~> 0.15.0'
+end
+
+appraise 'grape-16' do
+  gem 'grape', '~> 0.16.2'
+end

data/Gemfile

@@ -6,6 +6,5 @@ gemspec
 group :test do
   gem "pry-rails"
   gem "rspec-rails"
-  gem "grape"
   gem "redcarpet"
 end

data/autodoc-grape.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "autodoc"
-  spec.add_dependency "grape"
+  spec.add_dependency "grape", '>= 0.14.0'
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rails", "4.2.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency 'appraisal'
 end

data/lib/autodoc/grape.rb

@@ -2,6 +2,7 @@ require "autodoc"
 require "autodoc/grape/version"
 require "autodoc/grape/document/parameter"
 require "autodoc/grape/monkey_patches/documents_grape_extension"
+require "autodoc/grape/monkey_patches/configuration_grape_extension"
 require "autodoc/grape/document_grape_extension"
 
 module Autodoc

data/lib/autodoc/grape/document_grape_extension.rb

@@ -1,21 +1,45 @@
 module DocumentGrapeExtension
- private
-
-  def has_validators?
-    !!validators
+  def path_pattern
+    if Grape::VERSION.to_f >= 0.16
+      grape_pattern.path
+    else
+      grape_options[:path]
+    end
   end
 
+  private
+
   def method
     grape_options[:method]
   end
 
+  def has_validators?
+    !!validators
+  end
+
   def path
-    grape_options[:path].gsub(/\(.*\)$/,'')
+    if Autodoc.configuration.grape_path_arrange
+      Autodoc.configuration.grape_path_arrange.call(self)
+    else
+      path_pattern
+    end
+  end
+
+  def validators
+    route_info.instance_variable_get(:@options)[:params]
+  end
+
+  def parameters
+    validators.map { |validator| Autodoc::Grape::Document::Parameter.new(validator) }.join("\n")
   end
 
   def route_info
     @route_info ||= begin
-      request.env["rack.routing_args"][:route_info]
+      if Grape::VERSION.to_f >= 0.16
+        request.env["grape.routing_args"][:route_info]
+      else
+        request.env["rack.routing_args"][:route_info]
+      end
     end
   end
 
@@ -23,11 +47,7 @@ module DocumentGrapeExtension
     route_info.instance_variable_get(:@options)
   end
 
-  def validators
-    route_info.instance_variable_get(:@options)[:params]
-  end
-
-  def parameters
-    validators.map { |validator| Autodoc::Grape::Document::Parameter.new(validator) }.join("\n")
+  def grape_pattern
+    route_info.instance_variable_get(:@pattern)
   end
 end

data/lib/autodoc/grape/monkey_patches/configuration_grape_extension.rb

@@ -0,0 +1,5 @@
+module ConfigurationGrapeExtension
+  attr_accessor :grape_path_arrange
+end
+
+Autodoc::Configuration.send(:prepend, ConfigurationGrapeExtension)

data/lib/autodoc/grape/monkey_patches/documents_grape_extension.rb

@@ -6,7 +6,15 @@ module DocumentsGrapeExtension
   end
 
   def grape_request?(request)
-    defined?(Grape) && request.env["rack.routing_args"][:route_info].instance_of?(Grape::Route) rescue false
+    begin
+      if Grape::VERSION.to_f >= 0.16
+        request.env["grape.routing_args"][:route_info].instance_of?(Grape::Router::Route)
+      else
+        request.env["rack.routing_args"][:route_info].instance_of?(Grape::Route)
+      end
+    rescue
+      false
+    end
   end
 end
 

data/lib/autodoc/grape/version.rb

@@ -1,5 +1,5 @@
 module Autodoc
   module Grape
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autodoc-grape
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Keisuke Ishizawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autodoc
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - muddyapesjm66@gmail.com
@@ -106,6 +120,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -117,6 +132,7 @@ files:
 - lib/autodoc/grape.rb
 - lib/autodoc/grape/document/parameter.rb
 - lib/autodoc/grape/document_grape_extension.rb
+- lib/autodoc/grape/monkey_patches/configuration_grape_extension.rb
 - lib/autodoc/grape/monkey_patches/documents_grape_extension.rb
 - lib/autodoc/grape/version.rb
 homepage: https://github.com/kei-p/autodoc-grape