money 6.0.0.pre4 → 6.0.0.pre5

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## master
+- Fix BTC subunit
 - New option :sign_positive to add a + sign to positive numbers
 - Only allow to multiply a money by a number (int, float)
 - Fix typo
@@ -22,6 +23,8 @@
 - Change Money.from_bigdecimal (and in that way .to_money too) to keep precision when using `Money.infinite_precision = true`
 - Add :rounded_infinite_precision option to .format
 - Changed the New Taiwan Dollar symbol position from after the amount to before the amount.
+- Passing a Money instance to the Money constructor will obtain a new Money object with the same property values as the original
+- Add deprecation warning to comparators
 
 ## 5.1.1
 

data/config/currency_non_iso.json

@@ -6,7 +6,7 @@
     "symbol": "B⃦",
     "alternate_symbols": [],
     "subunit": "Satoshi",
-    "subunit_to_unit": 10000000,
+    "subunit_to_unit": 100000000,
     "symbol_first": true,
     "html_entity": "",
     "decimal_mark": ".",

data/lib/money/money.rb

@@ -272,9 +272,16 @@ class Money
   # @see Money.new_with_dollars
   #
   def initialize(fractional, currency = Money.default_currency, bank = Money.default_bank)
-    @fractional = as_d(fractional)
-    @currency = Currency.wrap(currency)
-    @bank     = bank
+    if (fractional.is_a? Money)
+      money = fractional
+      @fractional = money.fractional
+      @currency   = money.currency
+      @bank       = money.bank
+    else
+      @fractional = as_d(fractional)
+      @currency   = Currency.wrap(currency)
+      @bank       = bank
+    end
   end
 
   # Assuming using a currency using dollars:

data/lib/money/money/arithmetic.rb

@@ -25,6 +25,7 @@ class Money
     #   Money.new(100) == Money.new(100) #=> true
     def ==(other_money)
       if other_money.respond_to?(:to_money)
+        Money.deprecate "as of Money 6.1.0 you must `require 'money/core_extension'` to compare Money to core classes." unless other_money.is_a? Money
         other_money = other_money.to_money
         fractional == other_money.fractional && currency == other_money.currency
       else
@@ -45,6 +46,7 @@ class Money
 
     def <=>(other_money)
       if other_money.respond_to?(:to_money)
+        Money.deprecate "as of Money 6.1.0 you must `require 'money/core_extension'` to compare Money to core classes." unless other_money.is_a? Money
         other_money = other_money.to_money
         if fractional == 0 || other_money.fractional == 0 || currency == other_money.currency
           fractional <=> other_money.fractional

data/lib/money/money/formatting.rb

@@ -233,12 +233,8 @@ class Money
       if rules[:rounded_infinite_precision]
         formatted = ((BigDecimal(formatted) * currency.subunit_to_unit).round / BigDecimal(currency.subunit_to_unit.to_s)).to_s("F")
         formatted.gsub!(/\..*/) do |decimal_part|
-          if decimal_part == '.0'
-            ''
-          else
-            decimal_part << '0' while decimal_part.length < (currency.decimal_places + 1)
-            decimal_part
-          end
+          decimal_part << '0' while decimal_part.length < (currency.decimal_places + 1)
+          decimal_part
         end
       end
 

data/money.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "money"
-  s.version     = "6.0.0.pre4"
+  s.version     = "6.0.0.pre5"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin",
                    "Shane Emmons", "Simone Carletti"]

data/spec/money/formatting_spec.rb

@@ -453,7 +453,7 @@ describe Money, "formatting" do
         Money.new(BigDecimal.new('12.5'), "USD").format(:rounded_infinite_precision => true).should == "$0.13"
         Money.new(BigDecimal.new('123.1'), "BHD").format(:rounded_infinite_precision => true).should == "ب.د0.123"
         Money.new(BigDecimal.new('123.5'), "BHD").format(:rounded_infinite_precision => true).should == "ب.د0.124"
-        Money.new(BigDecimal.new('100.1'), "USD").format(:rounded_infinite_precision => true).should == "$1"
+        Money.new(BigDecimal.new('100.1'), "USD").format(:rounded_infinite_precision => true).should == "$1.00"
         Money.new(BigDecimal.new('109.5'), "USD").format(:rounded_infinite_precision => true).should == "$1.10"
         Money.new(BigDecimal.new('1'), "MGA").format(:rounded_infinite_precision => true).should == "Ar0.2"
       end

