mongoid 4.0.0.beta2 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6ad8c410d4ae0e13b891cef3eddfddd41a236d
-  data.tar.gz: b31dfba7b12e23a91520409662c9e73dd8452cd0
+  metadata.gz: 33fe9286d3ba938ede032903cc4a474975d6f7fe
+  data.tar.gz: 1d14ddf90e7ed9c9fc67cd0e8f609ce2e1e87f23
 SHA512:
-  metadata.gz: a89977a8214ab3eeb419d17976d446d38ac4279300e093e357da037512380fe0812fdc7d042fe6405d4a409388a859bd1c466175d10ad18110a2840e7211e646
-  data.tar.gz: e9fb4f020f0a90fb726453858926fca07941fafdfe270e9cdb40ee697fe5daa3a68937a0b148d6067e75ef9762b134b2263a52f1eefc6c992f02bb46c0c5cde6
+  metadata.gz: 267e9b0f0cf0a568200dd31043025f54fb75773f146d62a9c6fa5ec1561f6e9ae091608c39fe3ee6ce9bf568e681eb623799460c2d57f50a6b737a76f2e2d4a0
+  data.tar.gz: 2fcb46e0a9ab3ebca70be65d93017f96bfb3bd44da5b9d3cf1e517e6bd622ed2028a6ef16ed00c0212ffffcabeafbf061c4c48dbe60307f4aef22fc27e34a9c6

data/CHANGELOG.md

@@ -185,9 +185,6 @@ For instructions on upgrading to newer versions, visit
 * \#2956 Caching on queries now only happens when `cache` is specifically
   called. (Arthur Neves)
 
-* \#2898 Dirty attribute methods now properly handle field aliases.
-  (Niels Ganser)
-
 * \#2659 `Mongoid::Railtie` now properly uses only one initializer and
   the name has changed to `mongoid.load-config`.
 
@@ -223,6 +220,9 @@ For instructions on upgrading to newer versions, visit
   apply the default scope to the document, if the scope is not complex.
 
 * \#2200 Mass assignment security now mirrors Rails 4's behavior.
+  `without_protection` option was also removed.
+  `attr_accessible` class method was removed.
+  Mongoid and Strong parameters should work fine for mass assignment protection.
 
 * `delete_all` and `destroy_all` no longer take a `:conditions` hash but
   just the raw attributes.
@@ -345,6 +345,15 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#2898 Dirty attribute methods now properly handle field aliases.
+  (Niels Ganser)
+
+* \#3620 Add ActiveModel module instance methods to prohibited_methods list.
+  (Arthur Neves)
+
+* \#3610 Don't allow atomic operations on read-only attributes
+  (Frederico Araujo)
+
 * \#3619 Don't validate documents that are flagged for destruction.
   (Christopher J. Bottaro)
 

data/lib/mongoid/composable.rb

@@ -79,7 +79,9 @@ module Mongoid
       Threaded::Lifecycle,
       Traversable,
       Validatable,
-      Equality
+      Equality,
+      ActiveModel::Model,
+      ActiveModel::Validations
     ]
 
     class << self

data/lib/mongoid/fields/validators/macro.rb

@@ -51,8 +51,10 @@ module Mongoid
         #
         # @since 3.0.0
         def validate_name(klass, name, options)
-          if Mongoid.destructive_fields.include?(name)
-            raise Errors::InvalidField.new(klass, name)
+          [name, "#{name}?".to_sym, "#{name}=".to_sym].each do |n|
+            if Mongoid.destructive_fields.include?(n)
+              raise Errors::InvalidField.new(klass, n)
+            end
           end
 
           if !options[:overwrite] && klass.fields.keys.include?(name.to_s)

data/lib/mongoid/persistable.rb

@@ -165,6 +165,9 @@ module Mongoid
     # @since 4.0.0
     def process_atomic_operations(operations)
       operations.each do |field, value|
+        unless attribute_writable?(field)
+          raise Errors::ReadonlyAttribute.new(field, value)
+        end
         normalized = database_field_name(field)
         yield(normalized, value)
         remove_change(normalized)

