motion_model 0.4.1 → 0.4.2

data/lib/motion_model/model/model_casts.rb

@@ -6,7 +6,7 @@ module MotionModel
         when TrueClass, FalseClass then arg
         when Integer then arg != 0
         when String then (arg =~ /^true/i) != nil
-        else raise ArgumentError.new("type #{column_name} : #{type(column_name)} is not possible to cast.")
+        else raise ArgumentError.new("type #{column_name} : #{column_type(column_name)} is not possible to cast.")
       end
     end
 
@@ -23,14 +23,18 @@ module MotionModel
         when String
           return NSDate.dateWithNaturalLanguageString(arg.gsub('-','/'), locale:NSUserDefaults.standardUserDefaults.dictionaryRepresentation)
         when Time
-          return NSDate.dateWithNaturalLanguageString(arg.strftime('%Y/%m/%d %H:%M'), locale:NSUserDefaults.standardUserDefaults.dictionaryRepresentation)
+          return NSDate.dateWithNaturalLanguageString(arg.strftime('%Y/%m/%d %H:%M:%S'), locale:NSUserDefaults.standardUserDefaults.dictionaryRepresentation)
         else
           return arg
       end
     end
 
     def cast_to_array(arg)
-      arg.is_a?(Array) ? Array(arg) : arg.to_a
+      Array(arg)
+    end
+
+    def cast_to_hash(arg)
+      arg.is_a?(String) ? BW::JSON.parse(String(arg)) : arg
     end
 
     def cast_to_string(arg)
@@ -38,18 +42,19 @@ module MotionModel
     end
 
     def cast_to_type(column_name, arg) #nodoc
-      return nil if arg.nil? && ![ :boolean, :bool ].include?(type(column_name))
+      return nil if arg.nil? && ![ :boolean, :bool ].include?(column_type(column_name))
 
-      return case type(column_name)
-      when :string then cast_to_string(arg)
+      return case column_type(column_name)
+      when :string, :belongs_to_type then cast_to_string(arg)
       when :boolean, :bool then cast_to_bool(arg)
       when :int, :integer, :belongs_to_id then cast_to_integer(arg)
       when :float, :double then cast_to_float(arg)
-      when :date, :time then cast_to_date(arg)
+      when :date, :time, :datetime then cast_to_date(arg)
       when :text then cast_to_string(arg)
       when :array then cast_to_array(arg)
+      when :hash then cast_to_hash(arg)
       else
-        raise ArgumentError.new("type #{column_name} : #{type(column_name)} is not possible to cast.")
+        raise ArgumentError.new("type #{column_name} : #{column_type(column_name)} is not possible to cast.")
       end
     end
   end

data/lib/motion_model/model/transaction.rb

@@ -21,7 +21,7 @@ module MotionModel
       end
 
       def columns_without_relations
-        columns.select{|col| ![:has_many, :belongs_to].include?(type(col))}
+        columns.select{|col| ![:has_many, :belongs_to].include?(column_type(col))}
       end
 
       def restore_attributes

data/lib/motion_model/validatable.rb

@@ -3,10 +3,8 @@ module MotionModel
     class ValidationSpecificationError < RuntimeError;  end
     class RecordInvalid < RuntimeError; end
 
-
     def self.included(base)
       base.extend(ClassMethods)
-      base.instance_variable_set('@validations', [])
     end
 
     module ClassMethods
@@ -16,25 +14,39 @@ module MotionModel
           raise ex
         end
 
-
-    
         if validation_type == {}
           ex = ValidationSpecificationError.new('validation type not present or not a hash')
           raise ex
         end
     
-        @validations << {field => validation_type}
+        validations << {field => validation_type}
       end
       alias_method :validates, :validate
 
       def validations
-        @validations
+        @validations ||= []
       end
     end
-  
-     # It doesn't save when validations fails
-    def save(options={ :validate => true})
-      (valid? || !options[:validate]) ? super : false
+
+    def do_save?(options = {})
+      _valid = true
+      if options[:validate] != false
+        call_hooks 'validation' do
+          _valid = valid?
+        end
+      end
+      _valid
+    end
+    private :do_save?
+
+    def do_insert(options = {})
+      return false unless do_save?(options)
+      super
+    end
+
+    def do_update(options = {})
+      return false unless do_save?(options)
+      super
     end
 
     # it fails loudly
@@ -49,10 +61,12 @@ module MotionModel
     #
     # * Second, it returns the result of performing the validations.
     def valid?
