geoff 0.0.5 → 0.0.6

data/geoff.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Geoff::VERSION
 
-  gem.add_dependency 'neo4j'
+  if RUBY_PLATFORM=="java"
+    gem.add_dependency 'neo4j'
+  end
   gem.add_dependency 'activesupport', '~> 3.2.3'
   gem.add_dependency 'json'
 

data/lib/geoff/importer.rb

@@ -1,4 +1,3 @@
-require 'java'
 require 'fileutils'
 Dir["lib/jars/*"].each {|file| require file }
 
@@ -43,7 +42,6 @@ class Geoff
 
     def go
       raise Geoff::InvalidRules.new('Invalid rules') unless validate_rules(@rules)
-      delete_database if drop?
 
       log 'importing the database'
 
@@ -55,21 +53,6 @@ class Geoff
 
     private
 
-    def delete_database
-      if testmode?
-        Neo4j::Transaction.run do
-          Neo4j.db.each_node do |n|
-            n.del unless n.neo_id == 0
-          end
-        end
-      else
-        Neo4j.db.shutdown
-        FileUtils.rm_rf Neo4j::Config[:storage_path]
-        log "restarting the database #{Neo4j::Config[:storage_path]}"
-        Neo4j.db.start
-      end
-    end
-
     def import_geoff_rules(rules)
       sub_graph = Subgraph.new(rules)
       node_map = build_node_map
@@ -131,10 +114,6 @@ class Geoff
       $stdout.puts message unless silent?
     end
 
-    def drop?
-      option_value?(:drop, false)
-    end
-
     def silent?
       option_value? :silent
     end

data/lib/geoff/version.rb

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

data/lib/geoff.rb

@@ -1,9 +1,22 @@
 require "json"
 require "geoff/version"
 require 'geoff/node_dsl'
-require 'geoff/importer'
 require 'geoff/children_dsl'
 
+def java_present?
+  require 'java'
+  true
+rescue LoadError
+  false
+end
+
+if java_present?
+  require 'geoff/importer'
+else
+  $stderr.puts "In order to use the Geoff::Importer class and Geoff.import you must
+  be running under jruby"
+end
+
 class Geoff::Error                  < StandardError; end
 class Geoff::MissingNodeDefinition  < Geoff::Error ; end
 class Geoff::ContainerLabelMissing  < Geoff::Error ; end
@@ -38,9 +51,11 @@ class Geoff
   end
 
   def to_geoff
+    return @geoff if @geoff
+
     geoff = "#{add_classes}\n"
     geoff += @children_dsl.to_geoff if @children_dsl
-    geoff.chomp
+    @geoff = geoff.chomp
   end
 
   def <=> other

data/spec/models/geoff_spec.rb

@@ -134,8 +134,7 @@ describe Geoff do
           EOS
         }
 
-        specify "with parent node is root node, but no relationship,
-      don't create relationship to root node" do
+        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
@@ -145,7 +144,7 @@ describe Geoff do
             end
 
           end.to_geoff.should == expected
-      end
+        end
       end
 
       describe 'called second time' do
@@ -155,13 +154,12 @@ describe Geoff do
           end
         end
 
-        let(:expected_geoff) do
+        let(:geoff_returned_by_first_call) do
           node.to_geoff
         end
 
         it 'returns same geoff as on first call' do
-          pending 'Not implemented yet'
-          node.to_geoff.should == expected_geoff
+          node.to_geoff.should == geoff_returned_by_first_call
         end
       end
     end

metadata

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