easy_rails_money 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -47,3 +47,13 @@
 
   add_column and change_table do not work for now
   with this syntax
+
+## 0.0.8
+- bugfix: single currency was being persisted as a yaml object
+- #currency and #some_column_currency are both assigned
+  and persisted as a downcase string
+  eg. "inr" in the case of Indian Rupee
+  so that, Money.default_currency.id == "inr".to_sym
+  holds true
+  api is changed. previously #currency and #single_currency
+  gave a Money::Currency object. now is is a String 

data/README.md

@@ -372,3 +372,8 @@ loan_usd.currency # equals Money::Currency.new(:usd)
     is dependent on the database adapter  
     being used, which sucks. can test on other database adapters  
     or handle a generic error  
+13. add typecast for currency column  
+    right now, it is always a string  
+    do we want a Money::Currency object back?  
+    not decided  
+    see currency_persistence_spec.rb

data/lib/easy_rails_money/active_record/money_dsl.rb

@@ -28,7 +28,7 @@ module EasyRailsMoney
         end
         
         def with_currency currency, &block
-          self.single_currency = EasyRailsMoney::MoneyDslHelper.to_currency(currency)
+          self.single_currency = EasyRailsMoney::MoneyDslHelper.to_currency(currency).id.to_s
           instance_eval &block
         end
 
@@ -37,7 +37,7 @@ module EasyRailsMoney
           # single currency is defined
           if single_currency?
             if attributes && attributes[:currency]
-              instance.currency = EasyRailsMoney::MoneyDslHelper.to_currency attributes[:currency]
+              instance.currency = EasyRailsMoney::MoneyDslHelper.to_currency(attributes[:currency]).id.to_s
             else
               instance.currency = instance.class.single_currency
             end
@@ -61,6 +61,14 @@ module EasyRailsMoney
                 nil
               end
             end
+
+            define_method "#{column_name}=" do |value|
+              raise ::ArgumentError.new("only Integer or nil accepted") unless (value.kind_of?(Integer) || value.is_a?(NilClass))
+              
+              send("#{money_column}=", value)
+              # currency is stored in a seperate common column
+              return Money.new(value, self.currency)
+            end # define_method setter
           else
             # TODO: test if Memoization will make any difference
             define_method column_name do |*args|
@@ -73,20 +81,10 @@ module EasyRailsMoney
                 nil
               end
             end
-          end
-
-          if single_currency?
-            define_method "#{column_name}=" do |value|
-              raise ::ArgumentError.new("only Integer or nil accepted") unless (value.kind_of?(Integer) || value.is_a?(NilClass))
-
-              send("#{money_column}=", value)
-              # currency is stored in a seperate common column
-              return Money.new(value, self.currency)
-            end # define_method setter
-          else
+            
             define_method "#{column_name}=" do |value|
               raise ::ArgumentError.new("only Money or nil accepted") unless (value.kind_of?(Money) || value.is_a?(NilClass))
-
+              
               if value
                 send("#{money_column}=", value.fractional)
                 # it is stored in the database as a string but the Money
@@ -100,7 +98,7 @@ module EasyRailsMoney
                 return nil
               end
             end # define_method setter
-          end # if single_currency?
+          end
         end # def money
       end # module ClassMethods
       

data/lib/easy_rails_money/version.rb

