motion_model 0.2.8 → 0.3.0

data/lib/motion_model/model/persistence.rb

@@ -2,7 +2,7 @@ module MotionModel
   class PersistFileError < Exception; end
   
   module Model
-    module ClassMethods
+    module PublicClassMethods
       # Returns the unarchived object if successful, otherwise false
       #
       # Note that subsequent calls to serialize/deserialize methods

data/lib/motion_model/version.rb

@@ -1,3 +1,3 @@
 module MotionModel
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/spec/cascading_delete_spec.rb

@@ -0,0 +1,100 @@
+class Assignee
+  include MotionModel::Model
+  columns :assignee_name => :string
+  belongs_to :task
+end
+
+class Task
+  include MotionModel::Model
+  columns       :name => :string,
+                :details => :string,
+                :some_day => :date
+  has_many :assignees
+end
+
+class CascadingTask
+  include MotionModel::Model
+  columns       :name => :string,
+                :details => :string,
+                :some_day => :date
+  has_many :cascaded_assignees, :dependent => :delete
+end
+
+class CascadedAssignee
+  include MotionModel::Model
+  columns       :assignee_name => :string
+  belongs_to    :cascading_task
+  has_many      :employees
+end
+
+class Employee
+  include MotionModel::Model
+  columns       :name
+  belongs_to    :CascadedAssignee
+end
+
+describe "cascading deletes" do
+  # describe "when not marked for destruction" do
+  #   it "leaves assignees alone when they are not marked for destruction" do
+  #     Task.delete_all
+  #     Assignee.delete_all
+
+  #     task = Task.create :name => 'Walk the dog'
+  #     task.assignees.create :assignee_name => 'Joe'
+  #     lambda{task.destroy}.should.not.change{Assignee.length}
+  #   end
+  # end
+
+  describe "when marked for destruction" do
+    before do
+      CascadingTask.delete_all
+      CascadedAssignee.delete_all
+    end
+
+    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')
+
+      CascadingTask.count.should == 1
+      CascadedAssignee.count.should == 2
+
+      task.destroy
+
+      CascadingTask.count.should == 0
+      CascadedAssignee.count.should == 0
+    end
+
+    it "deletes all assignees when all tasks are destroyed" 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}"
+        end
+      end
+      CascadingTask.count.should == 3
+      CascadedAssignee.count.should == 9
+
+      CascadingTask.destroy_all
+      
+      CascadingTask.count.should == 0
+      CascadedAssignee.count.should == 0
+    end
+
+    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'
+
+      CascadingTask.count.should == 1
+      CascadedAssignee.count.should == 1
+      Employee.count.should == 1
+
+      task.destroy
+
+      CascadingTask.count.should == 0
+      CascadedAssignee.count.should == 0
+      Employee.count.should == 1
+    end
+  end
+end

data/spec/model_spec.rb

@@ -3,6 +3,10 @@ class Task
   columns       :name => :string, 
   							:details => :string,
   							:some_day => :date
+
+  def custom_attribute_by_method
+    "#{name} - #{details}"
+  end
 end
 
 class ATask
@@ -130,6 +134,12 @@ describe "Creating a model" do
       Task.count.should.equal(1)
     end
 
+    it 'instance variables have access to length and count' do
+      task = Task.create
+      task.length.should.equal(1)
+      task.count.should.equal(1)
+    end
+
     it 'when there is more than one element, length returned is correct' do
       10.times { Task.create }
       Task.length.should.equal(10)
@@ -137,6 +147,30 @@ describe "Creating a model" do
 
   end
 
+  describe 'adding or updating' do
+    before do
+      Task.delete_all
+    end
+
+    it 'adds to the collection when a new task is saved' do
+      task = Task.new
+      lambda{task.save}.should.change{Task.count}
+    end
+
+    it 'does not add to the collection when an existing task is saved' do
+      task = Task.create(:name => 'updateable')
+      task.name = 'updated'
+      lambda{task.save}.should.not.change{Task.count}
+    end
+
+    it 'updates data properly' do
+      task = Task.create(:name => 'updateable')
+      task.name = 'updated'
+      Task.where(:name).eq('updated').should == 0
+      lambda{task.save}.should.change{Task.where(:name).eq('updated')}
+    end
+  end
+
   describe 'deleting' do
     before do
       Task.delete_all
@@ -156,13 +190,45 @@ describe "Creating a model" do
       target = Task.find(:name).eq('task 2').first
       lambda{target.delete}.should.change{Task.length}
     end
+
+    it 'undeleting a row restores it' do
+      target = Task.find(:name).eq('task 3').first
+      target.should.not == nil
+      target.delete
+      target.undelete
+      Task.find(:name).eq('task 3').count.should.equal 1
+    end
   end
   
-  describe 'Handling Attribute method_missing Implementation' do
+  describe 'Handling Attribute Implementation' do
     it 'raises a NoMethodError exception when an unknown attribute it referenced' do
       task = Task.new
       lambda{task.bar}.should.raise(NoMethodError)
     end
+
+    it 'successfully retrieves by attribute' do
+      task = Task.create(:name => 'my task')
+      task.name.should == 'my task'
+    end
+
+    describe "dirty" do
+      before do
+        @new_task = Task.new
+      end
+
+      it 'marks a new object as dirty' do
+        @new_task.should.be.dirty
+      end
+
+      it 'marks a saved object as clean' do
+        lambda{@new_task.save}.should.change{@new_task.dirty?}
+      end
+
+      it 'marks a modified object as dirty' do
+        @new_task.save
+        lambda{@new_task.name = 'now dirty'}.should.change{@new_task.dirty?}
+      end
+    end
   end
   
   describe 'Type casting' do
@@ -224,68 +290,16 @@ describe "Creating a model" do
     it 'the date field should be the same as it was in string form' do
       @convertible.a_date.to_s.should.match(/^2012-09-15/)
     end
-        
   end
-end
 
-class NotifiableTask
-  include MotionModel::Model
-  columns :name
-  has_many :assignees
-  
-  attr_accessor :notification_called, :notification_details
-  
-  def hookup_events
-    @notification_id = NSNotificationCenter.defaultCenter.addObserver(self, selector:'dataDidChange:', name:'MotionModelDataDidChangeNotification', object:nil)
-    @notification_details = nil
-  end
-
-  def dataDidChange(notification)
-    @notification_called = true
-    @notification_details = notification.userInfo
-  end
-
-  def teardown_events
-    NSNotificationCenter.defaultCenter.removeObserver @notification_id
-  end
-end
+  describe 'defining custom attributes' do
+    before do
+      Task.delete_all
+      @task = Task.create :name => 'Feed the Cat', :details => 'Get food, pour out'
+    end
 
-describe 'data change notifications' do
-  before do
-    @task = NotifiableTask.new
-    @task.hookup_events
-  end
-  
-  after do
-    @task.teardown_events
-  end
-  
-  it "fires a change notification when an item is added" do
-    @task.notification_called = false
-    lambda{@task.save}.should.change{@task.notification_called}
-  end
-  
-  it "contains an add notification for new objects" do
-    @task.save
-    @task.notification_details[:action].should == 'add'
-  end
-  
-  it "contans an update notification for an updated object" do
-    @task.save
-    @task.name = "Bill"
-    @task.save
-    @task.notification_details[:action].should == 'update'
-  end
-  
-  it "contains a delete notification for a deleted object" do
-    @task.save
-    @task.delete
-    @task.notification_details[:action].should == 'delete'
-  end
-  
-  it "does not get a delete notification for delete_all" do
-    @task = NotifiableTask.create :name => 'Bob'
-    @task.notification_called = nil
-    lambda{NotifiableTask.delete_all}.should.not.change{@task.notification_called}
+    it 'uses a custom attribute by method' do
+      @task.custom_attribute_by_method.should == 'Feed the Cat - Get food, pour out'
+    end
   end
 end

data/spec/relation_spec.rb

@@ -6,7 +6,7 @@ end
 
 class Task
   include MotionModel::Model
-  columns       :name => :string, 
+  columns       :name => :string,
   							:details => :string,
   							:some_day => :date
   has_many :assignees
@@ -16,7 +16,7 @@ end
 class User
   include MotionModel::Model
   columns :name => :string
-  
+
   has_many :email_accounts
 end
 
@@ -25,7 +25,7 @@ class EmailAccount
   columns :name => :string
   belongs_to :user
 end
-  
+
 Inflector.inflections.irregular 'assignees', 'assignee'
 Inflector.inflections.irregular 'assignee', 'assignees'
 
@@ -45,33 +45,38 @@ describe 'related objects' do
   end
 
   describe 'has_many' do
+    before do
+      Task.delete_all
+      Assignee.delete_all
+    end
+
     it "is wired up right" do
       lambda {Task.new}.should.not.raise
       lambda {Task.new.assignees}.should.not.raise
     end
-  
+
     it 'relation objects are empty on initialization' do
       a_task = Task.create
       a_task.assignees.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.length.should == 1
+      a_task.assignees.count.should == 1
       a_task.assignees.first.assignee_name.should == 'bob'
       Assignee.count.should == 1
     end
-    
+
     describe "supporting has_many" do
       before do
         Task.delete_all
         Assignee.delete_all
-      
+
         @tasks = []
         @assignees = []
         1.upto(3) do |task|
-          t = Task.create(:name => "task #{task}")
+          t = Task.create(:name => "task #{task}", :id => task)
           assignee_index = 1
           @tasks << t
           1.upto(task * 2) do |assignee|
@@ -83,26 +88,28 @@ describe 'related objects' do
 
       it "is wired up right" do
         Task.count.should == 3
-        Assignee.count.should == 12        
+        Assignee.count.should == 12
       end
-      
+
       it "has 2 assignees for the first task" do
         Task.first.assignees.count.should == 2
       end
-      
+
       it "the first assignee for the second task is employee 7" do
         Task.find(2).name.should == @tasks[1].name
         Task.find(2).assignees.first.assignee_name.should == @assignees[2].assignee_name
       end
+
+      it 'supports adding related objects to parents' 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.count.should == assignee_count + 1
+      end
+
     end
-    
-    it 'supports adding related objects to parents' do
-      assignee = Assignee.new(:assignee_name => 'Zoe')
-      assignee_count = Task.find(3).assignees.count
-      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
@@ -112,7 +119,7 @@ describe 'related objects' do
       task.assignees.first.assignee_name.should == 'Chloe'
     end
   end
-  
+
   describe "supporting belongs_to" do
     before do
       Task.delete_all
@@ -172,15 +179,15 @@ describe 'related objects' do
           @a1.task.name.should == "Feed the cat"
         end
       end
-      
-      describe "directly assigning to child" 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.save
           @t1.assignees.count.should == 1
           @t1.assignees.first.assignee_name.should == @a1.assignee_name
         end
-        
+
         it "directly assigning an instance of a task to an assignee changes the assignee's task" do
           @a1.task = @t1
           @a1.save
@@ -188,7 +195,7 @@ describe 'related objects' do
           @t1.assignees.first.assignee_name.should == @a1.assignee_name
         end
       end
-    end 
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -36,6 +36,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - CHANGELOG
+- LICENSE
 - README.md
 - Rakefile
 - app/app_delegate.rb
@@ -49,6 +50,7 @@ files:
 - lib/motion_model/validatable.rb
 - lib/motion_model/version.rb
 - motion_model.gemspec
+- spec/cascading_delete_spec.rb
 - spec/ext_spec.rb
 - spec/finder_spec.rb
 - spec/model_spec.rb
@@ -80,6 +82,7 @@ signing_key:
 specification_version: 3
 summary: Simple model and validation mixins for RubyMotion
 test_files:
+- spec/cascading_delete_spec.rb
 - spec/ext_spec.rb
 - spec/finder_spec.rb
 - spec/model_spec.rb