graphable 0.0.5 → 0.1.0

data/graphable.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/graphable/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Joe Fredette"]
-  gem.email         = ["jfredett@gmail.com"]
+  gem.authors       = ["Joe Fredette", "Andrew Ross"]
+  gem.email         = ["jfredett@gmail.com", "andrewslavinross@gmail.com"]
   gem.description   = %q{A library for extracting static graph representations of data from rails-y databases}
   gem.summary       = %q{A library for extracting static graph representations of data from rails-y databases}
   gem.homepage      = "http://www.github.com/jfredett/graphable"

data/lib/graphable.rb

@@ -10,7 +10,7 @@ module Graphable
 
   included do
     Graphable.register NodeCreator.new(self)
-    indexes :id
+    graph_indexes :id
   end
 
   def self.register(registrant)
@@ -26,7 +26,7 @@ module Graphable
   end
 
   def self.build!
-    puts "Building Graph"
+    puts "Building Graph..."
     registry.select { |f| f.is_a? NodeCreator  }.map(&:call)
     registry.select { |f| f.is_a? IndexCreator }.map(&:call)
     registry.select { |f| f.is_a? EdgeCreator  }.map(&:call)
@@ -41,6 +41,18 @@ module Graphable
     @completed_indicies ||= {}
   end
 
+  def self.object_access_methods
+    @object_access_methods ||= {}
+  end
+
+  def self.objects_of(klass)
+    klass.send(object_access_methods[klass] || 'all')
+  end
+
+  def self.register_object_access_method(klass, method)
+    object_access_methods[klass] = method
+  end
+
   def self.completed_index(klass, method)
     completed_indicies[[klass, method]] = true
   end
@@ -49,23 +61,33 @@ module Graphable
     completed_indicies[[klass,method]]
   end
 
+  def self.completed_edges
+    @completed_edges ||= {}
+  end
+
+  def self.completed_edge(source, target, name)
+    completed_edges[[source,target,name]] = true
+  end
 
+  def self.has_completed_edge?(source, target, name)
+    completed_edges[[source,target,name]]
+  end
 
   module InstanceMethods
     def to_node
       attributes.to_hash.tap do |hash|
-        hash.each { |k, _| hash.delete(k) if k.to_s =~ /_id$/ } #remove FKs
+        hash.each { |k, v| hash.delete(k) if v.nil? || k.to_s =~ /_id$/ } #remove FKs and nil values
         hash[:type] = self.class.name
       end
     end
   end
 
   module ClassMethods
-    def index_name
+    def graph_index_name
       "#{name.downcase.pluralize}_index"
     end
 
-    def indexes(*methods)
+    def graph_indexes(*methods)
        methods.each do |method|
          Graphable.register IndexCreator.new(self, method) 
        end
@@ -83,6 +105,10 @@ module Graphable
         raise "Invalid Edge type, must be :through or :via"
       end
     end
+
+    def graph_with(method)
+      Graphable.register_object_access_method(self, method)
+    end
   end
 
 end

data/lib/graphable/edge_creator.rb

@@ -35,11 +35,11 @@ module Graphable
       # anyway.
       metadata.reject! { |_,v| v.nil? } 
 
-      Neography::Relationship.create(@name, source_node, target_node, metadata) 
+      Graphable.neo.create_relationship(@name, source_node, target_node, metadata) 
     end
 
     def sources
-      @source.all
+      Graphable.objects_of(@source)
     end
 
     def target_name
@@ -49,21 +49,26 @@ module Graphable
 
   class ThroughEdgeCreator < EdgeCreator
     def call 
-      puts "Building edges for #{@source.name} -> #{@target.name}"
-      sources.each_slice(100) do |slice|
-        slice.each do |source|
-          source_node = load_node(source)
-
-          intermediates_for(source).each do |intermediate_target|
+      return if Graphable.has_completed_edge?(@source, @target, @name)
+
+      puts "Building #{@name} edges for #{@source.name} -> #{@target.name}"
+      sources.each_slice(250) do |slice|
+        Graphable.neo.batch(*slice.map { |obj|
+          source_node = load_node(obj)
+          relationships = []
+          intermediates_for(obj).each do |intermediate_target|
+            metadata = {}
             metadata = @metadata_proc.call(intermediate_target) if @metadata_proc
             metadata = intermediate_target.send(:edge_metadata) if intermediate_target.respond_to?(:edge_metadata)
-
             target_node = load_node(intermediate_target.send(target_name)) rescue binding.pry
-
-            build_relationship(source_node, target_node, metadata || {})
+            next unless source_node && target_node
+            relationships << [:create_relationship, @name, source_node, target_node, metadata || {}]
           end
-        end
+          relationships
+        }.flatten(1))
       end
