mm_no_empties 0.0.4 → 0.0.5

data/lib/mm_no_empties/version.rb

@@ -1,3 +1,3 @@
 module MmNoEmpties
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/mm_no_empties.rb

@@ -2,11 +2,48 @@ require 'mongo_mapper'
 require "mm_no_empties/version"
 require 'mongo_mapper/plugins/keys/key'
 
+#modified versions of to_mongo that check nested values
+require_relative 'mongo_mapper/extensions/array'
+require_relative 'mongo_mapper/extensions/hash'
+require_relative 'mongo_mapper/extensions/set'
+
 module MmNoEmpties
   
   extend ActiveSupport::Concern
+  
+  module ClassMethods
+    
+    def set(*args)
+      criteria, updates, options = criteria_and_keys_from_args(args)
+      
+      unset_cmd = {}
+      
+      updates.each do |key, value|
+        updates[key]   = keys[key.to_s].set(value) if key?(key)
+        unset_cmd[key] = 1 unless updates[key].present?
+      end
+
+      set_attr = updates.except(*unset_cmd.keys)
+  
+      update_cmd = {}
+      update_cmd['$set']   = set_attr  if set_attr.present?
+      update_cmd['$unset'] = unset_cmd if unset_cmd.present?
+  
+      if options
+        collection.update(criteria, update_cmd, options.merge(:multi => true))
+      else
+        collection.update(criteria, update_cmd, :multi => true)
+      end
+  
+    end
+    
+  end
       
-  def attributes(include_all = false)
+  def attributes(options = {})
+
+    include_all     = options[:include_all]
+    stringify_bson  = options[:stringify_bson]
+    recursive       = options[:recursive]
     
     HashWithIndifferentAccess.new.tap do |attrs|
       persistable_keys = if include_all
@@ -20,17 +57,23 @@ module MmNoEmpties
       end
       
       persistable_keys.each do |name, key|
-        value = key.set(self[key.name])
-        attrs[name] = value
+        v = key.set(self[key.name])
+        case v
+        when MongoMapper::Document, MongoMapper::EmbeddedDocument, Hash, Array, Set
+          v = v.to_mongo(options) if v and recursive
+        when BSON::ObjectId, BSON::Binary
+          v = v.to_s if stringify_bson
+        end
+        attrs[name] = v   
       end
 
       embedded_associations.each do |association|
         if documents = instance_variable_get(association.ivar)
           
           val = if association.is_a?(MongoMapper::Plugins::Associations::OneAssociation)
-            documents.to_mongo
+            documents.to_mongo(options)
           else
-            documents.map { |document| document.to_mongo }
+            documents.map { |document| document.to_mongo(options) }
           end
             
           if include_all
@@ -45,5 +88,6 @@ module MmNoEmpties
   end
   alias :to_mongo :attributes
 
-  
 end
+
+

data/lib/mongo_mapper/extensions/array.rb

@@ -0,0 +1,48 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Array
+      
+      extend ActiveSupport::Concern
+      
+      module ClassMethods
+      
+        def to_mongo(value, options = {})
+          stringify_bson = options[:stringify_bson]
+          recursive      = options[:recursive]
+
+          value = value.clone if recursive
+          value = value.respond_to?(:lines) ? value.lines : value
+          value = value.to_a
+          value.map! do |v|
+            
+            case v
+            when Document, EmbeddedDocument, Hash, Array, Set
+              v = v.to_mongo(options) if v and recursive
+            when BSON::ObjectId, BSON::Binary
+              v = v.to_s if stringify_bson
+            end
+            
+            v
+            
+          end
+          value
+        end
+  
+        def from_mongo(value)
+          value || []
+        end
+      
+      end
+      
+      def to_mongo(options = {})
+        self.class.to_mongo(self, options)
+      end
+      
+    end
+  end
+end
+
+class Array
+  include MongoMapper::Extensions::Array
+end

data/lib/mongo_mapper/extensions/hash.rb

@@ -0,0 +1,47 @@
+# encoding: UTF-8
+module MongoMapper
+  module Extensions
+    module Hash
+      
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+      
+        def to_mongo(value, options = {})
+          stringify_bson = options[:stringify_bson]
+          recursive      = options[:recursive]
+
+          value = value.clone if recursive
+          hash  = value.to_hash
+          hash.each do |k,v|
+            
+            case v
+            when Document, EmbeddedDocument, Hash, Array, Set
+              v = v.to_mongo(options) if v and recursive
+            when BSON::ObjectId, BSON::Binary
+              v = v.to_s if stringify_bson
+            end
+
+            hash[k] = v
+            
+          end
+          hash
+        end
+        
+        def from_mongo(value)
+          HashWithIndifferentAccess.new(value || {})
+        end
+        
+      end
+      
+      def to_mongo(options = {})
+        self.class.to_mongo(self, options)
+      end
+      
+    end
+  end
+end
+
+class Hash
+  include MongoMapper::Extensions::Hash
+end

data/lib/mongo_mapper/extensions/set.rb

@@ -0,0 +1,35 @@
+# encoding: UTF-8
+require 'set'
+
+module MongoMapper
+  module Extensions
+    module Set
+      
+      extend ActiveSupport::Concern
+      
+      module ClassMethods
+          
+        def to_mongo(value, options = {})
+          recursive = options[:recursive]
+          v = value.to_a
+          v = v.to_mongo(options) if recursive
+          v
+        end
+  
+        def from_mongo(value)
+          (value || []).to_set
+        end
+        
+      end
+      
+      def to_mongo(options = {})
+        self.class.to_mongo(self, options)
+      end
+        
+    end
+  end
+end
+
+class Set
+  include MongoMapper::Extensions::Set
+end

data/spec/mm_no_empties_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../../lib/mm_no_empties', __FILE__)
+require 'pry'
 
 describe MmNoEmpties do
   
@@ -36,8 +37,9 @@ describe MmNoEmpties do
     MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
     MongoMapper.database = 'mm_no_empties_test'
     
-    @group  = Group.create
     @person = Person.new(name: 'Jon', age: 33)
+    @group  = Group.create :people => [@person]
+
   end
   
   it "should not include empty Arrays, Hashes and Sets in 'attributes'" do
@@ -49,11 +51,44 @@ describe MmNoEmpties do
   end
   
   it "should not include unused many associations in attributes" do
-    @group.attributes.keys.should_not include('people', 'owner', 'company_id')
+    @group.attributes.keys.should_not include('owner', 'company_id')
   end
   
   it "should restore empty fields when loading from the database" do
-    Group.first.attributes(:include_all).keys.should include('names', 'counts', 'tags')
+    Group.first.attributes(:include_all => true).keys.should include('names', 'counts', 'tags')
+  end
+  
+  it "should call to_mongo on array elements when recursive is true" do
+    @group['an_array'] = [1, 2, [3, 4].to_set]
+    @group.attributes(:recursive => true)['an_array'].should == [1, 2, [3, 4]]
+  end
+  
+  it "should call to_mongo on set elements when recursive is true" do
+    @group['a_set'] = [1, 2, [3, 4].to_set].to_set
+    @group.attributes(:recursive => true)['a_set'].should == [1, 2, [3, 4]]
+  end
+  
+  it "should call to_mongo on hash values when recursive is true" do
+    @group['a_hash'] = {:a => [1, 2].to_set}
+    @group.attributes(:recursive => true)['a_hash']['a'].should == [1, 2]
+  end
+  
+  it "should convert a BSON::ObjectId to a string if stringify_bson is true" do
+    @group.attributes(:stringify_bson => true)['_id'].should == @group.id.to_s
+  end
+  
+  it "should convert a BSON::ObjectId in an embedded document to a string if stringify_bson is true" do
+    @group.attributes(:stringify_bson => true)['people'].first['_id'].should == @person.id.to_s
+  end
+  
+  it "should convert a BSON::Binary to a string if stringify_bson is true" do
+    @group['a_bson_binary'] = BSON::Binary.new("foo")
+    @group.attributes(:stringify_bson => true)['a_bson_binary'].should be_an_instance_of String
+  end
+  
+  it "should convert a BSON::Binary in an embedded document to a string if stringify_bson is true" do
+    @group.people.first['a_bson_binary'] = BSON::Binary.new("foo")
+    @group.attributes(:stringify_bson => true)['people'].first['a_bson_binary'].should be_an_instance_of String
   end
   
   after(:all) do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jonathan Chambers
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-03 00:00:00 +00:00
+date: 2012-12-21 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,9 @@ files:
 - Rakefile
 - lib/mm_no_empties.rb
 - lib/mm_no_empties/version.rb
+- lib/mongo_mapper/extensions/array.rb
+- lib/mongo_mapper/extensions/hash.rb
+- lib/mongo_mapper/extensions/set.rb
 - mm_no_empties.gemspec
 - spec/mm_no_empties_spec.rb
 has_rdoc: true