motion_model 0.5.3 → 0.5.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmQ4MDAzNDMxNzQ2MDVhOWZkMDVhNjA0M2JhMWEwMGJmZWM4NTU1MQ==
-  data.tar.gz: !binary |-
-    M2UzM2UyYjcyY2JjOWUyMjNhZDRlZmQ1OGE0YTUzZDY5MzY2NDNmOA==
+SHA1:
+  metadata.gz: 9fa1c9fe578bfec914279fad0ced2ff4f6df49a1
+  data.tar.gz: 9952292bdef965d7ab76ab1f8a8c906a2f69fd67
 SHA512:
-  metadata.gz: !binary |-
-    ZWUxMmM3OGU3ZWM5YzU5YTEwMzVmMWE3OWYwYmNkYzRkYzk2ZTRiM2UzZGYz
-    ZGFiYTkyYzZiNGNlMjZjNmZlYThiMjM5YzRjNjQ1MTVmYWZhMzAwNGM0NDAy
-    YjBjOWE0ZjU4NjAwNmRiMjE2OWRiNTFhNDZiZjU1OTM0NmI5ODU=
-  data.tar.gz: !binary |-
-    ODZiYjlkNTNhM2MyODBhYTdlN2RiM2I4ZDM4YTAxNGM3ZDk3Y2E3NzBhMjE4
-    ZGZkZGFjNTcyYmRlZjRhM2ZjZjZkYjM0MGNhODdiZDc3YWEwMzIyNWI2NDli
-    OTdmYTliODZkNTQ1MmU3YWFmNzQ5ZjRlZmQyZGI1ODk3Y2ZmYjU=
+  metadata.gz: 41cb26133a685d546300513985f57e41fa58b4b8eb678689311d2b23bfddb6d9394d66f6f849ad4faff27369f3f95945c1525dcd7fa0105dfd801812236f2c8f
+  data.tar.gz: 8a1a29e8a90468f7392b1c9f54281fa3038956ad8776be4e668d5286057fbc164af9d25ca6b59efefdf2b0eb0daedff3481506264d33e9831fc64a1105d70d41

data/README.md

@@ -882,12 +882,17 @@ require "~/github/local/MotionModel/lib/motion_model.rb"
 The `~/github/local` is where I cloned it, but you can put it anyplace. Next, make
 sure you are following the project on GitHub so you know when there are changes.
 
-Submissions/Patches
+Submissions/Patches/Bug Reports
 ------------------
 
-Obviously, the ideal patch request is really a pull request from your own fork, complete with passing
-specs.
+For a submission, do this:
 
-Really, for a bug report, even a failing spec or some proposed code is fine. I really want to make
-this a decent tool for RubyMotion developers who need a straightforward data
-modeling and persistence framework.
+1. Fork it
+2. Create your feature branch (git checkout -b my-new-feature)
+3. Commit your changes (git commit -am 'Add some feature')
+4. Push to the branch (git push origin my-new-feature)
+5. Create new Pull Request
+
+For a bug report, the best bet is follow the above steps, but for #2 and 4,
+use the issue number in the branch. Once you have created the pull request,
+reference it in the issue.

data/motion/adapters/array_model_persistence.rb

@@ -44,17 +44,24 @@ module MotionModel
       # will remember the file name, so they may omit that argument.
       #
       # Raises a +MotionModel::PersistFileFailureError+ on failure.
-      def deserialize_from_file(file_name = nil)
+      def deserialize_from_file(file_name = nil, directory = nil)
         if schema_version != '1.0.0'
           migrate
         end
 
         @file_name = file_name if file_name
+        @file_path =
+          if directory.nil?
+            documents_file(@file_name)
+          else
+            File.join(directory, @file_name)
+          end
+            
 
-        if File.exist? documents_file(@file_name)
+        if File.exist? @file_path
           error_ptr = Pointer.new(:object)
 
-          data = NSData.dataWithContentsOfFile(documents_file(@file_name), options:NSDataReadingMappedIfSafe, error:error_ptr)
+          data = NSData.dataWithContentsOfFile(@file_path, options:NSDataReadingMappedIfSafe, error:error_ptr)
 
           if data.nil?
             error = error_ptr[0]
@@ -78,12 +85,19 @@ module MotionModel
       # remembered file name.
       #
       # Raises a +MotionModel::PersistFileError+ on failure.
-      def serialize_to_file(file_name = nil)
+      def serialize_to_file(file_name = nil, directory = nil)
         @file_name = file_name if file_name
+        @file_path =
+          if directory.nil?
+            documents_file(@file_name)
+          else
+            File.join(directory, @file_name)
+          end
+      
         error_ptr = Pointer.new(:object)
 
         data = NSKeyedArchiver.archivedDataWithRootObject collection
