simple_enum 1.6.4 → 1.6.5

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  metadata.gz: 891cf333ea0c52d94a7a8d40a2a861f3197ffa23c1f74cc0b127ef136e6df86f1f66d7db8fa94ce88669954a5eb6c551957a2c1c69c17aadf2b608f728104120
+  data.tar.gz: 6ac9b3af113c20669f840f748303a36182e25f94bd41565b13dda5fe3d70aeecd86b215393ad0ca36c6500963ed95e08e32a80453907501f33b4166549db6a66
+SHA1: 
+  metadata.gz: bd0a0e232a1fc335dff5f5f94c6ec8bf91c9d993
+  data.tar.gz: c6b7b1bdeb9bfee01cef4fc85f34172465528178

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_enum (1.6.4)
+    simple_enum (1.6.5)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/simple_enum/validation.rb

@@ -1,38 +1,56 @@
-module SimpleEnum
-  module Validation
-    # Validates an +as_enum+ field based on the value of it's column.
-    #
-    # Model:
-    #    class User < ActiveRecord::Base
-    #      as_enum :gender, [ :male, :female ]
-    #      validates_as_enum :gender
-    #    end
-    #
-    # View:
-    #    <%= select(:user, :gender, User.genders.keys) %>
-    #
-    # Configuration options:
-    # * <tt>:message</tt> - A custom error message (default: is <tt>[:activerecord, :errors, :messages, :invalid_enum]</tt>).
-    # * <tt>:on</tt> - Specifies when this validation is active (default is always, other options <tt>:create</tt>, <tt>:update</tt>).
-    # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
-    #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
-    #   method, proc or string should return or evaluate to a true or false value.
-    # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
-    #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
-    #   method, proc or string should return or evaluate to a true or false value.
-    def validates_as_enum(*attr_names)
-      configuration = attr_names.extract_options!
+module ActiveModel
+  module Validations
+    class AsEnumValidator < ActiveModel::Validator
+      attr_reader :attributes
 
-      attr_names.map! { |e| enum_definitions[e][:column] } # map to column name
+      def initialize(options)
+        @attributes = Array.wrap(options.delete(:attributes))
+        raise ":attributes cannot be blank" if @attributes.empty?
+        super
+      end
+
+      def setup(klass)
+        @klass = klass
+      end
+
+      def validate(record)
+        attributes.each do |attribute|
+          enum_def = @klass.enum_definitions[attribute]
+          raw_value = record.send(enum_def[:column])
 
-      validates_each(attr_names, configuration) do |record, attr_name, value|
-        enum_def = enum_definitions[attr_name]
-        unless send(enum_def[:name].to_s.pluralize).values.include?(value)
-          params = { :value => value}
-          params[:message] = configuration[:message] if configuration[:message].present?
-          record.errors.add(enum_def[:name], :invalid_enum, params)
+          next if (raw_value.nil? && options[:allow_nil]) || (raw_value.blank? && options[:allow_blank])
+
+          unless @klass.send(enum_def[:name].to_s.pluralize).values.include?(raw_value)
+            record.errors.add(attribute, :invalid_enum, options)
+          end
         end
       end
     end
+
+    module HelperMethods
+      # Validates an +as_enum+ field based on the value of it's column.
+      #
+      # Model:
+      #    class User < ActiveRecord::Base
+      #      as_enum :gender, [ :male, :female ]
+      #      validates_as_enum :gender
+      #    end
+      #
+      # View:
+      #    <%= select(:user, :gender, User.genders.keys) %>
+      #
+      # Configuration options:
+      # * <tt>:message</tt> - A custom error message (default: is <tt>[:activerecord, :errors, :messages, :invalid_enum]</tt>).
+      # * <tt>:on</tt> - Specifies when this validation is active (default is always, other options <tt>:create</tt>, <tt>:update</tt>).
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a true or false value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>). The
+      #   method, proc or string should return or evaluate to a true or false value.
+      def validates_as_enum(*attr_names)
+        validates_with AsEnumValidator, _merge_attributes(attr_names)
+      end
+    end
   end
 end

data/lib/simple_enum/version.rb

