grape_ape_rails 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c38d5143f2dfadcec3a305dd4c2eafe3b4ed2e2
-  data.tar.gz: 9c9652e751f91aa44806c9a0774c2ca0384b3449
+  metadata.gz: f8d75a716417af26b6ee509a1a7af2fce19b096b
+  data.tar.gz: e03bf4bca31988ff294232f51fc4be7afb938f1a
 SHA512:
-  metadata.gz: 83ae7387d5b330dc57a23380f5ffec25b87a0b6ddddac1da4e3d40cdfdc2f574dd030a1a95ba2bc74ebca9809fffb179c2cf3fb0ce27a3f90f780c252e5a78f7
-  data.tar.gz: 5220334028cd94d2fd7f4ba424862fc588fe510bc36cc58aeec77fc1525b837cf874785058a6ed8522cb477db060f892c45e40262680d7e946a8d8ce5245bda6
+  metadata.gz: e56880d0534ba6b3885867b04b2903a68a14a922afb9e16133d40edd3ded0819c596675bde5d37ec5f25bcfae18ad15b82ed7ffccfadc6251923b158ae3dad80
+  data.tar.gz: cc9a9e3b5fce7262a366e9d6ac7808ef8e629ad1796808a4d83f8c7ef64dd46ae31f26e1fab57428e5fa59ead077078f1591023ad01a1d72d73f22b26be8bc5f

data/grape_ape_rails.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport'
   spec.add_dependency 'multi_json'
   spec.add_dependency 'oj'
-  spec.add_dependency "grape", "0.9.0"
+  spec.add_dependency "grape", "~> 0.11.0"
   spec.add_dependency 'grape-rabl'
   spec.add_dependency 'grape-kaminari'
   spec.add_dependency 'grape-rails-cache'

data/lib/grape_ape_rails/version.rb

@@ -1,3 +1,3 @@
 module GrapeApeRails
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/lib/swagger/grape_swagger_modified.rb

@@ -29,8 +29,14 @@ module Grape
 
       def combine_namespaces(app)
         app.endpoints.each do |endpoint|
-          ns = endpoint.settings.stack.last[:namespace]
-          @combined_namespaces[ns.space] = ns if ns
+          ns = if endpoint.respond_to?(:namespace_stackable)
+                 endpoint.namespace_stackable(:namespace).last
+               else
+                 endpoint.settings.stack.last[:namespace]
+               end
+          # use the full namespace here (not the latest level only)
+          # and strip leading slash
+          @combined_namespaces[endpoint.namespace.sub(/^\//, '')] = ns if ns
 
           combine_namespaces(endpoint.options[:app]) if endpoint.options[:app]
         end
@@ -87,7 +93,6 @@ module Grape
             end
 
             desc api_doc.delete(:desc), params: api_doc.delete(:params)
-            @last_description.merge!(api_doc)
             get @@mount_path do
               header['Access-Control-Allow-Origin']   = '*'
               header['Access-Control-Request-Method'] = '*'
@@ -133,7 +138,6 @@ module Grape
                 required: true
               }
             }.merge(specific_api_doc.delete(:params) || {})
-            @last_description.merge!(specific_api_doc)
             get "#{@@mount_path}/:name" do
               header['Access-Control-Allow-Origin']   = '*'
               header['Access-Control-Request-Method'] = '*'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape_ape_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Matt E. Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,16 +56,16 @@ dependencies:
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: grape-rabl
   requirement: !ruby/object:Gem::Requirement