data/spec/money_spec.rb

@@ -4,38 +4,64 @@ require "spec_helper"
 
 describe Money do
   describe ".new" do
-    it "rounds the given cents to an integer" do
-      Money.new(1.00, "USD").cents.should == 1
-      Money.new(1.01, "USD").cents.should == 1
-      Money.new(1.50, "USD").cents.should == 2
+    let(:initializing_value) { 1 }
+    subject(:money) { Money.new(initializing_value) }
+
+    its(:bank) { should be Money::Bank::VariableExchange.instance }
+
+    context 'given the initializing value is an integer' do
+      let(:initializing_value) { Integer(1) }
+      it 'stores the integer as the number of cents' do
+        expect(money.cents).to eq initializing_value
+      end
     end
 
-    it "is associated to the singleton instance of Bank::VariableExchange by default" do
-      Money.new(0).bank.should be(Money::Bank::VariableExchange.instance)
+    context 'given the initializing value is a float' do
+      context 'and the value is 1.00' do
+        let(:initializing_value) { 1.00 }
+        it { should eq Money.new(1) }
+      end
+
+      context 'and the value is 1.01' do
+        let(:initializing_value) { 1.01 }
+        it { should eq Money.new(1) }
+      end
+
+      context 'and the value is 1.50' do
+        let(:initializing_value) { 1.50 }
+        it { should eq Money.new(2) }
+      end
     end
 
-    it "handles Rationals" do
-      n = Rational(1)
-      Money.new(n).cents.should == 1
+    context 'given the initializing value is a rational' do
+      let(:initializing_value) { Rational(1) }
+      it { should eq Money.new(1) }
     end
 
-    it "handles Floats" do
-      n = Float("1")
-      Money.new(n).cents.should == 1
+    context 'given the initializing value is money' do
+      let(:initializing_value) { Money.new(1_00, Money::Currency.new('NZD')) }
+      it { should eq initializing_value }
     end
 
-    context "infinite_precision = true" do
-      before do
-        Money.infinite_precision = true
-      end
+    context 'given a currency is not provided' do
+      subject(:money) { Money.new(initializing_value) }
+      its(:currency) { should eq Money.default_currency }
+    end
 
-      after do
-        Money.infinite_precision = false
+    context 'given a currency is provided' do
+      subject(:money) { Money.new(initializing_value, currency) }
+
+      context 'and the currency is NZD' do
+        let(:currency) { Money::Currency.new('NZD') }
+        its(:currency) { should eq Money::Currency.new('NZD') }
       end
+    end
 
-      it "doesn't round cents" do
-        Money.new(1.01, "USD").cents.should == BigDecimal("1.01")
-        Money.new(1.50, "USD").cents.should == BigDecimal("1.50")
+    context "infinite_precision = true" do
+      before { Money.stub(:infinite_precision => true) }
+      context 'given the initializing value is 1.50' do
+        let(:initializing_value) { 1.50 }
+        its(:cents) { should eq BigDecimal('1.50') }
       end
     end
   end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: money
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre4
+  version: 6.0.0.pre5
+  prerelease: 6
 platform: ruby
 authors:
 - Tobias Luetke
@@ -12,11 +13,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,6 +26,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,6 +34,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,6 +42,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -45,6 +50,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,6 +58,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -59,6 +66,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -66,6 +74,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,34 +120,29 @@ files:
 homepage: http://rubymoney.github.com/money
 licenses:
 - MIT
-metadata: {}
-post_install_message: |2
-
-  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 :-)
+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"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>'
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Money and currency exchange support library.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: ea888a5a751fe5366637910259bed324998d8946
-  data.tar.gz: 23c2300799b945f0ae892d71bc64511e1978d209
-SHA512:
-  metadata.gz: c14c97b517d52e3e78ab675b033eb2f59a2d0d46315d592bc928d87fda3896c2b90a163512468697a8817395db147f98894aa9fc24b6b433b59a33892947386c
-  data.tar.gz: 05ac021536a9b31669856f93a47ccec21605fac4c99b0e828b579dbea7df6a4945dfe6742f71b25e19df28989014b553cccb84a8e2169ea08dccfecb76e88957