+
+      Graphable.completed_edge(@source, @target, @name)
     end
 
     def targets_for(source)
@@ -79,17 +84,25 @@ module Graphable
 
   class ViaEdgeCreator < EdgeCreator
     def call 
-      puts "Building edges for #{@source.name} -> #{@target.name}"
-      sources.each do |source|
-        source_node = load_node(source)
-
-        targets_for(source).each do |target|
-          metadata = @metadata_proc.call(target) if @metadata_proc
-
-          target_node = load_node(target) rescue binding.pry
-          build_relationship(source_node, target_node, metadata || {})
-        end
+      return if Graphable.has_completed_edge?(@source, @target, @name)
+
+      puts "Building #{@name} edges for #{@source.name} -> #{@target.name}"
+      sources.each_slice(250) do |slice|
+        Graphable.neo.batch(*slice.map { |obj|
+          source_node = load_node(obj)
+          relationships = []
+          targets_for(obj).each do |target|
+            metadata = {}
+            metadata = @metadata_proc.call(target) if @metadata_proc
+            target_node = load_node(target) rescue binding.pry
+            next unless source_node && target_node
+            relationships << [:create_relationship, @name, source_node, target_node, metadata]
+          end
+          relationships
+        }.flatten(1))
       end
+
+      Graphable.completed_edge(@source, @target, @name)
     end
 
     def targets_for(source)

data/lib/graphable/index_creator.rb

@@ -3,7 +3,7 @@ module Graphable
     extend Forwardable
 
     attr_reader :klass
-    delegate [:name, :all, :index_name] => :@klass
+    delegate [:name, :graph_index_name] => :@klass
 
     def initialize(klass, method)
       @klass = klass
@@ -13,11 +13,13 @@ module Graphable
     def call
       return if Graphable.has_indexed?(@klass, @method)
 
-      puts "Building index for #{name}"
-      Graphable.neo.create_node_index(index_name, 'fulltext')
+      puts "Building #{@method} index for #{name}"
+      Graphable.neo.create_node_index(graph_index_name, 'exact') # fulltext
 
-      all.to_a.each do |object|
-        Graphable.neo.add_node_to_index(index_name, @method, object.send(@method), Graphable.index_cache[object])
+      Graphable.objects_of(@klass).each_slice(250) do |slice|
+        Graphable.neo.batch(*slice.map do |obj|
+          [:add_node_to_index, graph_index_name, @method, obj.send(@method), Graphable.index_cache[obj]] 
+        end)
       end
 
       Graphable.completed_index(@klass, @method)

data/lib/graphable/node_creator.rb

@@ -5,7 +5,7 @@ module Graphable
     extend Forwardable
 
     attr_reader :klass
-    delegate [:name, :all] => :@klass
+    delegate [:name] => :@klass
 
     def initialize(klass)
       @klass = klass
@@ -13,9 +13,12 @@ module Graphable
 
     def call 
       puts "Building nodes for #{name}"
-      all.each_slice(100) do |slice|
-        slice.each do |object|
-          Graphable.index_cache[object] = Neography::Node.create(object.to_node) 
+      Graphable.objects_of(@klass).each_slice(250) do |slice|
+        nodes = Graphable.neo.batch(*slice.map do |obj| 
+          [:create_node, obj.to_node]
+        end)
+        slice.zip(nodes).each do |object, node|
+          Graphable.index_cache[object] = node["body"]
         end
       end
     end

data/lib/graphable/version.rb

@@ -1,3 +1,3 @@
 module Graphable
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: graphable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
 - Joe Fredette
+- Andrew Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156110660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156110660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: neography
-  requirement: &2156109400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,11 +38,17 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156109400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library for extracting static graph representations of data from rails-y
   databases
 email:
 - jfredett@gmail.com
+- andrewslavinross@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -72,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: A library for extracting static graph representations of data from rails-y