acvwilson-currency 0.6.4 → 0.7

data/currency.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{currency}
-  s.version = "0.6.4"
+  s.version = "0.7"
  
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asa Wilson", "David Palm"]

data/lib/currency/active_record.rb

@@ -145,27 +145,29 @@ module Currency::ActiveRecord
         column = opts[:column] || opts[:attr_name]
         opts[:column] = column
 
+        # TODO: rewrite with define_method (dvd, 15-03-2009)
         if column.to_s != attr_name.to_s
           alias_accessor = <<-"end_eval"
-alias :before_money_#{column}=, :#{column}=
-
-def #{column}=(__value)
-  @{attr_name} = nil # uncache
-  before_money#{column} = __value
-end
+            alias :before_money_#{column}=, :#{column}=
 
+            def #{column}=(__value)
+              @{attr_name} = nil # uncache
+              before_money#{column} = __value
+            end
 end_eval
-        end
 
+        end
+        alias_accessor ||= ''
+        
         currency = opts[:currency]
 
         currency_column = opts[:currency_column]
         if currency_column && ! currency_column.kind_of?(String)
-          currency_column = currency_column.to_s
           currency_column = "#{column}_currency"
         end
+
         if currency_column
-          read_currency = "read_attribute(:#{currency_column.to_s})"
+          read_currency = "read_attribute(:#{currency_column})"
           write_currency = "write_attribute(:#{currency_column}, #{attr_name}_money.nil? ? nil : #{attr_name}_money.currency.code.to_s)"
         end
         opts[:currency_column] = currency_column
@@ -187,6 +189,7 @@ end_eval
           read_time = "self.#{time}"
         end
         opts[:time] = time
+
         if opts[:time_update]
           write_time = "self.#{time} = #{attr_name}_money && #{attr_name}_money.time"
         end
@@ -201,63 +204,66 @@ end_eval
 
         validate_allow_nil = opts[:allow_nil] ? ', :allow_nil => true' : ''
         validate = "# Validation\n"
-        validate << "\nvalidates_numericality_of :#{attr_name}#{validate_allow_nil}\n"
+        validate << "\nvalidates_numericality_of :#{attr_name} #{validate_allow_nil}\n"
         validate << "\nvalidates_format_of :#{currency_column}, :with => /^[A-Z][A-Z][A-Z]$/#{validate_allow_nil}\n" if currency_column
-        # validate << "\nbefore_validation :debug_#{attr_name}_before_validate\n"
-        # 
-        # validate << %Q{
-        #   def debug_#{attr_name}_before_validate
-        #     logger.debug "\tValidating #{attr_name}. Allow nils? #{validate_allow_nil}"
-        #     logger.debug "\t\t'#{attr_name}': '\#\{#{attr_name}.inspect\}' (class: '\#\{#{attr_name}.class\}')"
-        #     logger.debug "\t\tcurrency column, '#{currency_column}': '\#\{#{currency_column}.inspect\}' (class: '\#\{#{currency_column}.class\}'), matches '/^[A-Z][A-Z][A-Z]$/': \#\{'#{currency_column}'.match(/^[A-Z][A-Z][A-Z]$/).to_a.inspect\}"
-        #   end
-        # }
-
-        alias_accessor ||= ''
-
-        module_eval (opts[:module_eval] = x = <<-"end_eval"), __FILE__, __LINE__
-#{validate}
-
-#{alias_accessor}
-
-def #{attr_name}
-  # $stderr.puts "  \#{self.class.name}##{attr_name}"
-  unless @#{attr_name}
-    #{attr_name}_rep = read_attribute(:#{column})
-    unless #{attr_name}_rep.nil?
-      @#{attr_name} = ::Currency::Money.new_rep(#{attr_name}_rep, #{read_currency} || #{currency}, #{read_time} || #{time})
-      #{read_preferred_currency}
-    end
-  end
-  @#{attr_name}
-end
-
-def #{attr_name}=(value)
-  if value.nil? || value.to_s.strip == ''
-    #{attr_name}_money = nil
-  elsif value.kind_of?(Integer) || value.kind_of?(String) || value.kind_of?(Float)
-    #{attr_name}_money = ::Currency::Money(value, #{currency})
-    #{write_preferred_currency}
-  elsif value.kind_of?(::Currency::Money)
-    #{attr_name}_money = value
-    #{write_preferred_currency}
-    #{write_currency ? write_currency : "#{attr_name}_money = #{attr_name}_money.convert(#{currency})"}
-  else
-    raise ::Currency::Exception::InvalidMoneyValue, value
-  end
-
-  @#{attr_name} = #{attr_name}_money # TODO: Really needed? Isn't the write_attribute enough?
+        
+        # =================================================================================================
+        # = Define the currency_column setter, so that the Money object changes when the currency changes =
+        # =================================================================================================
+        if currency_column
+          currency_column_setter = %Q{
+            def #{currency_column}=(currency_code)
+              @#{attr_name} = nil
+              write_attribute(:#{currency_column}, currency_code)
+            end
+          }
+          class_eval currency_column_setter, __FILE__, __LINE__
+        end
+        
+        class_eval (opts[:module_eval] = x = <<-"end_eval"), __FILE__, __LINE__
+          #{validate}
+
+          #{alias_accessor}
+
+          # Getter
+          def #{attr_name}
+            unless @#{attr_name}
+              rep = read_attribute(:#{column})
+              unless rep.nil?
+                @#{attr_name} = ::Currency::Money.new_rep(rep, #{read_currency} || #{currency}, #{read_time} || #{time})
+                #{read_preferred_currency}
+              end
+            end
+            @#{attr_name}
+          end
+          
+          # Setter
+          def #{attr_name}=(value)
+            if value.nil? || value.to_s.strip == ''
+              #{attr_name}_money = nil
+            elsif value.kind_of?(Integer) || value.kind_of?(String) || value.kind_of?(Float)
+              #{attr_name}_money = ::Currency::Money(value, #{read_currency})
+              #{write_preferred_currency}
+            elsif value.kind_of?(::Currency::Money)
+              #{attr_name}_money = value
+              #{write_preferred_currency}
+              #{write_currency ? write_currency : "#{attr_name}_money = #{attr_name}_money.convert(#{currency})"}
+            else
+              raise ::Currency::Exception::InvalidMoneyValue, value
+            end
+
+            @#{attr_name} = #{attr_name}_money # TODO: Really needed? Isn't the write_attribute enough? (answer: no, because the getter method does an "if @#{attr_name}" to check if it's set)
   
-  write_attribute(:#{column}, #{attr_name}_money.nil? ? nil : #{money_rep})
-  #{write_time}
+            write_attribute(:#{column}, #{attr_name}_money.nil? ? nil : #{attr_name}_money.rep)
+            #{write_time}
 
-  value
-end
-
-def #{attr_name}_before_type_cast
-  #{attr_name}.to_f if #{attr_name}
-end
+            value
+          end
 
+          def #{attr_name}_before_type_cast
+            #{attr_name}.to_f if #{attr_name}
+          end
+          
 end_eval
 =begin
           Replaced the _before_type_cast because it's buggy and weird:

data/lib/currency.rb

@@ -130,7 +130,7 @@ require 'currency/exception'
 require 'currency/money'
 require 'currency/currency'
 require 'currency/currency/factory'
-require 'currency/money'
+require 'currency/money'  # TODO: Why require this twice? (dvd, 15-03-2009)
 require 'currency/parser'
 require 'currency/formatter' # require this one before the parser and enjoy the weird bugs!
 require 'currency/exchange'

data/spec/ar_simple_spec.rb

@@ -1,23 +1,80 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # Copyright (C) 2008 Asa Wilson <acvwilson(at)gmail.com>
+# Copyright (C) 2009 David Palm <dvdplm(at)gmail.com>
 # See LICENSE.txt for details.
 
 require File.dirname(__FILE__) + '/ar_spec_helper'
 
-describe Currency::ActiveRecord do
-  it "simple" do
-    # TODO: move insert_records into a before block?
-    insert_records
+class Dog < ActiveRecord::Base
+  attr_money :price, :currency_column => true, :allow_nil => true
+end
 
-    usd = @currency_test.find(@usd.id)
-    usd.should_not be_nil
-    assert_equal_currency usd, @usd
+describe "extending ActiveRecord" do
+  describe "attr_money" do
+    before do
+      Dog.connection.execute("INSERT INTO dogs VALUES(null, 'fido', 1500, 'USD')") # NOTE: by-passing AR here to achieve clean slate (dvd, 15-03-2009)
+      @dog = Dog.first
+    end
 
-    cad = @currency_test.find(@cad.id)
-    cad.should_not == nil
-    assert_equal_money cad, @cad
+    describe "retrieving money values" do
+      it "sets up the Money object at first read" do
+        pending
+      end
+      
+      it "returns the ivar on subsequent reads" do
+        pending
+      end
+      
+      it "does not setup a Money object if the db column does not contain an integer to use for money rep" do
+        pending
+      end
+      
+      it "casts the currency to the preferred one, if a preferred currency was set" do
+        pending
+      end
+    end
+    
+    describe "currency column" do
+      before do
+        Dog.connection.execute("INSERT INTO dogs VALUES(null, 'fido', 1500, 'USD')") # NOTE: by-passing AR here to achieve clean slate (dvd, 15-03-2009)
+        @dog = Dog.first
+      end
 
-    cad.amount.currency.code.should == :USD
-  end
-end
+      it "changes the currency when the value on the currency column changes" do
+        @dog.price.currency.code.should == :USD
+        @dog.update_attributes(:price_currency => 'EUR')
+        @dog.price.currency.code.should == :EUR
+      end
+      
+      it "does NOT convert to the new currency when the currency column changes" do
+        @dog.price.rep.should == 1500
+        @dog.update_attributes(:price_currency => :EUR)
+        @dog.price.rep.should == 1500
+      end
+    end
+    
+    describe "saving" do
+      it "saves the price with the default currency when set to 10.money" do
+        @dog.price = 10.money
+        @dog.price.should == Currency::Money("10")
+      end
+      
+      it "saves the price with the currency of the Money object" do
+        @dog.price = 10.money(:EUR)
+        @dog.price.should == Currency::Money("10", "EUR")
+      end
+      
+      it "can change just the currency" do
+        @dog.price_currency = 'CAD'
+        @dog.save
+        @dog.price.should == Currency::Money("15", "CAD")
+      end
+      
+      it "can save changes using update_attributes" do
+        @dog.update_attributes(:price => 5, :price_currency => 'CAD')
+        @dog.price.should == 5.money('CAD')
+      end
+    end
 
+  end
+end

data/spec/ar_spec_helper.rb

@@ -8,6 +8,42 @@ require 'active_record'
 require 'active_record/migration'
 require File.dirname(__FILE__) + '/../lib/currency/active_record'
 
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/db/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+# ActiveRecord::Base.establish_connection(config['mysql_debug'])
+ActiveRecord::Base.establish_connection(config['sqlite3mem'])
+
+ActiveRecord::Migration.verbose = false
+load(File.dirname(__FILE__) + "/db/schema.rb")
+
+# ============================================
+# = Load some currency symbols (171 records) =
+# ============================================
+currency_codes = IO.read(File.dirname(__FILE__) + '/db/currency_codes.sql')
+currency_codes.each_line do |sql_insert|
+  ActiveRecord::Base.connection.execute(sql_insert)
+end
+
+# ================================
+# = Load some rates (84 records) =
+# ================================
+rates = IO.read(File.dirname(__FILE__) + '/db/currency_historical_rates.sql')
+rates.each_line do |sql_insert|
+  ActiveRecord::Base.connection.execute(sql_insert)
+end
+
+AR_M = ActiveRecord::Migration
+AR_B = ActiveRecord::Base
+
+
+
+=begin
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'active_record'
+require 'active_record/migration'
+require File.dirname(__FILE__) + '/../lib/currency/active_record'
+
 AR_M = ActiveRecord::Migration
 AR_B = ActiveRecord::Base
 
@@ -124,4 +160,5 @@ def assert_equal_currency(a,b)
   b.amount.currency.should == a.amount.currency
   b.amount.currency.code.should == a.amount.currency.code
 
-end
+end
+=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acvwilson-currency
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: "0.7"
 platform: ruby
 authors: 
 - Asa Wilson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 06:05:45.477389 -08:00
+date: 2009-03-15 11:25:57.897576 -07:00
 default_executable: 
 dependencies: []
 

data/spec/ar_column_spec.rb

@@ -1,56 +0,0 @@
-require File.dirname(__FILE__) + '/ar_spec_helper'
-
-##################################################
-# Basic CurrenyTest AR::B class
-#
-
-# TODO: Move elsewhere, combine with other AR tests
-
-TABLE_NAME = 'currency_column_test'
-
-class CurrencyColumnTestMigration < AR_M
-  def self.up
-    create_table TABLE_NAME.intern do |t|
-      t.column :name,     :string
-      t.column :amount,   :integer # Money
-      t.column :amount_currency,   :string, :size => 3 # Money.currency.code
-    end
-  end
-
-  def self.down
-    drop_table TABLE_NAME.intern
-  end
-end
-
-class CurrencyColumnTest < AR_B
-  set_table_name TABLE_NAME
-  attr_money :amount, :currency_column => true
-end 
-
-##################################################
-
-describe "ActiveRecord macros" do
-  before(:all) do
-    AR_B.establish_connection(database_spec)
-    @currency_test_migration ||= CurrencyColumnTestMigration 
-    @currency_test ||= CurrencyColumnTest
-    schema_down
-    schema_up
-  end
-  
-  after(:all) do
-    schema_down
-  end
-
-  it "can store and retrieve money values from a DB and automagically transfomr them to Money" do
-    insert_records
-
-    usd = @currency_test.find(@usd.id)
-    usd.should == @usd
-    usd.object_id.should_not == @usd.object_id # not same object
-
-    cad = @currency_test.find(@cad.id)
-    cad.should == @cad
-    cad.object_id.should_not == @cad.object_id # not same object
-  end
-end