-        unless data.writeToFile(documents_file(@file_name), options: NSDataWritingAtomic, error: error_ptr)
+        unless data.writeToFile(@file_path, options: NSDataWritingAtomic, error: error_ptr)
           # De-reference the pointer.
           error = error_ptr[0]
 
@@ -92,7 +106,6 @@ module MotionModel
         end
       end
 
-
       def documents_file(file_name)
         file_path = File.join NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true), file_name
         file_path

data/motion/ext.rb

@@ -300,45 +300,47 @@ class Debug
   @@silent = false
   @@colorize = true
 
-  # Use silence if you want to keep messages from being echoed
-  # to the console.
-  def self.silence
-    @@silent = true
-  end
+  class << self
+    # Use silence if you want to keep messages from being echoed
+    # to the console.
+    def silence
+      @@silent = true
+    end
 
-  def self.colorize
-    @@colorize
-  end
+    def colorize
+      @@colorize
+    end
 
-  def self.colorize=(value)
-    @@colorize = value == true
-  end
+    def colorize=(value)
+      @@colorize = value == true
+    end
 
-  # Use resume when you want messages that were silenced to
-  # resume displaying.
-  def self.resume
-    @@silent = false
-  end
+    # Use resume when you want messages that were silenced to
+    # resume displaying.
+    def resume
+      @@silent = false
+    end
 
-  def self.put_message(type, message, color = Ansi.reset_color)
-    open_color = @@colorize ? color : ''
-    close_color = @@colorize ? Ansi.reset_color : ''
+    def put_message(type, message, color = Ansi.reset_color)
+      open_color = @@colorize ? color : ''
+      close_color = @@colorize ? Ansi.reset_color : ''
 
-    NSLog("#{open_color}#{type} #{caller[1]}: #{message}#{close_color}") unless @@silent
-  end
+      NSLog("#{open_color}#{type} #{caller[1]}: #{message}#{close_color}") unless @@silent
+    end
 
-  def self.info(msg)
-    put_message 'INFO', msg, Ansi.green_color
-  end
+    def info(msg)
+      put_message 'INFO', msg, Ansi.green_color
+    end
+    alias :log :info
 
-  def self.warning(msg)
-    put_message 'WARNING', msg, Ansi.yellow_color
-  end
+    def warning(msg)
+      put_message 'WARNING', msg, Ansi.yellow_color
+    end
 
-  def self.error(msg)
-    put_message 'ERROR', msg, Ansi.red_color
+    def error(msg)
+      put_message 'ERROR', msg, Ansi.red_color
+    end
   end
-
 end
 
 # These are C macros in iOS SDK. Not workable for Ruby.

data/motion/model/model.rb

@@ -106,6 +106,28 @@ module MotionModel
         end
       end
 
+      # Use at class level, as follows:
+      #
+      #   class Task
+      #     include MotionModel::Model
+      #     include MotionModel::ArrayModelAdapter
+      #
+      #     columns  :name, :details, :assignees, :created_at, :updated_at
+      #     has_many :assignees
+      #     protects_remote_timestamps
+      #
+      # In this case, creating or updating will not alter the values of the
+      # timestamps, preferring to allow the server to be the only authority
+      # for assigning timestamp information.
+
+      def protect_remote_timestamps
+        @_protect_remote_timestamps = true
+      end
+
+      def protect_remote_timestamps?
+        @_protect_remote_timestamps == true
+      end
+
       # Use at class level, as follows:
       #
       #   class Task
@@ -518,8 +540,10 @@ module MotionModel
 
     # Set created_at and updated_at fields
     def set_auto_date_field(field_name)
-      method = "#{field_name}="
-      self.send(method, Time.now) if self.respond_to?(method)
+      unless self.class.protect_remote_timestamps?
+        method = "#{field_name}="
+        self.send(method, Time.now) if self.respond_to?(method)
+      end
     end
 
     # Stub methods for hook protocols
@@ -792,7 +816,12 @@ module MotionModel
       when NilClass
         {column => value}
       when Proc
-        {column => default.call}
+        begin
+          {column => default.call}
+        rescue Exception => ex
+          Debug.error "\n\nProblem initializing #{self.class} : #{column} with default and proc.\nException: #{ex.message}\nSorry, your app is pretty much crashing.\n"
+          exit
+        end
       when Symbol
         {column => self.send(column)}
       else

data/motion/version.rb

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

data/spec/array_model_persistence_spec.rb

@@ -238,5 +238,21 @@ describe "serialization of relations" do
     Parent.first.children.first.name.should == 'Fergie'
     Parent.first.dog.first.name.should == 'Fluffy'
   end
-end
 
+  it "allows to serialize and eserialize from directories" do
+    directory_path = '/Library/Caches'
+    Parent.serialize_to_file('parents.dat', directory_path)
+    Child.serialize_to_file('children.dat', directory_path)
+    Dog.serialize_to_file('dogs.dat', directory_path)
+    Parent.delete_all
+    Child.delete_all
+    Dog.delete_all
+    Parent.deserialize_from_file('parents.dat', directory_path)
+    Child.deserialize_from_file('children.dat', directory_path)
+    Dog.deserialize_from_file('dogs.dat', directory_path)
+    Parent.first.name.should == 'BoB'
+    Parent.first.children.count.should == 2
+    Parent.first.children.first.name.should == 'Fergie'
+    Parent.first.dog.first.name.should == 'Fluffy'
+  end
+end

data/spec/date_spec.rb

@@ -27,6 +27,14 @@ describe "time conversions" do
               :updated_at => :date
     end
 
+    class ProtectedUpdateable
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns :name => :string,
+              :updated_at => :date
+      protect_remote_timestamps
+    end
+
     it "Sets created_at when an item is created" do
       c = Creatable.new(:name => 'test')
       lambda{c.save}.should.change{c.created_at}
@@ -50,6 +58,12 @@ describe "time conversions" do
       lambda{ c.save }.should.change{c.updated_at}
     end
 
+    it "Honors (protects) server side timestamps" do
+      c = ProtectedUpdateable.create(:name => 'test')
+      sleep 1
+      c.name = 'test 1'
+      lambda{ c.save }.should.not.change{c.updated_at}
+    end
   end
 
   describe "parsing ISO8601 date formats" do

data/spec/model_spec.rb

@@ -39,7 +39,7 @@ describe "Creating a model" do
       a_task = Task.new(:name => 'name', :details => 'details')
       a_task.name.should.equal('name')
     end
-    
+
     it 'creates a model with all attributes even if some omitted' do
       atask = Task.create(:name => 'bob')
       atask.should.respond_to(:details)
@@ -177,14 +177,14 @@ describe "Creating a model" do
         1.upto(10) {|i| Task.create(:name => "task #{i}")}
       end
     end
-    
+
     it 'deletes a row' do
       target = Task.find(:name).eq('task 3').first
       target.should.not == nil
       target.delete
       Task.find(:name).eq('task 3').count.should.equal 0
     end
-    
+
     it 'deleting a row changes length' do
       target = Task.find(:name).eq('task 2').first
       lambda{target.delete}.should.change{Task.length}
@@ -198,7 +198,7 @@ describe "Creating a model" do
       Task.find(:name).eq('task 3').count.should.equal 1
     end
   end
-  
+
   describe 'Handling Attribute Implementation' do
     it 'raises a NoMethodError exception when an unknown attribute it referenced' do
       task = Task.new
@@ -243,7 +243,7 @@ describe "Creating a model" do
       end
     end
   end
-  
+
   describe 'defining custom attributes' do
     before do
       Task.delete_all
@@ -254,4 +254,49 @@ describe "Creating a model" do
       @task.custom_attribute_by_method.should == 'Feed the Cat - Get food, pour out'
     end
   end
+
+  describe 'protecting timestamps' do
+    class NoTimestamps
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns name: :string
+      protect_remote_timestamps
+    end
+
+    class AutoTimeable
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns name:       :string,
+              created_at: :date,
+              updated_at: :date
+    end
+
+    class ProtectedTimestamps
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns name:       :string,
+              created_at: :date,
+              updated_at: :date
+      protect_remote_timestamps
+    end
+
+    it 'does nothing to break classes with no timestamps' do
+      lambda{NoTimestamps.create!(name: 'no timestamps')}.should.not.raise
+    end
+
+    it "changes the timestamps if they are not protected" do
+      auto_timeable = AutoTimeable.new(name: 'auto timeable')
+      lambda{auto_timeable.name = 'changed auto timeable'; auto_timeable.save!}.should.change{auto_timeable.updated_at}
+    end
+
+    it "does not change created_at if timestamps are protected" do
+      protected_times = ProtectedTimestamps.new(name: 'auto timeable', created_at: Time.now, updated_at: Time.now)
+      lambda{protected_times.name = 'changed created at'; protected_times.save!}.should.not.change{protected_times.created_at}
+    end
+
+    it "does not change updated_at if timestamps are protected" do
+      protected_times = ProtectedTimestamps.new(name: 'auto timeable', created_at: Time.now, updated_at: Time.now)
+      lambda{protected_times.name = 'changed updated at'; protected_times.save!}.should.not.change{protected_times.updated_at}
+    end
+  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Steve Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: motion-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: Simple model and validation mixins for RubyMotion
@@ -95,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Simple model and validation mixins for RubyMotion