exchange 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b07fc45eb9ab48bfe650be620f7e7a56320b7139
-  data.tar.gz: c282e0a9b56802cadd9fd5be61aadc4baf3dfdaf
+  metadata.gz: a7183dab51d6b41d1572ba98dcaf30d2be590ade
+  data.tar.gz: 345945166e17a720eb7cb04f41e4571d8d4f3403
 SHA512:
-  metadata.gz: af9f00a17b47fbe5c28a6cfbaaac207209da877a7bead8ceece961950d336638f2bc4944794ff6ea5268bbd0fe31ea0b23fc883686413226af58e535d610e946
-  data.tar.gz: 768f5bdbbc7dd3e8bbe71a23a3a97ee105856b282c286364cf743b5e59f934ba5f8426088777827e2715503046c33640638167b8c9b3729b4877f7d7f3d04741
+  metadata.gz: b99284cae296720f914a5e4acc10a35c2852f041e0edf3a542a90554ada02696549ac879e95c98aeedd9668a59f409717401279167da1cca868bb0af95fdaaef
+  data.tar.gz: c111ad35f96feea8915f815f911c9fcd408055851c8d1a2f03172ee09312b8f265bf93961457d70c85c0decd44dd2eb8123af2bc32fa9032961684f9615a52f6

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+branches:
+  only:
+    - master
 rvm:
   - 1.9.2
   - 1.9.3
@@ -8,4 +11,8 @@ rvm:
   - jruby-19mode
   - jruby-20mode
   
-script: bundle exec rspec
+script: bundle exec rspec
+
+matrix:
+  allow_failures:
+    - rvm: 2.1.0

data/Gemfile

@@ -3,13 +3,13 @@ source "http://rubygems.org"
 gemspec
 
 group :development do
-  gem "yard",       ">= 0.7.4"
-  gem "bundler",    ">= 1.0.0"
+  gem "yard",       "~> 0.8"
+  gem "bundler",    "~> 1.3"
 end
 
 group :test do
-  gem "nokogiri",   ">= 1.5.0", :require => false
-  gem "dalli",      ">= 2.0.0", :require => false
-  gem "redis",      ">= 2.2.0", :require => false
+  gem "nokogiri",   "~> 1.6", :require => false
+  gem "dalli",      "~> 2.6", :require => false
+  gem "redis",      "~> 3.0", :require => false
   gem "rspec"
 end

data/exchange.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
   s.require_paths     = ["lib"]
   
-  s.add_dependency             "nokogiri", "~> 1.6", ">= 1.0.0"
-  s.add_development_dependency "json", "~> 1.8", ">= 1.0.0"
-  s.add_development_dependency "yard", "~> 0.8", ">= 0.7.4"
-  s.add_development_dependency "bundler", "~> 1.5", ">= 1.0.0"
+  s.add_dependency             "nokogiri", "~> 1", ">= 1.0.0"
+  s.add_development_dependency "json", "~> 1", ">= 1.0.0"
+  s.add_development_dependency "yard", "~> 0.8"
+  s.add_development_dependency "bundler", "~> 1.3"
   if RUBY_ENGINE == 'rbx'
     s.add_development_dependency "rubysl-bigdecimal", "~> 2.0"
     s.add_development_dependency "rubysl-singleton", "~> 2.0"

data/lib/exchange/base.rb

@@ -8,7 +8,7 @@ module Exchange
   
   # The current version of the exchange gem
   #
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'.freeze
   
   # The root installation path of the gem
   # @version 0.5

data/lib/exchange/iso.rb

@@ -21,7 +21,7 @@ module Exchange
         # @private
         # @macro [attach] install_operations
       
-        def install_operation op      
+        def install_operation op
           self.class_eval <<-EOV
             def #{op} amount, currency, precision=nil, opts={}
               minor = definitions[currency][:minor_unit]
@@ -111,7 +111,7 @@ module Exchange
     # @example Convert a currency to a string without the currency
     #   Exchange::ISO.stringif(34.34, :omr, :amount_only => true) #=> "34.340"
     #
-    def stringify amount, currency, opts={}    
+    def stringify amount, currency, opts={}
       definition    = definitions[currency]
       separators    = definition[:separators] || {}
       format        = "%.#{definition[:minor_unit]}f"
@@ -130,7 +130,7 @@ module Exchange
     # @param currency The currency to return the symbol for
     # @return [String, NilClass] The symbol or nil
     # 
-    def symbol currency      
+    def symbol currency
       definitions[currency][:symbol]
     end
     
@@ -172,8 +172,8 @@ module Exchange
     def symbolize_keys hsh
       new_hsh = Hash.new
       
-      hsh.each_pair do |k,v| 
-        v = symbolize_keys v if v.is_a?(Hash)        
+      hsh.each_pair do |k,v|
+        v = symbolize_keys v if v.is_a?(Hash)
         new_hsh[k.downcase.to_sym] = v
       end
       

data/lib/exchange/typecasting.rb

@@ -56,13 +56,15 @@ module Exchange
       define_method :"#{attribute}_with_exchange_typecasting" do
         currency = evaluate_money_option(options[:currency]) if options[:currency]
         
-        test_for_currency_error(currency)
+        test_for_currency_error(currency, attribute)
         
         time     = evaluate_money_option(options[:at]) if options[:at]
         
-        Exchange::Money.new(send(:"#{attribute}_without_exchange_typecasting")) do |c|
-          c.currency = currency
-          c.time     = time if time
+        if value = send(:"#{attribute}_without_exchange_typecasting")
+          Exchange::Money.new(value) do |c|
+            c.currency = currency
+            c.time     = time if time
+          end
         end
       end
       exchange_typecasting_alias_method_chain attribute
@@ -111,7 +113,7 @@ module Exchange
     #   @method test_for_currency_error
     #
     def install_currency_error_tester
-      define_method :test_for_currency_error do |currency|
+      define_method :test_for_currency_error do |currency, attribute|
         raise NoCurrencyError.new("No currency is given for typecasting #{attribute}. Make sure a currency is present") unless currency
       end
     end

data/spec/exchange/typecasting_spec.rb

@@ -62,6 +62,23 @@ describe "Exchange::Typecasting" do
         subject.price.value.should == 0.77
       end
     end
+    context "when the currency is nil" do
+      before(:each) do
+        subject.manager.currency = nil
+      end
+      it "should raise an error" do
+        lambda { subject.price }.should raise_error(Exchange::NoCurrencyError, "No currency is given for typecasting price. Make sure a currency is present")
+      end
+    end
+    context "when the value is nil" do
+      before(:each) do
+        subject.price = nil
+        subject.manager.currency = :usd
+      end
+      it "should return nil" do
+        subject.price.should be_nil
+      end
+    end
   end
   
   describe "set" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exchange
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Beat Richartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1'
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -57,9 +57,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,29 +64,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.3'
 description: 'Simple Money handling for your ruby app – ISO4217-compatible Currency
   instantiation, conversion, string formatting and more via an intuitive DSL: 1.in(:usd).to(:eur)'
 email: attr_accessor@gmail.com