neo4j 7.0.12 → 7.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf9c94f04964b4b719c6eecfe051067a0b957580
-  data.tar.gz: 743f534ad03bbb3212db754c78023e3ff5831958
+  metadata.gz: df8bb64d46712b18b72eee7f986912e0f78d0c2f
+  data.tar.gz: 6cd7303b19d72680cb42e9f14485d666586bfdbe
 SHA512:
-  metadata.gz: 4254cc59800eb57234e1606e076060676ee13fba3bde10cf112106280d4c1519b859d924e8eab366367d6c870e96781c4221807f2098033d4bad8122a2223319
-  data.tar.gz: 5122828aa25d8b72092ad22648775f2361bf12c7698f912cf67ab199dc96c1a78ad07c501940699a549edef5af46d9a23ec20813d562b2eb30aa3548e94b7a7f
+  metadata.gz: 425a60cfa9c9b9cd2df77999a71168f29e413e7e5ac270ed32e5a5f93b8d4504aa2875c8db36b0100a26a9b4723e4c10a797bc7fed27b025c9787c99644466b7
+  data.tar.gz: 445087632f207eefd9b3e3a9c763a81bc1bf8b971e987e0e896faf7c82b9d975cc9d46ea40e0e68751a9dd7a3edc65cc9233b24ad0c64cccd26aa09205adfbc1

data/lib/neo4j/active_node/persistence.rb

@@ -125,14 +125,14 @@ module Neo4j::ActiveNode
         on_create_attrs, on_match_attrs, set_attrs = optional_attrs.values_at(*options)
 
         neo4j_session.query.merge(n: {self.mapped_label_names => match_attributes})
-          .on_create_set(n: on_create_props(on_create_attrs))
-          .on_match_set(n: on_match_props(on_match_attrs))
+          .on_create_set(on_create_clause(on_create_attrs))
+          .on_match_set(on_match_clause(on_match_attrs))
           .break.set(n: set_attrs)
           .pluck(:n).first
       end
 
       def find_or_create(find_attributes, set_attributes = {})
-        on_create_attributes = set_attributes.reverse_merge(on_create_props(find_attributes))
+        on_create_attributes = set_attributes.reverse_merge(find_attributes.merge(self.new(find_attributes).props_for_create))
 
         neo4j_session.query.merge(n: {self.mapped_label_names => find_attributes})
           .on_create_set(n: on_create_attributes)
@@ -155,12 +155,20 @@ module Neo4j::ActiveNode
 
       private
 
-      def on_create_props(find_attributes)
-        find_attributes.merge(self.new(find_attributes).props_for_create)
+      def on_create_clause(clause)
+        if clause.is_a?(Hash)
+          {n: clause.merge(self.new(clause).props_for_create)}
+        else
+          clause
+        end
       end
 
-      def on_match_props(match_attributes)
-        match_attributes.tap { |props| props[:updated_at] = DateTime.now.to_i if attributes_nil_hash.key?('updated_at') }
+      def on_match_clause(clause)
+        if clause.is_a?(Hash)
+          {n: clause.merge(attributes_nil_hash.key?('updated_at') ? {updated_at: Time.new.to_i} : {})}
+        else
+          clause
+        end
       end
     end
   end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '7.0.12'
+  VERSION = '7.0.13'
 end

data/lib/rails/generators/neo4j/migration/migration_generator.rb

@@ -0,0 +1,19 @@
+require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'neo4j.rb')
+
+module Neo4j
+  module Generators
+    class Migration < ::Neo4j::Generators::Base
+      def create_migration_file
+        real_file_name = "#{Time.zone.now.strftime('%Y%m%d%H%M%S')}_#{file_name.parameterize}"
+        @migration_class_name = file_name.camelize
+
+        if args[0] == 'force_add_index'
+          @content = "force_add_index #{args[1].to_s.classify.to_sym.inspect}, #{args[2].to_sym.inspect}"
+        end
+
+        template 'migration.erb', File.join('db/neo4j/migrate', real_file_name)
+      end
+    end
+  end
+end
+

data/lib/rails/generators/neo4j/migration/templates/migration.erb

@@ -0,0 +1,9 @@
+class <%= @migration_class_name %> < Neo4j::Migrations::Base
+  def up
+    <%= @content %>
+  end
+
+  def down
+    raise Neo4j::IrreversibleMigration
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 7.0.12
+  version: 7.0.13
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -293,6 +293,8 @@ files:
 - lib/neo4j/type_converters.rb
 - lib/neo4j/version.rb
 - lib/neo4j/wrapper.rb
+- lib/rails/generators/neo4j/migration/migration_generator.rb
+- lib/rails/generators/neo4j/migration/templates/migration.erb
 - lib/rails/generators/neo4j/model/model_generator.rb
 - lib/rails/generators/neo4j/model/templates/model.erb
 - lib/rails/generators/neo4j_generator.rb