acts_as_enum 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a87f2bd8780caf1086788662de93139dd7b372d
-  data.tar.gz: fe4800482f012175e35df285ab932a1cf0a17406
+  metadata.gz: 774afd9f15ea2a3e7a335f25ee07212c66bba092
+  data.tar.gz: c811e0a69f15cd3d4347acf4a79465dd682d1357
 SHA512:
-  metadata.gz: db904a20debad9bb82f9b7aa710237036366639a414f929d941c6b8aff9bbf6e79e6a7b216bb2e48ba5f2cf71c0aacb99a9878f3e1d1dd78418c2e1d63702912
-  data.tar.gz: 58c41173581530a1b8cf0d2c7785f0f93a1e686d584b75d0529c8788e4014a555b54213252b290e49129b0d604d6aa4076573b44a9ba7d934e9a7e906dfa4e9f
+  metadata.gz: 9a2404ad07b4479119bdab0f8693c06a03b0156b726f59c578dd1b99e9125b01d5d24bfff7d9367d4f5d6f4cd4c2a8da383a625fea2c0a2ffe60b9f29589b5d9
+  data.tar.gz: 017a4e0ed511de815a8065f320c64a0b0af342b61158abeb98ff4e1aa117f1adc6d4b714eb15a6f533bb9f7b5684d75003d2f5abdf98db4f3dd8bee8433c0bab

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2010 [name of plugin creator]
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2010 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,79 +1,79 @@
-== ActsAsEnum
-
-主要应用于有枚举类型属性的Model，这个插件会帮我们生成一些常用到的方法。
-
-如：枚举数组常量，每个元素的常量和布尔方法，属性的名字，Named scope方法
-
-
-== Getting Started
-
-In your Gemfile:
-
-  gem 'acts_as_enum'# Last officially released gem
-  # gem "acts_as_enum", :git => "git://github.com/liangwenke/acts_as_enum.git" # Track git repo
-
-or, to install as a gem:
-
-  gem install acts_as_enum
-
-or, to install as a plugin:
-
-  rails plugin install git://github.com/liangwenke/acts_as_enum.git
-
-
-== Usage
-
-Table column type as String
-
-  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 String and Number
-
-  class User < ActiveRecord::Base
-    acts_as_enum :status, :in => [ ['disable', '0', '冻结'], ['enable', '1', '激活'] ]
-  end
-
-Table column type as Boolean
-
-  class User < ActiveRecord::Base
-    acts_as_enum :status, :in => [ ['disable', false, '冻结'], ['enable', true, '激活'] ]
-  end
-
-
-Also can usage alias enum_attr
-
-  enum_attr :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ]
-  enum_attr :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ]
-
-
-Will generate bellow:
-
-  Constants: User::STATUSES, User::DISABLE, User::ENABLE
-
-  Named scopes: User.enable, User.disable
-
-  Class methods: User.status_options
-
-  Instance methods: user.status_name, user.enable?, user.disable?
-
-
-If with option prefix is true:
-
-  acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ], :prefix => true
-
-Will generate bellow:
-
-  User::STATUS_DISABLE, User::STATUS_ENABLE, User.status_enable, User.status_disable, user.status_enable?, user.status_disable?
-
-
-== Note
-
-Copyright (c) 2010 liangwenke.com@gmail.com, released under the MIT license
+== ActsAsEnum
+
+主要应用于有枚举类型属性的Model，这个插件会帮我们生成一些常用到的方法。
+
+如：枚举数组常量，每个元素的常量和布尔方法，属性的名字，Named scope方法
+
+
+== Getting Started
+
+In your Gemfile:
+
+  gem 'acts_as_enum'# Last officially released gem
+  # gem "acts_as_enum", :git => "git://github.com/liangwenke/acts_as_enum.git" # Track git repo
+
+or, to install as a gem:
+
+  gem install acts_as_enum
+
+or, to install as a plugin:
+
+  rails plugin install git://github.com/liangwenke/acts_as_enum.git
+
+
+== Usage
+
+Table column type as String
+
+  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 String and Number
+
+  class User < ActiveRecord::Base
+    acts_as_enum :status, :in => [ ['disable', '0', '冻结'], ['enable', '1', '激活'] ]
+  end
+
+Table column type as Boolean
+
+  class User < ActiveRecord::Base
+    acts_as_enum :status, :in => [ ['disable', false, '冻结'], ['enable', true, '激活'] ]
+  end
+
+
+Also can usage alias enum_attr
+
+  enum_attr :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ]
+  enum_attr :status, :in => [ ['disable', 0, '冻结'], ['enable', 1, '激活'] ]
+
+
+Will generate bellow:
+
+  Constants: User::STATUSES, User::DISABLE, User::ENABLE
+
+  Named scopes: User.enable, User.disable
+
+  Class methods: User.status_options
+
+  Instance methods: user.status_name, user.enable?, user.disable?, user.enable!, user.disable!
+
+
+If with option prefix is true:
+
+  acts_as_enum :status, :in => [ ['disable', '冻结'], ['enable', '激活'] ], :prefix => true
+
+Will generate bellow:
+
+  User::STATUS_DISABLE, User::STATUS_ENABLE, User.status_enable, User.status_disable, user.status_enable?, user.status_disable?
+
+
+== Note
+
+Copyright (c) 2010 liangwenke.com@gmail.com, released under the MIT license

data/Rakefile

@@ -1,23 +1,23 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the acts_as_enum plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the acts_as_enum plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActsAsEnum'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the acts_as_enum plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the acts_as_enum plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ActsAsEnum'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/TODO

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

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.2.0

data/init.rb

@@ -1 +1 @@
-require 'acts_as_enum'
+require 'acts_as_enum'

data/lib/acts_as_enum.rb

@@ -1,113 +1,114 @@
-# 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', '激活'] ]
-#    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, '激活'] ]
-#
-#    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]]
-#
-#      Instance methods: user.status_name, user.enable?, user.disable?
-#
-#
-#    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?
-
-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]
-
-      raise "Can not load Rails." unless defined?(Rails)
-      raise "Options :in can not be empty." if enum.blank?
-      raise "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
-
-      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 = 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 =~ /^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])
-        else
-          named_scope method_name.to_sym, :conditions => { attr.to_sym => attr_value }
-        end
-
-        class_eval(%Q{
-          def #{method_name}?
-            # #{attr}.to_s == #{method_name.upcase}
-            #{attr}.to_s == "#{attr_value}"
-          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
-
-ActiveRecord::Base.send(:include, ActsAsEnum)
+# 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', '激活'] ]
+#    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, '激活'] ]
+#
+#    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]]
+#
+#      Instance methods: user.status_name, user.enable?, user.disable?, user.enable!(update user.status to 1) and user.disable!(update user.status to 1)
+#
+#
+#    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?
+
+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]
+
+      raise "Can not load Rails." unless defined?(Rails)
+      raise "Options :in can not be empty." if enum.blank?
+      raise "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
+
+      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 = 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 =~ /^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])
+        else
+          named_scope method_name.to_sym, :conditions => { attr.to_sym => attr_value }
+        end
+
+        class_eval do
+          define_method "#{method_name}?" do
+            self[attr] == attr_value
+          end
+
+          define_method "#{method_name}!" do
+            update_attribute(attr, attr_value) # use update_attribute method to skip validations
+          end
+        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
+
+ActiveRecord::Base.send(:include, ActsAsEnum)

data/lib/tasks/acts_as_enum_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :acts_as_enum do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :acts_as_enum do
+#   # Task goes here
+# end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_enum
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Liang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies: []
 description: For multiple values activerecord attributes. This gem have some very
   useful methods and constants for attribute.
@@ -17,14 +17,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/acts_as_enum.rb
-- lib/tasks/acts_as_enum_tasks.rake
 - MIT-LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
 - TODO
 - VERSION
 - init.rb
+- lib/acts_as_enum.rb
+- lib/tasks/acts_as_enum_tasks.rake
 homepage: http://github.com/liangwenke/acts_as_enum
 licenses:
 - MIT
@@ -35,17 +35,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
 rubyforge_project: acts_as_enum
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enum Attribute for Rails ActiveRecord