attribute_enums 0.1.4 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.1.5
+
+* fix boolean default bug
+
+== 0.1.4
+
+* fix get_x_values bug
+
 == 0.1.3
 
 * fix when migrate tables don't exist, use model.column_names bug

data/lib/attribute_enums/active_record_extension.rb

@@ -15,8 +15,11 @@ module AttributeEnums
         methods = options.delete(:methods) || true
         i18n = options.delete(:i18n) || true
         booleans = options.delete(:booleans) || false
-        default = options.delete(:default) || (booleans ? true : "")
-
+        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
+        
         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
@@ -65,9 +68,9 @@ module AttributeEnums
 
         if default
           if booleans
-            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= #{ !default.blank? }; end`)
+            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`)
           else
-            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= "#{ default.to_s }"; end`)
+            class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= "#{ default_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.4"
+  VERSION = "0.1.5"
 end
 

data/spec/models/active_record/user_spec.rb

@@ -9,12 +9,26 @@ describe User do
     it { User.female.new.gender.should == "female" }
     it { User.get_gender_values.should == [["Girl", "female"], ["Boy", "male"]] }
     it { User.gender_values.should == {"female"=>"Girl", "male"=>"Boy"} }
-
-    user = User.create(:gender => :male)
+    
+    let(:user) { User.create(:gender => :male) }
     it { user.gender_text.should == "Boy" }
     it { user.male?.should be_true }
     it { user.female?.should be_false }
+    
+    #:in default == nil
+    it { User.create.gender.should be_nil }
   end
+  
+  context "test :in and :default" do
+    before {
+      User.attribute_enums :gender, :in => [:female, :male], :default => :female
+    }
+    let(:user) { User.create() }
+    it { user.gender.should_not be_nil }
+    it { user.gender.should == "female" }
+    it { user.gender_text.should == "Girl" }
+  end
+  
 
   context "test :booleans" do
     before {
@@ -24,10 +38,23 @@ describe User do
     it { User.not_enable.new.enable.should == false }
     it { User.get_enable_values.should == [["Yes", true], ["No", false]] }
     it { User.enable_values.should == {true=>"Yes", false=>"No"} }
-
-    user = User.create(:enable => true)
-    it { user.enable_text.should == "Yes" }
+    
+    let(:user) { User.create(:enable => true) }
     it { user.enable.should be_true }
+    it { user.enable_text.should == "Yes" }
+    
+    #:booleans default == true
+    it { User.create.enable.should be_true }
+  end
+  
+  context "test :booleans and :default" 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
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribute_enums
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77692500 !ruby/object:Gem::Requirement
+  requirement: &17268800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77692500
+  version_requirements: *17268800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &77692280 !ruby/object:Gem::Requirement
+  requirement: &17268380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77692280
+  version_requirements: *17268380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77692070 !ruby/object:Gem::Requirement
+  requirement: &17267960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77692070
+  version_requirements: *17267960
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &77691860 !ruby/object:Gem::Requirement
+  requirement: &17267540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77691860
+  version_requirements: *17267540
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &77691610 !ruby/object:Gem::Requirement
+  requirement: &17267040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *77691610
+  version_requirements: *17267040
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &77691390 !ruby/object:Gem::Requirement
+  requirement: &17266620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77691390
+  version_requirements: *17266620
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &77691100 !ruby/object:Gem::Requirement
+  requirement: &17266080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *77691100
+  version_requirements: *17266080
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &77690830 !ruby/object:Gem::Requirement
+  requirement: &17265660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77690830
+  version_requirements: *17265660
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &77218320 !ruby/object:Gem::Requirement
+  requirement: &17265200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77218320
+  version_requirements: *17265200
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &77217830 !ruby/object:Gem::Requirement
+  requirement: &17264780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77217830
+  version_requirements: *17264780
 - !ruby/object:Gem::Dependency
   name: pry-padrino
-  requirement: &77217410 !ruby/object:Gem::Requirement
+  requirement: &17264360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77217410
+  version_requirements: *17264360
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77216780 !ruby/object:Gem::Requirement
+  requirement: &17263860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77216780
+  version_requirements: *17263860
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &77216250 !ruby/object:Gem::Requirement
+  requirement: &17263360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *77216250
+  version_requirements: *17263360
 description: A model attribute enums plugin for Rails3. like 'symbolize' gem.
 email:
 - vkill.net@gmail.com