symbolize 3.1.3 → 3.2.0

data/VERSION

@@ -1 +1 @@
-3.1.3
+3.2.0

data/lib/symbolize.rb

@@ -60,6 +60,7 @@ module Symbolize
       default_option = configuration.delete :default
 
       unless enum.nil?
+        # enum = enum.map { |e| e.respond_to?(:to_sym) ? e.to_sym : e}
         # Little monkeypatching, <1.8 Hashes aren't ordered.
         hsh = RUBY_VERSION > '1.9' || !defined?("ActiveSupport") ? Hash : ActiveSupport::OrderedHash
 
@@ -70,7 +71,10 @@ module Symbolize
             values = enum
           else
             values = hsh.new
-            enum.map { |v| [v, (capitalize ? v.to_s.capitalize : v.to_s)] }.each { |k, v| values[k] = v }
+            enum.map do |val|
+              key = val.respond_to?(:to_sym) ? val.to_sym : val
+              values[key] = capitalize ? val.to_s.capitalize : val.to_s
+            end
           end
 
           # Get the values of :in
@@ -119,7 +123,7 @@ module Symbolize
 
         if default_option
           class_eval("def #{attr_name}; read_and_symbolize_attribute('#{attr_name}') || :#{default_option}; end")
-          class_eval("def #{attr_name}= (value); write_symbolized_attribute('#{attr_name}', (value && !value.empty? ? value : #{default_option})); end")
+          class_eval("def #{attr_name}= (value); write_symbolized_attribute('#{attr_name}', value); end")
           class_eval("def set_default_for_attr_#{attr_name}; self[:#{attr_name}] ||= :#{default_option}; end")
           class_eval("before_save :set_default_for_attr_#{attr_name}")
         else
@@ -161,7 +165,14 @@ module Symbolize
   def write_symbolized_attribute attr_name, value
     val = { "true" => true, "false" => false }[value]
     val = symbolize_attribute(value) if val.nil?
-    self[attr_name] = val
+
+    current_value = self.send(attr_name)
+    if current_value == val
+      current_value
+    else
+      self[attr_name] = val
+      val
+    end
   end
 end
 

data/spec/symbolize_spec.rb

@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
     :win   => 'Videogame'
   }, :scopes => true
   symbolize :gui, :allow_blank => true, :in => [:cocoa, :qt, :gtk], :i18n => false
-  symbolize :karma, :in => [:good, :bad, :ugly], :methods => true, :i18n => false, :allow_nil => true
+  symbolize :karma, :in => %w{ good bad ugly}, :methods => true, :i18n => false, :allow_nil => true
   symbolize :cool, :in => [true, false], :scopes => true
 
   has_many :extras, :dependent => :destroy, :class_name => "UserExtra"
@@ -44,7 +44,7 @@ end
 
 # Test records
 User.create(:name => 'Anna', :other => :fo, :status => :active  , :so => :linux, :gui => :qt, :language => :pt, :sex => true, :cool => true)
-User.create(:name => 'Bob' , :other => :bar,:status => :inactive, :so => :mac, :gui => :gtk, :language => :en, :sex => false, :cool => false)
+User.create!(:name => 'Bob' , :other => :bar,:status => :inactive, :so => :mac, :gui => :gtk, :language => :en, :sex => false, :cool => false)
 
 
 describe "Symbolize" do
@@ -68,7 +68,7 @@ describe "Symbolize" do
     it "test_symbolize_symbol" do
       @user.status = :active
       @user.status.should eql(:active)
-      @user.status_before_type_cast.should eql(:active)
+      @user.status_before_type_cast.should eql('active')
       # @user.read_attribute(:status).should eql('active')
     end
 
@@ -317,7 +317,7 @@ describe "Symbolize" do
     #
     #  ActiveRecord <= 2
     #
-    if ActiveRecord::VERSION::MAJOR < 3
+    if ActiveRecord::VERSION::MAJOR <= 2
 
       it "test_symbolized_finder" do
         User.find(:all, :conditions => { :status => :inactive }).map(&:name).should eql(['Bob'])
@@ -330,6 +330,30 @@ describe "Symbolize" do
         end
       end
 
+      describe "dirty tracking / changed flag" do
+        before do
+          @anna = User.find_by_name!('Anna')
+        end
+
+        it "is dirty if you change the attribute value" do
+          @anna.language.should == :pt
+          @anna.language_changed?.should be_false
+
+          return_value = @anna.language = :en
+          return_value.should == :en
+          @anna.language_changed?.should be_true
+        end
+
+        it "is not dirty if you set the attribute value to the same value it was originally" do
+          @anna.language.should == :pt
+          @anna.language_changed?.should be_false
+
+          return_value = @anna.language = :pt
+          return_value.should == :pt
+          @anna.language_changed?.should be_false
+        end
+      end
+
       #
       #  ActiveRecord >= 3
       #
@@ -346,6 +370,30 @@ describe "Symbolize" do
         end
       end
 
+      describe "dirty tracking / changed flag" do
+        before do
+          @anna = User.find_by_name!('Anna')
+        end
+
+        it "is dirty if you change the attribute value" do
+          @anna.language.should == :pt
+          @anna.language_changed?.should be_false
+
+          return_value = @anna.language = :en
+          return_value.should == :en
+          @anna.language_changed?.should be_true
+        end
+
+        it "is not dirty if you set the attribute value to the same value it was originally" do
+          @anna.language.should == :pt
+          @anna.language_changed?.should be_false
+
+          return_value = @anna.language = :pt
+          return_value.should == :pt
+          @anna.language_changed?.should be_false
+        end
+      end
+
       describe "Named Scopes" do
 
         before do

data/symbolize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{symbolize}
-  s.version = "3.1.3"
+  s.version = "3.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-05-26}
   s.description = %q{ActiveRecord enums with i18n}
   s.email = %q{x@nofxx.com}
   s.extra_rdoc_files = [
@@ -37,11 +37,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{ActiveRecord enums with i18n}
-  s.test_files = [
-    "spec/db/create_testing_structure.rb",
-    "spec/spec_helper.rb",
-    "spec/symbolize_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 1
-  - 3
-  version: 3.1.3
+  - 2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -03:00
+date: 2011-05-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ActiveRecord enums with i18n
-test_files: 
-- spec/db/create_testing_structure.rb
-- spec/spec_helper.rb
-- spec/symbolize_spec.rb
+test_files: []
+