neo4apis 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435f18b35183016cf989780b44ca0e551f53c4b2
-  data.tar.gz: 127f94b29ba58b55709691b6c3823c384daf0dbd
+  metadata.gz: 6703750242a5bf7db9c935381dd13a2a02a3dd80
+  data.tar.gz: e2c20ffd72feac0aceaef04e20b543abbae9dd8d
 SHA512:
-  metadata.gz: ea2f6f6f40d3a224fe39c57c6ca25b6a248b51aac3f3e71c2e759bc1952f97d65ae79228430e73aaabd78a6d8c818984ad83fcde4ed6ab097e3b3d9e0395586c
-  data.tar.gz: 240362413f2b4bfb21efb5ee9b73e3a0423dd1be6b78d5a5a7632f167af382f1e09af167c9462ada6f451ee389410cd053ae0851fbfa0ab4c0eb664ac993f8fa
+  metadata.gz: 4a468fa6fa75440aafde30ab50af48cffffb46f80df45830ae98005280e860034896c2464efa01c7841d1d4746fc06b7cf9e14ed971a031cddc61a2f8ca83368
+  data.tar.gz: 64f6bdcfb90480b494f141d2458e978556dc31d2671e4d056845b40f3e67570a601c804f072cd2f1529fc5267b5067ab61de17032c71458cea1384bb26ab2186

data/lib/neo4apis.rb

@@ -1,6 +1,4 @@
 require 'neo4j-core'
 
-require 'neo4apis/version'
-
 require 'neo4apis/query_buffer'
 require 'neo4apis/base'

data/lib/neo4apis/base.rb

@@ -1,25 +1,27 @@
 module Neo4Apis
   class Base
-    DEFAULT_FLUSH_SIZE = 500
-
+    UUID_FIELDS = {}
     NODE_PROXIES = {}
     IMPORTERS = {}
 
     attr_reader :options
 
     def initialize(neo4j_session, options = {})
-      @buffer = QueryBuffer.new(neo4j_session)
+      @buffer = QueryBuffer.new(neo4j_session, options[:flush_size] || self.class.default_flush_size)
       @options = options
-      @flush_size = DEFAULT_FLUSH_SIZE
+
+      UUID_FIELDS.each do |label, uuid_field|
+        @buffer << create_constraint_query(label, uuid_field)
+      end
+      @buffer.flush
     end
 
     def add_node(label, props = {})
       require_batch
 
-      node_proxy = NODE_PROXIES[label]
-      raise ArgumentError, "No UUID specified for label `#{label}`" if not node_proxy
+      raise ArgumentError, "No UUID specified for label `#{label}`" if not UUID_FIELDS[label.to_sym]
 
-      node_proxy.new(label, props).tap do |node_proxy|
+      self.class.node_proxy(label).new(props).tap do |node_proxy|
         @buffer << create_node_query(node_proxy)
       end
     end
@@ -38,7 +40,7 @@ module Neo4Apis
 
       instance_eval &block
 
-      @buffer.flush
+      @buffer.close
     ensure
       @in_batch = false
     end
@@ -47,49 +49,70 @@ module Neo4Apis
       self.instance_exec object, &IMPORTERS[label.to_sym]
     end
 
+    def self.prefix(prefix)
+      @prefix = prefix
+    end
+
     def self.importer(label, &block)
       IMPORTERS[label.to_sym] = block
     end
 
     def self.uuid(label, uuid_field)
-      NODE_PROXIES[label.to_sym] = node_proxy_from_uuid(label.to_sym, uuid_field.to_sym)
+      UUID_FIELDS[label.to_sym] = uuid_field.to_sym
+    end
+
+    def self.node_proxy(label)
+      uuid_field = UUID_FIELDS[label.to_sym]
+
+      NODE_PROXIES[label.to_sym] ||= node_proxy_from_uuid(label, uuid_field)
     end
 
     def self.node_proxy_from_uuid(label, uuid_field)