@@ -1,5 +1,5 @@
 module SimpleEnum
 
   # +SimpleEnum+ version string.
-  VERSION = "1.6.4"
+  VERSION = "1.6.5"
 end

data/lib/simple_enum.rb

@@ -176,7 +176,7 @@ module SimpleEnum
 
       # generate getter
       define_method("#{enum_cd}") do
-        id = respond_to?(:read_attribute) ? read_attribute(options[:column]) : send(options[:column])
+        id = send(options[:column])
         values_inverted[id]
       end
 
@@ -185,7 +185,7 @@ module SimpleEnum
         real = new_value.blank? ? nil : values[EnumHash.symbolize(new_value)]
         real = new_value if real.nil? && values_inverted[new_value].present?
         raise(ArgumentError, "Invalid enumeration value: #{new_value}") if (options[:whiny] and real.nil? and !new_value.blank?)
-        respond_to?(:write_attribute) ? write_attribute(options[:column], real) : send("#{options[:column]}=", real)
+        send("#{options[:column]}=", real)
       end
 
       # generate checker
@@ -244,11 +244,11 @@ module SimpleEnum
           sym = EnumHash.symbolize(k)
 
           define_method("#{prefix}#{sym}?") do
-            current = respond_to?(:read_attribute) ? read_attribute(options[:column]) : send(options[:column])
+            current = send(options[:column])
             code == current
           end
           define_method("#{prefix}#{sym}!") do
-            respond_to?(:write_attribute) ? write_attribute(options[:column], code) : send("#{options[:column]}=", code)
+            send("#{options[:column]}=", code)
             sym
           end
 
@@ -260,8 +260,6 @@ module SimpleEnum
       end
     end
 
-    include Validation
-
     def human_enum_name(enum, key, options = {})
       defaults = lookup_ancestors.map do |klass|
         :"#{self.i18n_scope}.enums.#{klass.model_name.i18n_key}.#{enum}.#{key}"

data/test/simple_enum_test.rb

@@ -202,6 +202,25 @@ class SimpleEnumTest < MiniTest::Unit::TestCase
     assert_equal "invalid manufacturer", computer.errors[:manufacturer].first
   end
 
+  def test_validator
+    validator_comp = extend_computer do
+      validates :manufacturer, :operating_system, :as_enum => true
+    end
+
+    computer = validator_comp.new
+    assert !computer.save, "save should return false"
+    assert_equal(1, computer.errors[:manufacturer].size)
+    assert_equal(1, computer.errors[:operating_system].size)
+
+    computer.manufacturer_cd = 84321483219
+    assert !computer.save, "save should return false"
+    assert_equal(1, computer.errors[:manufacturer].size)
+
+    computer.manufacturer_cd = 0
+    computer.operating_system_cd = 0
+    assert_equal(true, computer.save)
+  end
+
   def test_that_argumenterror_is_raised_if_invalid_symbol_is_passed
     assert_raises ArgumentError do
       Dummy.new :gender => :foo

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_enum
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 4
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors: 
 - Lukas Westermann
@@ -15,87 +9,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-21 00:00:00 Z
+date: 2013-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
-  prerelease: false
-  type: :runtime
   name: activesupport
-  version_requirements: *id001
+  type: :runtime
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
         version: 0.9.2
-  prerelease: false
-  type: :development
   name: rake
-  version_requirements: *id002
+  type: :development
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
-  prerelease: false
-  type: :development
   name: minitest
-  version_requirements: *id003
+  type: :development
+  requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
-  prerelease: false
-  type: :development
   name: activerecord
-  version_requirements: *id004
+  type: :development
+  requirement: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
-  prerelease: false
-  type: :development
   name: mongoid
-  version_requirements: *id005
+  type: :development
+  requirement: *id005
+  prerelease: false
 description: Provides enum-like fields for ActiveRecord, ActiveModel and Mongoid models.
 email: 
 - lukas.westermann@gmail.com
@@ -139,39 +104,29 @@ files:
 homepage: http://lwe.github.com/simple_enum/
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple enum-like field support for models.
 test_files: 
 - test/array_conversions_test.rb