Backwards compatibility for MultiJson.

This commit is contained in:
Bob Aman 2012-08-30 12:15:59 +03:00
parent e77169a7f4
commit 11155d3c39
9 changed files with 30 additions and 4 deletions

View File

@ -1,3 +1,7 @@
# 0.4.6
* Backwards compatibility for MultiJson
# 0.4.5 # 0.4.5
* Updated Launchy dependency * Updated Launchy dependency

View File

@ -2,16 +2,16 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-api-client" s.name = "google-api-client"
s.version = "0.4.5" s.version = "0.4.6"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Bob Aman"] s.authors = ["Bob Aman"]
s.date = "2012-07-31" s.date = "2012-08-30"
s.description = "The Google API Ruby Client makes it trivial to discover and access supported\nAPIs.\n" s.description = "The Google API Ruby Client makes it trivial to discover and access supported\nAPIs.\n"
s.email = "bobaman@google.com" s.email = "bobaman@google.com"
s.executables = ["google-api"] s.executables = ["google-api"]
s.extra_rdoc_files = ["README.md"] s.extra_rdoc_files = ["README.md"]
s.files = ["lib/google", "lib/google/api_client", "lib/google/api_client/batch.rb", "lib/google/api_client/client_secrets.rb", "lib/google/api_client/discovery", "lib/google/api_client/discovery/api.rb", "lib/google/api_client/discovery/media.rb", "lib/google/api_client/discovery/method.rb", "lib/google/api_client/discovery/resource.rb", "lib/google/api_client/discovery/schema.rb", "lib/google/api_client/discovery.rb", "lib/google/api_client/environment.rb", "lib/google/api_client/errors.rb", "lib/google/api_client/media.rb", "lib/google/api_client/reference.rb", "lib/google/api_client/result.rb", "lib/google/api_client/service_account.rb", "lib/google/api_client/version.rb", "lib/google/api_client.rb", "lib/google/inflection.rb", "spec/fixtures", "spec/fixtures/files", "spec/fixtures/files/sample.txt", "spec/google", "spec/google/api_client", "spec/google/api_client/batch_spec.rb", "spec/google/api_client/discovery_spec.rb", "spec/google/api_client/media_spec.rb", "spec/google/api_client/result_spec.rb", "spec/google/api_client/service_account_spec.rb", "spec/google/api_client_spec.rb", "spec/spec_helper.rb", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/spec.rake", "tasks/wiki.rake", "tasks/yard.rake", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "Rakefile", "README.md", "bin/google-api"] s.files = ["lib/compat", "lib/compat/multi_json.rb", "lib/google", "lib/google/api_client", "lib/google/api_client/batch.rb", "lib/google/api_client/client_secrets.rb", "lib/google/api_client/discovery", "lib/google/api_client/discovery/api.rb", "lib/google/api_client/discovery/media.rb", "lib/google/api_client/discovery/method.rb", "lib/google/api_client/discovery/resource.rb", "lib/google/api_client/discovery/schema.rb", "lib/google/api_client/discovery.rb", "lib/google/api_client/environment.rb", "lib/google/api_client/errors.rb", "lib/google/api_client/media.rb", "lib/google/api_client/reference.rb", "lib/google/api_client/result.rb", "lib/google/api_client/service_account.rb", "lib/google/api_client/version.rb", "lib/google/api_client.rb", "lib/google/inflection.rb", "spec/fixtures", "spec/fixtures/files", "spec/fixtures/files/sample.txt", "spec/google", "spec/google/api_client", "spec/google/api_client/batch_spec.rb", "spec/google/api_client/discovery_spec.rb", "spec/google/api_client/media_spec.rb", "spec/google/api_client/result_spec.rb", "spec/google/api_client/service_account_spec.rb", "spec/google/api_client_spec.rb", "spec/spec_helper.rb", "tasks/gem.rake", "tasks/git.rake", "tasks/metrics.rake", "tasks/spec.rake", "tasks/wiki.rake", "tasks/yard.rake", "CHANGELOG.md", "Gemfile", "Gemfile.lock", "LICENSE", "Rakefile", "README.md", "bin/google-api"]
s.homepage = "http://code.google.com/p/google-api-ruby-client/" s.homepage = "http://code.google.com/p/google-api-ruby-client/"
s.rdoc_options = ["--main", "README.md"] s.rdoc_options = ["--main", "README.md"]
s.require_paths = ["lib"] s.require_paths = ["lib"]

17
lib/compat/multi_json.rb Normal file
View File

@ -0,0 +1,17 @@
gem 'multi_json', '>= 1.0.0'
require 'multi_json'
unless MultiJson.respond_to?(:load)
module MultiJson
class <<self
alias :load :decode
end
end
end
unless MultiJson.respond_to?(:dump)
module MultiJson
class <<self
alias :dump :encode
end
end
end

View File

@ -17,6 +17,7 @@ gem 'faraday', '~> 0.8.1'
require 'faraday' require 'faraday'
require 'faraday/utils' require 'faraday/utils'
require 'multi_json' require 'multi_json'
require 'compat/multi_json'
require 'stringio' require 'stringio'
require 'google/api_client/version' require 'google/api_client/version'

View File

@ -14,6 +14,7 @@
require 'multi_json' require 'multi_json'
require 'compat/multi_json'
module Google module Google

View File

@ -15,6 +15,7 @@
require 'time' require 'time'
require 'multi_json' require 'multi_json'
require 'compat/multi_json'
require 'base64' require 'base64'
require 'autoparse' require 'autoparse'
require 'addressable/uri' require 'addressable/uri'

View File

@ -17,6 +17,7 @@ gem 'faraday', '~> 0.8.1'
require 'faraday' require 'faraday'
require 'faraday/utils' require 'faraday/utils'
require 'multi_json' require 'multi_json'
require 'compat/multi_json'
require 'addressable/uri' require 'addressable/uri'
require 'stringio' require 'stringio'
require 'google/api_client/discovery' require 'google/api_client/discovery'

View File

@ -22,7 +22,7 @@ if !defined?(::Google::APIClient::VERSION)
module VERSION module VERSION
MAJOR = 0 MAJOR = 0
MINOR = 4 MINOR = 4
TINY = 5 TINY = 6
STRING = [MAJOR, MINOR, TINY].join('.') STRING = [MAJOR, MINOR, TINY].join('.')
end end

View File

@ -21,6 +21,7 @@ gem 'faraday', '~> 0.8.1'
require 'faraday' require 'faraday'
require 'faraday/utils' require 'faraday/utils'
require 'multi_json' require 'multi_json'
require 'compat/multi_json'
gem 'signet', '~> 0.4.0' gem 'signet', '~> 0.4.0'
require 'signet/oauth_1/client' require 'signet/oauth_1/client'