neo4j 2.2.3-java → 2.2.4-java

data/lib/neo4j/rails/node_persistance.rb

@@ -41,6 +41,15 @@ module Neo4j
         self
       end
 
+      def freeze_if_deleted
+        unless new_record?
+          Neo4j::IdentityMap.remove_node_by_id(neo_id)
+          unless self.class.load_entity(neo_id)
+            set_deleted_properties
+            freeze
+          end
+        end
+      end
 
       def reload_from_database
         Neo4j::IdentityMap.remove_node_by_id(neo_id)

data/lib/neo4j/rails/persistence.rb

@@ -74,7 +74,7 @@ module Neo4j
 
       # Returns +true+ if the properties hash has been frozen.
       def frozen?
-        reload unless new_record?
+        freeze_if_deleted
         @_properties.frozen?
       end
 
@@ -117,7 +117,7 @@ module Neo4j
           props = args.first
           raise "Can't get or create entity since #{props.inspect} does not included unique key #{props[unique_factory_key]}'" unless props[unique_factory_key]
           index = index_for_type(_decl_props[unique_factory_key][:index])
-          Neo4j::Core::Index::UniqueFactory.new(unique_factory_key, index) { |*| create!(*args) }.get_or_create(unique_factory_key, props[unique_factory_key])
+          Neo4j::Core::Index::UniqueFactory.new(unique_factory_key, index) { |*| create!(*args) }.get_or_create(unique_factory_key, props[unique_factory_key]).wrapper
         end
 
         # Same as #create, but raises an error if there is a problem during save.

data/lib/neo4j/rails/persistence.rb~

@@ -0,0 +1,186 @@
+module Neo4j
+  module Rails
+    # Defines the create, delete and update methods.
+    # @see ClassMethods class methods when including this module
+    module Persistence
+      extend ActiveSupport::Concern
+      extend TxMethods
+
+
+      # Persist the object to the database.  Validations and Callbacks are included
+      # by default but validation can be disabled by passing <tt>:validate => false</tt>
+      # to <tt>save</tt>. Creates a new transaction.
+      # @param (see Neo4j::Rails::Validations#save)
+      # @return [Boolean] true if it was persisted
+      # @see Neo4j::Rails::Validations Neo4j::Rails::Validations - for the :validate parameter
+      # @see Neo4j::Rails::Callbacks Neo4j::Rails::Callbacks - for callbacks
+      def save(*)
+        create_or_update
+      end
+      tx_methods :save
+
+      # Persist the object to the database.  Validations and Callbacks are included
+      # by default but validation can be disabled by passing :validate => false
+      # to #save!  Creates a new transaction.
+      #
+      # @raise a RecordInvalidError if there is a problem during save.
+      # @param (see Neo4j::Rails::Validations#save)
+      # @return nil
+      # @see #save
+      # @see Neo4j::Rails::Validations Neo4j::Rails::Validations - for the :validate parameter
+      # @see Neo4j::Rails::Callbacks Neo4j::Rails::Callbacks - for callbacks
+      def save!(*args)
+        unless save(*args)
+          raise RecordInvalidError.new(self)
+        end
+      end
+
+      # Removes the node from Neo4j and freezes the object.
+      def destroy
+        delete
+        freeze
+      end
+
+      # Same as #destroy but doesn't run destroy callbacks and doesn't freeze
+      # the object. Creates a new transaction
+      def delete
+        del unless new_record? || destroyed?
+        set_deleted_properties
+      end
+      tx_methods :delete
+
+      # Returns +true+ if the object was destroyed.
+      def destroyed?
+        @_deleted || (!new_record? && !self.class.load_entity(neo_id))
+      end
+
+      # Returns +true+ if the record is persisted, i.e. it’s not a new record and it was not destroyed
+      def persisted?
+        !new_record? && !destroyed?
+      end
+
+      # Returns +true+ if the record hasn't been saved to Neo4j yet.
+      def new_record?
+        _java_entity.nil?
+      end
+
+      alias :new? :new_record?
+
+      # Freeze the properties hash.
+      def freeze
+        @_properties.freeze
+        self
+      end
+
+      # Returns +true+ if the properties hash has been frozen.
+      def frozen?
+        reload unless new_record?
+        @_properties.frozen?
+      end
+
+
+      module ClassMethods
+
+        def transaction(&block)
+          Neo4j::Rails::Transaction.run do |tx|
+            block.call(tx)
+          end
+        end
+
+        def new(*args, &block)
+          instance = orig_new(*args, &block)
+          instance.instance_eval(&block) if block
+          instance
+        end
+
+        # Initialize a model and set a bunch of attributes at the same time.  Returns
+        # the object whether saved successfully or not.
+        def create(*args)
+          new(*args).tap do |o|
+            yield o if block_given?
+            o.save
+          end
+        end
+
+        # Get the indexed entity, creating it (exactly once) if no indexed entity exist.
+        #
+        # @example Creating a Unique node
+        #
+        #   class MyNode < Neo4j::Rails::Model
+        #     property :email, :index => :exact, :unique => true
+        #   end
+        #
+        #   node = MyNode.get_or_create(:email =>'jimmy@gmail.com', :name => 'jimmy')
+        #
+        # @see #put_if_absent
+        def get_or_create(*args)
+          props = args.first
+          raise "Can't get or create entity since #{props.inspect} does not included unique key #{props[unique_factory_key]}'" unless props[unique_factory_key]
+          index = index_for_type(_decl_props[unique_factory_key][:index])
+          Neo4j::Core::Index::UniqueFactory.new(unique_factory_key, index) { |*| create!(*args) }.get_or_create(unique_factory_key, props[unique_factory_key])
+        end
+
+        # Same as #create, but raises an error if there is a problem during save.
+        # @return [Neo4j::Rails::Model, Neo4j::Rails::Relationship]
+        def create!(*args)
+          new(*args).tap do |o|
+            yield o if block_given?
+            o.save!
+          end
+        end
+
+        # Destroy each node in turn.  Runs the destroy callbacks for each node.
+        def destroy_all
+          all.each do |n|
+            n.destroy
+          end
+        end
+      end
+
+      # Returns if the entity is currently being updated or created
+      def create_or_updating?
+        !!@_create_or_updating
+      end
+
+      protected
+
+      def update
+        write_changed_attributes
+        clear_changes
+        true
+      end
+
+      def create_or_update
+        # since the same model can be created or updated twice from a relationship we have to have this guard
+        @_create_or_updating = true
+        result = persisted? ? update : create
+        unless result != false
+          Neo4j::Rails::Transaction.fail if Neo4j::Rails::Transaction.running?
+          false
+        else
+          true
+        end
+      rescue => e
+        Neo4j::Rails::Transaction.fail if Neo4j::Rails::Transaction.running?
+        raise e
+      ensure
+        @_create_or_updating = nil
+      end
+
+      def set_deleted_properties
+        @_deleted = true
+      end
+
+      public
+      class RecordInvalidError < RuntimeError
+        attr_reader :record
+
+        def initialize(record)
+          @record = record
+          super(@record.errors.full_messages.join(", "))
+        end
+      end
+    end
+  end
+end
+

data/lib/neo4j/rails/relationship_persistence.rb

@@ -73,6 +73,15 @@ module Neo4j
         self
       end
 
+      def freeze_if_deleted
+        unless new_record?
+          Neo4j::IdentityMap.remove_rel_by_id(neo_id)
+          unless self.class.load_entity(neo_id)
+            set_deleted_properties
+            freeze
+          end
+        end
+      end
 
       def reload_from_database
         Neo4j::IdentityMap.remove_rel_by_id(id) if persisted?

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/neo4j.gemspec

@@ -32,5 +32,5 @@ It comes included with the Apache Lucene document database.
   s.add_dependency('orm_adapter', ">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0", "< 3.3")
   s.add_dependency("railties", ">= 3.0.0", "< 3.3")
-  s.add_dependency("neo4j-wrapper", '2.2.3')
+  s.add_dependency("neo4j-wrapper", '2.2.4')
 end

metadata

@@ -1,78 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 2.2.3
-  prerelease:
+  version: 2.2.4
 platform: java
 authors:
 - Andreas Ronge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.3
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: activemodel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - !binary |-
-        PA==
+    - - <
       - !ruby/object:Gem::Version
         version: '3.3'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - !binary |-
-        PA==
+    - - <
       - !ruby/object:Gem::Version
         version: '3.3'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: railties
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - !binary |-
-        PA==
+    - - <
       - !ruby/object:Gem::Version
         version: '3.3'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - !binary |-
-        PA==
+    - - <
       - !ruby/object:Gem::Version
         version: '3.3'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -81,14 +70,12 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
-    none: false
+        version: 2.2.4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.3
-    none: false
+        version: 2.2.4
   prerelease: false
   type: :runtime
 description: "You can think of Neo4j as a high-performance graph engine with all the\
@@ -109,34 +96,6 @@ files:
 - bin/neo4j-shell
 - bin/neo4j-upgrade
 - lib/neo4j.rb
-- lib/db/active_tx_log
-- lib/db/messages.log
-- lib/db/neostore
-- lib/db/neostore.id
-- lib/db/neostore.nodestore.db
-- lib/db/neostore.nodestore.db.id
-- lib/db/neostore.propertystore.db
-- lib/db/neostore.propertystore.db.arrays
-- lib/db/neostore.propertystore.db.arrays.id
-- lib/db/neostore.propertystore.db.id
-- lib/db/neostore.propertystore.db.index
-- lib/db/neostore.propertystore.db.index.id
-- lib/db/neostore.propertystore.db.index.keys
-- lib/db/neostore.propertystore.db.index.keys.id
-- lib/db/neostore.propertystore.db.strings
-- lib/db/neostore.propertystore.db.strings.id
-- lib/db/neostore.relationshipstore.db
-- lib/db/neostore.relationshipstore.db.id
-- lib/db/neostore.relationshiptypestore.db
-- lib/db/neostore.relationshiptypestore.db.id
-- lib/db/neostore.relationshiptypestore.db.names
-- lib/db/neostore.relationshiptypestore.db.names.id
-- lib/db/nioneo_logical.log.active
-- lib/db/nioneo_logical.log.v0
-- lib/db/tm_tx_log.1
-- lib/db/index/lucene-store.db
-- lib/db/index/lucene.log.active
-- lib/db/index/lucene.log.v0
 - lib/generators/neo4j.rb
 - lib/generators/neo4j/model/model_generator.rb
 - lib/generators/neo4j/model/templates/model.erb
@@ -145,6 +104,7 @@ files:
 - lib/neo4j/version.rb~
 - lib/neo4j/rails/accept_id.rb
 - lib/neo4j/rails/attributes.rb
+- lib/neo4j/rails/attributes.rb~
 - lib/neo4j/rails/callbacks.rb
 - lib/neo4j/rails/column.rb
 - lib/neo4j/rails/compositions.rb
@@ -156,6 +116,7 @@ files:
 - lib/neo4j/rails/node_persistance.rb
 - lib/neo4j/rails/observer.rb
 - lib/neo4j/rails/persistence.rb
+- lib/neo4j/rails/persistence.rb~
 - lib/neo4j/rails/rack_middleware.rb
 - lib/neo4j/rails/rails.rb
 - lib/neo4j/rails/railtie.rb
@@ -189,6 +150,7 @@ files:
 - neo4j.gemspec
 homepage: http://github.com/andreasronge/neo4j/tree
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options:
 - --quiet
@@ -202,24 +164,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: A graph database for JRuby
 test_files: []

data/lib/db/active_tx_log

@@ -1 +0,0 @@
-tm_tx_log.1