-      @messages = []
-      @valid = true
-      self.class.validations.each do |validations|
-        validate_each(validations)
+      call_hooks 'validation' do
+        @messages = []
+        @valid = true
+        self.class.validations.each do |validations|
+          validate_each(validations)
+        end
       end
       @valid
     end
@@ -129,7 +143,7 @@ module MotionModel
       elsif value.is_a?(String) || value.nil?
         result = value.nil? || ((value.length == 0) == setting)
         additional_message = setting ? "non-empty" : "non-empty"
-        add_message(field, "incorrect value supplied for #{field.to_s.humanize} -- should be #{additional_message}.") if result
+        add_message(field, "incorrect value supplied for #{field.to_s} -- should be #{additional_message}.") if result
         return !result
       end
       return false

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.1"
+  VERSION = "0.4.2"
 end

data/spec/adapter_spec.rb

@@ -0,0 +1,30 @@
+class ModelWithAdapter
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+
+  columns :name
+end
+
+describe 'adapters with adapter method defined' do
+  it "does not raise an exception" do
+    lambda{ModelWithAdapter.create(:name => 'bob')}.should.not.raise
+  end
+
+  it "provides humanized string representation of the current adapter" do
+    ModelWithAdapter.create(:name => 'bob').adapter.should == 'Array Model Adapter'
+  end
+end
+
+class ModelWithoutAdapter
+  include MotionModel::Model
+
+  columns :name
+end
+
+describe 'adapters without adapter method defined' do
+  it "raises an exception" do
+    lambda{
+      ModelWithoutAdapter.new
+    }.should.raise(MotionModel::AdapterNotFoundError)
+  end
+end

data/spec/array_model_persistence_spec.rb

@@ -0,0 +1,229 @@
+class PersistTask
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+  columns :name => :string,
+          :desc => :string,
+          :created_at => :date,
+          :updated_at => :date
+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
+
+  it "does not change created or updated date on load" do
+    created_at = PersistTask.first.created_at
+    updated_at = PersistTask.first.updated_at
+
+    PersistTask.serialize_to_file('test.dat')
+    tasks = PersistTask.deserialize_from_file('test.dat')
+    puts tasks.inspect
+    PersistTask.first.created_at.should == created_at
+    PersistTask.first.updated_at.should == updated_at
+  end
+
+  describe 'model change resiliency' do
+    it 'column addition' do
+      Object.send(:remove_const, :Foo) if defined?(Foo)
+      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
+
+      Foo.delete_all
+      class Foo
+        columns         :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
+      Object.send(:remove_const, :Foo) if defined?(Foo)
+      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) if defined?(Foo)
+      class Foo
+        include MotionModel::Model
+        include MotionModel::ArrayModelAdapter
+        columns       :name => :string,
+                      :address => :string
+      end
+      Foo.deserialize_from_file('test.dat')
+    end
+  end
+
+  describe "array model migrations" do
+    class TestForColumnAddition
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns       :name => :string, :desc => :string
+    end
+
+    it "column addition should call migrate first as a test" do
+      TestForColumnAddition.mock!(:migrate)
+      TestForColumnAddition.deserialize_from_file('dfca.dat')
+      1.should == 1
+    end
+
+    it "this example should pass" do
+      1.should == 1
+    end
+
+    it "accepts properly formatted version strings" do
+      lambda{TestForColumnAddition.schema_version("3.1")}.should.not.raise
+    end
+
+    it "rejects non-string versions" do
+      lambda{TestForColumnAddition.schema_version(3)}.should.raise(MotionModel::ArrayModelAdapter::VersionNumberError)
+    end
+
+    it "rejects improperly formated version strings" do
+      lambda{TestForColumnAddition.schema_version("3/1/1")}.should.raise(MotionModel::ArrayModelAdapter::VersionNumberError)
+    end
+
+    it "returns the version number if no arguments supplied" do
+      TestForColumnAddition.schema_version("3.1")
+      TestForColumnAddition.schema_version.should == "3.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_relation.create :name => 'Fergie'
+    parent.children_relation.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/cascading_delete_spec.rb

@@ -58,8 +58,8 @@ describe "cascading deletes" do
 
     it "deletes assignees that belong to a destroyed task" do
       task = CascadingTask.create(:name => 'cascading')
-      task.cascaded_assignees.create(:assignee_name => 'joe')
-      task.cascaded_assignees.create(:assignee_name => 'bill')
+      task.cascaded_assignees_relation.create(:assignee_name => 'joe')
+      task.cascaded_assignees_relation.create(:assignee_name => 'bill')
 
       CascadingTask.count.should == 1
       CascadedAssignee.count.should == 2