data/lib/mongoid/relations/touchable.rb

@@ -31,7 +31,7 @@ module Mongoid
         touches = touch_atomic_updates(field)
         unless touches.empty?
           selector = atomic_selector
-          _root.collection.find(selector).update(positionally(selector, touches))
+          _root.collection.where(selector).update(positionally(selector, touches))
         end
         run_callbacks(:touch)
         true

data/lib/mongoid/version.rb

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

data/spec/mongoid/attributes/readonly_spec.rb

@@ -60,11 +60,11 @@ describe Mongoid::Attributes::Readonly do
     context "when updating an existing readonly field" do
 
       before do
-        Person.attr_readonly :title, :terms
+        Person.attr_readonly :title, :terms, :score
       end
 
       let(:person) do
-        Person.create(title: "sir", terms: true)
+        Person.create(title: "sir", terms: true, score: 1)
       end
 
       context "when updating via the setter" do
@@ -83,6 +83,46 @@ describe Mongoid::Attributes::Readonly do
         end
       end
 
+      context "when updating via inc" do
+
+        context 'with single field operation' do
+          it "raises an error " do
+            expect {
+              person.inc(score: 1)
+            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          end
+        end
+
+        context 'with multiple fields operation' do
+          it "raises an error " do
+            expect {
+              person.inc(score: 1, age: 1)
+            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          end
+        end
+      end
+
+      context "when updating via bit" do
+
+        context 'with single field operation' do
+          it "raises an error " do
+            expect {
+              person.bit(score: { or: 13 })
+            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          end
+        end
+
+        context 'with multiple fields operation' do
+          it "raises an error " do
+            expect {
+              person.bit(
+                age: { and: 13 }, score: { or: 13 }, inte: { and: 13, or: 10 }
+              )
+            }.to raise_error(Mongoid::Errors::ReadonlyAttribute)
+          end
+        end
+      end
+
       context "when updating via []=" do
 
         before do

data/spec/mongoid/contextual/atomic_spec.rb

@@ -103,8 +103,10 @@ describe Mongoid::Contextual::Atomic do
         expect(depeche_mode.reload.likes).to eq(12)
       end
 
-      it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to eq(0)
+      if mongodb_version > "2.5"
+        it "does not error on non initialized fields" do
+          expect(smiths.reload.likes).to eq(0)
+        end
       end
     end
 
@@ -118,8 +120,10 @@ describe Mongoid::Contextual::Atomic do
         expect(depeche_mode.reload.likes).to eq(61)
       end
 
-      it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to eq(13)
+      if mongodb_version > "2.5"
+        it "does not error on non initialized fields" do
+          expect(smiths.reload.likes).to eq(13)
+        end
       end
     end
 
@@ -133,8 +137,10 @@ describe Mongoid::Contextual::Atomic do
         expect(depeche_mode.reload.likes).to eq(14)
       end
 
-      it "does not error on non initialized fields" do
-        expect(smiths.reload.likes).to eq(10)
+      if mongodb_version > "2.5"
+        it "does not error on non initialized fields" do
+          expect(smiths.reload.likes).to eq(10)
+        end
       end
     end
   end

data/spec/mongoid/fields_spec.rb

@@ -815,12 +815,14 @@ describe Mongoid::Fields do
 
     context "when the field name conflicts with mongoid's internals" do
 
-      context "when the field is named __metadata" do
+      [:__metadata, :invalid].each do |meth|
+        context "when the field is named #{meth}" do
 
-        it "raises an error" do
-          expect {
-            Person.field(:__metadata)
-          }.to raise_error(Mongoid::Errors::InvalidField)
+          it "raises an error" do
+            expect {
+              Person.field(meth)
+            }.to raise_error(Mongoid::Errors::InvalidField)
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -62,6 +62,11 @@ def purge_database_alt!
   end
 end
 
+def mongodb_version
+  session = Mongoid::Sessions.default
+  session.command(buildinfo: 1)["version"]
+end
+
 # Set the database that the spec suite connects to.
 Mongoid.configure do |config|
   config.load_configuration(CONFIG)

metadata

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