geoff 0.0.3.beta → 0.0.4

data/spec/models/geoff_spec.rb

@@ -3,70 +3,167 @@ require 'neo4j'
 require 'geoff'
 
 describe Geoff do
-  class CoverageArea
-    include Neo4j::NodeMixin
-  end
-  class Cafe
-    include Neo4j::NodeMixin
-  end
+  before { stub_node_dsl_object_id }
 
-  class Carrier
-    include Neo4j::NodeMixin
-  end
+  context do
 
-  class Branch
-    include Neo4j::NodeMixin
-  end
-  describe 'base nodes' do
+    class Branch
+      include Neo4j::NodeMixin
+    end
 
-    let(:builder) do
-      Geoff(Cafe, Carrier, Branch, CoverageArea)
+    class Cafe
+      include Neo4j::NodeMixin
     end
 
-    let(:expected_geoff) do
-      strip_whitespace <<-EOS
+    describe 'base nodes' do
+
+      let(:builder) do
+        Geoff(Cafe, Branch)
+      end
+
+      let(:expected_geoff) do
+        strip_whitespace <<-EOS
         (ROOT)-[:Cafe]->(Cafe)
-        (ROOT)-[:Carrier]->(Carrier)
         (ROOT)-[:Branch]->(Branch)
-        (ROOT)-[:CoverageArea]->(CoverageArea)
-      EOS
-    end
+        EOS
+      end
 
-    specify do
-      builder.to_s.should == expected_geoff
+      specify do
+        builder.to_s.should == expected_geoff
+      end
     end
-  end
 
-  describe 'Geoff sugar' do
-    let(:node) do
-      Geoff(Branch) do
-        branch 'starbucks_branch' do
-          delay_time 15
+    describe 'Geoff sugar' do
+      let(:node) do
+        Geoff(Branch) do
+          branch 'starbucks_branch' do
+            delay_time 15
+          end
         end
       end
-    end
 
-    let(:expected_geoff) do
-      strip_whitespace <<-EOS
+      let(:expected_geoff) do
+        strip_whitespace <<-EOS
         (ROOT)-[:Branch]->(Branch)
         (starbucks_branch) {"_classname":"Branch","delay_time":15}
         (Branch)-[:all]->(starbucks_branch)
+        EOS
+      end
+
+      specify do
+        node.to_geoff.should == expected_geoff
+      end
+
+      specify do
+        pending 'not implemented'
+        ->{
+          Geoff do
+          branch 'starbucks_branch' do
+            delay_time 15
+          end
+          end
+        }.should raise_error Geoff::MissingClassDefinition, "branch"
+      end
+    end
+  end
+
+  context do
+    let(:expected_geoff) do
+      strip_whitespace <<-EOS
+      (ROOT)-[:Sandwich]->(Sandwich)
+      (ROOT)-[:Cheese]->(Cheese)
+      (ROOT)-[:Egg]->(Egg)
       EOS
     end
 
-    specify do
-      node.to_geoff.should == expected_geoff
+    class Sandwich
+      include Neo4j::NodeMixin
     end
 
-    specify do
-      pending 'not implemented'
-      ->{
-        Geoff do
-          branch 'starbucks_branch' do
-            delay_time 15
+    class Cafe
+      include Neo4j::NodeMixin
+    end
+
+    class Branch
+      include Neo4j::NodeMixin
+    end
+
+
+    class Cheese
+      include Neo4j::NodeMixin
+    end
+
+    class Egg
+      include Neo4j::NodeMixin
+    end
+
+
+    describe "#to_s" do
+      specify do
+        dsl = Geoff.new Sandwich, Cheese, Egg
+        dsl.to_s.should == dsl.to_geoff
+      end
+    end
+
+    describe "#to_geoff" do
+      it "outputs root node geoff syntax" do
+        dsl = Geoff.new(Sandwich, Cheese, Egg)
+        dsl.to_geoff.should == expected_geoff
+      end
+
+      specify do
+        ->{Geoff.new 2 }  .should raise_error ArgumentError
+        ->{Geoff.new '' } .should raise_error ArgumentError
+        ->{Geoff.new ['']}.should raise_error ArgumentError
+        ->{Geoff.new [1]} .should raise_error ArgumentError
+
+        ->{Geoff.new(Egg)}.should_not raise_error ArgumentError
+      end
+
+
+      context "with a block" do
+        let(:expected) {
+          strip_whitespace <<-EOS
+        (ROOT)-[:Cafe]->(Cafe)
+        (ROOT)-[:Branch]->(Branch)
+        (Starbucks) {"_classname":"Cafe"}
+        (Cafe)-[:all]->(Starbucks)
+        (starbucks_branch) {"_classname":"Branch"}
+        (Branch)-[:all]->(starbucks_branch)
+        (Starbucks)-[:owns]->(starbucks_branch)
+          EOS
+        }
+
+        specify "with parent node is root node, but no relationship,
+      don't create relationship to root node" do
+          Geoff.new(Cafe, Branch) do
+            cafe 'Starbucks' do
+              children 'owns' do
+                #create relationship to parent node of type owns (comes from children DSL)
+                branch 'starbucks_branch'
+              end
+            end
+
+          end.to_geoff.should == expected
+      end
+      end
+
+      describe 'called second time' do
+        let(:node) do
+          Geoff.new(Cafe) do
+            cafe 'Starbucks'
           end
         end
-      }.should raise_error Geoff::MissingClassDefinition, "branch"
+
+        let(:expected_geoff) do
+          node.to_geoff
+        end
+
+        it 'returns same geoff as on first call' do
+          pending 'Not implemented yet'
+          node.to_geoff.should == expected_geoff
+        end
+      end
     end
   end
 end

data/spec/node_dsl_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'geoff/node_dsl'
+
+describe NodeDsl do
+  subject { NodeDsl.new(node_name: 'starbucks') }
+
+  describe '#node_name' do
+    context 'in normal (non-test) use of builder' do
+      before do
+        subject.stub(:object_id).and_return 'egg'
+      end
+
+      its(:node_name) { should == 'starbucks_egg' }
+    end
+
+    context 'with object_id returning nil to make integration testing easier' do
+      before do
+        subject.stub(:object_id).and_return nil
+      end
+
+      its(:node_name) { should == 'starbucks' }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
-
 Dir["spec/support/**/*.rb"].each {|f| require_relative File.join('..', f)}
 
 RSpec.configure do |config|
 end
+
+def stub_node_dsl_object_id
+  NodeDsl.any_instance.stub(:object_id).and_return nil
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: geoff
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 0.0.3.beta
+  prerelease:
+  version: 0.0.4
 platform: ruby
 authors:
 - David Rouchy
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j
@@ -123,27 +123,45 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-version
 - .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- bin/autospec
+- bin/coderay
+- bin/erubis
+- bin/htmldiff
+- bin/ldiff
+- bin/neo4j-jars
+- bin/neo4j-shell
+- bin/neo4j-upgrade
+- bin/pry
+- bin/rackup
+- bin/rails
+- bin/rake
+- bin/rake2thor
+- bin/rdebug
+- bin/ri
+- bin/rspec
+- bin/thor
+- bin/tilt
 - geoff.gemspec
 - lib/geoff.rb
 - lib/geoff/children_dsl.rb
 - lib/geoff/container.rb
 - lib/geoff/dsl_exception_handling.rb
 - lib/geoff/importer.rb
-- lib/geoff/neo4j_wrapper_dsl.rb
-- lib/geoff/neo4j_wrapper_validator.rb
 - lib/geoff/node_dsl.rb
 - lib/geoff/version.rb
 - spec/integration/children_dsl_spec.rb
+- spec/integration/geoff_spec.rb
 - spec/integration/node_dsl_spec.rb
+- spec/models/container_spec.rb
 - spec/models/geoff_spec.rb
-- spec/models/neo4j_wrapper_dsl_spec.rb
-- spec/models/neo4j_wrapper_validator_spec.rb
+- spec/node_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/support/geof_matchers.rb
 homepage: ''
@@ -160,9 +178,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:
@@ -172,10 +190,11 @@ specification_version: 3
 summary: DSL to allow easy generating of data for Neo4j
 test_files:
 - spec/integration/children_dsl_spec.rb
+- spec/integration/geoff_spec.rb
 - spec/integration/node_dsl_spec.rb
+- spec/models/container_spec.rb
 - spec/models/geoff_spec.rb
-- spec/models/neo4j_wrapper_dsl_spec.rb
-- spec/models/neo4j_wrapper_validator_spec.rb
+- spec/node_dsl_spec.rb
 - spec/spec_helper.rb
 - spec/support/geof_matchers.rb
 has_rdoc:

data/lib/geoff/neo4j_wrapper_dsl.rb

@@ -1,50 +0,0 @@
-require 'geoff/children_dsl'
-
-class Neo4jWrapperDsl
-  def initialize *classes, &block
-    options = classes.last.is_a?(Hash) ? classes.pop : {}
-
-    validate classes
-
-    options.merge!({
-      parent_node_name: 'ROOT',
-      type:       nil,
-      container: Container.new
-    })
-
-    @children_dsl = ChildrenDsl.new(options, &block) if block_given?
-  end
-
-  def to_geoff
-    geoff = "#{add_classes}\n"
-    geoff += @children_dsl.to_geoff if @children_dsl
-    geoff.chomp
-  end
-
-  def <=> other
-    to_geoff == other.to_geoff ? 0 : -1
-  end
-
-  def to_s
-    to_geoff
-  end
-
-  private
-
-  def add_classes
-    @classes.map{|c| root_to_class_as_geoff c }.join("\n")
-  end
-
-  def root_to_class_as_geoff c
-    "(ROOT)-[:#{c}]->(#{c})"
-  end
-
-  def validate classes
-    @classes = classes || []
-
-    @classes.each do |c|
-      m = "Class #{c} should include Neo4j::NodeMixin"
-      raise ArgumentError, m unless c.is_a?(Class) and c.included_modules.include? Neo4j::NodeMixin
-    end
-  end
-end

data/lib/geoff/neo4j_wrapper_validator.rb

