motion_model 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+2102-03-15: Fixed bug where created_at and updated_at were being incorrectly
+            when restored from persistence (thanks Justin McPherson for finding
+            that).
+
+            Moved all NSCoder stuff out of Model to ArrayModelAdapter.
+
 2012-02-19: Included Doug Puchalski's great refactoring of Model that provides an
             adapter for ArrayModelAdapter. WARNING!!! This is a breaking change
             since version 0.3.8. You will have to include:

data/lib/motion_model/adapters/array_model_adapter.rb

@@ -107,6 +107,15 @@ module MotionModel
       self.class.issue_notification(self, :action => 'add')
     end
 
+    # This adds to the ArrayStore without the magic date
+    # and id manipulation stuff
+    def add_to_store(*)
+      do_insert
+      @dirty = @new_record = false
+    end
+
+
+
     # Count of objects in the current collection
     def length
       collection.length

data/lib/motion_model/ext.rb

@@ -1,49 +1,67 @@
+# The reason the String extensions are wrapped in
+# conditional blocks is to reduce the likelihood
+# of a namespace collision with other libraries.
+
 class String
-  def humanize
-    self.split(/_|-| /).join(' ')
+  unless String.instance_methods.include?(:humanize)
+    def humanize
+      self.split(/_|-| /).join(' ')
+    end
   end
 
-  def titleize
-    self.split(/_|-| /).each{|word| word[0...1] = word[0...1].upcase}.join(' ')
+  unless String.instance_methods.include?(:titleize)
+    def titleize
+      self.split(/_|-| /).each{|word| word[0...1] = word[0...1].upcase}.join(' ')
+    end
   end
 
-  def empty?
-    self.length < 1
+  unless String.instance_methods.include?(:empty?)
+    def empty?
+      self.length < 1
+    end
   end
 
-  def pluralize
-    Inflector.inflections.pluralize self
+  unless String.instance_methods.include?(:pluralize)
+    def pluralize
+      Inflector.inflections.pluralize self
+    end
   end
 
-  def singularize
-    Inflector.inflections.singularize self
+  unless String.instance_methods.include?(:singularize)
+    def singularize
+      Inflector.inflections.singularize self
+    end
   end
 
-  def camelize(uppercase_first_letter = true)
-    string = self.dup
-    string.gsub!(/(?:_|(\/))([a-z\d]*)/i) do
-      new_word = $2.downcase
-      new_word[0] = new_word[0].upcase
-      new_word = "/#{new_word}" if $1 == '/'
-      new_word
+  unless String.instance_methods.include?(:camelize)
+    def camelize(uppercase_first_letter = true)
+      string = self.dup
+      string.gsub!(/(?:_|(\/))([a-z\d]*)/i) do
+        new_word = $2.downcase
+        new_word[0] = new_word[0].upcase
+        new_word = "/#{new_word}" if $1 == '/'
+        new_word
+      end
+      if uppercase_first_letter && uppercase_first_letter != :lower
+        string[0] = string[0].upcase
+      else
+        string[0] = string[0].downcase
+      end
+      string.gsub!('/', '::')
+      string
     end
-    if uppercase_first_letter && uppercase_first_letter != :lower
-      string[0] = string[0].upcase
-    else
-      string[0] = string[0].downcase
+  end
+
+  unless String.instance_methods.include?(:underscore)
+    def underscore
+      word = self.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
     end
-    string.gsub!('/', '::')
-    string
-  end
-
-  def underscore
-    word = self.dup
-    word.gsub!(/::/, '/')
-    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!("-", "_")
-    word.downcase!
-    word
   end
 end
 

data/lib/motion_model/model/model.rb

@@ -378,9 +378,15 @@ module MotionModel
       self.send("#{field_name}=", Time.now) if self.respond_to? field_name
     end
 
+    # Stub methods for hook protocols
+    def before_save(*); end
+    def after_save(*);  end
+    def before_delete(*); end
+    def after_delete(*); end
+
     def call_hook(hook_name, postfix)
       hook = "#{hook_name}_#{postfix}"
-      self.send(hook, self) if respond_to? hook.to_sym
+      self.send(hook, self)
     end
 
     def call_hooks(hook_name, &block)
@@ -442,13 +448,6 @@ module MotionModel
       column_named(column_name).options
     end
 
-    # True if this object responds to the method or
-    # property, otherwise false.
-    alias_method :old_respond_to?, :respond_to?
-    def respond_to?(method)
-      column_named(method) || old_respond_to?(method)
-    end
-
     def dirty?
       @dirty
     end

data/lib/motion_model/version.rb

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

data/motion_model.gemspec

@@ -13,5 +13,6 @@ Gem::Specification.new do |gem|
   gem.name          = "motion_model"
   gem.require_paths = ["lib"]
   gem.add_dependency 'bubble-wrap', '~> 1.1.4'
+  gem.add_dependency 'motion-support', '>=0.1.0'
   gem.version       = MotionModel::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.4
+- !ruby/object:Gem::Dependency
+  name: motion-support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: Simple model and validation mixins for RubyMotion
 email:
 - sxross@gmail.com
@@ -49,7 +65,6 @@ files:
 - lib/motion_model/model/formotion.rb
 - lib/motion_model/model/model.rb
 - lib/motion_model/model/model_casts.rb
-- lib/motion_model/model/persistence.rb
 - lib/motion_model/model/transaction.rb
 - lib/motion_model/validatable.rb
 - lib/motion_model/version.rb
@@ -64,7 +79,6 @@ files:
 - spec/model_hook_spec.rb
 - spec/model_spec.rb
 - spec/notification_spec.rb
-- spec/persistence_spec.rb
 - spec/relation_spec.rb
 - spec/transaction_spec.rb
 - spec/validation_spec.rb
@@ -103,7 +117,6 @@ test_files:
 - spec/model_hook_spec.rb
 - spec/model_spec.rb
 - spec/notification_spec.rb
-- spec/persistence_spec.rb
 - spec/relation_spec.rb
 - spec/transaction_spec.rb
 - spec/validation_spec.rb

data/lib/motion_model/model/persistence.rb

@@ -1,102 +0,0 @@
-module MotionModel
-  class PersistFileError < Exception; end
-  
-  module Model
-    module PublicClassMethods
-      # Returns the unarchived object if successful, otherwise false
-      #
-      # Note that subsequent calls to serialize/deserialize methods
-      # will remember the file name, so they may omit that argument.
-      #
-      # Raises a +MotionModel::PersistFileFailureError+ on failure.
-      def deserialize_from_file(file_name = nil)
-        @file_name = file_name if file_name
-        
-        if File.exist? documents_file(@file_name)
-          error_ptr = Pointer.new(:object)
-      
-          data = NSData.dataWithContentsOfFile(documents_file(@file_name), options:NSDataReadingMappedIfSafe, error:error_ptr)
-          
-          if data.nil?
-            error = error_ptr[0]
-            raise MotionModel::PersistFileFailureError.new "Error when reading the data: #{error}"
-          else
-            bulk_update do
-              collection = NSKeyedUnarchiver.unarchiveObjectWithData(data)
-            end
-            return self
-          end
-        else
-          return false
-        end
-      end
-      # Serializes data to a persistent store (file, in this
-      # terminology). Serialization is synchronous, so this
-      # will pause your run loop until complete.
-      #
-      # +file_name+ is the name of the persistent store you
-      # want to use. If you omit this, it will use the last
-      # remembered file name.
-      #
-      # Raises a +MotionModel::PersistFileError+ on failure.
-      def serialize_to_file(file_name = nil)
-        @file_name = file_name if file_name
-        error_ptr = Pointer.new(:object)
-        
-        data = NSKeyedArchiver.archivedDataWithRootObject @collection
-        unless data.writeToFile(documents_file(@file_name), options: NSDataWritingAtomic, error: error_ptr)
-          # De-reference the pointer.
-          error = error_ptr[0]
-
-          # Now we can use the `error' object.
-          raise MotionModel::PersistFileError.new "Error when writing data: #{error}"
-        end
-      end
-    
-
-      def documents_file(file_name)
-        file_path = File.join NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true), file_name
-        file_path
-      end
-    end
-    
-    def initWithCoder(coder)
-      self.init
-
-      new_tag_id = 1
-      columns.each do |attr|
-        next if self.class.has_relation?(attr)
-        # If a model revision has taken place, don't try to decode
-        # something that's not there.
-        if coder.containsValueForKey(attr.to_s)
-          value = coder.decodeObjectForKey(attr.to_s)
-          self.send("#{attr}=", value)
-        else
-          self.send("#{attr}=", nil)
-        end
-
-        # re-issue tags to make sure they are unique
-        @tag = new_tag_id
-        new_tag_id += 1
-      end
-      save
-
-      self
-    end
-    
-    # Follow Apple's recommendation not to encode missing
-    # values.
-    def encodeWithCoder(coder)
-      columns.each do |attr|
-        # Serialize attributes except the proxy has_many and belongs_to ones.
-        unless [:belongs_to, :has_many].include? column_named(attr).type
-          value = self.send(attr)
-          unless value.nil?
-            coder.encodeObject(value, forKey: attr.to_s)
-          end
-        end
-      end
-    end
-    
-  end
-end

data/spec/persistence_spec.rb

@@ -1,187 +0,0 @@
-class PersistTask
-  include MotionModel::Model
-  include MotionModel::ArrayModelAdapter
-  columns :name, :desc
-end
-
-describe 'persistence' do
-  before do
-    PersistTask.delete_all
-    %w(one two three).each do |task|
-      @tasks = PersistTask.create(:name => "name #{task}")
-    end
-  end
-  
-  it "serializes data" do
-    lambda{PersistTask.serialize_to_file('test.dat')}.should.not.raise
-  end
-  
-  it 'reads persisted model data' do
-    PersistTask.serialize_to_file('test.dat')
-
-    PersistTask.delete_all
-    
-    PersistTask.count.should      == 0
-    
-    tasks = PersistTask.deserialize_from_file('test.dat')
-    
-    PersistTask.count.should      == 3
-    PersistTask.first.name.should == 'name one'
-    PersistTask.last.name.should  == 'name three'
-  end
-  
-  describe 'model change resiliency' do
-    it 'column addition' do
-      class Foo
-        include MotionModel::Model
-        include MotionModel::ArrayModelAdapter
-        columns       :name => :string
-      end
-      @foo = Foo.create(:name=> 'Bob')
-      Foo.serialize_to_file('test.dat')
-      
-      @foo.should.not.respond_to :address
-  
-      class Foo
-        include MotionModel::Model
-        include MotionModel::ArrayModelAdapter
-        columns       :name => :string,
-                      :address => :string
-      end
-      Foo.deserialize_from_file('test.dat')
-      
-      @foo = Foo.first
-      
-      @foo.name.should == 'Bob'
-      @foo.address.should == nil
-      @foo.should.respond_to :address
-      Foo.length.should == 1
-    end
-    
-    it "column removal" do
-      class Foo
-        include MotionModel::Model
-        include MotionModel::ArrayModelAdapter
-        columns       :name => :string, :desc => :string
-      end
-
-      @foo = Foo.create(:name=> 'Bob', :desc => 'who cares anyway?')
-      Foo.serialize_to_file('test.dat')
-      
-      @foo.should.respond_to :desc
-  
-      Object.send(:remove_const, :Foo)
-      class Foo
-        include MotionModel::Model
-        include MotionModel::ArrayModelAdapter
-        columns       :name => :string,
-                      :address => :string
-      end
-      Foo.deserialize_from_file('test.dat')
-
-      # @foo = Foo.first
-      # @foo.name.should == 'Bob'
-      # @foo.address.should == nil
-      # @foo.should.not.respond_to :desc
-      # @foo.should.respond_to :address
-      # Foo.length.should == 1
-    end
-  end
-
-  describe "remembering filename" do
-    class Foo
-      include MotionModel::Model
-      include MotionModel::ArrayModelAdapter
-      columns :name => :string
-    end
-
-    before do
-      Foo.delete_all
-      @foo = Foo.create(:name => 'Bob')
-    end
-
-    it "deserializes from last file if no filename given (previous method serialize)" do
-      Foo.serialize_to_file('test.dat')
-      Foo.delete_all
-      Foo.count.should == 0
-      Foo.deserialize_from_file 
-      Foo.count.should == 1
-    end
-
-    it "deserializes from last file if no filename given (previous method deserialize)" do
-      Foo.serialize_to_file('test.dat')
-      Foo.serialize_to_file('bogus.dat')           # serialize sets default filename to something bogus
-      File.delete Foo.documents_file('bogus.dat')  # and we get rid of that file
-      Foo.deserialize_from_file('test.dat')        # so we'll be sure the default filename last was set by deserialize
-      Foo.delete_all
-      Foo.count.should == 0
-      Foo.deserialize_from_file
-      Foo.count.should == 1
-    end
-
-    it "serializes to last file if no filename given (previous method serialize)" do
-      Foo.serialize_to_file('test.dat')
-      Foo.create(:name => 'Ted')
-      Foo.serialize_to_file 
-      Foo.delete_all
-      Foo.count.should == 0
-      Foo.deserialize_from_file('test.dat')
-      Foo.count.should == 2
-    end
-
-    it "serializes to last file if no filename given (previous method deserialize)" do
-      Foo.serialize_to_file('test.dat')
-      Foo.delete_all
-      Foo.serialize_to_file('bogus.dat')           # serialize sets default filename to something bogus
-      File.delete Foo.documents_file('bogus.dat')  # and we get rid of that file
-      Foo.deserialize_from_file('test.dat')        # so we'll be sure the default filename was last set by deserialize
-      Foo.create(:name => 'Ted')
-      Foo.serialize_to_file 
-      Foo.delete_all
-      Foo.count.should == 0
-      Foo.deserialize_from_file('test.dat')
-      Foo.count.should == 2
-    end
-
-  end
-end
-
-class Parent
-  include MotionModel::Model
-  include MotionModel::ArrayModelAdapter
-  columns   :name
-  has_many  :children
-end
-  
-class Child
-  include MotionModel::Model
-  include MotionModel::ArrayModelAdapter
-  columns     :name
-  belongs_to  :parent
-end
-
-describe "serialization of relations" do  
-  before do
-    parent = Parent.create(:name => 'BoB')
-    parent.children.create :name => 'Fergie'
-    parent.children.create :name => 'Will I Am'
-  end
-  
-  it "is wired up right" do
-    Parent.first.name.should == 'BoB'
-    Parent.first.children.count.should == 2
-  end
-  
-  it "serializes and deserializes properly" do
-    Parent.serialize_to_file('parents.dat')
-    Child.serialize_to_file('children.dat')
-    Parent.delete_all
-    Child.delete_all
-    Parent.deserialize_from_file('parents.dat')
-    Child.deserialize_from_file('children.dat')
-    Parent.first.name.should == 'BoB'
-    Parent.first.children.count.should == 2
-    Parent.first.children.first.name.should == 'Fergie'
-  end
-end
-