monetize 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbeee1313b44a976a6f7244940b8b8f3b4101054
-  data.tar.gz: 147a0f56f5fec9af8d00861c233fe1bd607b5d6d
+  metadata.gz: 0da3f5e2bea465f09b1722aeedb65d9d0ff40b65
+  data.tar.gz: 1dc558e00ac98b0dce9900ff9f4b1d4a1fc25366
 SHA512:
-  metadata.gz: 46456db1721dd08e2bad8fb665986ec4acfdeaaf8ea08eabd13909ba421c12a5d0d042ff7d8cfbd9b4a1a942df7608f3573043a6d49f407577df242feac10e78
-  data.tar.gz: 9c3edb5b6b7d885403dfa1b895d2331f0ab8c4206ce9aae3739e9ec7c2ad1406dcfbfde983fa2c3dd427ca79d93beb0c2bb289c43e9fd0ef8474dfd1498dea35
+  metadata.gz: d56c2152a81bea83158da6cc4021b3668ef60a2396058dfdb11f5bce250467d54ee8c8fe193ccc0e114b96c88fa761879f7285072b9255b3b5b45db08b4c1022
+  data.tar.gz: 9553d4f65cfad911f9abf46b8d94b4be771981cbdcefd6098b71e06da4b3b143b75cefc52b8ed48e85e5275eab9094b87e5e4b26d86ae3d44349c7b8c8900361

data/CHANGELOG.md

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

data/CONTRIBUTING.md

@@ -5,13 +5,16 @@
 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!!!!!
+4. Create your feature branch (`git checkout -b my-new-feature`)
+5. Make your changes
+6. Test your changes
+7. Commit your changes (`git commit -am 'Add some feature'`)
+8. Push to the branch (`git push origin my-new-feature`)
+9. Create a Pull Request
+10. Celebrate!!!!!
 
 ## Notes
 
-When contributing, please make sure to update the CHANGELOG when you submit
+When contributing, please make sure to update the [CHANGELOG.md](CHANGELOG.md) when you submit
 your pull request. Upon merging of your first pull request, you will be
 given commit access to the repository.

data/README.md

@@ -26,25 +26,34 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-Monetize.parse("$100") == Money.new(100_00, "USD")
-Monetize.parse("€100") == Money.new(100_00, "EUR")
-Monetize.parse("£100") == Money.new(100_00, "GBP")
+Monetize.parse("USD 100") == Money.new(100_00, "USD")
+Monetize.parse("EUR 100") == Money.new(100_00, "EUR")
+Monetize.parse("GBP 100") == Money.new(100_00, "GBP")
 
 "100".to_money == Money.new(100_00, "USD")
 ```
 
-Optionally, enable the ability to assume the currency from a passed symbol.
+Optionally, enable the ability to assume the currency from a passed symbol. Otherwise, currency symbols will be ignored, and USD used as the default currency:
 
 ```ruby
+Monetize.parse("£100") == Money.new(100_00, "USD")
+
 Monetize.assume_from_symbol = true
 
-"$100".to_money == Money.new(100_00, "USD")
+Monetize.parse("£100") == Money.new(100_00, "GBP")
+"€100".to_money == Money.new(100_00, "EUR")
+```
+
+Monetize can also parse a list of values, returning an array-like object ([Monetize::Collection](lib/collection.rb)):
+
+```ruby
+Monetize.parse_collection("€80/$100") == [Money.new(80_00, "EUR"), Money.new(100_00, "USD")]
+Monetize.parse_collection("€80, $100") == [Money.new(80_00, "EUR"), Money.new(100_00, "USD")]
+
+# The #range? method detects the presence of a hyphen
+Monetize.parse_collection("€80-$100").range? == true
 ```
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+See [CONTRIBUTING.md](CONTRIBUTING.md) for details.

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+task default: :spec
+
+RSpec::Core::RakeTask.new

data/lib/collection.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+require 'monetize'
+
+module Monetize
+  class Collection
+    extend Forwardable
+    include Enumerable
+    def_delegators :@list, :[], :each, :last
+
+    attr_reader :input, :currency, :options
+
+    def self.parse(input, currency = Money.default_currency, options = {})
+      new(input, currency, options).parse
+    end
+
+    def initialize(input, currency = Money.default_currency, options = {})
+      if input.respond_to? :strip
+        @input = input.clone.strip
+      else
+        raise ArgumentError 'Input must be a string'
+      end
+
+      @currency = currency
+      @options = options
+      @list = []
+    end
+
+    def parse
+      if range?
+        @list = split_range.map { |fragment| Monetize.parse(fragment, currency, options) }
+      else
+        @list = split_list.map { |fragment| Monetize.parse(fragment, currency, options) }
+      end
+
+      self
+    end
+
+    def range?
+      RANGE_SPLIT =~ input
+    end
+
+    private
+
+    LIST_SPLIT = %r{[/,]}
+    RANGE_SPLIT = /-/
+
+    def split_list
+      Array @input.split(LIST_SPLIT)
+        .map(&:strip)
+    end
+
+    def split_range
+      Array @input.split(RANGE_SPLIT)
+        .map(&:strip)
+    end
+  end
+end

data/lib/monetize.rb

@@ -3,6 +3,7 @@
 require "money"
 require "monetize/core_extensions"
 require "monetize/version"
+require "collection"
 
 module Monetize
 
@@ -11,7 +12,9 @@ module Monetize
     "€"    => "EUR",
     "£"    => "GBP",
     "R$"   => "BRL",
-    "R"    => "ZAR"
+    "R"    => "ZAR",
+    "¥"    => "JPY",
+    "C$"   => "CAD"
   }
 
   # Class methods
@@ -37,6 +40,10 @@ module Monetize
     Money.new(fractional, currency)
   end
 
+  def self.parse_collection(input, currency = Money.default_currency, options = {})
+    Collection.parse(input, currency, options)
+  end
+
   def self.from_string(value, currency = Money.default_currency)
     value = BigDecimal.new(value.to_s)
     from_bigdecimal(value, currency)

data/lib/monetize/core_extensions.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "monetize/core_extensions/nil_class"
 require "monetize/core_extensions/numeric"
 require "monetize/core_extensions/string"
 require "monetize/core_extensions/symbol"
+require "monetize/core_extensions/hash"

data/lib/monetize/core_extensions/hash.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+class Hash
+  def to_money(currency = nil)
+    Money.new(self[:cents], self[:currency] || currency || Money.default_currency)
+  end
+end

data/lib/monetize/core_extensions/nil_class.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def to_money(currency = nil)
+    Money.new(nil, currency || Money.default_currency)
+  end
+end

data/lib/monetize/version.rb

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

data/spec/core_extensions_spec.rb

@@ -5,6 +5,21 @@ require "monetize"
 require "monetize/core_extensions"
 
 describe Monetize, "core extensions" do
+  describe NilClass do
+    describe "#to_money" do
+      it "work as documented" do
+        money = nil.to_money
+        expect(money.cents).to eq 0
+        expect(money.currency).to eq Money.default_currency
+      end
+
+      it "accepts optional currency" do
+        expect(nil.to_money('USD')).to eq Money.new(nil, 'USD')
+        expect(nil.to_money('EUR')).to eq Money.new(nil, 'EUR')
+      end
+    end
+  end
+
   describe Numeric do
     describe "#to_money" do
       it "work as documented" do
@@ -142,6 +157,38 @@ describe Monetize, "core extensions" do
     end
   end
 
+  describe Hash do
+    describe "#to_money" do
+
+      context "when currency is present in hash" do
+        subject(:hash){ { cents: 5, currency: "EUR" } }
+
+        it "converts Hash to Money using key from hash" do
+          expect(hash.to_money).to eq(Money.new(5, "EUR"))
+        end
+      end
+
+      context "when currency is passed as argument" do
+        subject(:hash){ { cents: 10 } }
+
+        it "converts Hash to Money using passed currency argument" do
+          expect(hash.to_money("JPY")).to eq(Money.new(10, "JPY"))
+        end
+      end
+
+      context "when no currency is passed" do
+        subject(:hash){ { cents: 123 } }
+
+        before { allow(Money).to receive(:default_currency).and_return("USD") }
+
+        it "converts Hash to Money using default value" do
+          expect(hash.to_money("USD")).to eq(Money.new(123, "USD"))
+        end
+      end
+
+    end
+  end
+
   describe Symbol do
     describe "#to_currency" do
       it "converts Symbol to Currency" do
@@ -159,5 +206,4 @@ describe Monetize, "core extensions" do
       end
     end
   end
-
 end

data/spec/monetize_spec.rb

@@ -50,6 +50,14 @@ describe Monetize do
           expect(Monetize.parse("R$R9.99")).to eq Money.new(999, 'BRL')
         end
 
+        it "parses formatted inputs with Japanese Yen passed as a symbol" do
+          expect(Monetize.parse("¥999")).to eq Money.new(999, 'JPY')
+        end
+
+        it "parses formatted inputs with Canadian Dollar passed as a symbol" do
+          expect(Monetize.parse("C$9.99")).to eq Money.new(999, 'CAD')
+        end
+
         it 'should assume default currency if not a recognised symbol' do
           expect(Monetize.parse("L9.99")).to eq Money.new(999, 'USD')
         end
@@ -62,12 +70,17 @@ describe Monetize 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')
+          expect(Monetize.parse("-¥999")).to eq Money.new(-999, 'JPY')
+          expect(Monetize.parse("-C$9.99")).to eq Money.new(-999, 'CAD')
         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')
+          expect(Monetize.parse("+¥999")).to eq Money.new(999, 'JPY')
+          expect(Monetize.parse("+C$9.99")).to eq Money.new(999, 'CAD')
+
         end
 
         it 'parses formatted inputs with currency symbol and postfix minus sign' do
@@ -208,6 +221,30 @@ describe Monetize do
     end
   end
 
+  describe ".parse_collection" do
+    it "parses into a Money::Collection" do
+      expect(Monetize.parse_collection("$7")).to be_a Monetize::Collection
+    end
+
+    it "parses comma separated values" do
+      collection = Monetize.parse_collection("$5, $7")
+      expect(collection.first).to eq Monetize.parse("$5")
+      expect(collection.last).to eq Monetize.parse("$7")
+    end
+
+    it "parses slash separated values" do
+      collection = Monetize.parse_collection("£4.50/€6")
+      expect(collection.first).to eq Monetize.parse("£4.50")
+      expect(collection.last).to eq Monetize.parse("€6")
+    end
+
+    it "parses hyphens as ranges" do
+      collection = Monetize.parse_collection("$4 - $10")
+      expect(collection.first).to eq Monetize.parse("$4")
+      expect(collection.last).to eq Monetize.parse("$10")
+    end
+  end
+
   describe ".from_string" do
     it "converts given amount to cents" do
       expect(Monetize.from_string("1")).to eq Money.new(1_00)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monetize
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -82,8 +82,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/collection.rb
 - lib/monetize.rb
 - lib/monetize/core_extensions.rb
+- lib/monetize/core_extensions/hash.rb
+- lib/monetize/core_extensions/nil_class.rb
 - lib/monetize/core_extensions/numeric.rb
 - lib/monetize/core_extensions/string.rb
 - lib/monetize/core_extensions/symbol.rb