attribute_enums 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.1.6
+
+* fix boolean validate inclusion bug
+
 == 0.1.5
 
 * fix boolean default bug

data/README.markdown

@@ -92,14 +92,14 @@ default `true`
     User.enable       => User.where(:enable => true)
     User.not_enable   => User.where(:enable => false)
 
-###allow_blank
-
-default `false`
-
 ###validate
 
 default `true`
 
+###allow_blank
+
+default `false`, is valid with validate == true
+
 ###methods and use example
 
 default `true`
@@ -120,6 +120,8 @@ default `true`
 
 if your defined `default`, it set attribute `default` value before validate.
 
+Note: if your migration defined field default, this is invalidation.
+
 
 ##Run test for development
 

data/lib/attribute_enums/active_record_extension.rb

@@ -15,15 +15,18 @@ module AttributeEnums
         methods = options.delete(:methods) || true
         i18n = options.delete(:i18n) || true
         booleans = options.delete(:booleans) || false
-        default_value = options.delete(:default)
-        default_value = true if default_value.nil? and booleans
-        raise "if booleans, default must be in true/false" if booleans and ![true, false].index(default_value)
-        default = default_value.nil? ? false : true
+        
+        default_field_value = options.delete(:default)
+        default_field_value = true if default_field_value.nil? and booleans
+        raise "if booleans, default must be in true/false" if booleans and ![true, false].index(default_field_value)
+        
+        default = (default_field_value.nil? ? false : true)
         
         return if !self.table_exists? or !self.respond_to?(:column_names)
         raise "attribute #{ attribute_name } does not exist." unless column_names.index(attribute_name)
-        raise "in/within and booleans has one and only one exist." if (!within.blank? and !booleans.blank?) or
-                                                               (within.blank? and booleans.blank?)
+        raise "in/within and booleans has one and only one exist." if (!within.blank? and !booleans.blank?) or (within.blank? and booleans.blank?)
+        
+        
         if booleans
           within = [true, false]
         else
@@ -45,13 +48,18 @@ module AttributeEnums
           end
         end
 
-        unless allow_blank
-          validates attribute_name, :presence => true
-        end
-
+        
         if use_validate
-          validates attribute_name, :inclusion => { :in => booleans ? [true, false] : (within + within.collect{|x| x.to_sym}) },
+          if allow_blank
+            validates attribute_name, :presence => true
+          else
+            if booleans
+              validates attribute_name, :inclusion => { :in => [true, false] }
+            else
+              validates attribute_name, :inclusion => { :in => within + within.collect{|x| x.to_sym} },
                                     :if => eval(%Q`Proc.new { |record| record.#{ attribute_name }? }`)
+            end
+          end
         end
 
         if methods
@@ -68,9 +76,9 @@ module AttributeEnums
 
         if default
           if booleans
-            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; v = read_attribute("#{ attribute_name }");  self.#{ attribute_name } = (v.nil? ? #{ !default_value.blank? } : v) ; end`)
+            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } = #{ default_field_value } if read_attribute("#{ attribute_name }").nil? ; end`)
           else
-            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= "#{ default_value.to_s }"; end`)
+            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= "#{ default_field_value.to_s }"; end`)
           end
           eval(%Q`before_validation :set_default_for_attr_#{ attribute_name }`)
         end

data/lib/attribute_enums/version.rb

@@ -1,4 +1,4 @@
 module AttributeEnums
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end
 

data/spec/models/active_record/user_spec.rb

@@ -26,7 +26,6 @@ describe User do
     let(:user) { User.create() }
     it { user.gender.should_not be_nil }
     it { user.gender.should == "female" }
-    it { user.gender_text.should == "Girl" }
   end
   
 
@@ -47,14 +46,22 @@ describe User do
     it { User.create.enable.should be_true }
   end
   
-  context "test :booleans and :default" do
+  context "test :booleans and :default => false" do
     before {
       User.attribute_enums :enable, :booleans => true, :default => false
     }    
     let(:user) { User.create() }
     it { user.enable.should be_false }
     it { user.enable.should_not be_nil }
-    it { user.enable_text.should == "No" }
+  end
+  
+  context "test :booleans and :default => true" do
+    before {
+      User.attribute_enums :enable, :booleans => true, :default => true
+    }    
+    let(:user) { User.create() }
+    it { user.enable.should be_true }
+    it { user.enable.should_not be_nil }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute_enums
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17268800 !ruby/object:Gem::Requirement
+  requirement: &13934340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17268800
+  version_requirements: *13934340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17268380 !ruby/object:Gem::Requirement
+  requirement: &13933920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17268380
+  version_requirements: *13933920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17267960 !ruby/object:Gem::Requirement
+  requirement: &13933500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17267960
+  version_requirements: *13933500
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &17267540 !ruby/object:Gem::Requirement
+  requirement: &13933080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17267540
+  version_requirements: *13933080
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17267040 !ruby/object:Gem::Requirement
+  requirement: &13932580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *17267040
+  version_requirements: *13932580
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &17266620 !ruby/object:Gem::Requirement
+  requirement: &13932160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17266620
+  version_requirements: *13932160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &17266080 !ruby/object:Gem::Requirement
+  requirement: &13931620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *17266080
+  version_requirements: *13931620
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &17265660 !ruby/object:Gem::Requirement
+  requirement: &13931200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17265660
+  version_requirements: *13931200
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &17265200 !ruby/object:Gem::Requirement
+  requirement: &13930740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17265200
+  version_requirements: *13930740
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &17264780 !ruby/object:Gem::Requirement
+  requirement: &13930320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17264780
+  version_requirements: *13930320
 - !ruby/object:Gem::Dependency
   name: pry-padrino
-  requirement: &17264360 !ruby/object:Gem::Requirement
+  requirement: &13929900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17264360
+  version_requirements: *13929900
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &17263860 !ruby/object:Gem::Requirement
+  requirement: &13929400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17263860
+  version_requirements: *13929400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17263360 !ruby/object:Gem::Requirement
+  requirement: &13928900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17263360
+  version_requirements: *13928900
 description: A model attribute enums plugin for Rails3. like 'symbolize' gem.
 email:
 - vkill.net@gmail.com