mongoid 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fe9286d3ba938ede032903cc4a474975d6f7fe
-  data.tar.gz: 1d14ddf90e7ed9c9fc67cd0e8f609ce2e1e87f23
+  metadata.gz: 0047adcc376dc5ab66b47ee9134f3498c22926d2
+  data.tar.gz: c36d95ca80568bb70a33a472536e6689703b903c
 SHA512:
-  metadata.gz: 267e9b0f0cf0a568200dd31043025f54fb75773f146d62a9c6fa5ec1561f6e9ae091608c39fe3ee6ce9bf568e681eb623799460c2d57f50a6b737a76f2e2d4a0
-  data.tar.gz: 2fcb46e0a9ab3ebca70be65d93017f96bfb3bd44da5b9d3cf1e517e6bd622ed2028a6ef16ed00c0212ffffcabeafbf061c4c48dbe60307f4aef22fc27e34a9c6
+  metadata.gz: 53384fa62466c3142ae2b8f8040e42145d5c45624c476d3fec257fa3c13d5a3939e960fa91db71e1d7ddf68e7f9ede61c3789a5c100114713af4f59fede92407
+  data.tar.gz: f1a487e461294f61724d698a86487f406cce5e88be767915841cc2797267ba94d702094f74bccbbf576f46a5aa850044ef76e99f180617534c86da3d4b8aca9c

data/CHANGELOG.md

@@ -345,6 +345,9 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#3676 Make pluck work with embedded associations
+  (Arthur Neves)
+
 * \#2898 Dirty attribute methods now properly handle field aliases.
   (Niels Ganser)
 

data/lib/mongoid/contextual/memory.rb

@@ -197,6 +197,17 @@ module Mongoid
         self
       end
 
+      def pluck(*fields)
+        fields = Array.wrap(fields)
+        documents.map do |doc|
+          if fields.size == 1
+            doc[fields.first]
+          else
+            fields.map { |n| doc[n] }.compact
+          end
+        end.compact
+      end
+
       # Skips the provided number of documents.
       #
       # @example Skip the documents.

data/lib/mongoid/interceptable.rb

@@ -259,12 +259,22 @@ module Mongoid
         send("_#{kind}_callbacks").each do |callback|
           chain.append(callback) if callback.kind == place
         end
-        class_eval <<-EOM
-          def #{name}()
-            #{chain.compile}
+
+        if Gem::Version.new("4.1.0") <= Gem::Version.new(ActiveSupport::VERSION::STRING)
+          self.class.send :define_method, name do
+            runner = ActiveSupport::Callbacks::Filters::Environment.new(self, false, nil)
+            chain.compile.call(runner).value
           end
-          protected :#{name}
-        EOM
+          self.class.send :protected, name
+        else
+          class_eval <<-EOM
+            def #{name}()
+              #{chain.compile}
+            end
+            protected :#{name}
+          EOM
+        end
+
       end
       send(name)
     end

data/lib/mongoid/serializable.rb

@@ -102,7 +102,7 @@ module Mongoid
         attrs[name] = value ? value.serializable_hash(options) : nil
       elsif names.include?(name) && !fields.has_key?(name)
         attrs[name] = read_attribute(name)
-      else
+      elsif !attribute_missing?(name)
         attrs[name] = send(name)
       end
     end

data/lib/mongoid/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Mongoid
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 end

data/lib/rails/generators/mongoid/config/templates/mongoid.yml

@@ -21,12 +21,12 @@ development:
         # read: secondary_preferred
 
         # How many times Moped should attempt to retry an operation after
-        # failure. (default: 30)
-        # max_retries: 30
+        # failure. (default: The number of nodes in the cluster)
+        # max_retries: 20
 
         # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # retry_interval: 1
+        # operation on failure. (default: 0.25)
+        # retry_interval: 0.25
   # Configure Mongoid specific options. (optional)
   options:
     # Includes the root model name in json serialization. (default: false)

data/spec/mongoid/contextual/memory_spec.rb

@@ -729,6 +729,63 @@ describe Mongoid::Contextual::Memory do
     end
   end
 
+  describe "#pluck" do
+
+    let(:hobrecht) do
+      Address.new(street: "hobrecht")
+    end
+
+    let(:friedel) do
+      Address.new(street: "friedel")
+    end
+
+    let(:criteria) do
+      Address.all.tap do |crit|
+        crit.documents = [ hobrecht, friedel ]
+      end
+    end
+
+    let(:context) do
+      described_class.new(criteria)
+    end
+
+    context "when plucking" do
+
+      let!(:plucked) do
+        context.pluck(:street)
+      end
+
+      it "returns the values" do
+        expect(plucked).to eq([ "hobrecht", "friedel" ])
+      end
+    end
+
+    context "when plucking a field that doesnt exist" do
+
+      context "when pluck one field" do
+
+        let(:plucked) do
+          context.pluck(:foo)
+        end
+
+        it "returns a empty array" do
+          expect(plucked).to eq([])
+        end
+      end
+
+      context "when pluck multiple fields" do
+
+        let(:plucked) do
+          context.pluck(:foo, :bar)
+        end
+
+        it "returns a empty array" do
+          expect(plucked).to eq([[], []])
+        end
+      end
+    end
+  end
+
   describe "#skip" do
 
     let(:hobrecht) do

data/spec/mongoid/interceptable_spec.rb

@@ -421,6 +421,7 @@ describe Mongoid::Interceptable do
 
           before(:all) do
             Band.define_model_callbacks(:rearrange)
+            Band.after_rearrange { }
           end
 
           after(:all) do

data/spec/mongoid/serializable_spec.rb

@@ -231,6 +231,24 @@ describe Mongoid::Serializable do
           )
         end
       end
+
+      context "when only two attributes are loaded" do
+        before do
+          person.save
+        end
+
+        let(:from_db) do
+          Person.only("_id", "username").first
+        end
+
+        let(:hash) do
+          from_db.serializable_hash
+        end
+
+        it "returns those two attributes only" do
+          expect(hash.keys).to eq(["_id", "username"])
+        end
+      end
     end
 
     context "when a model has dynamic fields" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Durran Jordan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement