simple_enum 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e5699f6a6006961ea0474ccaf7c711e71308c14
-  data.tar.gz: 2773209fbca30a18661973ff3bd69a83fdc75a63
+  metadata.gz: f6a68b2d21b025bcb22c251918ff51b412be8ab6
+  data.tar.gz: bbe02918d4165d9bca1917c7dc38981bc0127136
 SHA512:
-  metadata.gz: 42ffff4b1ded83914ac64f886d3bf3cca7fd7feea2e2ba7e395067baefb3ad981e930efe3a135c8e9b785499dc1e672493ccc939944ef3a6cf1ec2a4a679e2b6
-  data.tar.gz: 6b064e2a9af7137cf9c9fc1d46d12139d6ffd4b3919c8f85378781a1771c869bd7c33d99f1a5a1f380c7e2ad6fe8ebe2fc5649f4b8d3e82695c5b32ade4f2825
+  metadata.gz: 4ce5b6271ff2a6b391819e544901d2ddfcfd64ff5c6c253b5f28cdafa94e169f9d2baa6ea7bfd0e35e03e270a63c36d8c4fa6c4f878f8926861d67f63fea0a4d
+  data.tar.gz: 91ad1ead6ee168f5fdcd08f82f004a232dcd1d48a8406a08f3b7597f000d8c96f0d2b7f10099f1ef0a00d4a099d32c19516fa81310aa532a43db8cd62d938e62

data/README.rdoc

@@ -82,6 +82,13 @@ useful when creating queries, displaying option elements or similar:
   *Disclaimer*: if you _ever_ decide to reorder this array, beaware that any previous mapping is lost. So it's recommended
   to create mappings (that might change) using hashes instead of arrays. For stuff like gender it might be probably perfectly
   fine to use arrays though.
+* You can use string values instead of integer values if your database column has the type +string+ or +text+:
+
+       class User < ActiveRecord::Base
+         as_eum :status, [:deleted, :active, :dsiabled], :strings => true
+       end
+
+       User.create!(status: :active) #=> #<User id: 1, status_cd: "active">
 * Want to use `SimpleEnum` in an ActiveModel, or other class, just do:
 
         class MyModel

data/lib/simple_enum.rb

@@ -182,6 +182,7 @@ module SimpleEnum
 
       # generate setter
       define_method("#{enum_cd}=") do |new_value|
+        new_value = new_value.to_s if options[:strings] && new_value
         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?)

data/lib/simple_enum/validation.rb

@@ -18,6 +18,8 @@ module ActiveModel
           enum_def = @klass.enum_definitions[attribute]
           raw_value = record.send(enum_def[:column])
 
+          raw_value = raw_value.to_s if enum_def[:options][:strings] && raw_value
+
           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)

data/lib/simple_enum/version.rb

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

data/test/orm/active_record.rb

@@ -30,6 +30,8 @@ def reload_db(options = {})
     t.column :word_cd, :string, :limit => 5
     t.column :role_cd, :string
     t.column :other, :integer
+    t.column :numeric_cd, :string
+    t.column :nilish_cd, :string
   end
 
   # Create ref-data table and fill with records
@@ -65,6 +67,16 @@ def extend_computer(current_i18n_name = "Computer", &block)
   end
 end
 
+def extend_dummy(current_i18n_name = "Dummy", &block)
+  Class.new(Dummy) do
+    ar32? ? self.table_name = 'dummies' : set_table_name('dummies')
+    instance_eval &block
+    instance_eval <<-RUBY
+      def self.model_name; MockName.mock!(#{current_i18n_name.inspect}) end
+    RUBY
+  end
+end
+
 def named_dummy(class_name, &block)
   begin
     return class_name.constantize
@@ -83,6 +95,8 @@ class Dummy < ActiveRecord::Base
   as_enum :word, { :alpha => 'alpha', :beta => 'beta', :gamma => 'gamma'}
   as_enum :didum, [ :foo, :bar, :foobar ], :column => 'other'
   as_enum :role, [:admin, :member, :anon], :strings => true
+  as_enum :numeric, [:"100", :"3.14"], :strings => true
+  as_enum :nilish, [:nil], :strings => true
 end
 
 class Gender < ActiveRecord::Base

data/test/orm/mongoid.rb

@@ -46,6 +46,16 @@ def extend_computer(current_i18n_name = "Computer", &block)
   end
 end
 
+def extend_dummy(current_i18n_name = "Dummy", &block)
+  Class.new(Dummy) do
+    self.collection_name = 'dummies'
+    instance_eval &block
+    instance_eval <<-RUBY
+      def self.model_name; MockName.mock!(#{current_i18n_name.inspect}) end
+    RUBY
+  end
+end
+
 def named_dummy(class_name, &block)
   begin
     return class_name.constantize
@@ -72,6 +82,8 @@ class Dummy
   as_enum :word, { :alpha => 'alpha', :beta => 'beta', :gamma => 'gamma'}
   as_enum :didum, [ :foo, :bar, :foobar ], :column => 'other'
   as_enum :role, [:admin, :member, :anon], :strings => true
+  as_enum :numeric, [:"100", :"3.14"], :strings => true
+  as_enum :nilish, [:nil], :strings => true
 
   before_save :check_typed
 

data/test/simple_enum_test.rb

@@ -44,6 +44,23 @@ class SimpleEnumTest < MiniTest::Unit::TestCase
     assert_equal(1, d.gender_cd)
   end
 
+  def test_setting_value_when_it_is_not_a_string_and_strings_is_true
+    d = Dummy.new    
+    d.numeric = 100
+    assert_equal(:"100", d.numeric)
+    assert_equal("100", d.numeric_cd)
+    d.numeric = 3.14
+    assert_equal(:"3.14", d.numeric)
+    assert_equal("3.14", d.numeric_cd)
+  end
+
+  def test_setting_value_to_nil_when_enum_has_nil_as_symbol_and_strings_is_true
+    d = Dummy.new
+    d.nilish = nil
+    assert_equal(nil, d.nilish)
+    assert_equal(nil, d.nilish_cd)
+  end
+
   def test_setting_value_as_key_in_constructor
     d = Dummy.new :gender => 1
     assert_equal(:female, d.gender)
@@ -221,6 +238,15 @@ class SimpleEnumTest < MiniTest::Unit::TestCase
     assert_equal(true, computer.save)
   end
 
+  def test_validator_allows_symbols_as_raw_colum_value_if_strings_is_true
+    validated_dummy = extend_dummy do
+      validates_as_enum :role
+    end
+
+    d = validated_dummy.new :role_cd  => :admin
+    assert d.valid?, "valid? should return true"
+  end
+
   def test_that_argumenterror_is_raised_if_invalid_symbol_is_passed
     assert_raises ArgumentError do
       Dummy.new :gender => :foo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_enum
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Lukas Westermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport