geoff 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    geoff (0.0.6)
+    geoff (0.0.8)
       activesupport (~> 3.2.3)
       json
       neo4j
@@ -31,7 +31,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
     json (1.7.5-java)
     linecache (0.46)

data/README.md

@@ -29,7 +29,6 @@ Prerequisites/ Caveats
 Usage
 -------
 
-
 ```ruby
 #Gemfile
 gem 'geoff'
@@ -84,12 +83,6 @@ before do
 end
 ```
 
-###Using a ramdisk see http://neo4j.rubyforge.org/guides/configuration.html
-
-```sh
-diskutil erasevolume HFS+ "ramdisk" `hdiutil attach -nomount ram://1165430`
-```
-
 ```geoff
 (ROOT)-[:Company]->(Company)
 (ROOT)-[:Person]->(Person)
@@ -190,4 +183,92 @@ Geoff(Company, target: self) do
 end
 ```
 
+#Injecting builders
+```ruby
+coffee_machines_builder = Geoff do
+  b.large_coffee_machines = children do
+    coffee_machine('large_machine') { power 2300 }
+    coffee_machine('xxl_machine'  ) { power 2600 }
+  end
+end
+
+tables_builder = Geoff do
+  b.tables = children do
+    table('round_table' ) { capacity 3 }
+    table('square_table') { capacity 4 }
+  end
+end
+
+Geoff(coffee_machines_builder, tables_builder) do
+  branch 'acme_coffee_luton_branch' do
+    number_of_employees 15
+
+    children do
+      b.small_coffee_machines type: 'uses', lease: '3 years'
+      b.tables type: 'has'
+    end
+  end
+end
+```
+Resulting graph
+```
+                           (Branch)
+                   acme_coffee_luton_branch---------------------(Table)
+                   /           |         \           has      square_table
+                  /            |          \                  {capacity: 4}
+                 /             |           \
+                /uses          |uses        \has
+               /               |             \
+              /                |              \
+             /                 |               \
+      (CoffeeMachine)   (CoffeeMachine)        (Table)
+       large_machine      xxl_machine        round_table
+       {power: 2300}     {power: 2600}      {capacity: 3}
+```
+
+#Cloning subtrees
+```ruby
+Geoff do
+  b.grinder = grinder 'fine_grinder'
+
+  branch 'acme_coffee_luton_branch' do
+    children 'uses' do
+      b.machine = coffee_machine('large_machine') do
+        power 2300
 
+        children 'connected_to' do
+          b.grinder clone: false
+        end
+      end
+
+      # this branch uses two identical large coffee machines
+      # but they share same grinder
+      b.machine type: 'uses', clone: true
+    end
+  end
+end
+```
+Resulting graph
+```
+                           (Branch)
+                    acme_coffee_luton_branch
+                        /           \
+                       /             \
+                      /               \
+                     /uses             \uses
+                    /                   \
+                   /                     \
+                  /                       \
+           (CoffeeMachine)          (CoffeeMachine)
+            large_machine            large_machine
+            {power: 2300}            {power: 2300}
+                  \                       /
+                   \                     /
+                    \                   /
+                     \connected_to     /connected_to
+                      \               /
+                       \             /
+                        \           /
+                          (Grinder)
+                         fine_grinder
+```

data/lib/geoff/importer.rb

@@ -68,11 +68,13 @@ class Geoff
 
     def rebuild_indexes
       log 're-building indexes'
-      types = root_node.relationships.map { |r| Kernel.const_get(r.get_type.to_s) }
+      if defined?(r.get_type.to_s)
+        types = root_node.relationships.map { |r| Kernel.const_get(r.get_type.to_s) }
 
-      Neo4j::Transaction.run do
-        types.each do |type|
-          re_index(type)
+        Neo4j::Transaction.run do
+          types.each do |type|
+            re_index(type)
+          end
         end
       end
     end

data/lib/geoff/version.rb

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

data/spec/integration/geoff_spec.rb

@@ -18,8 +18,8 @@ describe Geoff do
           coffee_machines_builder,
           tables_builder
         ) do
-          branch 'starbucks_luton_branch' do
-            delay_time 15
+          branch 'acme_coffee_luton_branch' do
+            number_of_employees 15
 
             children do
               b.small_coffee_machines type: 'uses', lease: '3 years'
@@ -27,8 +27,8 @@ describe Geoff do
             end
           end
 
-          branch 'starbucks_reading_branch' do
-            delay_time 10
+          branch 'acme_coffee_reading_branch' do
+            number_of_employees 10
 
             children do
               b.large_coffee_machines type: 'uses', lease: '3 years'
@@ -44,13 +44,13 @@ describe Geoff do
       let(:coffee_machines_builder) do
         Geoff(CoffeeMachine) do
           b.large_coffee_machines = children do
-            coffee_machine('large_illy'  ) { power 2300 }
-            coffee_machine('large_gaggia') { power 2600 }
+            coffee_machine('large_machine') { power 2300 }
+            coffee_machine('xxl_machine'  ) { power 2600 }
           end
 
           b.small_coffee_machines = children do
-            coffee_machine('small_illy'  ) { power 600 }
-            coffee_machine('small_gaggia') { power 750 }
+            coffee_machine('xs_machine'   ) { power 600 }
+            coffee_machine('small_machine') { power 750 }
           end
         end
       end
@@ -67,37 +67,37 @@ describe Geoff do
       let(:expected_geoff) do
         strip_whitespace <<-EOS
           (ROOT)-[:Branch]->(Branch)
-          (starbucks_luton_branch) {"_classname":"Branch","delay_time":15}
-          (Branch)-[:all]->(starbucks_luton_branch)
-          (small_illy) {"_classname":"CoffeeMachine","power":600}
-          (CoffeeMachine)-[:all]->(small_illy)
-          (starbucks_luton_branch)-[:uses]->(small_illy) {"lease":"3 years"}
-          (small_gaggia) {"_classname":"CoffeeMachine","power":750}
-          (CoffeeMachine)-[:all]->(small_gaggia)
-          (starbucks_luton_branch)-[:uses]->(small_gaggia) {"lease":"3 years"}
+          (acme_coffee_luton_branch) {"_classname":"Branch","number_of_employees":15}
+          (Branch)-[:all]->(acme_coffee_luton_branch)
+          (xs_machine) {"_classname":"CoffeeMachine","power":600}
+          (CoffeeMachine)-[:all]->(xs_machine)
+          (acme_coffee_luton_branch)-[:uses]->(xs_machine) {"lease":"3 years"}
+          (small_machine) {"_classname":"CoffeeMachine","power":750}
+          (CoffeeMachine)-[:all]->(small_machine)
+          (acme_coffee_luton_branch)-[:uses]->(small_machine) {"lease":"3 years"}
           (round_table) {"_classname":"Table","capacity":3}
           (Table)-[:all]->(round_table)
-          (starbucks_luton_branch)-[:has]->(round_table)
+          (acme_coffee_luton_branch)-[:has]->(round_table)
           (square_table) {"_classname":"Table","capacity":4}
           (Table)-[:all]->(square_table)
-          (starbucks_luton_branch)-[:has]->(square_table)
-          (starbucks_reading_branch) {"_classname":"Branch","delay_time":10}
-          (Branch)-[:all]->(starbucks_reading_branch)
-          (large_illy) {"_classname":"CoffeeMachine","power":2300}
-          (CoffeeMachine)-[:all]->(large_illy)
-          (starbucks_reading_branch)-[:uses]->(large_illy) {"lease":"3 years"}
-          (large_gaggia) {"_classname":"CoffeeMachine","power":2600}
-          (CoffeeMachine)-[:all]->(large_gaggia)
-          (starbucks_reading_branch)-[:uses]->(large_gaggia) {"lease":"3 years"}
+          (acme_coffee_luton_branch)-[:has]->(square_table)
+          (acme_coffee_reading_branch) {"_classname":"Branch","number_of_employees":10}
+          (Branch)-[:all]->(acme_coffee_reading_branch)
+          (large_machine) {"_classname":"CoffeeMachine","power":2300}
+          (CoffeeMachine)-[:all]->(large_machine)
+          (acme_coffee_reading_branch)-[:uses]->(large_machine) {"lease":"3 years"}
+          (xxl_machine) {"_classname":"CoffeeMachine","power":2600}
+          (CoffeeMachine)-[:all]->(xxl_machine)
+          (acme_coffee_reading_branch)-[:uses]->(xxl_machine) {"lease":"3 years"}
           (round_table) {"_classname":"Table","capacity":3}
           (Table)-[:all]->(round_table)
-          (starbucks_reading_branch)-[:has]->(round_table)
+          (acme_coffee_reading_branch)-[:has]->(round_table)
           (square_table) {"_classname":"Table","capacity":4}
           (Table)-[:all]->(square_table)
-          (starbucks_reading_branch)-[:has]->(square_table)
+          (acme_coffee_reading_branch)-[:has]->(square_table)
           (octagonal_table) {"_classname":"Table","capacity":8}
           (Table)-[:all]->(octagonal_table)
-          (starbucks_reading_branch)-[:has]->(octagonal_table)
+          (acme_coffee_reading_branch)-[:has]->(octagonal_table)
         EOS
       end
 
@@ -127,7 +127,7 @@ describe Geoff do
           Branch,
           coffee_machines_builder
         ) do
-          branch 'starbucks_luton_branch' do
+          branch 'acme_coffee_luton_branch' do
             children do
               b.coffee_machine type: 'uses', lease: '3 years'
             end
@@ -137,7 +137,7 @@ describe Geoff do
 
       let(:coffee_machines_builder) do
         Geoff(CoffeeMachine) do
-          b.coffee_machine = coffee_machine('illy') do
+          b.coffee_machine = coffee_machine('machine') do
             power 2300
 
             children 'connected_to' do
@@ -150,14 +150,14 @@ describe Geoff do
       let(:expected_geoff) do
         strip_whitespace <<-EOS
           (ROOT)-[:Branch]->(Branch)
-          (starbucks_luton_branch_1) {"_classname":"Branch"}
-          (Branch)-[:all]->(starbucks_luton_branch_1)
-          (illy_3) {"_classname":"CoffeeMachine","power":2300}
-          (CoffeeMachine)-[:all]->(illy_3)
+          (acme_coffee_luton_branch_1) {"_classname":"Branch"}
+          (Branch)-[:all]->(acme_coffee_luton_branch_1)
+          (machine_3) {"_classname":"CoffeeMachine","power":2300}
+          (CoffeeMachine)-[:all]->(machine_3)
           (fine_grinder_5) {"_classname":"Grinder"}
           (Grinder)-[:all]->(fine_grinder_5)
-          (illy_3)-[:connected_to]->(fine_grinder_5)
-          (starbucks_luton_branch_1)-[:uses]->(illy_3) {"lease":"3 years"}
+          (machine_3)-[:connected_to]->(fine_grinder_5)
+          (acme_coffee_luton_branch_1)-[:uses]->(machine_3) {"lease":"3 years"}
         EOS
       end
 
@@ -175,9 +175,9 @@ describe Geoff do
       Geoff(Branch) do
         b.grinder = grinder 'fine_grinder'
 
-        branch 'starbucks_luton_branch' do
+        branch 'acme_coffee_luton_branch' do
           children 'uses' do
-            b.illy = coffee_machine('large_illy') do
+            b.machine = coffee_machine('large_machine') do
               power 2300
 
               children 'connected_to' do
@@ -185,8 +185,9 @@ describe Geoff do
               end
             end
 
-            # this branch uses two identical large illy machines
-            b.illy type: 'uses', clone: true
+            # this branch uses two identical large machine machines
+            # but sharing same grinder
+            b.machine type: 'uses', clone: true
           end
         end
       end
@@ -197,16 +198,16 @@ describe Geoff do
         (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)
+        (acme_coffee_luton_branch) {"_classname":"Branch"}
+        (Branch)-[:all]->(acme_coffee_luton_branch)
+        (large_machine) {"_classname":"CoffeeMachine","power":2300}
+        (CoffeeMachine)-[:all]->(large_machine)
+        (large_machine)-[:connected_to]->(fine_grinder)
+        (acme_coffee_luton_branch)-[:uses]->(large_machine)
+        (large_machine) {"_classname":"CoffeeMachine","power":2300}
+        (CoffeeMachine)-[:all]->(large_machine)
+        (large_machine)-[:connected_to]->(fine_grinder)
+        (acme_coffee_luton_branch)-[:uses]->(large_machine)
       EOS
     end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: geoff
 version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease:
-  version: 0.0.7
 platform: ruby
 authors:
 - David Rouchy
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j
@@ -174,13 +174,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
   none: false
 requirements: []
 rubyforge_project:
@@ -197,5 +203,4 @@ test_files:
 - spec/node_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/support/geof_matchers.rb
-has_rdoc:
 ...