acts_as_enum 1.0.2 → 1.1.1

data/CHANGELOG

@@ -19,3 +19,9 @@
 
 1.0.2
   Fixed a bug for #{boolean_column_attr}_name method
+
+1.1.0
+  Option :in support Hash Object
+
+1.1.1
+  Fix a bug for scope method

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.1

data/lib/acts_as_enum.rb

@@ -1,11 +1,11 @@
 # EnumAttr#  == Example
-# 
+#
 #    acts_as_enum(attr, options)
 #    attr is model attribute
 #    options incldue :in, :prefix
 #    :in value as Array [ [value, label], ... ] or [ [special_method_name, value, label], ... ]
 #    :prefix value as true or false
-# 
+#
 #    table column status type is Varchar or Varchar2
 #    class User < ActiveRecord::Base
 #      acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ]
@@ -19,24 +19,24 @@
 #    class User < ActiveRecord::Base
 #      acts_as_enum :status, :in => [ ['disable', '0', '冻结'], ['enable', '1', '激活'] ]
 #    end
-# 
+#
 #    Also can usage alias enum_attr
 #    enum_attr :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ]
-#    
+#
 #    Will generate bellow:
-#    
+#
 #      Constants: User::STATUSES(return hash { 0 => "冻结", 1 => "激活" }), User::DISABLE, User::ENABLE
-#      
+#
 #      Named scopes: User.enable, User.disable
-# 
-#      Class methods: User.status_options => [["冻结", 0], ["激活", 1]] 
-# 
+#
+#      Class methods: User.status_options => [["冻结", 0], ["激活", 1]]
+#
 #      Instance methods: user.status_name, user.enable?, user.disable?
-#      
-#      
-#    If with option prefix is true: 
+#
+#
+#    If with option prefix is true:
 #      acts_as_enum :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ], :prefix => true
-#      
+#
 #    Will generate bellow:
 #      User::STATUS_DISABLE, User::STATUS_ENABLE, User.status_enable, User.status_disable, user.status_enable?, user.status_disable?
 
@@ -44,17 +44,23 @@ module ActsAsEnum
   def self.included(base)
     base.extend ClassMethods
   end
-  
+
   module ClassMethods
     def acts_as_enum(attr, options = { :in => [], :prefix => false })
       attr = attr.to_s
       plural_upcase_attr = attr.pluralize.upcase
       enum = options[:in]
-      
-      rails "Can not load Rails" unless defined?(Rails)
-      rails "Options :in can not be empty" if enum.blank?
-      rails "Options :in must be an array object" unless enum.is_a?(Array)
-      
+
+      rails "Can not load Rails." unless defined?(Rails)
+      rails "Options :in can not be empty." if enum.blank?
+      rails "Options :in must be an object of Array or Hash." unless enum.is_a?(Array) or enum.is_a?(Hash)
+
+      if enum.is_a?(Hash)
+        enum = enum.to_a
+      elsif enum.is_a?(Array) and enum.first.is_a?(String)
+        enum = enum.inject([]) { |arr, obj| arr << [obj] * 2 }
+      end
+
       is_key_value_enum = enum.first.size == 2 ? true : false
 
       # validates_inclusion_of attr, :in => enum.collect { |arr| arr[1] }, :allow_blank => true
@@ -64,18 +70,18 @@ module ActsAsEnum
         hash
       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]
         method_name = options[:prefix] ? "#{attr}_#{enum_name}" : enum_name
-        
+
         const_set("#{method_name}".upcase, attr_value)
-        
+
         if Rails.version =~ /^2/
           named_scope method_name.to_sym, :conditions => { attr.to_sym => attr_value }
         else
-          scope method_name.to_sym, where(["#{attr} = ?", attr_value])
+          scope method_name.to_sym, where(["#{self.table_name}.#{attr} = ?", attr_value])
         end
 
         class_eval(%Q{
@@ -85,19 +91,19 @@ module ActsAsEnum
           end
         })
       end
-        
+
       class_eval(%Q{
         def self.#{attr}_options
           #{plural_upcase_attr}.inject([]){ |arr, obj| arr << obj.reverse }
         end
-        
+
         def #{attr}_name
           return #{plural_upcase_attr}[#{attr}] if #{attr}.is_a?(FalseClass)
           #{plural_upcase_attr}[#{attr}] unless #{attr}.blank?
         end
       })
     end
-    
+
     alias enum_attr acts_as_enum
   end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
-- LiangWenKe
+- Mike Liang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies: []
-description: 主要应用于有枚举类型属性的Model，这个插件会帮我们生成一些常用到的方法。
+description: For multiple values activerecord attributes. This gem have some very
+  useful methods and constants for attribute.
 email: liangwenke.com@gmail.com
 executables: []
 extensions: []
@@ -46,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: acts_as_enum
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Enum Attribute for Rails ActiveRecord