acts_as_enum 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f93b4c339f00efab7d18b2adc56bd95fb0fedf8
-  data.tar.gz: b4aee29c9cd9b44b21edca60880ff5e90a8dfa46
+  metadata.gz: 00e1befcc950cf4fc093bea43536a6c6c5f9e324
+  data.tar.gz: 339904c036a720d6195bf3dfeced23ce427e4ea9
 SHA512:
-  metadata.gz: cfb6c41f711b72f74907f503830e606cd0ab438203437745a317485c7910334904a4238ce222751ffb9cd03796916ef84de058a122ec9ec4238c0844c59c6a88
-  data.tar.gz: 9d9e1f914f13006114e8c109c674bd957bc3d8b9e5dd29dc3299ed23bb1acb46ec7a2287893c52133c0a8428283b8de958e8caaa17b9cd13cfcbca05f8b5510a
+  metadata.gz: f3273e040dcb1806f533a0876490f2fd50bcb87248d4c08b1834168426c567098c56dbb9470f3cd243ad7233ed56267e0d5a4f35c55c2064e3eb18ddf3418d4b
+  data.tar.gz: 65df571ec89213facf734046207e55f79b6b4155f3d0cfc68541531cd7b1eeb6c3b566c6433b7555da9646553657c4b8597b60879504e6729c3b97f991c78a22

data/README.rdoc

@@ -23,12 +23,28 @@ or, to install as a plugin:
 
 == Usage
 
+Default
+
+  class User < ActiveRecord::Base
+    enum_attr :status, :in => %w(disable, enable)
+  end
+
 Table column type as String
 
   class User < ActiveRecord::Base
     acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ]
   end
 
+  Or
+
+  class User < ActiveRecord::Base
+    acts_as_enum :status, :in => { 'disable' => '冻结', { 'enable', '激活' }
+  end
+
+  class User < ActiveRecord::Base
+    enum_attr :status, :in => { 'disable' => '冻结', { 'enable', '激活' }
+  end
+
 Table column type as Integer
 
   class User < ActiveRecord::Base

data/TODO

@@ -1,5 +1,3 @@
 会继续添加如下功能
 
-1) 将会支持in里面的数组元素是符号类型
-
-2) 将会支参数in是Hash类型
+1) 将会支持in里面的数组元素是符号类型

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/lib/acts_as_enum.rb

@@ -5,11 +5,18 @@
 #    options incldue :in, :prefix
 #    :in value as Array [ [value, label], ... ] or [ [special_method_name, value, label], ... ]
 #    :prefix value as true or false
+# 
+#    class User < ActiveRecord::Base
+#      acts_as_enum :status, :in => %w(disable, enable)
+#    end
 #
 #    table column status type is Varchar or Varchar2
 #    class User < ActiveRecord::Base
 #      acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ]
 #    end
+#    class User < ActiveRecord::Base
+#      acts_as_enum :status, :in => { 'disable' => '冻结', { 'enable', '激活' }
+#    end
 #
 #    and type is Integer or number of string
 #    NOTE: table column value must be match type, i.e. varchar: '1'; integer: 1
@@ -61,25 +68,20 @@ module ActsAsEnum
         enum = enum.inject([]) { |arr, obj| arr << [obj] * 2 }
       end
 
-      is_key_value_enum = enum.first.size == 2 ? true : false
-
-      attr_options = enum.inject({}) do |hash, arr|
-        hash[is_key_value_enum ? arr.first : arr[1]] = arr.last.to_s
-        hash
+      attr_options = enum.each_with_object({}) do |arr, hash|
+        hash[arr[-2]] = arr.last.to_s
       end
       const_set(plural_upcase_attr, attr_options)
 
       enum.each do |arr|
         enum_name = arr.first.to_s.downcase
-        attr_value = is_key_value_enum ? arr.first : arr[1]
+        attr_value = arr[-2]
         method_name = options[:prefix] ? "#{attr}_#{enum_name}" : enum_name
 
-        const_set("#{method_name}".upcase, attr_value)
+        const_set(method_name.upcase, attr_value)
 
-        if Rails.version =~ /^4/
-          scope method_name.to_sym, -> { where(["#{self.table_name}.#{attr} = ?", attr_value]) }
-        elsif Rails.version =~ /^3/
-          scope method_name.to_sym, where(["#{self.table_name}.#{attr} = ?", attr_value])
+        if Rails.version =~ /^[34]/
+          scope method_name.to_sym, -> { where(attr => attr_value) }
         else
           named_scope method_name.to_sym, :conditions => { attr.to_sym => attr_value }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_enum
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Mike Liang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies: []
 description: For multiple values activerecord attributes. This gem have some very
   useful methods and constants for attribute.
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: acts_as_enum
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Enum Attribute for Rails ActiveRecord