super_list 1.2.1 → 1.3.0

data/README.rdoc

@@ -10,11 +10,15 @@
     super_list :gender2, 'Gender', :use_i18n => true
   end
 
-  User.new(:gender => 'NF').valid?            => false
-  User.new(:gender => 'M').valid?             => true
-  User.new(:gender => 'F').gender.to_s        => 'Female'
-  User.new(:gender => 'F').gender.to_s(:amos) => 'M2'
-  User.new(:gender => 'F').original_gender    => 'F'
+  User.new(:gender => 'NF').valid?              => false
+  User.new(:gender => 'M').valid?               => true
+  User.new(:gender => 'F').gender.to_s          => 'Female'
+  User.new(:gender => 'F').gender.to_s(:amos)   => 'M2'
+  User.new(:gender => 'F').original_gender      => 'F'
+
+  User.new(:gender => 'Man').valid?             => true
+  User.new(:gender => 'Man').original_gender    => 'M'
+  User.new(:gender => 'Man').gender.to_s(:amos) => 'M1'
 
   user = User.new(:gender => 'F', :gender2 => 'M')
   user.gender2.to_s                          => "translation missing: en.Gender.Man"

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.3.0

data/lib/super_list.rb

@@ -79,8 +79,20 @@ module SuperListActiveRecord
       data = SuperList[data]
       options = data.options.merge(options)
 
-      unless options[:no_validation]
-        validates_inclusion_of original_column, { :in => data.keys }.merge(options)
+      before_validation do
+        value = attributes[column.to_s]
+        keys = data.keys
+
+        if !keys.include?(value)
+          index = data.values.find_index(value)
+
+          if index
+            self.send("#{column}=", keys[index])
+          elsif !options[:no_validation]
+            self.errors.add(column, I18n.t('errors.messages.inclusion'))
+            return false
+          end
+        end
       end
 
       define_method "#{column}" do |*opt|

data/test/super_list_test.rb

@@ -17,14 +17,22 @@ class SuperListTest < ActiveSupport::TestCase
   test "only valid when included" do
     ## gender allow_blank => true
     assert Factory.build(:user).valid?
-    assert !Factory.build(:user, :gender => 'A').valid?
-    assert !Factory.build(:user, :gender => 'MF').valid?
+    assert Factory.build(:user, :gender => 'A').invalid?
+    assert Factory.build(:user, :gender => 'MF').invalid?
     assert Factory.build(:user, :gender => 'M').valid?
     assert Factory.build(:user, :gender => 'F').valid?
 
     ## gender1 allow_blank => false
     assert Factory.build(:user, :gender1 => 'M').valid?
-    assert !Factory.build(:user, :gender1 => '').valid?
+    assert Factory.build(:user, :gender1 => '').invalid?
+  end
+
+  test "set value" do
+    user = Factory.build(:user, :gender => 'Man')
+    assert user.valid?
+    assert_equal user.gender.to_s(:amos), 'M1'
+    user = Factory.build(:user, :gender => 'NoValue')
+    assert user.invalid?
   end
 
   test "no validations for gender2" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: super_list
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jinzhu