grape-route-helpers 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a436c5306eca86f756921e38c26141ad09b9ab2d
-  data.tar.gz: 69dd431b336b391cb402bc14775027e69cc6e2c8
+  metadata.gz: 83b55766476f52f66e8ca85e84cbb3982cc30ffc
+  data.tar.gz: 4e95656ec76aec7d9c61c09ed5f8d3ecf9d82992
 SHA512:
-  metadata.gz: c60ff91c855a14e6102130b36872503dbe03846eedff32e4814116f7a766afca8ad0bf0e79bd66ea964d3f2442c1069e4a41133b7cdeebc525fcd5793db47895
-  data.tar.gz: 8f0066969692d5b96fde60b43eaf39665473bfc6af49ac43d3be0d9506cfe8f00eea3f0115f1a3efd41dfe61202b6213034db98da7c2451edcb49610ae7986c0
+  metadata.gz: b0e423a706e7c000da1c40203dfa482e38582189521917dfa271ba5f024c9e3c9efc67d66dbaeff1651e2b15ab7655534d99ae5bc4035f00cf294478844df0b5
+  data.tar.gz: 87182c670bca69856919540aba66c97d965d2c17c2da71cc94763561bc881e4ded309a9cf5d13e2846c875d62d512ebf0f657950351786a8c807acfb8b78a219

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## April 28 2016
+
+* Release 2.0.0
+* Fix incompatibility between grape-route-helpers and grape 0.16.0
+
 ## April 11 2016
 
 * Release 1.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape-route-helpers (1.2.2)
+    grape-route-helpers (2.0.0)
       activesupport
       grape
       rake
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.3)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -29,25 +29,28 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    enumerable-lazy (0.0.1)
     equalizer (0.0.11)
-    grape (0.12.0)
+    grape (0.16.2)
       activesupport
       builder
       hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
+      mustermann19 (~> 0.4.3)
       rack (>= 1.3.0)
       rack-accept
-      rack-mount
       virtus (>= 1.0.0)
-    hashie (3.4.2)
+    hashie (3.4.3)
     i18n (0.7.0)
-    ice_nine (0.11.1)
+    ice_nine (0.11.2)
     json (1.8.3)
     method_source (0.8.2)
-    minitest (5.8.3)
-    multi_json (1.11.2)
+    minitest (5.8.4)
+    multi_json (1.11.3)
     multi_xml (0.5.5)
+    mustermann19 (0.4.3)
+      enumerable-lazy
     parser (2.3.0.pre.2)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.1)
@@ -58,8 +61,6 @@ GEM
     rack (1.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rainbow (2.0.0)
     rake (10.4.2)
     rspec (3.3.0)

data/README.md

@@ -2,10 +2,14 @@
 
 [![Build Status](https://travis-ci.org/reprah/grape-route-helpers.svg)](https://travis-ci.org/reprah/grape-route-helpers)
 
- Provides named route helpers for Grape APIs, similar to [Rails' route helpers](http://edgeguides.rubyonrails.org/routing.html#path-and-url-helpers).
+Provides named route helpers for Grape APIs, similar to [Rails' route helpers](http://edgeguides.rubyonrails.org/routing.html#path-and-url-helpers).
 
 ### Installation
 
+#### Compatibility with Grape
+
+If you're using grape 0.16.0 or higher, you'll need version 2.0.0 or higher of grape-route-helpers.
+
 #### Rails
 
  1.) Add the gem to your Gemfile.
@@ -132,7 +136,7 @@ This results in creating a helper called `is_the_server_running_path`.
 
 #### Testing
 
-You can you the route helpers in our API tests by including the `GrapeRouteHelpers::NamedRouteMatcher` module inside your specs. Here's an example:
+You can use route helpers in your API tests by including the `GrapeRouteHelpers::NamedRouteMatcher` module inside your specs. Here's an example:
 
 ```ruby
 require 'spec_helper'

data/grape-route-helpers.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.files       = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.homepage    = 'https://github.com/reprah/grape-route-helpers'
 
-  gem.add_runtime_dependency 'grape'
+  gem.add_runtime_dependency 'grape', '~> 0.16', '>= 0.16.0'
   gem.add_runtime_dependency 'activesupport'
   gem.add_runtime_dependency 'rake'
 

data/lib/grape-route-helpers/all_routes.rb

@@ -10,10 +10,7 @@ module GrapeRouteHelpers
 
     def all_routes
       routes = subclasses.flat_map { |s| s.send(:prepare_routes) }
-      # delete duplicate routes
-      routes.uniq do |route|
-        route.instance_variable_get( :@options )
-      end
+      routes.uniq(&:options)
     end
   end
 end

data/lib/grape-route-helpers/decorated_route.rb

@@ -10,7 +10,7 @@ module GrapeRouteHelpers
 
     def initialize(route)
       @route = route
-      @route_options = route.instance_variable_get(:@options)
+      @route_options = route.options
       @helper_names = []
       @helper_arguments = required_helper_segments
       @extension = default_extension
@@ -64,16 +64,17 @@ module GrapeRouteHelpers
     end
 
     def route_versions
+      version_pattern = /[^\[",\]\s]+/
       if route_version
-        route_version.split('|')
+        route_version.scan(version_pattern)
       else
         [nil]
       end
     end
 
     def path_helper_name(opts = {})
-      if route.route_as
-        name = route.route_as.to_s
+      if route_options[:as]
+        name = route_options[:as].to_s
       else
         segments = path_segments_with_values(opts)
 
@@ -90,7 +91,7 @@ module GrapeRouteHelpers
 
     def segment_to_value(segment, opts = {})
       options = HashWithIndifferentAccess.new(
-        route_options.merge(opts)
+        route.options.merge(opts)
       )
 
       if dynamic_segment?(segment)
@@ -124,7 +125,7 @@ module GrapeRouteHelpers
 
     def required_helper_segments
       segments_in_options = dynamic_path_segments.select do |segment|
-        route_options[segment.to_sym]
+        route.options[segment.to_sym]
       end
       dynamic_path_segments - segments_in_options
     end
@@ -144,19 +145,19 @@ module GrapeRouteHelpers
     end
 
     def route_path
-      route_options[:path]
+      route.path
     end
 
     def route_version
-      route_options[:version]
+      route.version
     end
 
     def route_namespace
-      route_options[:namespace]
+      route.namespace
     end
 
     def route_method
-      route_options[:method]
+      route.request_method
     end
   end
 end

data/lib/grape-route-helpers/version.rb

@@ -1,4 +1,4 @@
 # Gem version
 module GrapeRouteHelpers
-  VERSION = '1.2.2'
+  VERSION = '2.0.0'
 end

data/spec/grape_route_helpers/all_routes_spec.rb

@@ -21,7 +21,6 @@ describe GrapeRouteHelpers::AllRoutes do
 
         expect(duplicates).to be_empty
         expect(all_route_options.size).to eq(7)
-
       end
     end
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: grape-route-helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Harper Henn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement