haz_enum 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/haz_enum.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{haz_enum}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["thyphoon"]

data/lib/haz_enum/enum.rb

@@ -18,7 +18,11 @@ module HazEnum
       end
       
       define_method "#{enum_name}=" do |enum_to_set|
-        self["#{enum_column}"] = enum_to_set.name
+        if enum_to_set.respond_to?(:name)
+          self["#{enum_column}"] = enum_to_set.name
+        else
+          self["#{enum_column}"] = enum_class.const_get(enum_to_set).name
+        end
       end
       
       define_method "#{enum_name}_changed?" do
@@ -30,7 +34,12 @@ module HazEnum
         begin
           enum_class.const_get(self["#{enum_column}"])
         rescue NameError => e
-          self.errors.add("#{enum_name}".to_sym, I18n.t("activerecord.errors.messages.enum_value_invalid", :value => self["#{enum_column}"], :name => enum_name))
+          
+          message = I18n.translate("activerecord.errors.models.#{self.class.name.underscore}.attributes.#{enum_name}.enum_value_invalid", :value => self["#{enum_column}"], :name => enum_name) ||
+                    I18n.translate("activerecord.errors.models.#{self.class.name.underscore}.enum_value_invalid", :value => self["#{enum_column}"], :name => enum_name) ||
+                    I18n.translate(:'activerecord.errors.messages.enum_value_invalid', :value => self["#{enum_column}"], :name => enum_name)
+          
+          self.errors.add(enum_name.to_sym, message)
         end
       end
     end

data/spec/enum_spec.rb

@@ -7,29 +7,33 @@ describe "HazEnum" do
     before(:all) do
       setup_db
     end
-  
+    
     it "should have class method has_enum" do
       ClassWithEnum.should respond_to(:has_enum)
     end
-  
+    
     it "should be able to set enum-attribute via hash in initializer" do
       ClassWithEnum.new(:product => Products::Silver).product.should be(Products::Silver)
       ClassWithCustomNameEnum.new(:product => Products::Silver).product.should be(Products::Silver)
     end
-  
+    
+    it "should be able to set enum-value as string in initializer" do
+      ClassWithEnum.new(:product => "Silver").product.should be(Products::Silver)
+    end
+    
     it "should not be able to set enum-attribute by colum-name via hash in initializer" do
       ClassWithCustomNameEnum.new(:custom_name => Products::Silver).product.should_not be(Products::Silver)
       ClassWithCustomNameEnum.new(:custom_name => Products::Silver.name).product.should_not be(Products::Silver)
     end
-  
+    
     it "should have a enum_value attribute" do
       ClassWithCustomNameEnum.new(:product => Products::Gold).custom_name.should be(Products::Gold.name)
     end
-  
+    
     it "colum_name should be configurable" do
-      ClassWithCustomNameEnum.new(:product => Products::Gold).custom_name.should be(Products::Gold.name)
+      ClassWithCustomNameEnum.new(:product => Products::Gold).product.should be(Products::Gold)
     end
-  
+    
     it "should know if enum-attribute has changed" do
       product_enum = ClassWithEnum.new(:product => Products::Silver)
       product_enum.product_changed?.should be(true)
@@ -38,14 +42,14 @@ describe "HazEnum" do
       product_enum.product = Products::Gold
       product_enum.product_changed?.should be(true)
     end
-  
+    
     it "should know if enum-attribute has not really changed" do
       product_enum = ClassWithEnum.new(:product => Products::Silver)
       product_enum.save
       product_enum.product = Products::Silver
       product_enum.product_changed?.should be(false)
     end
-  
+    
     it "should validate enum-value" do
       enum_mixin = ClassWithEnum.new
       platin = "Platin"
@@ -54,7 +58,7 @@ describe "HazEnum" do
       enum_mixin.valid?.should_not be(true)
       enum_mixin.errors[:product].size.should > 0
     end
-  
+    
     after(:all) do
       teardown_db
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - thyphoon