geoff 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geoff (0.0.3.beta)
+    geoff (0.0.6)
       activesupport (~> 3.2.3)
       json
       neo4j
@@ -33,7 +33,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.4-java)
+    json (1.7.5-java)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     method_source (0.8)
@@ -96,7 +96,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.15.4)
+    thor (0.16.0)
     tilt (1.3.3)
 
 PLATFORMS

data/lib/geoff/children_dsl.rb

@@ -59,6 +59,7 @@ class ChildrenDsl
   def rel_geoff node_dsl, properties
     properties = properties.dup
     type       = properties.delete :type
+    properties.delete(:clone)
 
     "(#{parent_node_name})-[:#{type}]->(#{node_dsl.node_name})".tap do |r|
       r << " #{properties.to_json}" if properties.any?
@@ -87,7 +88,11 @@ class ChildrenDsl
 
     node_dsls = {}
     @node_dsls.each do |node_dsl, rel_properties|
-      node_dsls[node_dsl.clone] = rel_properties.dup
+      if rel_properties[:clone] == false
+        node_dsls[node_dsl] = rel_properties
+      else
+        node_dsls[node_dsl.clone] = rel_properties.dup
+      end
     end
 
     # sort it out, instance_variable_set is probably not the best way to clone object

data/lib/geoff/container.rb

@@ -43,7 +43,13 @@ class Container
 
   def handle_node_dsl m, *args
     node_dsl = @node_dsls[m]
-    rel_properties = args.first
+    rel_properties = args.first || {}
+
+    if rel_properties[:clone]
+      node_dsl = node_dsl.clone
+      rel_properties.delete(:clone)
+    end
+
     @recipient.add_node_dsl node_dsl, rel_properties
     node_dsl
   end

data/lib/geoff/version.rb

@@ -1,3 +1,3 @@
 class Geoff
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/integration/geoff_spec.rb

@@ -140,7 +140,7 @@ describe Geoff do
           b.coffee_machine = coffee_machine('illy') do
             power 2300
 
-            children 'includes' do
+            children 'connected_to' do
               grinder 'fine_grinder'
             end
           end
@@ -156,7 +156,7 @@ describe Geoff do
           (CoffeeMachine)-[:all]->(illy_3)
           (fine_grinder_5) {"_classname":"Grinder"}
           (Grinder)-[:all]->(fine_grinder_5)
-          (illy_3)-[:includes]->(fine_grinder_5)
+          (illy_3)-[:connected_to]->(fine_grinder_5)
           (starbucks_luton_branch_1)-[:uses]->(illy_3) {"lease":"3 years"}
         EOS
       end
@@ -166,6 +166,53 @@ describe Geoff do
         geoff.should == expected_geoff
       end
     end
+  end
+
+  describe 'cloning subtrees held in b variables' do
+    before { stub_node_dsl_object_id }
+
+    let(:builder) do
+      Geoff(Branch) do
+        b.grinder = grinder 'fine_grinder'
+
+        branch 'starbucks_luton_branch' do
+          children 'uses' do
+            b.illy = coffee_machine('large_illy') do
+              power 2300
 
+              children 'connected_to' do
+                b.grinder clone: false
+              end
+            end
+
+            # this branch uses two identical large illy machines
+            b.illy type: 'uses', clone: true
+          end
+        end
+      end
+    end
+
+    let(:expected_geoff) do
+      strip_whitespace <<-EOS
+        (ROOT)-[:Branch]->(Branch)
+        (fine_grinder) {"_classname":"Grinder"}
+        (Grinder)-[:all]->(fine_grinder)
+        (starbucks_luton_branch) {"_classname":"Branch"}
+        (Branch)-[:all]->(starbucks_luton_branch)
+        (large_illy) {"_classname":"CoffeeMachine","power":2300}
+        (CoffeeMachine)-[:all]->(large_illy)
+        (large_illy)-[:connected_to]->(fine_grinder)
+        (starbucks_luton_branch)-[:uses]->(large_illy)
+        (large_illy) {"_classname":"CoffeeMachine","power":2300}
+        (CoffeeMachine)-[:all]->(large_illy)
+        (large_illy)-[:connected_to]->(fine_grinder)
+        (starbucks_luton_branch)-[:uses]->(large_illy)
+      EOS
+    end
+
+    specify do
+      geoff = builder.to_geoff
+      geoff.should == expected_geoff
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: geoff
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - David Rouchy
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j