crazy_money 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d32e285aa7e2ce6a53feee1d214718ad5df46d
-  data.tar.gz: fcaa7be42922ae7fc23b1143cfdb4b496edf05ab
+  metadata.gz: 4e522634c0557a8ca099b26039e636b01264fafb
+  data.tar.gz: 43fded46f56621a24692d6fc2ee5a93fec20d38b
 SHA512:
-  metadata.gz: cce29b0c6b9ebae13e85ffefc8ed7b10cb290b4934895397ec054199672b221a0a95ccf997157146bd273061667d379d764e25c37ca3b97b4a57eee01ad1ef71
-  data.tar.gz: 8c492358bd8c5e5fb0e223d1671800aa440d12d902f6899c437cd3427e7b6c9879c2f200c33d98cf3b2392d37cdf46b3a33cfa15cda0f8736ea3461302149866
+  metadata.gz: 6cf5442027916f0f7b1d1d0dec4f6b0fada91fef7354cab787ab5033fdf03cfda93607f18149b1e5f918162a8b6afe3da80774b7fce3959541a89f3ce887a9af
+  data.tar.gz: 551da890dc3a1b473583192798324bc9e60f9e9d9c9351eb47aa4aafae3b259e97071b3b152fd9603b1a94b6724a69391718eae134304fef3dcce892b8a1b9bb

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
 notifications:

data/crazy_money.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "crazy_money"
-  spec.version       = "1.1.1"
+  spec.version       = "1.2.0"
   spec.authors       = ["Cédric Félizard"]
   spec.email         = ["cedric@felizard.fr"]
   spec.description   = %q{Simple money wrapper}
@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "currency_data", "~> 1.0.1"
+  spec.add_runtime_dependency "i18n", "~> 0.6.11"
+  spec.add_runtime_dependency "currency_data", "~> 1.1.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 3"
 end

data/lib/crazy_money.rb

@@ -1,9 +1,16 @@
 require "bigdecimal"
+require "i18n"
 require "currency_data"
 
 class CrazyMoney
   include Comparable
 
+  module Configuration
+    class << self
+      attr_accessor :current_currency
+    end
+  end
+
   def self.zero
     new 0
   end
@@ -12,8 +19,12 @@ class CrazyMoney
     @amount = BigDecimal.new(amount.to_s)
   end
 
-  def to_s
-    sprintf("%.2f", @amount)
+  def to_s(decimal_places: 2)
+    if current_currency = Configuration.current_currency
+      decimal_places = currency(current_currency).decimal_places
+    end
+
+    sprintf("%.#{decimal_places}f", @amount)
   end
 
   def inspect
@@ -58,22 +69,28 @@ class CrazyMoney
   def with_currency iso_code
     currency = currency(iso_code) || raise(ArgumentError, "Unknown currency: #{iso_code.inspect}")
 
-    left, right = to_s.split(".")
+    left, right = to_s(decimal_places: currency.decimal_places).split(".")
+    decimal_mark = right.nil? ? "" : currency.decimal_mark
     sign = left.slice!("-")
 
     left = left.reverse.scan(/.{1,3}/).map(&:reverse).reverse. # split every 3 digits right-to-left
-      join(currency.thousands_separator)
+      join(thousands_separator)
 
-    formatted = [sign, left, currency.decimal_mark, right].join
+    formatted = [sign, left, decimal_mark, right].join
 
-    formatted.public_send(
-      currency.symbol_first ? :prepend : :concat,
-      currency.symbol
-    )
+    if currency.symbol_first
+      [currency.prefered_symbol, formatted]
+    else
+      [formatted, " ", currency.prefered_symbol]
+    end.join
   end
 
 private
 
+  def thousands_separator
+    I18n.t("number.currency.format.thousands_separator", default: " ")
+  end
+
   def currency iso_code
     ::CurrencyData.find(iso_code)
   end

data/spec/crazy_money_spec.rb

@@ -114,10 +114,11 @@ describe CrazyMoney do
     specify { expect(CrazyMoney.new("-13.37").with_currency("EUR")).to eq("€-13,37") }
     specify { expect(CrazyMoney.new("0").with_currency("EUR")).to eq("€0,00") }
 
-    specify { expect(CrazyMoney.new("-1234567.89").with_currency("USD")).to eq("$-1,234,567.89") }
-    specify { expect(CrazyMoney.new("-1234567.89").with_currency("EUR")).to eq("€-1.234.567,89") }
+    specify { expect(CrazyMoney.new("-1234567.89").with_currency("USD")).to eq("$-1 234 567.89") }
+    specify { expect(CrazyMoney.new("-1234567.89").with_currency("EUR")).to eq("€-1 234 567,89") }
 
-    specify { expect(CrazyMoney.new("13.37").with_currency("SEK")).to eq("13,37kr") }
+    specify { expect(CrazyMoney.new("13.37").with_currency("SEK")).to eq("13,37 kr") }
+    specify { expect(CrazyMoney.new("1337").with_currency("XPF")).to eq("1 337 CFP") }
   end
 end
 

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: crazy_money
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Cédric Félizard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: currency_data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Simple money wrapper
 email:
 - cedric@felizard.fr