mongo_mapper 0.13.0.beta1 → 0.13.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 157572885e8b22a43d1585eb772fcbf1c95f6aa1
-  data.tar.gz: 29cff77a4aba848e0ec1bde7a7fe2ba3f68b767a
+  metadata.gz: c064a0c4fc8a69754fd97b1d4d111b47533c5a9f
+  data.tar.gz: 93299ab0ef2f65d42de3a218315c4575ea6569a9
 SHA512:
-  metadata.gz: cc75dcd206c828239a06f49cb9374497f9e0b425201921a5dcdcc169b5d1eba5a1005fbc2ad299ee908b311b046c42c2e5b97e339e668117f7a0c5ab815d98d4
-  data.tar.gz: 003c0ac6bb4aaec67634ee5aedaa252f4d81f9a40d6e496ab108b5c408d22891495ec969e07d9bdc8b8315d25e0e309ac1ccdd0f29c2feac70257857a2c0e2a5
+  metadata.gz: 2552482a4e28cdc65871040dc6425ddf1a6030e9a1896ddb1b4bdd0442ca11c3fd0a01edf3838768fde2102376ddb957af2ce7ae563d07b92ab623ab71d6c2fc
+  data.tar.gz: e9a796fbf22d16874f9f862ff030e2aa29eb53fadc373cba5affdfd8fafee02fef0a04d33805520dac387fc6c4c9b935689cbf65ade1633152eacc4ffc085432

data/lib/mongo_mapper/plugins/associations/many_embedded_polymorphic_proxy.rb

@@ -13,7 +13,7 @@ module MongoMapper
         protected
           def find_target
             (@_values || []).map do |hash|
-              child = polymorphic_class(hash).load(hash)
+              child = polymorphic_class(hash).load(hash, true)
               assign_references(child)
               child
             end

data/lib/mongo_mapper/plugins/associations/many_embedded_proxy.rb

@@ -13,7 +13,7 @@ module MongoMapper
         private
           def find_target
             (@_values ||= []).map do |attrs|
-              klass.load(attrs).tap do |child|
+              klass.load(attrs, true).tap do |child|
                 assign_references(child)
               end
             end

data/lib/mongo_mapper/plugins/associations/one_embedded_polymorphic_proxy.rb

@@ -7,11 +7,11 @@ module MongoMapper
           @value = value.respond_to?(:attributes) ? value.attributes.merge(association.type_key_name => value.class.name) : value
           reset
         end
-        
+
         protected
           def find_target
             if @value
-              child = polymorphic_class(@value).load(@value)
+              child = polymorphic_class(@value).load(@value, true)
               assign_references(child)
               child
             end
@@ -27,4 +27,4 @@ module MongoMapper
       end
     end
   end
-end
+end

data/lib/mongo_mapper/plugins/associations/one_embedded_proxy.rb

@@ -12,9 +12,9 @@ module MongoMapper
 
         def replace(doc)
           if doc.respond_to?(:attributes)
-            @target = klass.load(doc.attributes)
+            @target = klass.load(doc.attributes, true)
           else
-            @target = klass.load(doc)
+            @target = klass.load(doc, true)
           end
           assign_references(@target)
           loaded
@@ -29,7 +29,7 @@ module MongoMapper
 
           def find_target
             if @value
-              klass.load(@value).tap do |child|
+              klass.load(@value, true).tap do |child|
                 assign_references(child)
               end
             end

data/lib/mongo_mapper/plugins/keys.rb

@@ -77,13 +77,13 @@ module MongoMapper
         end
 
         # load is overridden in identity map to ensure same objects are loaded
-        def load(attrs)
+        def load(attrs, with_cast = false)
           return nil if attrs.nil?
           begin
             attrs['_type'] ? attrs['_type'].constantize : self
           rescue NameError
             self
-          end.allocate.initialize_from_database(attrs)
+          end.allocate.initialize_from_database(attrs, with_cast)
         end
 
         private
@@ -106,19 +106,34 @@ module MongoMapper
           end
 
           def create_accessors_for(key)
-            accessors_module.module_eval <<-end_eval
-              def #{key.name}
-                read_key(:#{key.name})
-              end
+            accessors = ""
+            if key.read_accessor?
+              accessors << <<-end_eval
+                def #{key.name}
+                  read_key(:#{key.name})
+                end
+
+                def #{key.name}_before_type_cast
+                  read_key_before_type_cast(:#{key.name})
+                end
+              end_eval
+            end
 
-              def #{key.name}=(value)
-                write_key(:#{key.name}, value)
-              end
+            if key.write_accessor?
+              accessors << <<-end_eval
+                def #{key.name}=(value)
+                  write_key(:#{key.name}, value)
+                end
+              end_eval
+            end
 
-              def #{key.name}?
-                read_key(:#{key.name}).present?
-              end
-            end_eval
+            if key.predicate_accessor?
+              accessors << <<-end_eval
+                def #{key.name}?
+                  read_key(:#{key.name}).present?
+                end
+              end_eval
+            end
 
             if block_given?
               accessors_module.module_eval do
@@ -126,6 +141,7 @@ module MongoMapper
               end
             end
 
+            accessors_module.module_eval accessors
             include accessors_module
           end
 
@@ -194,11 +210,11 @@ module MongoMapper
         yield self if block_given?
       end
 
-      def initialize_from_database(attrs={})
+      def initialize_from_database(attrs={}, with_cast = false)
         @_new = false
         init_ivars
         initialize_default_values(attrs)
-        load_from_database(attrs)
+        load_from_database(attrs, with_cast)
         self
       end
 
@@ -334,14 +350,14 @@ module MongoMapper
           @_dynamic_attributes = {}                                      # Dumpable
         end
 
-        def load_from_database(attrs)
+        def load_from_database(attrs, with_cast = false)
           return if attrs == nil || attrs.blank?
 
           attrs.each do |key, value|
             if !@__mm_keys.key?(key) && respond_to?(:"#{key}=")
               self.send(:"#{key}=", value)
             else
-              internal_write_key key, value, false
+              internal_write_key key, value, with_cast
             end
           end
         end

data/lib/mongo_mapper/plugins/keys/key.rb

@@ -3,7 +3,7 @@ module MongoMapper
   module Plugins
     module Keys
       class Key
-        attr_accessor :name, :type, :options, :default, :ivar, :abbr
+        attr_accessor :name, :type, :options, :default, :ivar, :abbr, :accessors
 
         ID_STR = '_id'
 
@@ -15,6 +15,7 @@ module MongoMapper
           @embeddable  = type.respond_to?(:embeddable?) ? type.embeddable? : false
           @is_id       = @name == ID_STR
           @typecast    = @options[:typecast]
+          @accessors   = Array(@options[:accessors]).compact.map &:to_s
           @has_default  = !!options.key?(:default)
           self.default = self.options[:default] if default?
 
@@ -28,7 +29,7 @@ module MongoMapper
                  "Accessors called `#{@name}` have been created instead."
           end
           @ivar = :"@#{name}" if valid_ruby_name?
-          validate_key_name! unless dynamic?
+          validate_key_name! unless dynamic? or !any_accessor?
         end
 
         def persisted_name
@@ -89,6 +90,24 @@ module MongoMapper
           !!@name.match(/\A[a-z_][a-z0-9_]*\z/i)
         end
 
+        def read_accessor?
+          any_accessor? ["read"]
+        end
+
+        def write_accessor?
+          any_accessor? ["write"]
+        end
+
+        def predicate_accessor?
+          any_accessor? ["present", "predicate", "boolean"]
+        end
+
+        def any_accessor?(arr_opt = [])
+          return true if @accessors.empty?
+          return false unless (@accessors & ["skip", "none"]).empty?
+          return !(@accessors & arr_opt).empty?
+        end
+
         private
           def typecast_class
             @typecast_class ||= options[:typecast].constantize

data/lib/mongo_mapper/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapper
-  Version = '0.13.0.beta1'
+  Version = '0.13.0.beta2'
 end

data/spec/functional/embedded_document_spec.rb

@@ -9,6 +9,7 @@ describe "EmbeddedDocument" do
 
     @pet_klass = EDoc('Pet') do
       key :name, String
+      key :flag, Boolean
     end
 
     @klass.many :pets, :class => @pet_klass
@@ -294,4 +295,22 @@ describe "EmbeddedDocument" do
       pets[0].name.should == "Sasha"
     end
   end
-end
+
+  context "Issue #536" do
+    it "should update attributes with string keys" do
+      person = @klass.create(:pets => [@pet_klass.new(:name => 'Rasmus', :flag => true)])
+      person.update_attributes!({"pets" => ["name" => "sparky", "flag" => "false"]})
+      person.reload
+      person.pets.first.name.should == "sparky"
+      person.pets.first.flag.should be_false
+    end
+
+     it "should update attributes with symbol keys" do
+       person = @klass.create(:pets => [@pet_klass.new(:name => 'Rasmus', :flag => true)])
+       person.update_attributes!({pets: [:name => "sparky", :flag => "false"]})
+       person.reload
+       person.pets.first.name.should == "sparky"
+       person.pets.first.flag.should be_false
+    end
+  end
+end

data/spec/functional/keys_spec.rb

@@ -52,6 +52,19 @@ describe "Keys" do
     expect { doc.new }.to_not raise_error
   end
 
+  it "should permit for key overrides" do
+    doc = Class.new do
+      include MongoMapper::Document
+      key :class, String, :accessors => :skip
+    end
+
+    doc.collection.insert('class' => 'String')
+    doc.all.first.tap do |d|
+      d.class.should == doc
+      d["class"].should == "String"
+      d.attributes["class"].should == "String"
+    end
+  end
 
   context "key segmenting" do
     let(:doc) {

data/spec/functional/scopes_spec.rb

@@ -43,7 +43,7 @@ describe "Scopes" do
 
            # Ordering is important here; where needs to happen before foo_id is defined
            # in order to produce the behavior we're testing against regression.
-           scope :type, where(type: "bar")
+           scope :type, where(:type => "bar")
            key :foo_id, ObjectId
         }}
         before {

data/spec/unit/key_spec.rb

@@ -70,6 +70,10 @@ describe "Key" do
     it "should permit bad names if __dynamic" do
       expect { Key.new(:"id.bar", :__dynamic => true) }.to_not raise_error
     end
+
+    it "should permit bad names if it is not to create accessors" do
+      expect { Key.new(:"id.bar", :accessors => :skip) }.to_not raise_error
+    end
   end
 
   context "A key" do
@@ -138,6 +142,40 @@ describe "Key" do
     end
   end
 
+  context "with the :attributes option" do
+    subject { @key }
+    before { @key = Key.new(:test, String, :accessors => accessor) }
+
+    context "with :read" do
+      let(:accessor) { :read }
+      its(:read_accessor?) { should be_true }
+      its(:write_accessor?) { should be_false }
+      its(:predicate_accessor?) { should be_false }
+    end
+
+    context "with :write" do
+      let(:accessor) { :write }
+      its(:read_accessor?) { should be_false }
+      its(:write_accessor?) { should be_true }
+      its(:predicate_accessor?) { should be_false }
+    end
+
+    context "with :predicate" do
+      let(:accessor) { :predicate }
+      its(:read_accessor?) { should be_false }
+      its(:write_accessor?) { should be_false }
+      its(:predicate_accessor?) { should be_true }
+    end
+
+    context "with an array of options" do
+      let(:accessor) { [:read, :write] }
+
+      its(:read_accessor?) { should be_true }
+      its(:write_accessor?) { should be_true }
+      its(:predicate_accessor?) { should be_false }
+    end
+  end
+
   context "setting a value with a custom type" do
     it "should correctly typecast" do
       key = Key.new(:foo, FooType)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta1
+  version: 0.13.0.beta2
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement