mongoid_embedded_helper 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mongoid/embedded_helper.rb

@@ -46,39 +46,52 @@ module Mongoid::Extensions::Array
     def adjust!(attrs = {})
       attrs.each_pair do |key, value|
         self.each do |doc|
-          doc.adjust_attribs!(attrs)
+          doc.adjust!(attrs)
         end
       end
       self
     end  
   end
 end
+
+module Mongoid
+  class Criteria
+    def adjust!(attrs = {})
+      to_a.adjust!(attrs)
+    end  
+  end
+end
      
 module Mongoid::Document        
-  def adjust_attribs!(attrs = {}) 
+  def present? key
+    respond_to? key    
+  end
+  
+  def adjust!(attrs = {}) 
     run_callbacks(:before_update)              
     (attrs || {}).each_pair do |key, value|
-      next if !value.integer?
-
+      next if !value.integer? # only add integer values     
+      next if !present? key # only add to properties already present!
+      
       if set_allowed?(key)
-        current_val = @attributes[key.to_s]         
+        current_val = @attributes[key.to_s] || 0
 
         if current_val.integer?
           @attributes[key.to_s] = current_val + value 
         end
 
       elsif write_allowed?(key)
-        current_val = send("#{key}")         
+        current_val = send("#{key}") || 0
 
         if current_val.integer?    
           send("#{key}=", current_val + value) 
         end
       end 
-      identify if id.blank?
-      notify
-      run_callbacks(:after_update)
-      self
     end
+    identify if id.blank?
+    notify
+    run_callbacks(:after_update)
+    self
   end
 end
 

data/mongoid_embedded_helper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_embedded_helper}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/spec/mongoid/embedded_helper_spec.rb

@@ -9,6 +9,14 @@ class Person
   embeds_many :lists   
 end  
 
+class PosPerson
+  include Mongoid::Document
+  include Mongoid::EmbeddedHelper
+  field :pos, :type => Integer
+  field :name, :type => String
+  embeds_many :lists   
+end  
+
 
 class List
   include Mongoid::Document
@@ -35,6 +43,7 @@ describe 'Mongoid Embedded Helper' do
 
   before :each do
     @person = Person.create! :name => 'Kristian'
+    @pos_person = PosPerson.create! :name => 'Kristian'
     # person.lists = []               
     list = List.new :pos => 1, :name => 'My list'
     (1..3).each do |counter|  
@@ -67,10 +76,35 @@ describe 'Mongoid Embedded Helper' do
       result = @person.lists[0].items[0].in_collection.where(:number.gt => 1).to_a  
       result.size.should == 2
     end
+  end
+  
+  describe '#adjust!' do                            
+    context 'on an array' do
+      it "should add 1 to all positions greater than 1" do
+        result = @person.lists[0].items.where(:pos.gt => 1).to_a.adjust!(:pos => 1)
+        result.map(&:pos).should == [3, 4]
+      end
+    end
+
+    context 'on a criteria' do
+      it "should add 1 to all positions greater than 1" do
+        result = @person.lists[0].items.where(:pos.gt => 1).adjust!(:pos => 1)
+        result.map(&:pos).should == [3, 4]
+      end
+    end
+
+    context 'on a document with a pos' do           
+      it "should add 1 to the position" do      
+        result = @pos_person.adjust!(:pos => 1)
+        result.pos.should == 1
+      end
+    end
 
-    it "should add 1 to all positions greater than 1" do
-      result = @person.lists[0].items.where(:pos.gt => 1).to_a.adjust!(:pos => 1)
-      result.map(&:pos).should == [3, 4]
+    context 'on a document without a pos field' do           
+      it "should NOT add 1 to the position" do      
+        result = @person.adjust!(:pos => 1)
+        lambda {result.pos}.should raise_error
+      end
     end
   end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kristian Mandrup