@@ -74,7 +74,7 @@ describe "cascading deletes" do
       1.upto(3) do |item|
         task = CascadingTask.create :name => "Task #{item}"
         1.upto(3) do |assignee|
-          task.cascaded_assignees.create :name => "assignee #{assignee} for task #{task}"
+          task.cascaded_assignees_relation.create :assignee_name => "assignee #{assignee} for task #{task}"
         end
       end
       CascadingTask.count.should == 3
@@ -88,8 +88,8 @@ describe "cascading deletes" do
 
     it "deletes only one level when a task is destroyed but dependent is delete" do
       task = CascadingTask.create :name => 'dependent => :delete'
-      assignee = task.cascaded_assignees.create :assignee_name => 'deletable assignee'
-      assignee.employees.create :name => 'person who sticks around'
+      assignee = task.cascaded_assignees_relation.create :assignee_name => 'deletable assignee'
+      assignee.employees_relation.create :name => 'person who sticks around'
 
       CascadingTask.count.should == 1
       CascadedAssignee.count.should == 1

data/spec/date_spec.rb

@@ -11,7 +11,8 @@ describe "time conversions" do
       should == "03-18-2012 | 07:00 PM"
   end
 
-  it "Sets created_at when an item is created" do
+  describe "auto_date_fields" do
+
     class Creatable
       include MotionModel::Model
       include MotionModel::ArrayModelAdapter
@@ -19,25 +20,37 @@ describe "time conversions" do
               :created_at => :date
     end
 
-    c = Creatable.new(:name => 'test')
-    lambda{c.save}.should.change{c.created_at}
-  end
-
-    it "Sets updated_at when an item is created" do
     class Updateable
       include MotionModel::Model
       include MotionModel::ArrayModelAdapter
       columns :name => :string,
-              :created_at => :date,
               :updated_at => :date
     end
 
-    c = Updateable.create(:name => 'test')
-    c.name = 'test 1'
-    lambda{c.save}.should.not.change{c.created_at}
-    d = Updateable.create(:name => 'test')
-    d.name = 'test 2'
-    lambda{d.save}.should.change{d.updated_at}
+    it "Sets created_at when an item is created" do
+      c = Creatable.new(:name => 'test')
+      lambda{c.save}.should.change{c.created_at}
+    end
+
+    it "Sets updated_at when an item is created" do
+      c = Updateable.new(:name => 'test')
+      lambda{c.save}.should.change{c.updated_at}
+    end
+
+    it "Doesn't update created_at when an item is updated" do
+      c = Creatable.create(:name => 'test')
+      c.name = 'test 1'
+      lambda{c.save}.should.not.change{c.created_at}
+    end
+
+    it "Updates updated_at when an item is updated" do
+      c = Updateable.create(:name => 'test')
+      sleep 1
+      c.name = 'test 1'
+      lambda{ c.save }.should.change{c.updated_at}
+    end
+
   end
 
+
 end

data/spec/finder_spec.rb

@@ -77,6 +77,7 @@ describe 'finders' do
     end
     
     it 'all returns all members of the collection as an array' do
+      Task.all.each { |t| puts t }
       Task.all.length.should.equal(10)
     end
     

data/spec/formotion_spec.rb

@@ -1,3 +1,4 @@
+Object.send(:remove_const, :ModelWithOptions) if defined?(ModelWithOptions)
 class ModelWithOptions
   include MotionModel::Model
   include MotionModel::ArrayModelAdapter

data/spec/model_hook_spec.rb

@@ -1,3 +1,4 @@
+Object.send(:remove_const, :Task) if defined?(Task)
 class Task
   attr_reader :before_delete_called, :after_delete_called
   attr_reader :before_save_called, :after_save_called
@@ -8,19 +9,19 @@ class Task
                 :details => :string,
                 :some_day => :date
 
-  def before_delete(object)
+  def before_delete(sender)
     @before_delete_called = true
   end
 
-  def after_delete(object)
+  def after_delete(sender)
     @after_delete_called = true
   end
 
-  def before_save(object)
+  def before_save(sender)
     @before_save_called = true
   end
 
-  def after_save(object)
+  def after_save(sender)
     @after_save_called = true
   end
 

data/spec/model_spec.rb

@@ -45,12 +45,6 @@ describe "Creating a model" do
       atask.should.respond_to(:details)
     end
 
-    it 'simply bypasses spurious attributes erroneously set' do
-      a_task = Task.new(:name => 'details', :zoo => 'very bad')
-      a_task.should.not.respond_to(:zoo)
-      a_task.name.should.equal('details')
-    end
-    
     it "adds a default value if none supplied" do
       a_type_test = TypeCast.new
       a_type_test.an_int.should.equal(3)
@@ -89,7 +83,7 @@ describe "Creating a model" do
     end
 
     it "the type of a column can be retrieved" do
-      Task.new.type(:some_day).should.equal(:date)
+      Task.new.column_type(:some_day).should.equal(:date)
     end
 
   end

data/spec/relation_spec.rb

@@ -30,9 +30,6 @@ class EmailAccount
   belongs_to :user
 end
 
-Inflector.inflections.irregular 'assignees', 'assignee'
-Inflector.inflections.irregular 'assignee', 'assignees'
-
 describe 'related objects' do
   describe "supporting belongs_to and has_many with camelcased relations" do
     before do
@@ -42,7 +39,7 @@ describe 'related objects' do
 
     it "camelcased style" do
       t = User.create(:name => "Arkan")
-      t.email_accounts.create(:name => "Gmail")
+      t.email_accounts_relation.create(:name => "Gmail")
       EmailAccount.first.user.name.should == "Arkan"
       User.last.email_accounts.last.name.should == "Gmail"
     end
@@ -61,12 +58,12 @@ describe 'related objects' do
 
     it 'relation objects are empty on initialization' do
       a_task = Task.create
-      a_task.assignees.all.should.be.empty
+      a_task.assignees_relation.all.should.be.empty
     end
 
     it "supports creating related objects directly on parents" do
       a_task = Task.create(:name => 'Walk the Dog')
-      a_task.assignees.create(:assignee_name => 'bob')
+      a_task.assignees_relation.create(:assignee_name => 'bob')
       a_task.assignees.count.should == 1
       a_task.assignees.first.assignee_name.should == 'bob'
       Assignee.count.should == 1
@@ -84,7 +81,7 @@ describe 'related objects' do
           assignee_index = 1
           @tasks << t
           1.upto(task * 2) do |assignee|
-            @assignees << t.assignees.create(:assignee_name => "employee #{assignee_index}_assignee_for_task_#{t.id}")
+            @assignees << t.assignees_relation.create(:assignee_name => "employee #{assignee_index}_assignee_for_task_#{t.id}")
             assignee_index += 1
           end
         end
@@ -108,7 +105,7 @@ describe 'related objects' do
         assignee = Assignee.new(:assignee_name => 'Zoe')
         Task.count.should == 3
         assignee_count = Task.find(3).assignees.count
-        Task.find(3).assignees.push(assignee)
+        Task.find(3).assignees_relation.push(assignee)
         Task.find(3).assignees.count.should == assignee_count + 1
       end
 
@@ -116,7 +113,7 @@ describe 'related objects' do
 
     it "supports creating blank (empty) scratchpad associated objects" do
       task = Task.create :name => 'watch a movie'
-      assignee = task.assignees.new
+      assignee = task.assignees_relation.new # TODO per Rails convention, this should really be #build, not #new
       assignee.assignee_name = 'Chloe'
       assignee.save
       task.assignees.count.should == 1
@@ -132,7 +129,7 @@ describe 'related objects' do
 
     it "allows a child to back-reference its parent" do
       t = Task.create(:name => "Walk the Dog")
-      t.assignees.create(:assignee_name => "Rihanna")
+      t.assignees_relation.create(:assignee_name => "Rihanna")
       Assignee.first.task.name.should == "Walk the Dog"
     end
 
@@ -146,7 +143,7 @@ describe 'related objects' do
 
       describe "basic wiring" do
         before do
-          @t1.assignees << @a1
+          @t1.assignees_relation << @a1
         end
 
         it "pushing a created assignee gives a task count of 1" do
@@ -164,7 +161,7 @@ describe 'related objects' do
 
       describe "when pushing assignees onto two different tasks" do
         before do
-          @t2.assignees << @a1
+          @t2.assignees_relation << @a1
         end
 
         it "pushing assignees to two different tasks lets the last task have the assignee (count)" do
@@ -186,7 +183,7 @@ describe 'related objects' do
 
       describe "directly assigning to child" do
         it "directly assigning a different task to an assignee changes the assignee's task" do
-          @a1.task = @t1.id
+          @a1.task_id = @t1.id
           @a1.save
           @t1.assignees.count.should == 1
           @t1.assignees.first.assignee_name.should == @a1.assignee_name