open_exchange_rates 0.3.0 → 0.4.0

data/README.md

@@ -1,6 +1,7 @@
 # OpenExchangeRates
 
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/vlado/open_exchange_rates)
+[![Gem Version](https://badge.fury.io/rb/open_exchange_rates.png)](http://badge.fury.io/rb/open_exchange_rates)
 
 Ruby gem for currency conversion based on [Open Exchange Rates API](http://openexchangerates.org) - free / open source hourly-updated currency data for everybody
 
@@ -83,9 +84,9 @@ If you omit **:from** or **:to** option conversion will be related to base curre
 ## TODO
 
 - ability to set default currency (USD is currently always set as base currency)
-- ability to pass Date as :on option (only 'yyyy-mm-dd' works currently)
+- <del>ability to pass Date as :on option (only 'yyyy-mm-dd' works currently)</del>
 - write some docs
-- write more test for specific situations (invalid date, ...)
+- write more test for specific situations (<del>invalid date</del>, ...)
 
 ## Contributing
 

data/lib/open_exchange_rates/rates.rb

@@ -1,4 +1,5 @@
 require "open-uri"
+require "date"
 
 module OpenExchangeRates
   class Rates
@@ -9,8 +10,15 @@ module OpenExchangeRates
       end
     end
 
-    def initialize(app_id = nil)
-      @app_id = app_id || OpenExchangeRates.configuration.app_id
+    attr_reader :app_id
+
+    def initialize(options = {})
+      if options.kind_of? Hash
+        @app_id = options[:app_id] || OpenExchangeRates.configuration.app_id
+      else
+        warn "[DEPRECATION] `OpenExchangeRates::Rates.new('myappid')` is deprecated.  Please use `OpenExchangeRates::Rates.new(:app_id => 'myappid')` instead."
+        @app_id = options
+      end
       raise MissingAppIdError unless @app_id
     end
 
@@ -45,7 +53,24 @@ module OpenExchangeRates
       OpenExchangeRates::Response.new(@latest_response)
     end
 
-    def on(date_string)
+    def valid_yyyy_mm_dd(date_string)
+      matches = date_string =~ /^([0-9]{4})(?:(1[0-2]|0[1-9])|-(1[0-2]|0[1-9])-)(3[0-1]|0[1-9]|[1-2][0-9])/
+      raise ArgumentError, 'Not a valid date string (ie. yyyy-mm-dd)' unless matches
+      date_string
+    end
+
+    def date_string_from(date_representation)
+      if date_representation.kind_of? Date
+        date_representation.to_s
+      elsif date_representation.kind_of? String
+        valid_yyyy_mm_dd date_representation
+      else
+        raise ArgumentError, "'on' must be a Date or 'yyyy-mm-dd' string"
+      end
+    end
+
+    def on(date_representation)
+      date_string = date_string_from(date_representation)
       OpenExchangeRates::Response.new(parse_on(date_string))
     end
 
@@ -64,4 +89,4 @@ module OpenExchangeRates
     end
 
   end
-end
+end

data/lib/open_exchange_rates/version.rb

@@ -1,3 +1,3 @@
 module OpenExchangeRates
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/rates_test.rb

@@ -1,4 +1,5 @@
 require "test_helper"
+require 'complex'
 
 class TestOpenExchangeRates < Test::Unit::TestCase
 
@@ -13,11 +14,27 @@ class TestOpenExchangeRates < Test::Unit::TestCase
     OpenExchangeRates.configuration.app_id = ENV['OPEN_EXCHANGE_RATES_APP_ID']
   end
 
+  def test_app_id_configuration
+    fx = OpenExchangeRates::Rates.new
+    assert_equal ENV['OPEN_EXCHANGE_RATES_APP_ID'], fx.app_id
+
+    OpenExchangeRates.configure do |config|
+      config.app_id = "myappid"
+    end
+    fx = OpenExchangeRates::Rates.new
+    assert_equal "myappid", fx.app_id
+
+    fx = OpenExchangeRates::Rates.new(:app_id => 'myotherappid')
+    assert_equal "myotherappid", fx.app_id
+
+    OpenExchangeRates.configuration.app_id = ENV['OPEN_EXCHANGE_RATES_APP_ID']
+  end
+
   def test_invalid_app_id_raise_error
     stub(OpenExchangeRates.configuration).app_id { "somethingstupid" }
     fx = OpenExchangeRates::Rates.new
 
-    assert_raise NoMethodError do
+    assert_raise OpenURI::HTTPError do
       fx.exchange_rate(:from => "USD", :to => "EUR")
     end
   end
@@ -62,6 +79,25 @@ class TestOpenExchangeRates < Test::Unit::TestCase
     assert_equal 0.171472, fx.exchange_rate(:from => "HRK", :to => "AUD", :on => "2012-05-10")
   end
 
+  def test_exchange_rate_on_specific_date_specified_by_date_class
+    fx = OpenExchangeRates::Rates.new
+    stub(fx).parse_on { OpenExchangeRates::Parser.new.parse(open_asset("2012-05-10.json")) }
+
+    assert_equal 1, fx.exchange_rate(:from => "USD", :to => "USD", :on => Date.new(2012,05,10))
+  end
+
+  def test_exchange_requires_valid_date
+    fx = OpenExchangeRates::Rates.new
+
+    assert_raise ArgumentError do
+      fx.exchange_rate(:from => "USD", :to => "USD", :on => "somethingstupid")
+    end
+
+    assert_raise ArgumentError do
+      fx.exchange_rate(:from => "USD", :to => "USD", :on => Complex(0.3))
+    end
+  end
+
   def test_convert
     fx = OpenExchangeRates::Rates.new
     stub(fx).parse_latest { OpenExchangeRates::Parser.new.parse(open_asset("latest.json")) }
@@ -183,4 +219,4 @@ private
     File.open("#{assets_root}/#{filename}")
   end
 
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: open_exchange_rates
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Vlado Cingel
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 Z
+date: 2013-01-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: yajl-ruby
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :runtime
-  name: yajl-ruby
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rr
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -41,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :development
-  name: rr
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,10 +57,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :development
-  name: rake
-  prerelease: false
+  version_requirements: *id003
 description: Ruby library for Open Exchange Rates API - free / open source hourly-updated currency data for everybody
 email: 
 - vladocingel@gmail.com
@@ -124,3 +124,4 @@ test_files:
 - test/assets/latest.json
 - test/rates_test.rb
 - test/test_helper.rb
+has_rdoc: