mongoid_embedded_helper 0.1.2 → 0.2.0

data/README.markdown

@@ -13,7 +13,7 @@ Mongoid doesn't allow you to perform direct queries on an embedded collection. Y
 To overcome this limitation, use the EmbeddedHelper module to add a method <code>query_class</code> which will find the closest non-embedded node in the hierarchy and
 then traverse down the path back to the object, so that you can perform the query on the embedded collection.
 
-<code>
+<pre>
 require 'mongoid_embedded_helper'
 
 class Item
@@ -29,7 +29,48 @@ end
 item = @person.lists[0].items[0]
 item.query_class.where(:number.gt => 1).to_a  
   
-</code>
+</pre>
+
+## Adjust!
+
+An as added bonus, an extra adjust! method has been added to Document, Criteria and Array. This enables multi-mutation of attributes!
+
+*Here an example using a number*
+<pre>
+it "should times all positions (greater than 1) by 2" do
+  result = @person.lists[0].items.where(:pos.gt => 1).adjust!(:pos => lambda {|e| e * 2})
+  result.map(&:pos).should == [4, 6]
+end
+</pre>
+
+Passing a number is a convenience shortcut for adding a number instead of having to use the Proc approach as shown below.
+
+*Here an example using a lambda (or Proc):*
+<pre>
+it "should times all positions (greater than 1) by 2" do
+  result = @person.lists[0].items.where(:pos.gt => 1).adjust!(:pos => lambda {|e| e * 2})
+  result.map(&:pos).should == [4, 6]
+end
+</pre>
+
+The Proc approach can in simple cases be declared using a shortcut Symbol/String approach 
+
+*Here an example using a symbol :upcase to declare that the method #upcase should be used as the mutator:*
+<pre>
+  it "should upcase the name - using symbol arg" do      
+    result = @person.adjust!(:name => :upcase)
+    result.name.should == 'Kristian'.upcase
+  end
+</pre>
+
+*And using a String 'upcase' instead of a symbol:*
+<pre>
+  it "should upcase the name - using symbol arg" do      
+    result = @person.adjust!(:name => 'upcase')
+    result.name.should == 'Kristian'.upcase
+  end
+</pre>
+
 
 ## Copyright ##
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/mongoid/embedded_helper.rb

@@ -70,29 +70,58 @@ module Mongoid::Document
   def adjust!(attrs = {}) 
     run_callbacks(:before_update)              
     (attrs || {}).each_pair do |key, value|
-      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] || 0
-
-        if current_val.integer?
-          @attributes[key.to_s] = current_val + value 
-        end
-
-      elsif write_allowed?(key)
-        current_val = send("#{key}") || 0
-
-        if current_val.integer?    
-          send("#{key}=", current_val + value) 
-        end
-      end 
+      adjust_by_proc!(key, value) if value.kind_of?(Proc)
+      adjust_by_symbol!(key, value) if value.kind_of?(Symbol) || value.kind_of?(String)
+      adjust_by_number!(key, value) if value.kind_of?(Numeric) # only add integer values     
     end
     identify if id.blank?
     notify
     run_callbacks(:after_update)
     self
+  end  
+
+  private 
+
+  def adjust_by_proc! key, proc
+    if set_allowed?(key)
+      current_val = @attributes[key.to_s]
+      @attributes[key.to_s] = proc.call(current_val)
+    elsif write_allowed?(key)
+      current_val = send("#{key}")
+      send("#{key}=", proc.call(current_val))
+    end     
+  end
+
+  def adjust_by_symbol! key, name
+    method = name.to_sym
+    if set_allowed?(key)
+      current_val = @attributes[key.to_s]
+      @attributes[key.to_s] = current_val.send(method)
+    elsif write_allowed?(key)
+      current_val = send("#{key}")
+      send("#{key}=", current_val.send(method))
+    end     
   end
+
+  
+  def adjust_by_number! key, value
+    if set_allowed?(key)
+      current_val = @attributes[key.to_s] || 0
+
+      if current_val.kind_of? Numeric
+        @attributes[key.to_s] = current_val + value 
+      end
+
+    elsif write_allowed?(key)
+      current_val = send("#{key}") || 0
+
+      if current_val.kind_of? Numeric
+        send("#{key}=", current_val + value) 
+      end
+    end 
+  end
+    
 end
 
 class Array

data/mongoid_embedded_helper.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_embedded_helper}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   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

@@ -78,7 +78,7 @@ describe 'Mongoid Embedded Helper' do
     end
   end
   
-  describe '#adjust!' do                            
+  describe '#adjust! numeric' 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)
@@ -105,7 +105,46 @@ describe 'Mongoid Embedded Helper' do
         result = @person.adjust!(:pos => 1)
         lambda {result.pos}.should raise_error
       end
+    end  
+  end
+
+  describe '#adjust! by proc' do
+    context 'on an array' do
+      it "should times all positions (greater than 1) by 2" do
+        result = @person.lists[0].items.where(:pos.gt => 1).to_a.adjust!(:pos => lambda {|e| e * 2})
+        result.map(&:pos).should == [4, 6]
+      end
     end
-  end  
+
+    context 'on a criteria' do
+      it "should times all positions (greater than 1) by 2" do
+        result = @person.lists[0].items.where(:pos.gt => 1).adjust!(:pos => lambda {|e| e * 2})
+        result.map(&:pos).should == [4, 6]
+      end
+    end
+
+    context 'on a document with a name field' do           
+      it "should upcase the name" do      
+        result = @person.adjust!(:name => lambda {|e| e.upcase })
+        result.name.should == 'Kristian'.upcase
+      end
+    end            
+  end          
+  
+  describe '#adjust! by symbol and string' do
+    context 'on a document with a name field' do           
+      it "should upcase the name - using string arg" do      
+        result = @person.adjust!(:name => 'upcase')
+        result.name.should == 'Kristian'.upcase
+      end
+    end            
+
+    context 'on a document with a name field' do           
+      it "should upcase the name - using symbol arg" do      
+        result = @person.adjust!(:name => :upcase)
+        result.name.should == 'Kristian'.upcase
+      end
+    end            
+  end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup