monetize 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6302730a9554cb777109e4b35eaaee0da9963dbf
-  data.tar.gz: ce9f0611782915a2aa0f788e2b9ad6a676c4dbaf
+  metadata.gz: bbeee1313b44a976a6f7244940b8b8f3b4101054
+  data.tar.gz: 147a0f56f5fec9af8d00861c233fe1bd607b5d6d
 SHA512:
-  metadata.gz: 183e6584506fe0ff495c2d0d32ea6c3d208f16a9be9d01aec21d4d07f7d5c22218e29062aa09e82fa48d08e485ee8030f9b72d8f690ed3e2f3e83c98501362c3
-  data.tar.gz: 57b26b992ced6c627aa6c346a6c495e91cbef9d3faef1fd9578790346ec8488cb147c2f85d927a09fbda71575c8a844c9b7179667f89a01e5a5f271b29eb0252
+  metadata.gz: 46456db1721dd08e2bad8fb665986ec4acfdeaaf8ea08eabd13909ba421c12a5d0d042ff7d8cfbd9b4a1a942df7608f3573043a6d49f407577df242feac10e78
+  data.tar.gz: 9c3edb5b6b7d885403dfa1b895d2331f0ab8c4206ce9aae3739e9ec7c2ad1406dcfbfde983fa2c3dd427ca79d93beb0c2bb289c43e9fd0ef8474dfd1498dea35

data/lib/monetize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Monetize
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/monetize.rb

@@ -21,13 +21,14 @@ module Monetize
     attr_accessor :assume_from_symbol
   end
 
-  def self.parse(input, currency = Money.default_currency)
+  def self.parse(input, currency = Money.default_currency, options = {})
     input = input.to_s.strip
 
-    computed_currency = compute_currency(input)
-    if not assume_from_symbol
-      computed_currency = input[/[A-Z]{2,3}/] || currency
-    end
+    computed_currency = if options.fetch(:assume_from_symbol) { assume_from_symbol }
+                          compute_currency(input)
+                        else
+                          input[/[A-Z]{2,3}/]
+                        end
 
     currency = computed_currency || currency || Money.default_currency
     currency = Money::Currency.wrap(currency)
@@ -169,6 +170,6 @@ module Monetize
   end
 
   def self.currency_symbol_regex
-    /\A(?<symbol>#{regex_safe_symbols})/
+    /\A[\+|\-]?(?<symbol>#{regex_safe_symbols})/
   end
 end

data/monetize.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "money", "~> 6.4.0"
+  spec.add_dependency "money", "~> 6.5.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/monetize_spec.rb

@@ -53,6 +53,31 @@ describe Monetize do
         it 'should assume default currency if not a recognised symbol' do
           expect(Monetize.parse("L9.99")).to eq Money.new(999, 'USD')
         end
+
+        it 'parses formatted inputs without currency detection when overridden' do
+          expect(Monetize.parse("£9.99", nil, assume_from_symbol: false)).to eq Money.new(999, 'USD')
+        end
+
+        it 'parses formatted inputs with minus sign and currency symbol' do
+          expect(Monetize.parse("-€9.99")).to eq Money.new(-999, 'EUR')
+          expect(Monetize.parse("-£9.99")).to eq Money.new(-999, 'GBP')
+          expect(Monetize.parse("-R$R9.99")).to eq Money.new(-999, 'BRL')
+        end
+
+        it 'parses formatted inputs with plus and GBP passed as symbol' do
+          expect(Monetize.parse("+€9.99")).to eq Money.new(999, 'EUR')
+          expect(Monetize.parse("+£9.99")).to eq Money.new(999, 'GBP')
+          expect(Monetize.parse("+R$R9.99")).to eq Money.new(999, 'BRL')
+        end
+
+        it 'parses formatted inputs with currency symbol and postfix minus sign' do
+          expect(Monetize.parse("€9.99-")).to eq Money.new(-999, 'EUR')
+        end
+
+        it 'parses formatted inputs with currency symbol and postfix plus sign' do
+          expect(Monetize.parse("€9.99+")).to eq Money.new(999, 'EUR')
+        end
+
       end
 
       context 'opted out' do
@@ -75,6 +100,10 @@ describe Monetize do
         it "ignores the British Pounds Sterling symbol" do
           expect(Monetize.parse("£9.99")).to eq Money.new(999, 'USD')
         end
+
+        it 'parses formatted inputs with currency detection when overridden' do
+          expect(Monetize.parse("£9.99", nil, assume_from_symbol: true)).to eq Money.new(999, 'GBP')
+        end
       end
 
       it 'should opt out by default' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement