named-routes 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/named-routes/routes.rb

@@ -16,7 +16,7 @@ module NamedRoutes
       end
 
       def route(name, definition, include_prefix=true)
-        full_definition = (include_prefix && prefix) ? File.join("", prefix, definition) : definition
+        full_definition = eval(definition, {}, :prefix => include_prefix)
         _defined_routes[name.to_s] = full_definition
         define_method name do |*args|
           self.class.eval(full_definition, [args.first].compact.first || {})
@@ -38,12 +38,13 @@ module NamedRoutes
         @_defined_routes ||= {}
       end
 
-      def eval(definition, params_arg={})
+      def eval(definition, params_arg={}, options={})
+        full_definition = (options[:prefix] && prefix) ? File.join("", prefix, definition) : definition
         params = Mash.new(params_arg)
         uri_string = if params.empty?
-          definition
+          full_definition
         else
-          definition.split("/").map do |segment|
+          full_definition.split("/").map do |segment|
             segment_value = segment[/^:(.*)/, 1]
             segment_value_parts = segment_value.to_s.split(".")
             segment_name = segment_value_parts[0]
@@ -61,8 +62,6 @@ module NamedRoutes
         uri_string
       end
 
-      # TODO: Create eval_without_prefix
-
       def escape_params(params={})
         params.inject({}) do |memo, kv|
           key, value = kv

data/spec/named-routes/routes_spec.rb

@@ -69,21 +69,46 @@ module NamedRoutes
     end
 
     describe ".eval" do
-      context "when params hash is not given" do
-        it "returns the definition" do
-          routes_class.eval("/current-user/:category/top-choices").should == "/current-user/:category/top-choices"
+      describe "params hash" do
+        context "when params hash is not given" do
+          it "returns the definition" do
+            routes_class.eval("/current-user/:category/top-choices").should == "/current-user/:category/top-choices"
+          end
+        end
+
+        context "when params hash is given" do
+          it "returns the uri with the param replaced with the given param value with additional params added as url params" do
+            schemed_uri_1 = routes_class.current_user_category_top_choices(:category => "cars", :foo => "bar", :baz => {"one" => "two three"})
+
+            path, query = schemed_uri_1.split("?")
+            path.should == "/current-user/cars/top-choices"
+            query.should include("foo=bar")
+            query.should include("baz[one]=two+three")
+            routes_class.eval("/decision-streams/:stream_id", :stream_id => 99).should == "/decision-streams/99"
+          end
         end
       end
 
-      context "when params hash is given" do
-        it "returns the uri with the param replaced with the given param value with additional params added as url params" do
-          schemed_uri_1 = routes_class.current_user_category_top_choices(:category => "cars", :foo => "bar", :baz => {"one" => "two three"})
+      describe "options hash" do
+        describe "defaults" do
+          it "defaults to :prefix false" do
+            routes_class.prefix = "/user"
+            routes_class.eval("/current-user/:category/top-choices", {}).should == "/current-user/:category/top-choices"
+          end
+        end
 
-          path, query = schemed_uri_1.split("?")
-          path.should == "/current-user/cars/top-choices"
-          query.should include("foo=bar")
-          query.should include("baz[one]=two+three")
-          routes_class.eval("/decision-streams/:stream_id", :stream_id => 99).should == "/decision-streams/99"
+        context "when :prefix is true" do
+          it "prepends the prefix to the uri" do
+            routes_class.prefix = "/user"
+            routes_class.eval("/current-user/:category/top-choices", {}, :prefix => true).should == "/user/current-user/:category/top-choices"
+          end
+        end
+
+        context "when :prefix is false" do
+          it "does not prepend the prefix to the uri" do
+            routes_class.prefix = "/user"
+            routes_class.eval("/current-user/:category/top-choices", {}, :prefix => false).should == "/current-user/:category/top-choices"
+          end
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Brian Takita