counterfeit 0.0.1 → 0.0.2

data/.gitignore

@@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
+spec/debug.log
+*.sqlite3

data/lib/counterfeit/active_record.rb

@@ -8,20 +8,31 @@ module Counterfeit
         options = options.with_indifferent_access
         
         default_currency = options.delete(:currency).try(:to_s).try(:upcase)
+        
         amount_attr = options.delete(:amount_attribute) || "#{attr}_in_cents"
         currency_attr = options.delete(:currency_attribute) || "#{attr}_currency"
         
         mapping = [[ amount_attr, 'cents' ], [ currency_attr, 'currency_as_string' ]]
         
         after_initialize do
-          self[currency_attr] = default_currency || Money.default_currency.iso_code
+          self[currency_attr] ||= default_currency || Money.default_currency.iso_code
+        end
+        
+        constructor = lambda { |cents, currency| Money.new(cents || 0, currency) }
+        
+        converter = lambda do |value|
+          if value.respond_to?(:to_money)
+            value.to_money(default_currency)
+          else
+            raise ArgumentError, "Can't convert #{value.class} to Money"
+          end
         end
         
         composed_of attr.to_sym,
           :class_name => 'Money',
           :mapping => mapping,
-          :constructor => Proc.new { |cents, currency| Money.new(cents || 0, currency || Money.default_currency) },
-          :converter => Proc.new { |value| value.respond_to?(:to_money) ? value.to_money : raise(ArgumentError, "Can't convert #{value.class} to Money") }
+          :constructor => constructor,
+          :converter => converter
         
       end
       

data/lib/counterfeit/version.rb

@@ -1,3 +1,3 @@
 module Counterfeit
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/counterfeit_spec.rb

@@ -19,9 +19,11 @@ describe Item do
   end
   
   it 'should handle custom attribute names' do
-    item = Item.new(:money => 500)
-    item.custom_money_amount.should == 500_00
-    item.custom_money_currency.should == 'EUR'
+    Item.new(:money => 500).custom_money_amount.should == 500_00
+  end
+  
+  it 'should respect default currency attribute' do
+    Item.new.custom_money_currency.should == 'EUR'
   end
   
   it 'should work witn has_money alias' do
@@ -36,7 +38,7 @@ describe Item do
   it 'should automatically turn on google exchange on fail' do
     Money.google_saved_the_day = false
     Money.default_bank = Money::Bank::VariableExchange.instance
-    money = Money.new(50000, 'USD')
+    money = Money.new(500_00, 'USD')
     lambda do
       money.exchange_to('EUR')
     end.should_not raise_error
@@ -46,10 +48,20 @@ describe Item do
   
   it 'should use the google hack only once' do
     Money.default_bank = Money::Bank::VariableExchange.instance
-    money = Money.new(50000, 'USD')
+    money = Money.new(500_00, 'USD')
     money.bank.should be_kind_of(Money::Bank::VariableExchange)
     lambda do
       money.exchange_to('EUR')
     end.should raise_error(Money::Bank::UnknownRate)
   end
+  
+  it 'should allow currency change' do
+    Money.default_currency = Money::Currency.new('USD')
+    item = Item.create
+    item.price_currency.should == 'USD'
+    item.update_attributes(:price => '100', :price_currency => 'RUB')
+    item.reload.price.should == Money.new(100_00, 'RUB')
+    item.save
+    item.reload.price_currency.should == 'RUB'
+  end
 end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ require File.expand_path('../../lib/counterfeit', __FILE__)
 
 db_filename = 'counterfeit.sqlite3'
 
-File.delete(db_filename)
+File.delete(db_filename) if File.exists?(db_filename)
 
 active_record_configuration = { :adapter => 'sqlite3', :database => db_filename }
 

metadata

@@ -1,128 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: counterfeit
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-25 00:00:00.000000000 +07:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2158214320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: money
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2158214320
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: &2158213820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.7.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: google_currency
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2158213820
+- !ruby/object:Gem::Dependency
+  name: google_currency
+  requirement: &2158213360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2158213360
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2158212900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2158212900
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2158212440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *2158212440
 description: Easy Money gem integration for rails 3.
-email: 
+email:
 - rwz@duckroll.ru
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
 - Rakefile
 - counterfeit.gemspec
-- counterfeit.sqlite3
 - lib/counterfeit.rb
 - lib/counterfeit/active_record.rb
 - lib/counterfeit/money.rb
 - lib/counterfeit/schema.rb
 - lib/counterfeit/version.rb
 - spec/counterfeit_spec.rb
-- spec/debug.log
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/rwz/counterfeit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: counterfeit
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easy Money gem integration for rails 3.
-test_files: 
+test_files:
 - spec/counterfeit_spec.rb
-- spec/debug.log
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb

data/spec/debug.log

@@ -1,63 +0,0 @@
-# Logfile created on 2011-06-16 20:34:50 +0700 by logger.rb/25413
-  SQL (0.2ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'RUB', 0, 'RUB')
-  AREL (0.2ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'RUB', 0, 'RUB')
-  SQL (0.2ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.4ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'RUB', 0, 'RUB')
-  AREL (0.4ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'RUB', 0, 'RUB')
-  SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'THB', 0, 'RUB')
-  AREL (0.2ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'THB', 0, 'RUB')
-  SQL (0.2ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'THB', 0, 'RUB')
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'THB', 0, 'RUB')
-  SQL (0.2ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'THB', 0, 'RUB')
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "money_in_cents", "money_currency") VALUES (0, 'RUB', 0, 'THB', 0, 'RUB')
-  SQL (0.2ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', 50000, 'RUB')
-  SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.2ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', 50000, 'RUB')
-  SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.2ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', NULL, NULL)
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', 50000, 'RUB')
-  SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-  AREL (0.3ms)  INSERT INTO "items" ("price_in_cents", "price_currency", "balance_in_cents", "balance_currency", "custom_money_amount", "custom_money_currency") VALUES (0, 'RUB', 0, 'THB', 50000, 'RUB')