has_money_fields 0.0.5 → 0.1.0

data/History.md

@@ -1,5 +1,12 @@
 
-0.0.4 / 2012-05-17 
+0.1.0 / 2013-01-16
+==================
+
+  * Add constructor to avoid issues in some apps
+  * Tested in quite some production apps with good results, so we bump a major
+    version :)
+
+0.0.4 / 2012-05-17
 ==================
 
   * Fix error when using a Fixnum as argument

data/has_money_fields.gemspec

@@ -26,6 +26,7 @@ currency data in a safe and clean way.
   s.add_dependency "money"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec", "~> 2"
+  s.add_development_dependency "rake"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"
 end

data/lib/has_money_fields/version.rb

@@ -1,3 +1,3 @@
 module HasMoneyFields
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/lib/has_money_fields.rb

@@ -10,8 +10,9 @@ module HasMoneyFields
 
       args.each do |attr|
         converter = Proc.new do |value|
-	  # remove all non digit characters from the price
-          value.gsub! /[^\d|\.|\,]/, "" if value.instance_of? String
+          # remove all non digit characters from the price
+          value.gsub!(/[^\d|\.|\,]/, "") if value.instance_of?(String)
+
           if value.respond_to? :to_money
             value.to_money
           else
@@ -19,6 +20,15 @@ module HasMoneyFields
           end
         end
 
+        constructor = Proc.new do |cents, currency|
+
+          cents = cents.to_i if cents.instance_of?(String)
+
+          currency = Money.default_currency if currency.nil?
+
+          Money.new(cents, currency)
+        end
+
         if options[:only_cents]
           mapping = [["money_#{attr.to_s}", "cents"]]
         else
@@ -28,7 +38,7 @@ module HasMoneyFields
         self.composed_of attr,
           :class_name => "Money",
           :mapping => mapping,
-          :constructor => :new,
+          :constructor => constructor,
           :converter => converter,
           :allow_nil => true
 

data/spec/has_money_fields_spec.rb

@@ -46,9 +46,9 @@ describe "Model with money fields" do
     subject {@product}
 
     its(:money_price){ should == 100000 }
-    its(:currency_price){ should == "USD" }        
+    its(:currency_price){ should == "USD" }
   end
-  
+
   context "with price with commas" do
     before do
       @product = Product.create! :price => "$1000,50 + VAT"
@@ -56,9 +56,9 @@ describe "Model with money fields" do
     subject {@product}
 
     its(:money_price){ should == 100050 }
-    its(:currency_price){ should == "USD" }        
+    its(:currency_price){ should == "USD" }
   end
-  
+
   context "with price with periods" do
     before do
       @product = Product.create! :price => "$1000.50 + VAT"
@@ -66,17 +66,27 @@ describe "Model with money fields" do
     subject {@product}
 
     its(:money_price){ should == 100050 }
-    its(:currency_price){ should == "USD" }        
+    its(:currency_price){ should == "USD" }
   end
-  
+
+  context "some test which includes periods" do
+    before do
+      @product = Product.create! :price => "$1000.50 INCL."
+    end
+    subject {@product}
+
+    its(:money_price){ should == 100050 }
+    its(:currency_price){ should == "USD" }
+  end
+
 
   context "with number only prices" do
     before do
-      @product = Product.create! :price => 1000 
+      @product = Product.create! :price => 1000
     end
     subject {@product}
 
-    its(:money_price){ should == 100000 }       
+    its(:money_price){ should == 100000 }
   end
 
   context "with validations" do
@@ -85,7 +95,7 @@ describe "Model with money fields" do
         validates :price, :presence => true
       end
 
-      @product = Product.new :price => nil
+      @product = Product.new :price => ""
     end
 
     it "is invalid" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_money_fields
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +161,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2465088672690308953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2465088672690308953
 requirements: []
 rubyforge_project: has_money_fields
 rubygems_version: 1.8.24