active_node 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fba7d60bad2e08d7dc4e0750638d7307e04fc17
-  data.tar.gz: 65347e49175fad7daae68761797e7c195bcfb287
+  metadata.gz: caa007d44ee08eba702076849cea0c799428c3b6
+  data.tar.gz: a5df8569e661a75c6291db2dc3803df0bcfe2f51
 SHA512:
-  metadata.gz: 35794dbe68d4e3345b8860fce9597a095d7888090b2da7336a175a4492e8c11577a339b0a2832242f03cbd7e23c11aa61ed6c723c1d62aa965500856a45fca96
-  data.tar.gz: 9cf27db0e024749342e86a971a8156a4e5efa99e91e327899fb0797ebacbf7817012f7d2867f2ccada1eb1256e799cb7b4a67bff469ca4c8b0e6815f346b1c39
+  metadata.gz: 24731c0ae1f393568ac28a1c06f924105e530dcf60d82b96b56dedbab10016bd02e6c067bea482633283acb9415e5e601007e85855432fcf3a999d526c75143c
+  data.tar.gz: b3060005f8751aa730546ddf3ec72e1168b8400b8ce8eb7c72f7bc4a6ae591cc60e148ffaff508a37af58fe817d5a6ae5f581ebb2072c836082a9ec684a778b3

data/lib/active_node/persistence.rb

@@ -85,7 +85,7 @@ module ActiveNode
     end
 
     def persisted?
-      id.present?
+      id.present? && !destroyed?
     end
 
     def initialize hash={}, split_by=:respond_to_writer?
@@ -109,6 +109,10 @@ module ActiveNode
       @destroyed = destroyable
     end
 
+    def destroyed?
+      @destroyed
+    end
+
     def destroy!
       destroy true
     end
@@ -218,8 +222,7 @@ module ActiveNode
     end
 
     def all_attributes
-      attributes.merge(@hash)
+      attributes.except('id').merge(@hash)
     end
-
   end
 end

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/functional/persistence_spec.rb

@@ -7,7 +7,14 @@ describe ActiveNode::Persistence do
       Address.find(a.id).should == a
     end
 
-    it "should save not conventionally named object" do
+    it "should not set id property" do
+      a = Address.create!
+      ActiveNode::Neo.db.get_node_properties(a.id).should be_nil
+      a.save
+      ActiveNode::Neo.db.get_node_properties(a.id).should be_nil
+    end
+
+    it "should save unconventionally named object" do
       NeoUser.new(name: 'Heinrich').save.should be_true
       NeoUser.all.map(&:name).should == ['Heinrich']
     end
@@ -59,6 +66,20 @@ describe ActiveNode::Persistence do
     end
   end
 
+  describe "#destroyed?" do
+    it "returns false if a record has not been destroyed" do
+      person = Person.create!
+      expect(person).to_not be_destroyed
+    end
+
+    it "returns true after a record has been destroyed" do
+      person = Person.create!
+      person.destroy
+
+      expect(person).to be_destroyed
+    end
+  end
+
   describe "#create!" do
     it "should persist attributes" do
       Person.create!(name: 'abc').name.should == 'abc'
@@ -92,6 +113,24 @@ describe ActiveNode::Persistence do
     end
   end
 
+  describe "#persisted?" do
+    it "returns true if an id is assigned and the record is not destroyed" do
+      person = Person.new id: 123
+      expect(person).to be_persisted
+    end
+
+    it "returns false if an id is assigned and the record is destroyed" do
+      person = Person.create!
+      person.destroy
+      expect(person).to_not be_persisted
+    end
+
+    it "returns false if an id is not assigned" do
+      person = Person.new
+      expect(person).to_not be_persisted
+    end
+  end
+
   describe "#incoming" do
     it "can retrieve heterogenous models" do
       a = Address.create!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr