motion_model 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f8aff0f64a66b3acc96dc5b3bc3539cb9ce7414
-  data.tar.gz: 8297cac822d64df7c823e6aeab801c54657c217c
+  metadata.gz: 892db8d37703846647efbe466622223f16e4457a
+  data.tar.gz: 4e6afc9963ed9d066f0260e94f68f2955bada371
 SHA512:
-  metadata.gz: b01dc4562a81064f0ade25f402f3bc50c84d9cb91a9132b3497ea844ee2e6f29c141259888f495794ddf11e8bc6694dc30f456607455b7a60c2c19b25822dc48
-  data.tar.gz: dfee05ac135e297256a9476c9f7b83c6e0bfd0ccc2646a4557338a7c1f882898100c17f4653cba221880d4d7c9d3d445c15f0308ffd8474096d634476f536432
+  metadata.gz: 2c3e7b74836767c12d63e75db5b5880005b04a9f87d9ccc0c23edfcc895ebd1f093823a608d0500297899af8a55683a3c63aeb1c807f69449972dbc11398dd3e
+  data.tar.gz: 67dd32daed7a6c8bbe9b53950d435bea746668f17494f279283ba42c5c30b59a4911167ae7be3cb4edce64c714d38ee0f6a0d03c9388f4f33a31809836908d72

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     bubble-wrap (1.4.0)
     motion-stump (0.3.0)
+    rake (10.4.2)
 
 PLATFORMS
   ruby
@@ -10,3 +11,4 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap
   motion-stump (~> 0.2)
+  rake

data/motion/adapters/array_model_persistence.rb

@@ -70,6 +70,11 @@ module MotionModel
             bulk_update do
               NSKeyedUnarchiver.unarchiveObjectWithData(data)
             end
+            
+            # ensure _next_id is in sync with deserialized model
+            max_id = self.all.map { |o| o.id }.max
+            increment_next_id(max_id) unless max_id.nil? || _next_id > max_id
+            
             return self
           end
         else

data/motion/ext.rb

@@ -370,3 +370,13 @@ class Module
     const.split(/::/).inject(base) { |mod, name| mod.const_get(name) }
   end
 end
+
+class Object
+  def try(*a, &b)
+    if a.empty? && block_given?
+      yield self
+    else
+      public_send(*a, &b) if respond_to?(a.first)
+    end
+  end
+end

data/motion/version.rb

@@ -4,5 +4,5 @@
 # or forward port their code to take advantage
 # of adapters.
 module MotionModel
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/array_model_persistence_spec.rb

@@ -255,4 +255,33 @@ describe "serialization of relations" do
     Parent.first.children.first.name.should == 'Fergie'
     Parent.first.dog.first.name.should == 'Fluffy'
   end
+  
+  class StoredTask
+    include MotionModel::Model
+    include MotionModel::ArrayModelAdapter
+    columns   :name
+  end
+
+  describe "reloading correct ids" do
+    before do
+      # # StoredTasks.dat was built with the following
+      # t1 = StoredTask.create(name: "One")     # id: 1
+      # t2 = StoredTask.create(name: "Two")     # id: 2
+      # t3 = StoredTask.create(name: "Three")   # id: 3
+      # t2.destroy
+
+      # # StoredTasks.all => [id: 1, id:3]
+      # StoredTask.serialize_to_file('StoredTasks.dat')
+      StoredTask.deserialize_from_file('StoredTasks.dat', NSBundle.mainBundle.resourcePath)
+    end
+
+    it "creates a new task with the correct id after deserialization" do
+      StoredTask.count.should == 2
+      StoredTask.first.id.should == 1
+      StoredTask.last.id.should == 3
+      
+      t4 = StoredTask.create(name: "Four")
+      t4.id.should == 4
+    end
+  end
 end

data/spec/relation_spec.rb

@@ -195,6 +195,25 @@ describe 'related objects' do
           @t1.assignees.count.should == 1
           @t1.assignees.first.assignee_name.should == @a1.assignee_name
         end
+        
+        it "directly assigning the assignee a nil task twice doesn't change anything" do
+          @a1.task.should == nil
+          @a1.task = nil
+          @a1.dirty?.should == false
+        end
+
+        it "directly assigning the existing task to an assignee doesn't change anything" do
+          @a1.task = @t1
+          @a1.save
+          @a1.task = @t1
+          @a1.dirty?.should == false
+        end
+        
+        it "directly assigning the assignee a nil task twice doesn't change anything" do
+          @a1.task.should == nil
+          @a1.task = nil
+          @a1.dirty?.should == false
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Steve Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -69,6 +69,7 @@ files:
 - motion/validatable.rb
 - motion/version.rb
 - motion_model.gemspec
+- resources/StoredTasks.dat
 - spec/adapter_spec.rb
 - spec/array_model_persistence_spec.rb
 - spec/cascading_delete_spec.rb
@@ -127,4 +128,3 @@ test_files:
 - spec/relation_spec.rb
 - spec/transaction_spec.rb
 - spec/validation_spec.rb
-has_rdoc: