acvwilson-currency 0.6.3 → 0.6.4

data/currency.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{currency}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
  
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Asa Wilson"]
+  s.authors = ["Asa Wilson", "David Palm"]
   s.date = %q{#{Date.today}}
   s.description = %q{Currency conversions for Ruby}
-  s.email = ["acvwilson@gmail.com"]
+  s.email = ["acvwilson@gmail.com", "dvdplm@gmail.com"]
   s.extra_rdoc_files = ["ChangeLog", "COPYING.txt", "LICENSE.txt", "Manifest.txt", "README.txt", "Releases.txt", "TODO.txt"]
   s.files = ["COPYING.txt", "currency.gemspec", "examples/ex1.rb", "examples/xe1.rb", "lib/currency/active_record.rb", "lib/currency/config.rb", "lib/currency/core_extensions.rb", "lib/currency/currency/factory.rb", "lib/currency/currency.rb", "lib/currency/exception.rb", "lib/currency/exchange/rate/deriver.rb", "lib/currency/exchange/rate/source/base.rb", "lib/currency/exchange/rate/source/failover.rb", "lib/currency/exchange/rate/source/federal_reserve.rb", "lib/currency/exchange/rate/source/historical/rate.rb", "lib/currency/exchange/rate/source/historical/rate_loader.rb", "lib/currency/exchange/rate/source/historical/writer.rb", "lib/currency/exchange/rate/source/historical.rb", "lib/currency/exchange/rate/source/new_york_fed.rb", "lib/currency/exchange/rate/source/provider.rb", "lib/currency/exchange/rate/source/test.rb", "lib/currency/exchange/rate/source/the_financials.rb", "lib/currency/exchange/rate/source/timed_cache.rb", "lib/currency/exchange/rate/source/xe.rb", "lib/currency/exchange/rate/source.rb", "lib/currency/exchange/rate.rb", "lib/currency/exchange/time_quantitizer.rb", "lib/currency/exchange.rb", "lib/currency/formatter.rb", "lib/currency/macro.rb", "lib/currency/money.rb", "lib/currency/money_helper.rb", "lib/currency/parser.rb", "lib/currency.rb", "LICENSE.txt", "Manifest.txt", "README.txt", "Releases.txt", "spec/ar_spec_helper.rb", "spec/ar_column_spec.rb", "spec/ar_simple_spec.rb", "spec/config_spec.rb", "spec/federal_reserve_spec.rb", "spec/formatter_spec.rb", "spec/historical_writer_spec.rb", "spec/macro_spec.rb", "spec/money_spec.rb", "spec/new_york_fed_spec.rb", "spec/parser_spec.rb", "spec/spec_helper.rb", "spec/time_quantitizer_spec.rb", "spec/timed_cache_spec.rb", "spec/xe_spec.rb", "TODO.txt"]
   s.has_rdoc = true

data/lib/currency/active_record.rb

@@ -203,6 +203,15 @@ end_eval
         validate = "# Validation\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 ||= ''
 
@@ -246,13 +255,38 @@ def #{attr_name}=(value)
 end
 
 def #{attr_name}_before_type_cast
-  # FIXME: User cannot specify Currency
-  x = #{attr_name}
-  x &&= x.format(:symbol => false, :currency => false, :thousands => false)
-  x
+  #{attr_name}.to_f if #{attr_name}
 end
 
 end_eval
+=begin
+          Replaced the _before_type_cast because it's buggy and weird:
+
+          Bug:    if the Currency::Formatter.default is set to include the currency code (:code => true) then the
+                  call below to format() will leave the code in. When the validates_numericality_of kicks in it 
+                  can't cast to Float (yes, validates_numericality_of basically does just that) because of the "USD"
+                  of the currency code and everything fails. All the time.
+    
+          Weird:  assigning to "x" doesn't really make any sense, just useless overhead. Using the rare &&= is not a big 
+                  win over something like:
+                    x && x.format(..., ...)
+                  and actually longer too.
+                  The intention of the _before_type_cast method is to return a raw, unformatted value.
+                  When it does work, it returns a string on the form "123.456". Why not cast to Float right away?
+                  Arguably, the "raw" currency value is the integer rep stored in the db, but that wouldn't work
+                  very well with any known rails validations. I think casting to Float is reasonable.
+                  The taste Kurt Stephens has for weird Ruby code never ceases to amaze me. 
+      
+                  :)
+                  (dvd, 05-02-2009)
+          def #{attr_name}_before_type_cast
+            # FIXME: User cannot specify Currency
+            x = #{attr_name}
+            x &&= x.format(:symbol => false, :currency => false, :thousands => false)
+            x
+          end
+=end
+
         # $stderr.puts "   CODE = #{x}"
       end
     end

data/lib/currency/exchange/rate/source/historical/rate.rb

@@ -175,6 +175,7 @@ class Currency::Exchange::Rate::Source::Historical::Rate < ::ActiveRecord::Base
 
    # Shorthand.
    def find_matching_this(opt1 = :all, *opts)
+     # FIXME: this breaks somehow in Ruby 1.9 Not sure why. (dvd, 04-02-2009)
      self.class.find(opt1, :conditions => find_matching_this_conditions, *opts)
    end
 

metadata

@@ -1,21 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: acvwilson-currency
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Asa Wilson
+- David Palm
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-23 04:22:08.879031 -08:00
+date: 2009-02-05 06:05:45.477389 -08:00
 default_executable: 
 dependencies: []
 
 description: Currency conversions for Ruby
 email: 
 - acvwilson@gmail.com
+- dvdplm@gmail.com
 executables: []
 
 extensions: []