money 6.0.0 → 6.0.1.beta1

data/spec/core_extensions_spec.rb

@@ -110,8 +110,8 @@ describe Money, "core extensions" do
         "10.10 USD".to_money('USD').should == Money.new(1010, 'USD')
       end
 
-      it "raises error if optional currency doesn't match string currency" do
-        expect { "10.10 USD".to_money('EUR') }.to raise_error(/Mismatching Currencies/)
+      it "uses the parsed currency even if a currency was specified by the method" do
+        expect("10.10 USD".to_money("EUR")).to eq Money.new(1010, "USD")
       end
 
       it "ignores unrecognized data" do

data/spec/currency_spec.rb

@@ -112,6 +112,8 @@ describe Money::Currency do
     
     it "allows direct comparison of currencies and symbols/strings" do
       Money::Currency.new(:eur).should     == 'eur'
+      Money::Currency.new(:eur).should     == 'EUR'
+      Money::Currency.new(:eur).should     == :eur
       Money::Currency.new(:eur).should     == :EUR
       Money::Currency.new(:eur).should_not == 'usd'
     end
@@ -154,6 +156,20 @@ describe Money::Currency do
     end
   end
 
+  describe "#to_str" do
+    it "works as documented" do
+      Money::Currency.new(:usd).to_str.should == "USD"
+      Money::Currency.new(:eur).to_str.should == "EUR"
+    end
+  end
+
+  describe "#to_sym" do
+    it "works as documented" do
+      Money::Currency.new(:usd).to_sym.should == :USD
+      Money::Currency.new(:eur).to_sym.should == :EUR
+    end
+  end
+
   describe "#to_currency" do
     it "works as documented" do
       usd = Money::Currency.new(:usd)

data/spec/money/deprecations_spec.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+require "spec_helper"
+
+describe Money do
+  describe "#deprecate" do
+    let(:error_message) { "Deprecated method triggered here" }
+
+    it "should send a deprecation message with caller" do
+      Money.should_receive(:warn).with do |message|
+        message.should =~ /DEPRECATION WARNING: #{error_message} \(called from:.*:\d+\)/
+      end
+
+      Money.deprecate(error_message)
+    end
+  end
+end

data/spec/money/parsing_spec.rb

@@ -8,7 +8,7 @@ describe Money, "parsing" do
   eu4 = '{ "priority": 1, "iso_code": "EU4", "iso_numeric": "841", "name": "Euro with 4 decimal places", "symbol": "€", "subunit": "Cent", "subunit_to_unit": 10000, "symbol_first": true, "html_entity": "€", "decimal_mark": ",", "thousands_separator": "." }'
 
   describe ".parse" do
-    it "is depreciated" do
+    it "is deprecated" do
       Money.should_receive(:deprecate).at_least(1).times
       Money.parse("1.95")
     end
@@ -17,9 +17,6 @@ describe Money, "parsing" do
       five_ninety_five = Money.new(595, 'EUR')
 
       Money.parse('EUR 5,95').should    == five_ninety_five
-      #TODO: try and handle these
-      #Money.parse('€5,95').should       == five_ninety_five
-      #Money.parse('$5.95').should  == five_ninety_five
     end
 
     it "parses european-formatted inputs with multiple thousands-seperators" do
@@ -291,9 +288,9 @@ describe Money, "parsing" do
     end
 
     it "optimizes workload" do
-      Money.should_receive(:from_fixnum).with(1, "USD").and_return(Money.new(1_00,  "USD"))
+      Monetize.should_receive(:from_fixnum).with(1, "USD").and_return(Money.new(1_00,  "USD"))
       Money.from_numeric(1, "USD").should == Money.new(1_00,  "USD")
-      Money.should_receive(:from_bigdecimal).with(BigDecimal.new("1.0"), "USD").and_return(Money.new(1_00,  "USD"))
+      Monetize.should_receive(:from_bigdecimal).with(BigDecimal.new("1.0"), "USD").and_return(Money.new(1_00,  "USD"))
       Money.from_numeric(1.0, "USD").should == Money.new(1_00,  "USD")
     end
 

data/spec/money_spec.rb

@@ -250,12 +250,28 @@ YAML
         Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
       end
 
-      it "respects the rounding_mode" do
-        Money.rounding_mode = BigDecimal::ROUND_DOWN
-        Money.new(1.9).fractional.should == 1
+      context "with the setter" do
+        it "respects the rounding_mode" do
+          Money.rounding_mode = BigDecimal::ROUND_DOWN
+          Money.new(1.9).fractional.should == 1
 