@@ -1,3 +1,3 @@
 module EasyRailsMoney
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/active_record/currency_persistence_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+require 'active_record_spec_helper'
+
+# add test that the currency will be serialized in a fixed format
+# 
+# currency (single or otherwise) is always a string
+# and it is in smallcase
+# because, Money.default_currency.id == "inr".to_sym
+# 
+# previously, single_currency was a Money::Currency object
+# whereas some_money_currency was a string object
+# 
+# bugfix: also the currency object was being serialized as a yaml
+# which was a bug. facepalm stupid
+# 
+# this was added so that adding validations are easier
+# ie. no need to make a case-insensitive check
+# and to fix the above bug
+# 
+# not very happy. might want to add typecasts
+
+describe "Currency Persistence" do  
+  before(:all) do
+    currencies = ["inr", # Indian rupee
+                  "usd", # USA dollars
+                  "aud", # Australian dollar
+                  "eur", # Euro
+                  "gbp"  # British pound
+                 ]
+    @currency = currencies.shuffle[0]
+
+    # TODO: how to couple this choice with rspec seed
+    # take a random currency so that we do not depend on any one
+    # default_currency while testing
+    EasyRailsMoney.configure do |c|
+      c.default_currency = Money::Currency.new(@currency)
+    end
+  end
+  
+  context "individual currency", :wip do
+    let(:loan_model) {      
+      migrate CreateTableDefinition::CreateLoanWithoutCurrency
+      require 'loan_model_spec_helper'
+      Loan
+    }
+
+    subject {
+      loan = loan_model.new
+      loan.principal = 100.to_money(@currency)
+      loan.repaid    = 50.to_money(@currency)
+      loan.npa       = 10.to_money(@currency)
+      loan
+    }
+
+    it "currency should be capitalized" do            
+      subject.save!
+      
+      expect(subject.principal_currency).to eq @currency
+      expect(subject.principal_currency_before_type_cast).to eq @currency
+    end
+
+    it "currency should be capitalized for a new object" do
+      subject.save!
+      loan = loan_model.find subject.id
+
+      expect(subject.principal_currency).to eq @currency
+      expect(subject.principal_currency_before_type_cast).to eq @currency
+    end
+  end
+  
+  context "single currency" do
+    let(:loan_model) {      
+      migrate CreateTableDefinition::CreateLoanWithCurrency
+      require 'loan_with_currency_model_spec_helper'
+      LoanWithCurrency
+    }
+
+    subject {
+      loan = loan_model.new
+      loan.currency = @currency
+      loan.principal = 100 * 100
+      loan.repaid    = 50 * 100
+      loan.npa       = 10 * 100
+      loan
+    }
+
+    it "currency should be capitalized" do
+      subject.save!
+
+      expect(subject.currency).to eq @currency
+      expect(subject.currency_before_type_cast).to eq @currency
+    end
+
+    it "currency should be capitalized for a new object" do
+      subject.save!
+      loan = loan_model.find subject.id
+
+      expect(loan.currency).to eq @currency
+      expect(loan.currency_before_type_cast).to eq @currency
+    end
+  end
+end

data/spec/active_record/migration_spec.rb

@@ -1,193 +1,6 @@
 require 'spec_helper'
 require 'active_record_spec_helper'
-require 'active_record/schema_dumper'
-
-# migrations used in tests. our factories/fixtures
-# their class names are the same if they are functionally
-# equivalent, but are organized in different modules depending on
-# whether it is implemented using
-# schema_statements, create_table or change_table
-module SchemaStatements
-  class CreateLoanAndMoney < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans do |t|
-          t.string :name
-        end
-        add_money :loans, :principal
-      end
-    end
-  end
-
-  class CreateLoanWithCurrency < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans do |t|
-          t.string :name
-          t.currency
-        end
-        add_money :loans, :principal, :repaid, :npa
-      end
-    end
-  end
-
-  class RemoveMoneyColumnsFromLoan  < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        remove_money :loans, :principal, :repaid, :npa
-      end
-    end
-  end
-
-  class RemoveMoneyColumnsExceptPrincipalFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        remove_money :loans, :repaid, :npa
-      end
-    end
-  end
-
-  class RemovePrincipalFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        remove_money :loans, :principal
-      end
-    end
-  end
-
-  class RemoveCurrencyFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        remove_currency :loans
-      end
-    end
-  end
-end # module SchemaStatements
-
-module ChangeTable
-  class AddPrincipalToLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        change_table :loans do |t|
-          t.money :principal
-        end
-      end
-    end
-  end
-
-  class RemoveCurrencyFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        change_table :loans, force: true do |t|
-          t.remove_currency
-        end
-      end
-    end
-  end
-
-  class RemovePrincipalFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        change_table :loans do |t|
-          t.remove_money :principal
-        end
-      end
-    end
-  end
-  
-  class AddSingleCurrencyToLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        change_table :loans, force: true do |t|
-          t.currency
-        end
-      end
-    end
-  end
-
-  class RemoveMoneyColumnsFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        change_table :loans, force: true do |t|
-          t.remove_money :principal, :repaid, :npa
-        end
-      end
-    end
-  end
-
-  class RemoveMoneyColumnsExceptPrincipalFromLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        change_table :loans, force: true do |t|
-          t.remove_money :repaid, :npa
-        end
-      end
-    end
-  end
-end # module ChangeTable
-
-module CreateTableDefinition
-  class CreateLoan < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans do |t|
-          t.string :name
-        end
-      end
-    end
-  end
-
-  class CreateLoanAndMoney < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans do |t|
-          t.string :name
-          t.money  :principal
-        end
-      end
-    end
-  end
-
-  class CreateLoanWithConstraint < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans, :force => true do |t|
-          t.string :name
-          t.currency           :null => false
-          t.money  :principal, :null => false
-        end
-      end
-    end
-  end
-  
-  class CreateLoanWithCurrencySpecifiedFirst < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans, force: true do |t|
-          t.string :name
-          t.currency
-          t.money  :principal
-          t.money  :repaid
-          t.money  :npa
-        end
-      end
-    end
-  end
-
-  class CreateLoanWithCurrencySpecifiedInBetween  < ActiveRecord::Migration
-    def change
-      suppress_messages do
-        create_table :loans, force: true do |t|
-          t.string :name
-          t.money  :principal
-          t.money  :repaid
-          t.currency
-          t.money  :npa
-        end
-      end
-    end
-  end
-end # module CreateTableDefinition
+require 'migration_factory_spec_helper'
 
 describe "Migrating Money columns" do
 

data/spec/active_record/money_dsl_spec.rb

@@ -144,13 +144,13 @@ describe "Money DSL" do
       end
 
       it "sets currency column" do
-        expect(subject.currency).to eq ::Money::Currency.new(:inr)
+        expect(subject.currency).to eq "inr"
       end
 
       it "can change single currency on an instance" do
         loan = LoanWithCurrency.new(currency: :usd)
-        expect(loan.currency).to eq ::Money::Currency.new(:usd)
-        expect(loan.class.single_currency).to eq ::Money::Currency.new(:inr)
+        expect(loan.currency).to eq "usd"
+        expect(loan.class.single_currency).to eq "inr"
       end
 
       describe "#getter" do

data/spec/active_record_spec_helper.rb

@@ -1,3 +1,4 @@
+require 'active_record/schema_dumper'
 require 'tempfile'
 
 module CreateTableDefinition

data/spec/migration_factory_spec_helper.rb

@@ -0,0 +1,186 @@
+# migrations used in tests. our factories/fixtures
+# their class names are the same if they are functionally
+# equivalent, but are organized in different modules depending on
+# whether it is implemented using
+# schema_statements, create_table or change_table
+module SchemaStatements
+  class CreateLoanAndMoney < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans do |t|
+          t.string :name
+        end
+        add_money :loans, :principal
+      end
+    end
+  end
+
+  class CreateLoanWithCurrency < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans do |t|
+          t.string :name
+          t.currency
+        end
+        add_money :loans, :principal, :repaid, :npa
+      end
+    end
+  end
+
+  class RemoveMoneyColumnsFromLoan  < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        remove_money :loans, :principal, :repaid, :npa
+      end
+    end
+  end
+
+  class RemoveMoneyColumnsExceptPrincipalFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        remove_money :loans, :repaid, :npa
+      end
+    end
+  end
+
+  class RemovePrincipalFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        remove_money :loans, :principal
+      end
+    end
+  end
+
+  class RemoveCurrencyFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        remove_currency :loans
+      end
+    end
+  end
+end # module SchemaStatements
+
+module ChangeTable
+  class AddPrincipalToLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans do |t|
+          t.money :principal
+        end
+      end
+    end
+  end
+
+  class RemoveCurrencyFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans, force: true do |t|
+          t.remove_currency
+        end
+      end
+    end
+  end
+
+  class RemovePrincipalFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans do |t|
+          t.remove_money :principal
+        end
+      end
+    end
+  end
+  
+  class AddSingleCurrencyToLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans, force: true do |t|
+          t.currency
+        end
+      end
+    end
+  end
+
+  class RemoveMoneyColumnsFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans, force: true do |t|
+          t.remove_money :principal, :repaid, :npa
+        end
+      end
+    end
+  end
+
+  class RemoveMoneyColumnsExceptPrincipalFromLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        change_table :loans, force: true do |t|
+          t.remove_money :repaid, :npa
+        end
+      end
+    end
+  end
+end # module ChangeTable
+
+module CreateTableDefinition
+  class CreateLoan < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans do |t|
+          t.string :name
+        end
+      end
+    end
+  end
+
+  class CreateLoanAndMoney < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans do |t|
+          t.string :name
+          t.money  :principal
+        end
+      end
+    end
+  end
+
+  class CreateLoanWithConstraint < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, :force => true do |t|
+          t.string :name
+          t.currency           :null => false
+          t.money  :principal, :null => false
+        end
+      end
+    end
+  end
+  
+  class CreateLoanWithCurrencySpecifiedFirst < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, force: true do |t|
+          t.string :name
+          t.currency
+          t.money  :principal
+          t.money  :repaid
+          t.money  :npa
+        end
+      end
+    end
+  end
+
+  class CreateLoanWithCurrencySpecifiedInBetween  < ActiveRecord::Migration
+    def change
+      suppress_messages do
+        create_table :loans, force: true do |t|
+          t.string :name
+          t.money  :principal
+          t.money  :repaid
+          t.currency
+          t.money  :npa
+        end
+      end
+    end
+  end
+end # module CreateTableDefinition

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_rails_money
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -196,12 +196,14 @@ files:
 - lib/easy_rails_money/configuration.rb
 - lib/easy_rails_money/money_dsl_helper.rb
 - lib/easy_rails_money/version.rb
+- spec/active_record/currency_persistence_spec.rb
 - spec/active_record/migration_spec.rb
 - spec/active_record/money_dsl_spec.rb
 - spec/active_record_spec_helper.rb
 - spec/configuration_spec.rb
 - spec/loan_model_spec_helper.rb
 - spec/loan_with_currency_model_spec_helper.rb
+- spec/migration_factory_spec_helper.rb
 - spec/simplecov_helper.rb
 - spec/spec_helper.rb
 - vendor/cache/activemodel-3.2.12.gem
@@ -242,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1659709329796999212
+      hash: -3822270686044656207
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1659709329796999212
+      hash: -3822270686044656207
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -259,12 +261,14 @@ signing_key:
 specification_version: 3
 summary: Integrate Rail's ActiveRecord gem and the money gem
 test_files:
+- spec/active_record/currency_persistence_spec.rb
 - spec/active_record/migration_spec.rb
 - spec/active_record/money_dsl_spec.rb
 - spec/active_record_spec_helper.rb
 - spec/configuration_spec.rb
 - spec/loan_model_spec_helper.rb
 - spec/loan_with_currency_model_spec_helper.rb
+- spec/migration_factory_spec_helper.rb
 - spec/simplecov_helper.rb
 - spec/spec_helper.rb
 has_rdoc: