strong_routes 0.9.5 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b15e31fe4c1c99b2dae4003285ebe54fa57af7f
-  data.tar.gz: 2df7a6c037ab27aedb53062c8791554a02287e73
+  metadata.gz: c949ed86bf9856ae47f55db3b94ffe96ba990331
+  data.tar.gz: ee565e1289a1cb7bb38371ebb33d33b68acc94a9
 SHA512:
-  metadata.gz: 352a1c740e090c13a9c38694267751b410af4083e938b233d3d74f8b809defb161adb1c249c896ad8e5ae5b02bf1888d968d212dd569ad9ebd46951c897be032
-  data.tar.gz: 23f4690f909af7020d1a3b1c2a2d89b7bc37676f38d33f217ae116c89f56a25c06af4222674dc48c3fd0db9b9606a86834749f304e7b2c3d91673896a76011fe
+  metadata.gz: f79c6760a315f0c1b75a1af6e55b88837be7bc8276581dba273597b95e66e830859541e5988fab3c87c3f4711df61b20b27646c6b130f5722c5715b7339de114
+  data.tar.gz: e590063892de6bd092eaad914c0e2e6618d67cd9ddc0c4154550eddaa3e037c0c01f0410df3a883130d2c85305130cc87069f49fdfab067030a804517c4ad3e9

data/lib/strong_routes/rails/route_mapper.rb

@@ -19,15 +19,15 @@ module StrongRoutes
         map = matches.map { |match_data| match_data[:path] }
         map.compact!
         map.uniq!
+        map
       end
 
     private
 
-      # All we need for the allowed routes is the first segment (i.e. 'users'
-      # from '/users/:user_id/posts(/:format)'). Convert the path strings into
-      # match data objects.
+      # Convert the path strings into match data objects, capturing all segments
+      # except optional ones (e.g. :format).
       def matches
-        matches = paths.map { |path| path.match(/\A\/(?<path>[\w-]+)\/*.*\Z/) }
+        matches = paths.map { |path| path.match(/\A\/(?<path>[-:\w\/]+)\/*.*\Z/) }
         matches.compact!
         matches.uniq!
         matches

data/lib/strong_routes/route_matcher.rb

@@ -4,8 +4,28 @@ module StrongRoutes
       if route.is_a?(Regexp)
         super(route)
       else
-        super(/\A\/#{route}/i,)
+        route = map_dynamic_segments(route)
+        escaped_route = Regexp.escape(route)
+        super(/\A\/#{route}/i)
       end
     end
+
+    private
+
+    # Replace dynamic segments in the route with wildcards (e.g. /:foo/users/:id
+    # becomes /.*/users/.*)
+    #
+    def map_dynamic_segments(route)
+      segments = route.to_s.split('/')
+      segments.map! do |segment|
+        if segment =~ /:/
+          '.*'
+        else
+          segment
+        end
+      end
+
+      segments.join('/')
+    end
   end
 end

data/lib/strong_routes/version.rb

@@ -1,3 +1,3 @@
 module StrongRoutes
-  VERSION = "0.9.5"
+  VERSION = "1.0.0.rc1"
 end

data/spec/strong_routes/rails/route_mapper_spec.rb

@@ -4,7 +4,22 @@ require 'action_dispatch'
 require 'strong_routes/rails/route_mapper'
 
 describe ::StrongRoutes::Rails::RouteMapper do
-  let(:paths) { [ 'users', 'posts', 'comments', 'user_posts', 'bar', 'trading-post' ] }
+  let(:paths) {
+    [
+      'bar/sandwich',
+      'comments/:id',
+      'comments/:id/edit',
+      'posts/:id',
+      'posts/:id/edit',
+      'posts/:post_id/comments',
+      'posts/:post_id/comments/new',
+      'trading-post',
+      'user_posts/:id',
+      'users',
+      'users/:user_id/posts',
+      'users/:user_id/posts/new'
+    ]
+  }
   let(:route_set) {
     route_set = ActionDispatch::Routing::RouteSet.new
     route_set.draw do

data/spec/strong_routes/route_matcher_spec.rb

@@ -12,7 +12,7 @@ describe ::StrongRoutes::RouteMatcher do
       end
     end
 
-    context "when not given a symbol" do
+    context "when given a symbol" do
       let(:matcher) { /\A\/foo/i }
 
       subject { ::StrongRoutes::RouteMatcher.new(:foo) }
@@ -22,7 +22,7 @@ describe ::StrongRoutes::RouteMatcher do
       end
     end
 
-    context "when not given a string" do
+    context "when given a string" do
       let(:matcher) { /\A\/foo/i }
 
       subject { ::StrongRoutes::RouteMatcher.new('foo') }
@@ -31,5 +31,15 @@ describe ::StrongRoutes::RouteMatcher do
         subject.must_equal matcher
       end
     end
+
+    context "when given a string with dynamic segments" do
+      let(:matcher) { /\A\/.*\/foo\/.*\/bar/i }
+
+      subject { ::StrongRoutes::RouteMatcher.new(':id/foo/:foo_id/bar') }
+
+      it "creates a new matcher" do
+        subject.must_equal matcher
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_routes
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Adam Hutchison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -150,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2