enumerize 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ee47a15b97ca4432e16a29da74e928811cfa59
-  data.tar.gz: 025e85c0386121a06550ed0989bf0b8648b3df3e
+  metadata.gz: 1b707373f1cda45d2a21fd4f4b6fa2e512e94d0c
+  data.tar.gz: 989f1bbf21977dd0ab191ed2a41d865193702b82
 SHA512:
-  metadata.gz: 8df3f6bac28f16da9b07d8104f4e9961491827c7e04932a6449c4f61d19ab7439a31f96c8a702cae340b38ce0ba9aec42ae1e8aea688a6e6aa3a09af9a07c83a
-  data.tar.gz: 25c120a8fbfc07367e8cf498cfba05489cf8d3d6833554422cf70560a2d470a09f56628f08aa7fef95f8d8aef49b5bc1e657c8132fde05ddcf80c74f0af2eacb
+  metadata.gz: 55c9e20ec4db7a12db817177e8de84caa23659186312418bba4c8f96df5acde2cbea01f68485884e315dae24bbec36d4d4485dc8013591be9cae26e638f44abd
+  data.tar.gz: 6c592bfc03f5187f9caa8a07138ea16107a37fe037c610dfe8e4cf9e71b42e88e2a89181014a1074d57b07d234bd70b80663c33b7bc43017caa2731b8403ab7c

data/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### bug fix
 
+## 2.0.1 (October 18, 2016)
+
+### bug fix
+
+* Support enumerized attributes in #update_all on relation objects. (by [@lest](https://github.com/lest))
+
 ## 2.0.0 (August 10, 2016)
 
 ### enhancements

data/lib/enumerize/activerecord.rb

@@ -7,6 +7,10 @@ module Enumerize
         if self < ::ActiveRecord::Base
           include InstanceMethods
 
+          const_get(:ActiveRecord_Relation).include(RelationMethods)
+          const_get(:ActiveRecord_AssociationRelation).include(RelationMethods)
+          const_get(:ActiveRecord_Associations_CollectionProxy).include(RelationMethods)
+
           # Since Rails use `allocate` method on models and initializes them with `init_with` method.
           # This way `initialize` method is not being called, but `after_initialize` callback always gets triggered.
           after_initialize :_set_default_value_for_enumerized_attributes
@@ -42,15 +46,18 @@ module Enumerize
       end
     end
 
-    def update_all(updates)
-      if updates.is_a?(Hash)
-        enumerized_attributes.each do |attr|
-          next if updates[attr.name].blank? || attr.kind_of?(Enumerize::Multiple)
-          updates[attr.name] = attr.find_value(updates[attr.name]).value
+    module RelationMethods
+      def update_all(updates)
+        if updates.is_a?(Hash)
+          enumerized_attributes.each do |attr|
+            next if updates[attr.name].blank? || attr.kind_of?(Enumerize::Multiple)
+            enumerize_value = attr.find_value(updates[attr.name])
+            updates[attr.name] = enumerize_value && enumerize_value.value
+          end
         end
-      end
 
-      super(updates)
+        super(updates)
+      end
     end
   end
 end

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/test/activerecord_test.rb

@@ -20,7 +20,9 @@ ActiveRecord::Base.connection.instance_eval do
   end
 
   create_table :documents do |t|
+    t.integer :user_id
     t.string :visibility
+    t.integer :status
     t.timestamps null: true
   end
 end
@@ -33,6 +35,9 @@ class BaseEntity < ActiveRecord::Base
 end
 
 class Document < BaseEntity
+  belongs_to :user
+
+  enumerize :status, in: {draft: 1, release: 2}
 end
 
 module RoleEnum
@@ -57,6 +62,8 @@ class User < ActiveRecord::Base
   # There is no column for relationship enumeration for testing purposes: model
   # should not be broken even if the associated column does not exist yet.
   enumerize :relationship, :in => [:single, :married]
+
+  has_many :documents
 end
 
 class UniqStatusUser < User
@@ -411,6 +418,28 @@ describe Enumerize::ActiveRecordSupport do
     user.status.must_equal 'blocked'
   end
 
+  it 'allows using update_all on relation objects' do
+    User.delete_all
+
+    user = User.create(status: :active, account_type: :premium)
+
+    User.all.update_all(status: :blocked)
+    user.reload
+    user.status.must_equal 'blocked'
+  end
+
+  it 'allows using update_all on association relation objects' do
+    User.delete_all
+    Document.delete_all
+
+    user = User.create
+    document = Document.create(user: user, status: :draft)
+
+    user.documents.update_all(status: :release)
+    document.reload
+    document.status.must_equal 'release'
+  end
+
   it 'preserves string usage of update_all' do
     User.delete_all
 
@@ -430,4 +459,14 @@ describe Enumerize::ActiveRecordSupport do
     user.reload
     user.name.must_equal 'Frederick'
   end
+
+  it 'sets attribute to nil if given one is not valid' do
+    User.delete_all
+
+    user = User.create(status: :active)
+
+    User.update_all(status: :foo)
+    user.reload
+    user.status.must_equal nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport