motion_model 0.2.4 → 0.2.5

data/lib/motion_model/ext.rb

@@ -50,7 +50,9 @@ class Inflector
     
     @irregulars = [
       ['person', 'people'],
-      ['people', 'person']
+      ['people', 'person'],
+      ['children', 'child'],
+      ['child', 'children']
     ]
     
     @uncountables = [
@@ -194,7 +196,11 @@ class Debug
   def self.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
+    
+    ### It appears that RubyMotion does not support caller backtrace yet.
+    
+    # NSLog("#{open_color}#{type} #{caller[1]}: #{message}#{close_color}") unless @@silent
+    NSLog("#{open_color}#{type} #{message}#{close_color}") unless @@silent
   end
   
   def self.info(msg)
@@ -210,3 +216,14 @@ class Debug
   end
   
 end
+
+# These are C macros in iOS SDK. Not workable for Ruby.
+def UIInterfaceOrientationIsLandscape(orientation)
+  orientation == UIInterfaceOrientationLandscapeLeft ||
+     orientation == UIInterfaceOrientationLandscapeRight
+end
+
+def UIInterfaceOrientationIsPortrait(orientation)
+  orientation == UIInterfaceOrientationPortrait ||
+     orientation == UIInterfaceOrientationPortraitUpsideDown
+end

data/lib/motion_model/input_helpers.rb

@@ -208,6 +208,7 @@ module MotionModel
     end
     
     def cell_has_first_responder?(cell)
+      return false unless cell.respond_to?(:subviews)
       cell.subviews.each do |subview|
         return true if subview.isFirstResponder
       end

data/lib/motion_model/model/finder_query.rb

@@ -195,7 +195,7 @@ module MotionModel
     
     # task.assignees.new(:name => 'BoB')
     # creates a new unsaved Assignee object on the Task object task
-    def new(options)
+    def new(options = {})
       raise ArgumentError.new("Creating on a relation requires the parent be saved first.") if @related_object.nil?
       
       id_field = (@related_object.class.to_s.downcase + '_id').to_sym

data/lib/motion_model/model/model.rb

@@ -424,14 +424,14 @@ module MotionModel
       base_method = method.to_s.gsub('=', '').to_sym
       
       col = column_named(base_method)
-      raise RuntimeError.new("nil column #{method} accessed.") if col.nil?
+      raise NoMethodError.new("nil column #{method} accessed.") if col.nil?
 
       unless col.type == :belongs_to_id
         has_relation = relation_for(col) if self.class.has_relation?(col)
         return has_relation if has_relation
       end
       
-      if col
+      unless col.nil?
         if method.to_s.include?('=')
           @dirty = true
           return @data[base_method] = col.type == :belongs_to_id ? args[0] : self.cast_to_type(base_method, args[0])
@@ -439,11 +439,13 @@ module MotionModel
           return @data[base_method]
         end
       else
-        raise NoMethodError, <<ERRORINFO
+        exception = NoMethodError.new(<<ERRORINFO
 method: #{method}
 args:   #{args.inspect}
 in:     #{self.class.name}
 ERRORINFO
+)
+        raise exception
       end
     end
 

data/lib/motion_model/model/persistence.rb

@@ -10,12 +10,12 @@ module MotionModel
       #
       # Raises a +MotionModel::PersistFileFailureError+ on failure.
       def deserialize_from_file(file_name = nil)
-        @file_name ||= file_name
+        @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)
+          data = NSData.dataWithContentsOfFile(documents_file(@file_name), options:NSDataReadingMappedIfSafe, error:error_ptr)
           
           if data.nil?
             error = error_ptr[0]
@@ -38,11 +38,11 @@ module MotionModel
       #
       # Raises a +MotionModel::PersistFileFailureError+ on failure.
       def serialize_to_file(file_name = nil)
-        @file_name ||= file_name
+        @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)
+        unless data.writeToFile(documents_file(@file_name), options: NSDataWritingAtomic, error: error_ptr)
           # De-reference the pointer.
           error = error_ptr[0]
 
@@ -85,12 +85,15 @@ module MotionModel
     # values.
     def encodeWithCoder(coder)
       columns.each do |attr|
-        value = self.send(attr)
-        unless value.nil?
-          coder.encodeObject(value, forKey: attr.to_s)
+        # 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
+end

data/lib/motion_model/version.rb

@@ -1,3 +1,3 @@
 module MotionModel
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/model_spec.rb

@@ -134,12 +134,13 @@ describe "Creating a model" do
   describe 'finders' do
     before do
       Task.delete_all
-      10.times {|i| Task.create(:name => "task #{i}")}
+      @tasks = []
+      10.times {|i| @tasks.push Task.create(:name => "task #{i}")}
     end
 
     describe 'find' do
       it 'finds elements within the collection' do
-        task = Task.find(3).name.should.equal('task 3')
+        task = Task.find(3).name.should.equal(@tasks[2].name) # zero based
       end
 
       it 'returns nil if find by id is not found' do

data/spec/persistence_spec.rb

@@ -81,4 +81,97 @@ describe 'persistence' do
       Foo.length.should == 1
     end
   end
+
+  describe "remembering filename" do
+    class Foo
+      include MotionModel::Model
+      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
+
+describe "serialization of relations" do
+  class Parent
+    include MotionModel::Model
+    columns   :name
+    has_many  :children
+  end
+  
+  class Child
+    include MotionModel::Model
+    columns     :name
+    belongs_to  :parent
+  end
+  
+  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

data/spec/relation_spec.rb

@@ -75,6 +75,15 @@ describe 'related objects' do
       Task.find(3).assignees.push(assignee)
       Task.find(3).assignees.count.should == assignee_count + 1
     end
+    
+    it "supports creating blank (empty) scratchpad associated objects" do
+      task = Task.create :name => 'watch a movie'
+      assignee = task.assignees.new
+      assignee.assignee_name = 'Chloe'
+      assignee.save
+      task.assignees.count.should == 1
+      task.assignees.first.assignee_name.should == 'Chloe'
+    end
   end
   
   describe "supporting belongs_to" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies: []
 description: Simple model and validation mixins for RubyMotion
 email: