neo4apis 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc39e5d15243ff0fd5af9801cbee5effc409a7d
-  data.tar.gz: cc39d6d2a1975b0b77a5a7582ec0da1351e13dc3
+  metadata.gz: 959d680c2dde5dcfd1fd964faca6d3bebb41cc92
+  data.tar.gz: 5752b466c52b785c1e120df8eacd461288f355c0
 SHA512:
-  metadata.gz: ab9c88c313865a7d42d04f0ffa1ab12d0ed52e3ad016cbf982d54af3258dbdc0b824facb430c2c2c965f6bcde5d813cc9ce674769e45a203df11de62ec7957f9
-  data.tar.gz: fbd2705473967bc5e41e3adb9ef80e8ee9eef09b8685bf4f64202387f155d6cad00be40e0c7d502e0545883eeb3e1f5ecb3f3f712b6907e529a43e8dd27dc66c
+  metadata.gz: 9170517c8f5d446bc0ba93b3069910501fdf5e41c9168affe9ec18b509b12c5482be8b11f1eb5440eaa3d101b14acdf0c9809cb00e384df60cd6e0a1cf6d8fda
+  data.tar.gz: fe9290e06c5bd77bae2c0f57e38d3993f3cca58015d641df6edb369232a2c30ee4e7359ef3f80c5e1467cbe975b1b5260c911f5e77378445a257f53a583415a3

data/README.md

@@ -72,3 +72,15 @@ end
 
 ```
 
+## Options
+
+Options can be used in the instantiation of the Neo4Apis client:
+
+    neo4apis_awesome = Neo4Apis::AwesomeSite.new(neo4j_session, {option: value})
+
+
+`relationship_transform`
+
+Allowed values `upcase`, `downcase`, and `none`.  Default: `upcase`
+
+How should relationship types be transformed when saving?  Neo4j recommends upper case relationship types, so `upcase` is the default.  `none` sends through relationship types as specified in the add_relationship method

data/lib/neo4apis/base.rb

@@ -24,7 +24,7 @@ module Neo4Apis
 
       if object
         columns.each do |column|
-          props.send("#{column}=", object.send(column))
+          props[column] = object.send(column)
         end
       end
 
@@ -118,23 +118,45 @@ module Neo4Apis
     private
 
     def create_node_query(node_proxy)
-      query = Neo4j::Core::Query.new.
-        merge(node: {node_proxy.label => {node_proxy.uuid_field => node_proxy.uuid_value}}).
-        break.
-        set(node: node_proxy.props)
+      return if node_proxy.props.empty?
 
-      query = query.set("node:#{self.class.common_label}") if self.class.common_label
+      cypher = <<-QUERY
+      MERGE (node:`#{node_proxy.label}` {#{node_proxy.uuid_field}: {uuid_value}})
+      SET #{set_attributes(:node, node_proxy.props.keys)}
+QUERY
 
-      query
+      cypher << " SET node:`#{self.class.common_label}`" if self.class.common_label
+
+      OpenStruct.new({to_cypher: cypher,
+                      merge_params: {uuid_value: node_proxy.uuid_value, props: 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}}).
-        merge("source-[rel:#{type}]->target").
-        break.
-        set(rel: props)
+      return if props.empty?
+
+      type = type.to_s.send(relationship_transform) if relationship_transform != :none
+
+      cypher = <<-QUERY
+              MATCH (source:`#{source.label}`), (target:`#{source.label}`)
+              WHERE source.#{source.uuid_field}={source_value} AND target.#{target.uuid_field}={target_value}
+              MERGE source-[rel:`#{type}`]->target
+              SET #{set_attributes(:rel, props.keys)}
+QUERY
+
+      OpenStruct.new({to_cypher: cypher,
+                      merge_params: {source_value: source.uuid_value, target_value: target.uuid_value, props: props}})
+    end
+
+    def relationship_transform
+      (@options[:relationship_transform] || :upcase).to_sym.tap do |transform|
+        fail "Invalid relationship_transform value: #{transform.inspect}" if not [:upcase, :downcase, :none].include?(transform)
+      end
+    end
+
+    def set_attributes(var, properties)
+      properties.map do |property|
+        "#{var}.#{property} = {props}.#{property}"
+      end.join(', ')
     end
 
     def create_constraint_query(label, uuid_field)

data/neo4apis.gemspec

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