neo4j 1.0.0.beta.4 → 1.0.0.beta.5

data/lib/neo4j/mapping/node_mixin.rb

@@ -44,7 +44,7 @@ module Neo4j::Mapping
       c.instance_eval do
         # these constants are used in the Neo4j::RelClassMethods and Neo4j::PropertyClassMethods
         # they are defined here since they should only be defined once -
-        # all subclasses share the same index, declared properties and index_updaters
+        # all subclasses share the same index and declared properties
         unless c.const_defined?(:DECL_RELATIONSHIPS)
           const_set(:ROOT_CLASS, self)
           const_set(:DECL_RELATIONSHIPS, {})
@@ -64,9 +64,6 @@ module Neo4j::Mapping
         super
       end
       c.indexer c
-
     end
-
-
   end
 end

data/lib/neo4j/rails/model.rb

@@ -2,6 +2,7 @@ class Neo4j::Model
   include Neo4j::NodeMixin
   include ActiveModel::Validations
   include ActiveModel::Dirty
+  include ActiveModel::MassAssignmentSecurity
   extend ActiveModel::Naming
   extend ActiveModel::Callbacks
   define_model_callbacks :create, :save, :update, :destroy
@@ -23,12 +24,21 @@ class Neo4j::Model
   end
 
   def init_on_create(*args) # :nodoc:
-    _run_create_callbacks do
-      @_new_record = true
-      super
+    if Neo4j::Rails::Transaction.running?
+      super()
+      init_on_create_in_tx(*args)
+    else
+      Neo4j::Rails::Transaction.run { super(); init_on_create_in_tx(*args) }
     end
   end
 
+  def init_on_create_in_tx(*args)
+    _run_save_callbacks do
+      _run_create_callbacks do
+        self.attributes=args[0] if args[0].respond_to?(:each_pair)
+      end
+    end
+  end
   # --------------------------------------
   # Identity
   # --------------------------------------
@@ -48,10 +58,7 @@ class Neo4j::Model
   end
 
 
-  # --------------------------------------
   # enables ActiveModel::Dirty and Validation
-  # --------------------------------------
-
   def method_missing(method_id, *args, &block)
     if !self.class.attribute_methods_generated?
       self.class.define_attribute_methods(self.class.properties_info.keys)
@@ -85,28 +92,37 @@ class Neo4j::Model
     self[key]
   end
 
-  def attributes=(attrs)
-    attrs.each do |k, v|
+  def attributes=(values)
+    sanitize_for_mass_assignment(values).each do |k, v|
       if respond_to?("#{k}=")
         send("#{k}=", v)
       else
         self[k] = v
       end
     end
-    end
+  end
 
 
   # Updates this resource with all the attributes from the passed-in Hash and requests that the record be saved.
   # If the saving fails because of a connection or remote service error, an exception will be raised.
   # If saving fails because the resource is invalid then false will be returned.
   def update_attributes(attributes)
-    update(attributes) # TODO !!!
+    Neo4j::Rails::Transaction.running? ? update_attributes_in_tx(attributes): Neo4j::Rails::Transaction.run { update_attributes_in_tx(attributes) }
+  end
+
+  def update_attributes_in_tx(attributes)
+    self.attributes=attributes
     save
   end
 
-  # --------------------------------------
-  # CRUD
-  # --------------------------------------
+  def update_attributes!(attributes)
+    Neo4j::Rails::Transaction.running? ? update_attributes_in_tx!(attributes): Neo4j::Rails::Transaction.run { update_attributes_in_tx!(attributes) }
+  end
+
+  def update_attributes_in_tx!(attributes)
+    self.attributes=attributes
+    save!
+  end
 
   def delete
     super
@@ -116,24 +132,38 @@ class Neo4j::Model
   def save
     if valid?
       # if we are trying to save a value then we should create a real node
-      if persisted?
-        _run_update_callbacks do
-          @previously_changed = changes
-          @changed_attributes.clear
-        end
-      else
-        node = Neo4j::Node.new(props)
-        init_on_load(node)
-        init_on_create
+      Neo4j::Rails::Transaction.running? ? save_in_tx : Neo4j::Rails::Transaction.run { save_in_tx }
+      true
+    else
+      # if not valid we should rollback the transaction if there is one
+      # so that the changes does not take place.
+      # no point failing the transaction if we have not already persisted it since it will then
+      # not be persisted
+      Neo4j::Rails::Transaction.fail if Neo4j::Rails::Transaction.running? && persisted?
+      false
+    end
+  end
+
+  def save_in_tx
+    if persisted?
+      # already existing node - so we are updating it
+      _run_update_callbacks do
         @previously_changed = changes
         @changed_attributes.clear
       end
-      true
+    else
+      # we are creating a new node
+      node = Neo4j::Node.new(props)
+      init_on_load(node)
+      init_on_create
+      @previously_changed = changes
+      @changed_attributes.clear
     end
+
   end
 
   def save!
-    raise RecordInvalidError.new(self) unless save
+  raise RecordInvalidError.new(self) unless save
   end
 
   # In neo4j all object are automatically persisted in the database when created (but the Transaction might get rollback)
@@ -147,7 +177,7 @@ class Neo4j::Model
   end
 
   def new_record?()
-    @_new_record
+    _java_node.kind_of?(Neo4j::Value)
   end
 
   def del
@@ -156,7 +186,7 @@ class Neo4j::Model
   end
 
   def destroy
-    _run_update_callbacks { del }
+     Neo4j::Rails::Transaction.running? ? _run_update_callbacks { del } : Neo4j::Rails::Transaction.run { _run_update_callbacks { del } }
   end
 
   def destroyed?()
@@ -171,9 +201,10 @@ class Neo4j::Model
   class << self
     # returns a value object instead of creating a new node
     def new(*args)
-      value = Neo4j::Value.new(*args)
+      value = Neo4j::Value.new
       wrapped = self.orig_new
       wrapped.init_on_load(value)
+      wrapped.attributes=args[0] if args[0].respond_to?(:each_pair)
       wrapped
     end
 
@@ -200,11 +231,19 @@ class Neo4j::Model
       end
     end
 
+    def create(*)
+      Neo4j::Rails::Transaction.running? ? super : Neo4j::Rails::Transaction.run { super }
+    end
+
     def create!(*args)
       model = create(*args)
       raise RecordInvalidError.new(model) unless model.valid?
       model
     end
+
+    def transaction(&block)
+      Neo4j::Rails::Transaction.run &block
+    end
   end
 
 end

data/lib/neo4j/rails/transaction.rb

@@ -11,19 +11,56 @@ module Neo4j
     #      ...
     #  end
     class Transaction
-      def self.filter(*)
-        begin
-          tx = Neo4j::Transaction.new
-          yield
-          tx.success
-        rescue Exception
-          tx.failure unless tx.nil?
-          raise
-        ensure
-          tx.finish unless tx.nil?
+      class << self
+        def new
+          finish if Thread.current[:neo4j_transaction]
+          Thread.current[:neo4j_transaction] = Neo4j::Transaction.new
+        end
+
+        def current
+          Thread.current[:neo4j_transaction]
+        end
+
+        def running?
+          Thread.current[:neo4j_transaction] != nil
+        end
+
+        def fail?
+          Thread.current[:neo4j_transaction_fail] != nil
+        end
+
+        def fail
+          Thread.current[:neo4j_transaction_fail] = true
+        end
+
+        def success
+          Thread.current[:neo4j_transaction_fail] = nil
+        end
+
+        def finish
+          tx = Thread.current[:neo4j_transaction]
+          tx.success unless Thread.current[:neo4j_transaction_fail]
+          tx.finish
+          Thread.current[:neo4j_transaction] = nil
+          Thread.current[:neo4j_transaction_fail] = nil
+        end
+
+        def filter(*, &block)
+          run &block
+        end
+
+        def run
+          begin
+            new
+            yield
+          rescue
+            fail
+            raise
+          ensure
+            finish
+          end
         end
       end
     end
   end
-
 end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.4"
+  VERSION = "1.0.0.beta.5"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 4
-  version: 1.0.0.beta.4
+    - 5
+  version: 1.0.0.beta.5
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +02:00
+date: 2010-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency