monetize 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3936d5c9346eab97303ce52913b65bf5d68978b
-  data.tar.gz: 35fa705a15d608df8909ee74acf1eb3db1b7581e
+  metadata.gz: 5993b4139001864566f5938e83eb0dbd3e6346c1
+  data.tar.gz: 70a6f8947b3c53c688f3fd99c9c6dee3b469a13a
 SHA512:
-  metadata.gz: cbed507b666182b576e1e377d2364e94d8af046171977584f53e0097f668856c2d83fb2fda486eb1baac09c201d3430be0f99ad2aadf372b48465ec6c71ca5b5
-  data.tar.gz: f55af07eb6857557de29d62d41941b7331b233c82979f2614d4386a309f1d00b265c78f2d3a8a8a26c3950001fcd183147ecdfed69431d45445babad467d2fbe
+  metadata.gz: aeaf837897719780e6034acd08afb139d33a96946905fd85f67a1fcf6a9577c35c236c89162da48f7dcc52b7c05a15b7775b11054022f9f93c7385fc8b95653f
+  data.tar.gz: 93040c8ac2c3e29625dacd7ab46494738e02c255bf193f52a0e5d159c2dd25f971596977d685e991eebb3928355709e8e12d63f3802c44b7c9374346d7cd3c76

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
 script: bundle exec rspec spec
 notifications:
   recipients:

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## master (next release)
+- Added correct parsing of Brazilian Real $R symbol
+- Add testing task for  Brazilian Real parsing 

data/CONTRIBUTING.md

@@ -0,0 +1,17 @@
+# Contribution Guidelines
+
+## Steps
+
+1. Fork [the repo](https://github.com/RubyMoney/monetize)
+2. Grab dependencies: `bundle install`
+3. Make sure everything is working: `bundle exec rspec spec`
+4. Make your changes
+5. Test your changes
+5. Create a Pull Request
+6. Celebrate!!!!!
+
+## Notes
+
+When contributing, please make sure to update the CHANGELOG when you submit
+your pull request. Upon merging of your first pull request, you will be
+given commit access to the repository.

data/lib/monetize.rb

@@ -6,6 +6,14 @@ require "monetize/version"
 
 module Monetize
 
+  CURRENCY_SYMBOLS = {
+    "$"    => "USD",
+    "€"    => "EUR",
+    "£"    => "GBP",
+    "R$"   => "BRL",
+    "R"    => "ZAR"
+  }
+
   # Class methods
   class << self
     # @attr_accessor [true, false] assume_from_symbol Use this to enable the
@@ -16,15 +24,10 @@ module Monetize
   def self.parse(input, currency = Money.default_currency)
     input = input.to_s.strip
 
-    computed_currency = if assume_from_symbol && input =~ /^(\$|€|£)/
-                          case input
-                          when /^\$/ then "USD"
-                          when /^€/ then "EUR"
-                          when /^£/ then "GBP"
-                          end
-                        else
-                          input[/[A-Z]{2,3}/]
-                        end
+    computed_currency = compute_currency(input)
+    if not assume_from_symbol
+      computed_currency = input[/[A-Z]{2,3}/] || currency
+    end
 
     currency = computed_currency || currency || Money.default_currency
     currency = Money::Currency.wrap(currency)
@@ -143,4 +146,29 @@ module Monetize
 
     negative ? cents * -1 : cents
   end
+
+  private
+
+  def self.contains_currency_symbol?(amount)
+    currency_symbol_regex === amount
+  end
+
+  def self.compute_currency(amount)
+    if contains_currency_symbol?(amount)
+      matches = amount.match(currency_symbol_regex)
+      CURRENCY_SYMBOLS[matches[:symbol]]
+    else
+      amount[/[A-Z]{2,3}/]
+    end
+  end
+
+  def self.regex_safe_symbols
+    CURRENCY_SYMBOLS.keys.map { |key|
+      Regexp.escape(key)
+    }.join('|')
+  end
+
+  def self.currency_symbol_regex
+    /\A(?<symbol>#{regex_safe_symbols})/
+  end
 end

data/lib/monetize/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Monetize
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 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.1.0.beta1"
+  spec.add_dependency "money", "~> 6.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/monetize_spec.rb

@@ -19,41 +19,64 @@ describe Monetize do
       expect(Monetize.parse('EUR 1.111.234.567,89')).to eq Money.new(111123456789, 'EUR')
     end
 
-    describe 'currency assumption' do
+    describe 'currency detection' do
+
       context 'opted in' do
-        before do
+        before :all do
           Monetize.assume_from_symbol = true
         end
 
-        after do
+        after :all do
           Monetize.assume_from_symbol = false
         end
 
-        it "parses formatted inputs with the currency passed as a symbol" do
-          original_currency = Money.default_currency
-          Money.default_currency = "EUR"
-          Money.default_currency = original_currency
+        it "parses formatted inputs with Euros passed as a symbol" do
           expect(Monetize.parse("€5.95")).to eq Money.new(595, 'EUR')
+        end
+
+        it "parses formatted inputs with Euros passed as a symbol with surrounding space" do
           expect(Monetize.parse(" €5.95 ")).to eq Money.new(595, 'EUR')
+        end
+
+        it "parses formatted inputs with British Pounds Sterling passed as a symbol" do
           expect(Monetize.parse("£9.99")).to eq Money.new(999, 'GBP')
         end
 
+        it "parses formatted inputs with South African Rand passed as a symbol" do
+          expect(Monetize.parse("R9.99")).to eq Money.new(999, 'ZAR')
+        end
+
+        it "parses formatted inputs with Brazilian real passed as a symbol" do
+          expect(Monetize.parse("R$R9.99")).to eq Money.new(999, 'BRL')
+        end
+
         it 'should assume default currency if not a recognised symbol' do
           expect(Monetize.parse("L9.99")).to eq Money.new(999, 'USD')
         end
       end
+
       context 'opted out' do
         before do
           Monetize.assume_from_symbol = false
         end
-        it "parses formatted inputs with the currency passed as a symbol but ignores the symbol" do
-          expect(Monetize.parse("$5.95")).to eq Money.new(595, 'USD')
+
+        it "ignores the Euro symbol" do
           expect(Monetize.parse("€5.95")).to eq Money.new(595, 'USD')
+        end
+
+        it "ignores the South African Rand symbol" do
+          expect(Monetize.parse("R5.95")).to eq Money.new(595, 'USD')
+        end
+
+        it "ignores the Euro symbol with surrounding spaces" do
           expect(Monetize.parse(" €5.95 ")).to eq Money.new(595, 'USD')
-          expect(Monetize.parse("£9.99")).to eq Money.new(999, 'USD')
+        end
 
+        it "ignores the British Pounds Sterling symbol" do
+          expect(Monetize.parse("£9.99")).to eq Money.new(999, 'USD')
         end
       end
+
       it 'should opt out by default' do
         expect(Monetize.assume_from_symbol).to be_falsy
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0.beta1
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0.beta1
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,8 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md