neo4apis 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad7db52ef054711d9a46ad72faf561c33362031
-  data.tar.gz: 0e2e23ad1809609017197d73dbec931ce930bc4e
+  metadata.gz: 9dc39e5d15243ff0fd5af9801cbee5effc409a7d
+  data.tar.gz: cc39d6d2a1975b0b77a5a7582ec0da1351e13dc3
 SHA512:
-  metadata.gz: 414105a2a254d9ff77289b2b6a2f91d09b03476ac3bcfde76747bf2ed7a0d7b9c3f743f5f70a7b89765e1bced4931367ff64be9613776ec6b55913a73f28dc48
-  data.tar.gz: af73110ad0007e807b88e7122887c3e0a25b079c536fecbef727a09ad4bc4f4420904aba4291fcbc1a92cfb35ba8354dcab216fc92054aedfcad529a503c448b
+  metadata.gz: ab9c88c313865a7d42d04f0ffa1ab12d0ed52e3ad016cbf982d54af3258dbdc0b824facb430c2c2c965f6bcde5d813cc9ce674769e45a203df11de62ec7957f9
+  data.tar.gz: fbd2705473967bc5e41e3adb9ef80e8ee9eef09b8685bf4f64202387f155d6cad00be40e0c7d502e0545883eeb3e1f5ecb3f3f712b6907e529a43e8dd27dc66c

data/bin/neo4apis

@@ -5,9 +5,10 @@ require 'neo4apis/cli/base'
 
 # Require all of the neo4apis gems so that we can include their CLI classes
 # This is rubygems specific.  Happy for other solutions that anybody can provide
-Gem::Specification.all.select do |spec|
+Gem::Specification.select do |spec|
   spec.name =~ /neo4apis-/
 end.map(&:name).map do |name|
+  puts "requiring #{name}"
   require name
 end
 

data/lib/neo4apis/base.rb

@@ -62,8 +62,12 @@ module Neo4Apis
       self.instance_exec(*args, &IMPORTERS[label.to_sym])
     end
 
-    def self.prefix(prefix)
-      @prefix = prefix
+    def self.common_label(common_label = nil)
+      if common_label.nil?
+        @common_label
+      else
+        @common_label = common_label
+      end
     end
 
     def self.importer(label, &block)
@@ -114,27 +118,27 @@ module Neo4Apis
     private
 
     def create_node_query(node_proxy)
-      Neo4j::Core::Query.new.
-        merge(node: {self.class.full_label(node_proxy.label) => {node_proxy.uuid_field => node_proxy.uuid_value}}).
+      query = Neo4j::Core::Query.new.
+        merge(node: {node_proxy.label => {node_proxy.uuid_field => node_proxy.uuid_value}}).
         break.
         set(node: node_proxy.props)
+
+      query = query.set("node:#{self.class.common_label}") if self.class.common_label
+
+      query
     end
 
     def create_relationship_query(type, source, target, props)
       Neo4j::Core::Query.new.
-        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}}).
+        match(source: {source.label => {source.uuid_field => source.uuid_value}}).
+        match(target: {target.label => {target.uuid_field => target.uuid_value}}).
         merge("source-[rel:#{type}]->target").
         break.
         set(rel: props)
     end
 
     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
-
-    def self.full_label(label)
-      "#{@prefix}#{label}".to_sym
+      Neo4j::Core::Query.new.create("CONSTRAINT ON (node:`#{label}`) ASSERT node.#{uuid_field} IS UNIQUE")
     end
 
     def require_batch

data/lib/neo4apis/cli/base.rb

@@ -2,7 +2,6 @@ module Neo4Apis
   module CLI
     class Base < ::Thor
       class_option :neo4j_url, type: :string,  default: 'http://localhost:7474'
-      
     end
   end
 end

data/lib/neo4apis/query_buffer.rb

@@ -34,6 +34,8 @@ module Neo4Apis
     private
 
     def execute
+      return if empty?
+
       @faraday_connection.post do |req|
         req.url '/db/data/transaction/commit'
         req.headers['Accept'] = 'application/json; charset=UTF-8'

data/neo4apis.gemspec

@@ -3,7 +3,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name     = "neo4apis"
-  s.version  = '0.5.1'
+  s.version  = '0.6.0'
   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.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday