Add path helpers as class methods.

maxdemarzi · Sep 20, 2012 · 2dd4b16 · 2dd4b16
1 parent 23e4522
commit 2dd4b16
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 41 deletions.
diff --git a/lib/neography/rest/batch.rb b/lib/neography/rest/batch.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class Batch
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :batch, "/batch"

diff --git a/lib/neography/rest/clean.rb b/lib/neography/rest/clean.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class Clean
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :clean, "/cleandb/secret-key"

diff --git a/lib/neography/rest/node_auto_indexes.rb b/lib/neography/rest/node_auto_indexes.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class NodeAutoIndexes < AutoIndexes
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
 
       add_path :key_value,        "/index/auto/node/:key/:value"
       add_path :query_index,      "/index/auto/node/?query=:query"

diff --git a/lib/neography/rest/node_indexes.rb b/lib/neography/rest/node_indexes.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class NodeIndexes < Indexes
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :all,       "/index/node"

diff --git a/lib/neography/rest/node_paths.rb b/lib/neography/rest/node_paths.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class NodePaths
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :base, "/node/:id/path"

diff --git a/lib/neography/rest/node_properties.rb b/lib/neography/rest/node_properties.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class NodeProperties < Properties
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
 
       add_path :all,    "/node/:id/properties"
       add_path :single, "/node/:id/properties/:property"

diff --git a/lib/neography/rest/node_relationships.rb b/lib/neography/rest/node_relationships.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class NodeRelationships
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :base,       "/node/:id/relationships"

diff --git a/lib/neography/rest/node_traversal.rb b/lib/neography/rest/node_traversal.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class NodeTraversal
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :traversal, "/node/:id/traverse/:type"

diff --git a/lib/neography/rest/nodes.rb b/lib/neography/rest/nodes.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class Nodes
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :index,  "/node"

diff --git a/lib/neography/rest/paths.rb b/lib/neography/rest/paths.rb
@@ -2,8 +2,23 @@ module Neography
   class Rest
     module Paths
 
-      def self.included(mod)
-        mod.send :extend, ClassMethods
+      def add_path(key, path)
+        method_name = :"#{key}_path"
+
+        metaclass = (class << self; self; end)
+        metaclass.instance_eval do
+          define_method method_name do |*attributes|
+            if attributes.any?
+              build_path(path, *attributes)
+            else
+              path
+            end
+          end
+        end
+
+        define_method method_name do |*attributes|
+          self.class.send(method_name, *attributes)
+        end
       end
 
       def build_path(path, attributes)
@@ -16,18 +31,6 @@ def encode(value)
         URI.encode(value).gsub("/","%2F")
       end
 
-      module ClassMethods
-        def add_path(key, path)
-          define_method :"#{key}_path" do |*attributes|
-            if attributes.any?
-              build_path(path, *attributes)
-            else
-              path
-            end
-          end
-        end
-      end
-
     end
   end
 end
diff --git a/lib/neography/rest/relationship_auto_indexes.rb b/lib/neography/rest/relationship_auto_indexes.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class RelationshipAutoIndexes < AutoIndexes
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
 
       add_path :key_value,        "/index/auto/relationship/:key/:value"
       add_path :query_index,      "/index/auto/relationship/?query=:query"

diff --git a/lib/neography/rest/relationship_indexes.rb b/lib/neography/rest/relationship_indexes.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class RelationshipIndexes < Indexes
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :all,       "/index/relationship"

diff --git a/lib/neography/rest/relationship_properties.rb b/lib/neography/rest/relationship_properties.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class RelationshipProperties < Properties
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
 
       add_path :all,    "/relationship/:id/properties"
       add_path :single, "/relationship/:id/properties/:property"

diff --git a/lib/neography/rest/relationships.rb b/lib/neography/rest/relationships.rb
@@ -1,7 +1,7 @@
 module Neography
   class Rest
     class Relationships
-      include Neography::Rest::Paths
+      extend Neography::Rest::Paths
       include Neography::Rest::Helpers
 
       add_path :base,   "/relationship/:id"

diff --git a/spec/unit/rest/paths_spec.rb b/spec/unit/rest/paths_spec.rb
@@ -4,32 +4,62 @@ module Neography
   class Rest
 
     class Dummy
-      include Paths
+      extend Paths
 
       add_path :one, "/node/:id"
       add_path :two, "/node/:id/properties/:property"
     end
 
     describe Dummy do
 
-      it { should respond_to(:one_path) }
-      it { should respond_to(:two_path) }
+      context "instance methods" do
 
-      it "replaces a key" do
-        subject.one_path(:id => 42).should == "/node/42"
-      end
+        it { should respond_to(:one_path) }
+        it { should respond_to(:two_path) }
 
-      it "replaces multiple keys" do
-        subject.two_path(:id => 42, :property => "foo").should == "/node/42/properties/foo"
-      end
+        it "replaces a key" do
+          subject.one_path(:id => 42).should == "/node/42"
+        end
+
+        it "replaces multiple keys" do
+          subject.two_path(:id => 42, :property => "foo").should == "/node/42/properties/foo"
+        end
+
+        it "url encodes spaces" do
+          subject.one_path(:id => "with space").should == "/node/with%20space"
+        end
+
+        # URI.encode does not escape slashes (and rightly so), but should escape these keys
+        it "url encodes slashes" do
+          subject.one_path(:id => "with/slash").should == "/node/with%2Fslash"
+        end
 
-      it "url encodes spaces" do
-        subject.one_path(:id => "with space").should == "/node/with%20space"
       end
 
-      # URI.encode does not escape slashes (and rightly so), but should escape these keys
-      it "url encodes slashes" do
-        subject.one_path(:id => "with/slash").should == "/node/with%2Fslash"
+      context "class methods" do
+
+        subject { Dummy }
+
+        it { should respond_to(:one_path) }
+        it { should respond_to(:two_path) }
+
+        it "replaces a key" do
+          subject.one_path(:id => 42).should == "/node/42"
+        end
+
+        it "replaces multiple keys" do
+          subject.two_path(:id => 42, :property => "foo").should == "/node/42/properties/foo"
+        end
+
+        it "url encodes spaces" do
+          subject.one_path(:id => "with space").should == "/node/with%20space"
+        end
+
+        # URI.encode does not escape slashes (and rightly so), but should escape these keys
+        it "url encodes slashes" do
+          subject.one_path(:id => "with/slash").should == "/node/with%2Fslash"
+        end
+
       end
 
     end