-        Money.rounding_mode = BigDecimal::ROUND_UP
-        Money.new(1.1).fractional.should == 2
+          Money.rounding_mode = BigDecimal::ROUND_UP
+          Money.new(1.1).fractional.should == 2
+        end
+      end
+
+      context "with a block" do
+        it "respects the rounding_mode" do
+          Money.rounding_mode(BigDecimal::ROUND_DOWN) do
+            Money.new(1.9).fractional
+          end.should == 1
+
+          Money.rounding_mode(BigDecimal::ROUND_UP) do
+            Money.new(1.1).fractional
+          end.should == 2
+
+          Money.rounding_mode.should == BigDecimal::ROUND_HALF_EVEN
+        end
       end
     end
 

metadata

@@ -1,24 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.0.0
-  prerelease: 
+  version: 6.0.1.beta1
 platform: ruby
 authors:
-- Tobias Luetke
-- Hongli Lai
-- Jeremy McNevin
 - Shane Emmons
-- Simone Carletti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -26,15 +20,55 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -50,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,80 +104,104 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 description: This library aids one in handling money and different currencies.
 email:
-- semmons99+RubyMoney@gmail.com
+- shane@emmons.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- config/currency_iso.json
+- .gitignore
+- .travis.yml
+- AUTHORS
+- CHANGELOG.md
+- CONTRIBUTING.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
 - config/currency_backwards_compatible.json
+- config/currency_iso.json
 - config/currency_non_iso.json
-- lib/money/currency.rb
-- lib/money/money/arithmetic.rb
-- lib/money/money/parsing.rb
-- lib/money/money/formatting.rb
-- lib/money/core_extensions.rb
-- lib/money/deprecations.rb
-- lib/money/currency/loader.rb
-- lib/money/currency/heuristics.rb
-- lib/money/bank/variable_exchange.rb
+- lib/money.rb
 - lib/money/bank/base.rb
 - lib/money/bank/single_currency.rb
+- lib/money/bank/variable_exchange.rb
+- lib/money/core_extensions.rb
+- lib/money/core_extensions/numeric.rb
+- lib/money/core_extensions/string.rb
+- lib/money/core_extensions/symbol.rb
+- lib/money/currency.rb
+- lib/money/currency/heuristics.rb
+- lib/money/currency/loader.rb
+- lib/money/deprecations.rb
 - lib/money/money.rb
-- lib/money.rb
-- spec/support/default_currency_helper.rb
-- spec/currency_spec.rb
+- lib/money/money/arithmetic.rb
+- lib/money/money/formatting.rb
+- lib/money/money/parsing.rb
+- lib/money/version.rb
+- money.gemspec
+- spec/bank/base_spec.rb
+- spec/bank/single_currency_spec.rb
+- spec/bank/variable_exchange_spec.rb
 - spec/core_extensions_spec.rb
-- spec/money/parsing_spec.rb
+- spec/currency/heuristics_spec.rb
+- spec/currency_spec.rb
 - spec/money/arithmetic_spec.rb
+- spec/money/deprecations_spec.rb
 - spec/money/formatting_spec.rb
+- spec/money/parsing_spec.rb
 - spec/money_spec.rb
-- spec/currency/heuristics_spec.rb
 - spec/spec_helper.rb
-- spec/bank/single_currency_spec.rb
-- spec/bank/variable_exchange_spec.rb
-- spec/bank/base_spec.rb
-- CHANGELOG.md
-- LICENSE
-- README.md
-- Rakefile
-- money.gemspec
+- spec/support/default_currency_helper.rb
 homepage: http://rubymoney.github.com/money
 licenses:
 - MIT
-post_install_message: ! "\nPlease note the following API changes in Money version
-  6\n\n - Money#amount, Money#dollars methods now return instances of BigDecimal (rather
-  than Float).\n\nPlease read the migration notes at https://github.com/RubyMoney/money#migration-notes\nand
-  choose the migration that best suits your application.\n\nTest responsibly :-)\n"
+metadata: {}
+post_install_message: |
+  Please note the following API changes in Money version 6
+
+   - Money#amount, Money#dollars methods now return instances of BigDecimal (rather than Float).
+
+  Please read the migration notes at https://github.com/RubyMoney/money#migration-notes
+  and choose the migration that best suits your application.
+
+  Test responsibly :-)
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2830931323134829129
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Money and currency exchange support library.
-test_files: []
+test_files:
+- spec/bank/base_spec.rb
+- spec/bank/single_currency_spec.rb
+- spec/bank/variable_exchange_spec.rb
+- spec/core_extensions_spec.rb
+- spec/currency/heuristics_spec.rb
+- spec/currency_spec.rb
+- spec/money/arithmetic_spec.rb
+- spec/money/deprecations_spec.rb
+- spec/money/formatting_spec.rb
+- spec/money/parsing_spec.rb
+- spec/money_spec.rb
+- spec/spec_helper.rb
+- spec/support/default_currency_helper.rb
+has_rdoc: