named-routes 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/named-routes/routes.rb

@@ -1,7 +1,7 @@
 module NamedRoutes
   class Routes
     class_inheritable_accessor :host, :prefix
-    
+
     extend(Module.new do
       def instance
         @instance ||= new
@@ -94,6 +94,10 @@ module NamedRoutes
       end
     end)
 
+    def eval(*args)
+      self.class.eval(*args)
+    end
+
     def as_json(*args)
       self.class.defined_routes
     end

data/spec/named-routes/routes_spec.rb

@@ -6,8 +6,8 @@ module NamedRoutes
       NamedRoutes.routes.host = "example.com"
     end
 
-    def routes
-      @routes ||= begin
+    def routes_class
+      @routes_class ||= begin
         routes_class = Class.new(NamedRoutes::Routes)
         routes_class.route(:root, "/")
         routes_class.route(:current_user_category_top_choices, "/current-user/:category/top-choices")
@@ -19,27 +19,27 @@ module NamedRoutes
     describe "uri definition" do
       context "when params hash is not given" do
         it "returns the definition" do
-          routes.root.should == "/"
-          routes.current_user_category_top_choices.should == "/current-user/:category/top-choices"
-          routes.decision_stream.should == "/decision-streams/:stream_id"
+          routes_class.root.should == "/"
+          routes_class.current_user_category_top_choices.should == "/current-user/:category/top-choices"
+          routes_class.decision_stream.should == "/decision-streams/:stream_id"
         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.current_user_category_top_choices(:category => "cars", :foo => "bar", :baz => {"one" => "two three"})
+          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.decision_stream(:stream_id => 99).should == "/decision-streams/99"
+          routes_class.decision_stream(:stream_id => 99).should == "/decision-streams/99"
         end
       end
 
       context "when a prefix is given" do
-        def routes
-          @routes ||= begin
+        def routes_class
+          @routes_class ||= begin
             routes_class = Class.new(NamedRoutes::Routes)
             routes_class.prefix = "general"
             routes_class.route(:root, "/")
@@ -51,18 +51,18 @@ module NamedRoutes
 
         context "when default and include_prefix argument is true" do
           it "appends the prefix to the returned uris" do
-            routes.root.should == "/general/"
-            routes.current_user_category_top_choices.should == "/general/current-user/:category/top-choices"
-            routes.decision_stream.should == "/general/decision-streams/:stream_id"
-            routes.current_user_category_top_choices(:category => "cars").should == "/general/current-user/cars/top-choices"
-            routes.decision_stream(:stream_id => 99).should == "/general/decision-streams/99"
+            routes_class.root.should == "/general/"
+            routes_class.current_user_category_top_choices.should == "/general/current-user/:category/top-choices"
+            routes_class.decision_stream.should == "/general/decision-streams/:stream_id"
+            routes_class.current_user_category_top_choices(:category => "cars").should == "/general/current-user/cars/top-choices"
+            routes_class.decision_stream(:stream_id => 99).should == "/general/decision-streams/99"
           end
         end
 
         context "when include_prefix argument is false in the uri definition" do
           it "does not append the prefix to the returned uris" do
-            routes.uri(:raw_path, "/raw/path", false).should == "/raw/path"
-            routes.raw_path.should == "/raw/path"
+            routes_class.uri(:raw_path, "/raw/path", false).should == "/raw/path"
+            routes_class.raw_path.should == "/raw/path"
           end
         end
       end
@@ -71,38 +71,45 @@ module NamedRoutes
     describe ".eval" do
       context "when params hash is not given" do
         it "returns the definition" do
-          routes.eval("/current-user/:category/top-choices").should == "/current-user/:category/top-choices"
+          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.current_user_category_top_choices(:category => "cars", :foo => "bar", :baz => {"one" => "two three"})
+          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.eval("/decision-streams/:stream_id", :stream_id => 99).should == "/decision-streams/99"
+          routes_class.eval("/decision-streams/:stream_id", :stream_id => 99).should == "/decision-streams/99"
         end
       end
     end
 
+    describe "#eval" do
+      it "delegates to self.class.eval" do
+        routes = routes_class.new
+        routes.eval("/current-user/:category/top-choices").should == routes_class.eval("/current-user/:category/top-choices")
+      end
+    end
+
     describe ".http" do
       it "returns a full http schemed_uri (with ::NamedRoutes.host) for the given named route" do
-        routes.http.decision_stream(:stream_id => "11").should == "http://example.com/decision-streams/11"
+        routes_class.http.decision_stream(:stream_id => "11").should == "http://example.com/decision-streams/11"
       end
     end
 
     describe ".https" do
       it "returns a full https schemed_uri (with ::NamedRoutes.host) for the given named route" do
-        routes.https.decision_stream(:stream_id => "11").should == "https://example.com/decision-streams/11"
+        routes_class.https.decision_stream(:stream_id => "11").should == "https://example.com/decision-streams/11"
       end
     end
 
     describe "#normalize" do
-      def routes
-        @routes ||= begin
+      def routes_class
+        @routes_class ||= begin
           route_class = Class.new(NamedRoutes::Routes)
           route_class
         end
@@ -110,34 +117,34 @@ module NamedRoutes
 
       context "when there is no prefix" do
         before do
-          routes.prefix.should == nil
+          routes_class.prefix.should == nil
         end
 
         it "returns the given uri" do
-          routes.normalize("/prefix/foo/bar").should == "/prefix/foo/bar"
+          routes_class.normalize("/prefix/foo/bar").should == "/prefix/foo/bar"
         end
       end
 
       context "when there is a prefix" do
         context "when the prefix begins with a /" do
           before do
-            routes.prefix = "/prefix"
+            routes_class.prefix = "/prefix"
           end
 
           it "strips out the prefix from the beginning" do
-            routes.normalize("/prefix/foo/bar").should == "/foo/bar"
-            routes.normalize("/prefix/foo/prefix/bar").should == "/foo/prefix/bar"
+            routes_class.normalize("/prefix/foo/bar").should == "/foo/bar"
+            routes_class.normalize("/prefix/foo/prefix/bar").should == "/foo/prefix/bar"
           end
         end
 
         context "when the prefix does not begin with a /" do
           before do
-            routes.prefix = "prefix"
+            routes_class.prefix = "prefix"
           end
 
           it "strips out the prefix from the beginning" do
-            routes.normalize("/prefix/foo/bar").should == "/foo/bar"
-            routes.normalize("/prefix/foo/prefix/bar").should == "/foo/prefix/bar"
+            routes_class.normalize("/prefix/foo/bar").should == "/foo/bar"
+            routes_class.normalize("/prefix/foo/prefix/bar").should == "/foo/prefix/bar"
           end
         end
       end
@@ -145,7 +152,7 @@ module NamedRoutes
 
     describe ".as_json" do
       it "returns a hash of all of the route methods as keys and the definions as values for the instance" do
-        routes.as_json.should == {
+        routes_class.as_json.should == {
           "root" => "/",
           "current_user_category_top_choices" => "/current-user/:category/top-choices",
           "decision_stream" => "/decision-streams/:stream_id"
@@ -155,7 +162,7 @@ module NamedRoutes
 
     describe "#as_json" do
       it "returns a hash of all of the route methods as keys and the definions as values" do
-        routes.instance.as_json.should == {
+        routes_class.instance.as_json.should == {
           "root" => "/",
           "current_user_category_top_choices" => "/current-user/:category/top-choices",
           "decision_stream" => "/decision-streams/:stream_id"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Brian Takita
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -08:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency