google_currency 1.2.0 → 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+Google Currency 2.0.0
+=====================
+
+Features
+--------
+ - Added multi_json to allow users to select their own JSON parsing engine.
+ - Removed deprecated method #get_google_rate.
+
+Bugfixes
+--------
+ - Updated deprecated rake tasks
+
 Google Currency 1.1.1
 =====================
 

data/README.md

@@ -1,14 +1,23 @@
 Google Currency
 ===============
 
+[![Build Status](https://secure.travis-ci.org/RubyMoney/google_currency.png)](http://travis-ci.org/RubyMoney/google_currency)
+
 This gem extends Money::Bank::VariableExchange with Money::Bank::GoogleCurrency
 and gives you access to the current Google Currency exchange rates.
 
+You have to load one of the JSON libraries supported by
+[MultiJSON](https://github.com/intridea/multi_json) (`json` for example)
+if it's not already loaded by your application. In a Rails application,
+ActiveSupport provides a JSON implementation that is automatically recognized.
+
 Usage
 -----
 
     require 'money'
     require 'money/bank/google_currency'
+    require 'json'
+    MultiJson.engine = :json_gem # or :yajl
 
     # set default bank to instance of GoogleCurrency
     Money.default_bank = Money::Bank::GoogleCurrency.new
@@ -26,4 +35,4 @@ An `UnknownCurrency` will be thrown if `#exchange_to` is called with a
 Copyright
 ---------
 
-Copyright (c) 2010 Shane Emmons. See {file:LICENSE} for details.
+Copyright (c) 2011 Shane Emmons. See {file:LICENSE} for details.

data/Rakefile

@@ -29,8 +29,8 @@ rescue LoadError
 end
 
 begin
-  require 'rake/gempackagetask'
-  Rake::GemPackageTask.new(gemspec) do |pkg|
+  require 'rubygems/package_task'
+  Gem::PackageTask.new(gemspec) do |pkg|
     pkg.gem_spec = gemspec
   end
   task :gem => :gemspec

data/google_currency.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google_currency"
-  s.version     = "1.2.0"
+  s.version     = "2.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons", "Donald Ball"]
   s.email       = ["semmons99+RubyMoney@gmail.com", "donald.ball@gmail.com"]
@@ -8,15 +8,15 @@ Gem::Specification.new do |s|
   s.summary     = "Access the Google Currency exchange rate data."
   s.description = "GoogleCurrency extends Money::Bank::Base and gives you access to the current Google Currency exchange rates."
 
-  s.required_rubygems_version = ">= 1.3.7"
+  s.required_rubygems_version = ">= 1.3.6"
 
   s.add_development_dependency "rspec", ">= 2.0.0"
   s.add_development_dependency "yard", ">= 0.5.8"
   s.add_development_dependency "json", ">= 1.4.0"
+  s.add_development_dependency "yajl-ruby", ">= 1.0.0"
 
   s.add_dependency "money", "~> 3.5"
-
-  s.requirements << "json"
+  s.add_dependency "multi_json", ">= 1.0.0"
 
   s.files =  Dir.glob("{lib,spec}/**/*")
   s.files += %w(LICENSE README.md CHANGELOG.md)

data/lib/money/bank/google_currency.rb

@@ -1,6 +1,6 @@
 require 'money'
 require 'open-uri'
-require 'json'
+require 'multi_json'
 
 class Money
   module Bank
@@ -65,24 +65,6 @@ class Money
         }
       end
 
-      ##
-      # Returns the requested rate after querying Google.
-      #
-      # @param [String, Symbol, Currency] from Currency to convert from
-      # @param [String, Symbol, Currency] to Currency to convert to
-      #
-      # @return [Float] The requested rate.
-      #
-      # @example
-      #   @bank = GoogleCurrency.new         #=> <Money::Bank::GoogleCurrency...>
-      #   @bank.get_google_rate(:USD, :EUR)  #=> 0.776337241
-      #
-      # @deprecated
-      def get_google_rate(from, to)
-        warn "#get_google_rate is deprecated, please use #get_rate"
-        fetch_rate(from, to)
-      end
-
       private
 
       ##
@@ -129,7 +111,9 @@ class Money
         data.gsub!(/rhs:/, '"rhs":')
         data.gsub!(/error:/, '"error":')
         data.gsub!(/icc:/, '"icc":')
-        JSON.parse(data)
+        data.gsub!(/(\xc2\xa0|\240)/, '')
+
+        MultiJson.decode(data)
       end
     end
   end

data/spec/{google_currency_spec.rb → google_currency_with_json_spec.rb}

@@ -3,34 +3,14 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'money'
 require 'money/bank/google_currency'
 
+require 'json'
+MultiJson.engine = :json_gem
+
 describe "GoogleCurrency" do
   before :each do
     @bank = Money::Bank::GoogleCurrency.new
   end
 
-  describe "#get_google_rate" do
-    it "should work for USD->USD" do
-      @bank.get_google_rate('USD', 'USD').should == 1.0
-    end
-
-    it "should work for usd->usd" do
-      @bank.get_google_rate('usd', 'usd').should == 1.0
-    end
-
-    it "should work for Currency.wrap(:USD)->Currency.wrap(:USD)" do
-      @bank.get_google_rate(Money::Currency.wrap(:USD),
-                            Money::Currency.wrap(:USD)).should == 1.0
-    end
-
-    it "should raise an UnknownCurrency error for an unknown currency" do
-      lambda{@bank.get_google_rate('USD', 'BATMAN')}.should raise_error(Money::Currency::UnknownCurrency)
-    end
-
-    it "should raise and UnknownRate error for a known currency but unknown rate" do
-      lambda{@bank.get_google_rate('USD', 'ALL')}.should raise_error(Money::Bank::UnknownRate)
-    end
-  end
-
   describe "#get_rate" do
     it "should use #fetch_rate when rate is unknown" do
       @bank.should_receive(:fetch_rate).once

data/spec/google_currency_with_yajl_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'money'
+require 'money/bank/google_currency'
+
+require 'yajl'
+MultiJson.engine = :yajl
+
+describe "GoogleCurrency" do
+  before :each do
+    @bank = Money::Bank::GoogleCurrency.new
+  end
+
+  describe "#get_rate" do
+    it "should use #fetch_rate when rate is unknown" do
+      @bank.should_receive(:fetch_rate).once
+      @bank.get_rate('USD', 'USD')
+    end
+
+    it "should not use #fetch_rate when rate is known" do
+      @bank.get_rate('USD', 'USD')
+      @bank.should_not_receive(:fetch_rate)
+      @bank.get_rate('USD', 'USD')
+    end
+
+    it "should return the correct rate" do
+      @bank.get_rate('USD', 'USD').should == 1.0
+    end
+
+    it "should store the rate for faster retreival" do
+      @bank.get_rate('USD', 'EUR')
+      @bank.rates.should include('USD_TO_EUR')
+    end
+  end
+
+  describe "#flush_rates" do
+    it "should empty @rates" do
+      @bank.get_rate('USD', 'EUR')
+      @bank.flush_rates
+      @bank.rates.should == {}
+    end
+  end
+
+  describe "#flush_rate" do
+    it "should remove a specific rate from @rates" do
+      @bank.get_rate('USD', 'EUR')
+      @bank.get_rate('USD', 'JPY')
+      @bank.flush_rate('USD', 'EUR')
+      @bank.rates.should include('USD_TO_JPY')
+      @bank.rates.should_not include('USD_TO_EUR')
+    end
+  end
+end

metadata

@@ -1,100 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google_currency
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Shane Emmons
 - Donald Ball
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-18 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &9979680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *9979680
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &9979176 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 5
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *9979176
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &9978624 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: money
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *9978624
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &9978048 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *9978048
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: &9977364 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 5
-        version: "3.5"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :runtime
-  version_requirements: *id004
-description: GoogleCurrency extends Money::Bank::Base and gives you access to the current Google Currency exchange rates.
-email: 
+  prerelease: false
+  version_requirements: *9977364
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &9976764 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *9976764
+description: GoogleCurrency extends Money::Bank::Base and gives you access to the
+  current Google Currency exchange rates.
+email:
 - semmons99+RubyMoney@gmail.com
 - donald.ball@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/money/bank/google_currency.rb
-- spec/google_currency_spec.rb
+- spec/google_currency_with_json_spec.rb
+- spec/google_currency_with_yajl_spec.rb
 - spec/spec_helper.rb
 - LICENSE
 - README.md
@@ -102,41 +97,28 @@ files:
 - Rakefile
 - .gemtest
 - google_currency.gemspec
-has_rdoc: true
 homepage: http://rubymoney.github.com/google_currency
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 21
-      segments: 
-      - 1
-      - 3
-      - 7
-      version: 1.3.7
-requirements: 
-- json
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
+requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Access the Google Currency exchange rate data.
 test_files: []
-