geoff 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,36 +1,39 @@
 PATH
   remote: .
   specs:
-    geoff (0.1.2)
+    geoff (0.2.0)
       activesupport (~> 3.2.3)
+      geoff-importer (>= 0.0.2)
       json
       neo4j
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     bouncy-castle-java (1.5.0146.1)
-    builder (3.0.0)
+    builder (3.0.4)
     coderay (1.0.7)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    geoff-importer (0.0.2)
+      neo4j-community (>= 1.8.M05, < 1.9)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -40,13 +43,13 @@ GEM
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     method_source (0.8)
-    multi_json (1.3.6)
+    multi_json (1.4.0)
     neo4j (2.2.0-java)
       activemodel (>= 3.0.0, < 3.3)
       neo4j-wrapper (= 2.2.0)
       orm_adapter (>= 0.0.3)
       railties (>= 3.0.0, < 3.3)
-    neo4j-community (1.8.RC1-java)
+    neo4j-community (1.8-java)
     neo4j-core (2.2.0-java)
       neo4j-community (>= 1.8.M05, < 1.9)
       neo4j-cypher (~> 1.0.0)
@@ -68,16 +71,16 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rbx-require-relative (0.0.9)
     rdoc (3.12)
       json (~> 1.4)
@@ -97,8 +100,9 @@ GEM
     ruby-debug-base (0.10.4-java)
     slop (3.3.2)
     spoon (0.0.1)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.16.0)

data/README.md

@@ -41,7 +41,7 @@ Geoff(Company, Person) do
   company 'Acme' do
     address "13 Something Road"
 
-    children :employees do
+    outgoing :employees do
       person 'Geoff'
 
       person 'Nigel' do
@@ -51,12 +51,18 @@ Geoff(Company, Person) do
   end
 
   company 'Github' do
-    children :customers do
+    outgoing :customers do
       person 'Tom'
       person 'Dick'
       person 'Harry'
     end
   end
+
+  person 'Harry' do
+    incoming :customers do
+      company 'NeoTech'
+    end
+  end
 end
 
 ```
@@ -112,7 +118,7 @@ end
 ```ruby
 Geoff(Company, Person) do
   company 'Amazon' do
-    children do
+    outgoing do
       person 'Tom', type: :customers
       person 'Tom', type: :supplier
     end
@@ -140,13 +146,13 @@ end
 ```ruby
 Geoff(Company, Person) do
   company 'Amazon' do
-    children 'employees' do
+    outgoing 'employees' do
       b.judas = person 'Judas'
     end
   end
 
   company 'Moonlighters' do
-    children do
+    outgoing do
       b.judas type: 'employees'
     end
   end
@@ -186,14 +192,14 @@ end
 #Injecting builders
 ```ruby
 coffee_machines_builder = Geoff do
-  b.large_coffee_machines = children do
+  b.large_coffee_machines = outgoing do
     coffee_machine('large_machine') { power 2300 }
     coffee_machine('xxl_machine'  ) { power 2600 }
   end
 end
 
 tables_builder = Geoff do
-  b.tables = children do
+  b.tables = outgoing do
     table('round_table' ) { capacity 3 }
     table('square_table') { capacity 4 }
   end
@@ -203,7 +209,7 @@ Geoff(coffee_machines_builder, tables_builder) do
   branch 'acme_coffee_luton_branch' do
     number_of_employees 15
 
-    children do
+    outgoing do
       b.small_coffee_machines type: 'uses', lease: '3 years'
       b.tables type: 'has'
     end
@@ -232,11 +238,11 @@ Geoff do
   b.grinder = grinder 'fine_grinder'
 
   branch 'acme_coffee_luton_branch' do
-    children 'uses' do
+    outgoing 'uses' do
       b.machine = coffee_machine('large_machine') do
         power 2300
 
-        children 'connected_to' do
+        outgoing 'connected_to' do
           b.grinder clone: false
         end
       end

data/geoff.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
 
   if RUBY_PLATFORM=="java"
     gem.add_dependency 'neo4j'