-      Struct.new(:label, :props) do
-        const_set(:UUID_FIELD, uuid_field)
+      Struct.new(:props) do
+        const_set(:UUID_FIELD, uuid_field.to_sym)
+        const_set(:LABEL, label.to_sym)
+
+        def uuid_field
+          self.class::UUID_FIELD
+        end
+
+        def label
+          self.class::LABEL
+        end
 
         def uuid_value
           raise ArgumentError, "props does not have UUID field `#{uuid_field}` for #{self.inspect}" if not props.has_key?(uuid_field)
 
           props[uuid_field]
         end
-
-        def uuid_field
-          self.class::UUID_FIELD
-        end
       end
     end
 
+    def self.default_flush_size
+      500
+    end
+
     private
 
     def create_node_query(node_proxy)
       Neo4j::Core::Query.new.
-        merge(node: {node_proxy.label => {node_proxy.uuid_field => node_proxy.uuid_value}}).
+        merge(node: {self.class.full_label(node_proxy.label) => {node_proxy.uuid_field => node_proxy.uuid_value}}).
         on_create_set(node: node_proxy.props)
     end
 
     def create_relationship_query(type, source, target, props)
       Neo4j::Core::Query.new.
-        match(source: {source.label => {source.uuid_field => source.uuid_value}}).
-        match(target: {target.label => {target.uuid_field => target.uuid_value}}).
+        match(source: {self.class.full_label(source.label) => {source.uuid_field => source.uuid_value}}).
+        match(target: {self.class.full_label(target.label) => {target.uuid_field => target.uuid_value}}).
         merge("source-[:#{type}]->target")
     end
 
-    def add_to_buffer(*args)
-      flush_buffer if buffer.size >= FLUSH_SIZE
+    def create_constraint_query(label, uuid_field)
+      Neo4j::Core::Query.new.create("CONSTRAINT ON (node:#{self.class.full_label(label)}) ASSERT node.#{uuid_field} IS UNIQUE")
+    end
 
-      @buffer << args
+    def self.full_label(label)
+      "#{@prefix}#{label}".to_sym
     end
 
     def require_batch

data/lib/neo4apis/query_buffer.rb

@@ -1,8 +1,9 @@
 module Neo4Apis
   class QueryBuffer < Array
 
-    def initialize(neo4j_session)
+    def initialize(neo4j_session, flush_size)
       @neo4j_session = neo4j_session
+      @flush_size = flush_size
 
       uri = URI.parse(@neo4j_session.resource_url)
 
@@ -15,17 +16,25 @@ module Neo4Apis
       super()
     end
 
+    def <<(query)
+      flush if size >= @flush_size
+
+      super
+    end
+
     def flush
       execute
 
       clear
     end
 
+    def close
+      flush
+    end
 
     private
 
     def execute
-      puts "request_body_data", request_body_data.inspect
       @faraday_connection.post do |req|
         req.url '/db/data/transaction/commit'
         req.headers['Accept'] = 'application/json; charset=UTF-8'

data/neo4apis.gemspec

@@ -1,11 +1,9 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-require 'neo4apis/version'
-
 Gem::Specification.new do |s|
   s.name     = "neo4apis"
-  s.version  = Neo4Apis::VERSION
+  s.version  = '0.0.3'
   s.required_ruby_version = ">= 1.9.1"
 
   s.authors  = "Brian Underwood"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4apis
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -50,7 +50,6 @@ files:
 - lib/neo4apis.rb
 - lib/neo4apis/base.rb
 - lib/neo4apis/query_buffer.rb
-- lib/neo4apis/version.rb
 - neo4apis.gemspec
 homepage: https://github.com/neo4jrb/neo4apis/
 licenses:
@@ -77,3 +76,4 @@ signing_key:
 specification_version: 4
 summary: An API to import web API data to neo4j
 test_files: []
+has_rdoc: 

data/lib/neo4apis/version.rb

@@ -1,3 +0,0 @@
-module Neo4Apis
-  VERSION = '0.0.2'
-end