super_list 1.2.0 → 1.2.1

data/Gemfile

@@ -9,7 +9,7 @@ group :development do
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
   gem "sqlite3-ruby", :require => "sqlite3"
-  gem "rails", "3.0.4"
+  gem "rails", "3.0.5"
   gem "capybara", ">= 0.4.0"
   gem "factory_girl"
 end

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
       mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
@@ -15,20 +15,20 @@ GEM
       rack-mount (~> 0.6.13)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     capybara (0.4.1.1)
       celerity (>= 0.7.9)
@@ -68,17 +68,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -107,6 +107,6 @@ DEPENDENCIES
   capybara (>= 0.4.0)
   factory_girl
   jeweler (~> 1.5.2)
-  rails (= 3.0.4)
+  rails (= 3.0.5)
   rcov
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/super_list.rb

@@ -79,7 +79,9 @@ module SuperListActiveRecord
       data = SuperList[data]
       options = data.options.merge(options)
 
-      validates_inclusion_of original_column, { :in => data.keys }.merge(options)
+      unless options[:no_validation]
+        validates_inclusion_of original_column, { :in => data.keys }.merge(options)
+      end
 
       define_method "#{column}" do |*opt|
         opt = opt[0].is_a?(Hash) ? opt[0] : {}

data/test/dummy/app/models/user.rb

@@ -2,4 +2,5 @@ class User < ActiveRecord::Base
   super_list :gender, 'Gender'
   super_list :gender1, 'Gender', :allow_blank => false, :use_i18n => true
   super_list :gender2, 'Gender', :use_i18n => true, :i18n_default => '未知'
+  super_list :gender3, 'Gender', :use_i18n => true, :i18n_default => '未知', :no_validation => true
 end

data/test/dummy/db/migrate/20110227014750_create_users.rb

@@ -4,6 +4,7 @@ class CreateUsers < ActiveRecord::Migration
       t.string :gender
       t.string :gender1
       t.string :gender2
+      t.string :gender3
 
       t.timestamps
     end

data/test/factories.rb

@@ -2,5 +2,6 @@ Factory.define :user do |t|
   t.gender 'M'
   t.gender1 'M'
   t.gender2 'M'
+  t.gender3 'M'
 end
 

data/test/super_list_test.rb

@@ -27,6 +27,11 @@ class SuperListTest < ActiveSupport::TestCase
     assert !Factory.build(:user, :gender1 => '').valid?
   end
 
+  test "no validations for gender2" do
+    assert Factory.build(:user, :gender3 => 'A').valid?
+    assert Factory.build(:user, :gender3 => 'M').valid?
+  end
+
   test "SuperList gender (don't use i18n)" do
     u = Factory(:user, :gender => 'F')
     assert_equal u.gender.to_s, 'Female'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: super_list
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Jinzhu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +08:00
+date: 2011-03-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,12 +85,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 5
+        version: 3.0.5
   requirement: *id005
   prerelease: false
   name: rails