acts_as_enum 0.2.0 → 1.0.1

data/CHANGELOG

@@ -13,3 +13,6 @@
 0.2.0
   Add alias method enum_attr for acts_as_enum
   Rename acts_as_enum options :enum to :in
+
+1.0.1
+ Options :in value is Array, can be have two or three elements

data/README.rdoc

@@ -7,11 +7,23 @@
 
 == Usage
 
+  Table column type as Varchar or Varchar2
+  class User < ActiveRecord::Base
+    acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ]
+  end
+
+  Table column type as Integer
   class User < ActiveRecord::Base
     acts_as_enum :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ]
   end
 
+  Table column type as Varchar and Number
+  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', '冻结'], ['enable', '激活'] ]
   enum_attr :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ]
 
   
@@ -27,7 +39,7 @@
     
     
     If with option prefix is true: 
-      acts_as_enum :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ], :prefix => true
+      acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ], :prefix => true
       
     Will generate bellow:
     

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.1

data/lib/acts_as_enum.rb

@@ -3,10 +3,22 @@
 #    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', '激活'] ]
+#    end
+#
+#    and type is Integer or number of string
+#    NOTE: table column value must be match type, i.e. varchar: '1'; integer: 1
 #    class User < ActiveRecord::Base
 #      acts_as_enum :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ]
 #    end
+#    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, '激活'] ]
@@ -27,29 +39,36 @@
 #      
 #    Will generate bellow:
 #      User::STATUS_DISABLE, User::STATUS_ENABLE, User.status_enable, User.status_disable, user.status_enable?, user.status_disable?
-    
+
 module ActsAsEnum
   def self.included(base)
     base.extend ClassMethods
   end
   
   module ClassMethods
-    def acts_as_enum(attr, opts = { :in => [], :prefix => false })
+    def acts_as_enum(attr, options = { :in => [], :prefix => false })
       attr = attr.to_s
       plural_upcase_attr = attr.pluralize.upcase
-      enum = opts[:in]
+      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 "Options :in can not be empty" if enum.blank?
+      rails "Options :in must be an array object" unless enum.is_a?(Array)
       
+      is_key_value_enum = enum.first.size == 2 ? true : false
+
       # validates_inclusion_of attr, :in => enum.collect { |arr| arr[1] }, :allow_blank => true
 
-      const_set(plural_upcase_attr, enum.inject({}) { |hash, arr| hash[arr[1]] = arr[2].to_s; hash })
+      attr_options = enum.inject({}) do |hash, arr|
+        hash[is_key_value_enum ? arr.first : arr[1]] = arr.last.to_s
+        hash
+      end
+      const_set(plural_upcase_attr, attr_options)
       
       enum.each do |arr|
-        enum_name, attr_value = arr[0].to_s, arr[1]
-        method_name = opts[:prefix] ? "#{attr}_#{enum_name}" : enum_name
+        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)
         
@@ -58,10 +77,11 @@ module ActsAsEnum
         else
           scope method_name.to_sym, where(["#{attr} = ?", attr_value])
         end
-        
+
         class_eval(%Q{
           def #{method_name}?
-            #{attr}.to_s == #{attr_value}.to_s
+            # #{attr}.to_s == #{method_name.upcase}
+            #{attr}.to_s == "#{attr_value}"
           end
         })
       end
@@ -72,7 +92,6 @@ module ActsAsEnum
         end
         
         def #{attr}_name
-          # #{plural_upcase_attr}.detect { |arr| arr[1] == #{attr} }[0] unless #{attr}.blank?
           #{plural_upcase_attr}[#{attr}] unless #{attr}.blank?
         end
       })

metadata

@@ -2,7 +2,7 @@
 name: acts_as_enum
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - LiangWenKe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 Z
+date: 2011-07-27 00:00:00 Z
 dependencies: []
 
 description: "\xE4\xB8\xBB\xE8\xA6\x81\xE5\xBA\x94\xE7\x94\xA8\xE4\xBA\x8E\xE6\x9C\x89\xE6\x9E\x9A\xE4\xB8\xBE\xE7\xB1\xBB\xE5\x9E\x8B\xE5\xB1\x9E\xE6\x80\xA7\xE7\x9A\x84Model\xEF\xBC\x8C\xE8\xBF\x99\xE4\xB8\xAA\xE6\x8F\x92\xE4\xBB\xB6\xE4\xBC\x9A\xE5\xB8\xAE\xE6\x88\x91\xE4\xBB\xAC\xE7\x94\x9F\xE6\x88\x90\xE4\xB8\x80\xE4\xBA\x9B\xE5\xB8\xB8\xE7\x94\xA8\xE5\x88\xB0\xE7\x9A\x84\xE6\x96\xB9\xE6\xB3\x95\xE3\x80\x82"