@@ -1,17 +0,0 @@
-class Neo4jWrapperValidator
-  NODE_NAME_REGEX = /^\(([^\)]+)\)/
-
-  def call container, node
-    node_name = node.match(NODE_NAME_REGEX)[1]
-
-    unless class_present? container, node_name
-      raise Geoff::MissingNodeDefinition, node_name
-    end
-
-    true
-  end
-
-  def class_present? container, node_name
-    container.node_list.include? node_name
-  end
-end

data/spec/models/neo4j_wrapper_dsl_spec.rb

@@ -1,86 +0,0 @@
-require File.expand_path('spec/spec_helper')
-require 'neo4j'
-require './lib/geoff/neo4j_wrapper_dsl'
-
-describe Neo4jWrapperDsl do
-  let(:expected_geoff) do
-    strip_whitespace <<-EOS
-      (ROOT)-[:Sandwich]->(Sandwich)
-      (ROOT)-[:Cheese]->(Cheese)
-      (ROOT)-[:Egg]->(Egg)
-    EOS
-  end
-
-  class Sandwich
-    include Neo4j::NodeMixin
-  end
-
-  class Cafe
-    include Neo4j::NodeMixin
-  end
-
-  class Branch
-    include Neo4j::NodeMixin
-  end
-
-
-  class Cheese
-    include Neo4j::NodeMixin
-  end
-
-  class Egg
-    include Neo4j::NodeMixin
-  end
-
-
-  describe "#to_s" do
-    specify do
-      dsl = Neo4jWrapperDsl.new Sandwich, Cheese, Egg
-      dsl.to_s.should == dsl.to_geoff
-    end
-  end
-
-  describe "#to_geoff" do
-    it "outputs root node geoff syntax" do
-      dsl = Neo4jWrapperDsl.new(Sandwich, Cheese, Egg)
-      dsl.to_geoff.should == expected_geoff
-    end
-
-    specify do
-      ->{Neo4jWrapperDsl.new 2 }  .should raise_error ArgumentError
-      ->{Neo4jWrapperDsl.new '' } .should raise_error ArgumentError
-      ->{Neo4jWrapperDsl.new ['']}.should raise_error ArgumentError
-      ->{Neo4jWrapperDsl.new [1]} .should raise_error ArgumentError
-
-      ->{Neo4jWrapperDsl.new(Egg)}.should_not raise_error ArgumentError
-    end
-
-
-    context "with a block" do
-      let(:expected) {
-        strip_whitespace <<-EOS
-        (ROOT)-[:Cafe]->(Cafe)
-        (ROOT)-[:Branch]->(Branch)
-        (Starbucks) {"_classname":"Cafe"}
-        (Cafe)-[:all]->(Starbucks)
-        (starbucks_branch) {"_classname":"Branch"}
-        (Branch)-[:all]->(starbucks_branch)
-        (Starbucks)-[:owns]->(starbucks_branch)
-        EOS
-      }
-
-      specify "with parent node is root node, but no relationship,
-      don't create relationship to root node" do
-        Neo4jWrapperDsl.new(Cafe, Branch) do
-          cafe 'Starbucks' do
-            children 'owns' do
-              #create relationship to parent node of type owns (comes from children DSL)
-              branch 'starbucks_branch'
-            end
-          end
-
-        end.to_geoff.should == expected
-      end
-    end
-  end
-end

data/spec/models/neo4j_wrapper_validator_spec.rb

@@ -1,28 +0,0 @@
-require './lib/geoff'
-require './lib/geoff/neo4j_wrapper_validator'
-
-describe Neo4jWrapperValidator do
-  let(:validator) { Neo4jWrapperValidator.new }
-
-    {
-      "(Egg)-[:relates]->(1)"      => {existing_nodes: %w(Branch Starbucks Cafe), node_name: "Egg",     valid: false},
-      "((Branch)-[:relates]->(1)"   => {existing_nodes: %w(Branch Cafe Starbucks), node_name: "Branch",   valid: false},
-      "(Starbucks)-[:relates]->(1)"   => {existing_nodes: %w(Branch Cafe Starbucks), node_name: "Starbucks",  valid: true},
-      "((_Branch)-[:relates]->(1)"  => {existing_nodes: %w(Branch),                 node_name: "(_Branch", valid: false},
-      "((Bra nch)-[:relates]->(1)"  => {existing_nodes: %w(Branch Cafe),        node_name: "(Bra nch", valid: false},
-      "((Branch)-[:relates]->(1)"   => {existing_nodes: %w(Branch Cafe),        node_name: "(Branch",  valid: false},
-      "(Branch)-[:relates]->(1)"    => {existing_nodes: [],                        node_name: "Branch",   valid: false}}.each do |input, details|
-    specify do
-      valid   = details[:valid]
-      existing_nodes = details[:existing_nodes]
-      node_name = details[:node_name]
-      container = mock 'container', node_list: existing_nodes
-
-      if valid
-        validator.call(container, input).should == true
-      else
-        ->{validator.call(container, input)}.should raise_error Geoff::MissingNodeDefinition, node_name
-      end
-    end
-  end
-end