+    gem.add_dependency 'geoff-importer', '>=0.0.2'
     gem.add_development_dependency 'jruby-openssl'
   end
   gem.add_dependency 'activesupport', '~> 3.2.3'

data/lib/geoff/indexer.rb

@@ -0,0 +1,55 @@
+class Geoff
+  class Error                  < StandardError ; end
+  class MissingIndexedProperty < Geoff::Error  ; end
+
+  module Indexer
+    class << self
+
+      def rebuild_indices db
+        @db = db
+
+        Geoff.log 're-building indexes'
+        Neo4j::Transaction.run do
+          node_types.each do |type|
+            re_index(type)
+          end
+        end
+
+      end
+
+      private
+      def node_types
+        root_node.relationships.map { |r| Kernel.const_get(r.get_type.to_s) rescue nil }.compact
+      end
+
+      def re_index(type)
+        Geoff.log "-> re-indexing #{type}"
+        props = type.instance_variable_get(:@_decl_props)
+        indexed_props = props.find_all { |_, p| p.has_key?(:index) }
+
+        indexed_props.each do |index|
+          all = type.all
+
+          all.each do |node|
+            @current_node = node
+            @current_index = index.first
+            node.add_index index.first
+          end
+        end
+
+      rescue NativeException => e
+        Geoff.log "-" * 80
+        message = "#{type} missing indexed attribute #{@current_index}, on node: #{@current_node.attributes}"
+        Geoff.log message
+        Geoff.log "-" * 80
+        Geoff.log e.message
+        Geoff.log "-" * 80
+        raise Geoff::MissingIndexedProperty, message
+      end
+
+      def root_node
+        @db.reference_node
+      end
+    end
+  end
+end

data/lib/geoff/version.rb

@@ -1,3 +1,3 @@
 class Geoff
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/geoff.rb

@@ -2,6 +2,7 @@ require "json"
 require "geoff/version"
 require 'geoff/node_dsl'
 require 'geoff/children_dsl'
+require 'geoff-importer'
 
 def java_present?
   require 'java'
@@ -11,7 +12,7 @@ rescue LoadError
 end
 
 if java_present?
-  require 'geoff/importer'
+  require 'geoff/indexer'
 else
   $stderr.puts "In order to use the Geoff::Importer class and Geoff.import you must
   be running under jruby"
@@ -24,6 +25,40 @@ class Geoff::DslSyntaxError         < Geoff::Error;  end
 
 
 class Geoff
+  class << self
+    
+    def import *args
+      @options = args[1]
+      Geoff.log @options
+      db = options.delete(:db) || Neo4j.db.graph
+      node_map = build_node_map db
+      Importer.import args[0], db, node_map
+      Indexer.rebuild_indices(Neo4j.db.graph) unless options[:skip_index]
+      true
+    end
+
+    def build_node_map db
+      return {} if db.is_a?(String)
+      ref_node = db.reference_node
+      ref_node.rels(:outgoing).inject({}) do |h, r|
+        h[r.rel_type.to_s] = r.end_node
+        h
+      end.merge("ROOT" => ref_node)
+    end
+
+    def log(message)
+      $stdout.puts message unless silent?
+    end
+
+    def silent?
+      options.has_key?(:silent) ? options[:silent] : false
+    end
+
+    def options
+      @options || {}
+    end
+  end
+
   attr_reader :children_dsl, :container
 
   def initialize *classes_and_builders, &block
@@ -45,7 +80,7 @@ class Geoff
       parent_node_dsl: nil,
       type:            nil,
       container:       @container
-    })
+      })
 
     @children_dsl = ChildrenDsl.new(options, &block) if block_given?
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j
@@ -33,6 +33,22 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: geoff-importer
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
@@ -180,7 +196,7 @@ files:
 - lib/geoff/children_dsl.rb
 - lib/geoff/container.rb
 - lib/geoff/dsl_exception_handling.rb
-- lib/geoff/importer.rb
+- lib/geoff/indexer.rb
 - lib/geoff/node_dsl.rb
 - lib/geoff/version.rb
 - spec/integration/children_dsl_spec.rb

data/lib/geoff/importer.rb

@@ -1,149 +0,0 @@
-require 'fileutils'
-Dir["lib/jars/*"].each {|file| require file }
-
-class Geoff
-  class Error                  < StandardError ; end
-  class MissingIndexedProperty < Geoff::Error  ; end
-  class InvalidRules           < Geoff::Error  ; end
-
-  def self.import *args
-    Importer.import *args
-  end
-
-  class Importer
-    Subgraph = org.neo4j.geoff.Subgraph
-
-    class << self
-      def import_files(*files, options)
-        concatenated = files.map{|f|File.read f}.join "\n"
-
-        import concatenated, options
-      end
-
-      def import_file(file, options = {})
-        rules = File.read(file)
-        import(rules, options)
-      end
-
-      def import(geoff, options = {})
-        geoff = geoff.to_geoff unless geoff.is_a? String
-
-        geoff = geoff.split "\n" if geoff.is_a? String
-
-        new(geoff, options).go
-      end
-    end
-
-    def initialize(rules, options)
-      @rules = rules
-      @options = options
-      log @options.inspect
-    end
-
-    def go
-      raise Geoff::InvalidRules.new('Invalid rules') unless validate_rules(@rules)
-
-      log 'importing the database'
-
-      import_geoff_rules @rules
-      rebuild_indexes
-
-      true
-    end
-
-    private
-
-    def import_geoff_rules(rules)
-      sub_graph = Subgraph.new(rules)
-      node_map = build_node_map
-      org.neo4j.geoff.Geoff.mergeIntoNeo4j(sub_graph, Neo4j.db.graph, node_map );
-    end
-
-    def build_node_map
-      root_node.rels(:outgoing).inject({}) do |h, r|
-        h[r.rel_type.to_s] = r.end_node
-        h
-      end.merge("ROOT" => root_node)
-    end
-
-    def rebuild_indexes
-      log 're-building indexes'
-      Neo4j::Transaction.run do
-        node_types.each do |type|
-          re_index(type)
-        end
-      end
-    end
-
-    def node_types
-      root_node.relationships.map { |r| Kernel.const_get(r.get_type.to_s) rescue nil }.compact
-    end
-
-    def re_index(type)
-      log "-> re-indexing #{type}"
-      props = type.instance_variable_get(:@_decl_props)
-      indexed_props = props.find_all { |_, p| p.has_key?(:index) }
-
-      indexed_props.each do |index|
-        all = type.all
-
-        all.each do |node|
-          @current_node = node
-          @current_index = index.first
-          node.add_index index.first
-        end
-      end
-
-    rescue NativeException => e
-      log "-" * 80
-      message = "#{type} missing indexed attribute #{@current_index}, on node: #{@current_node.attributes}"
-      log message
-      log "-" * 80
-      log e.message
-      log "-" * 80
-      raise Geoff::MissingIndexedProperty, message
-    end
-
-    def tx
-      Neo4j::Transaction.run { yield if block_given? }
-    end
-
-    def root_node
-      Neo4j.ref_node
-    end
-
-    def log(message)
-      $stdout.puts message unless silent?
-    end
-
-    def silent?
-      option_value? :silent
-    end
-
-    def testmode?
-      option_value? :test
-    end
-
-    def option_value?(key, default = false)
-      @options[key].nil? ? default : @options[key]
-    end
-
-    def validate_rules(rules)
-      @invalid = Array(rules).map do |r|
-        validate_rule(r)
-      end.compact
-
-      @invalid.each { |r, message| log "Rule '#{r}' is invalid: #{message}" }
-      @invalid.empty?
-    end
-
-    def validate_rule(rule)
-      Subgraph.new(Array(rule))
-      nil
-    rescue Exception => e
-      return [rule, e.message]
-    end
-
-  end
-
-end