google-api-client 0.4.5 → 0.4.6

data/CHANGELOG.md

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

data/lib/compat/multi_json.rb

@@ -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

data/lib/google/api_client.rb

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

data/lib/google/api_client/client_secrets.rb

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

data/lib/google/api_client/discovery/schema.rb

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

data/lib/google/api_client/reference.rb

@@ -17,6 +17,7 @@ gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 require 'multi_json'
+require 'compat/multi_json'
 require 'addressable/uri'
 require 'stringio'
 require 'google/api_client/discovery'
@@ -63,7 +64,7 @@ module Google
         self.headers = options[:headers] || {}
         if options[:media]
           self.media = options[:media]
-          upload_type = parameters['uploadType'] || parameters['upload_type']
+          upload_type = self.parameters.find { |(k, _)| ['uploadType', 'upload_type'].include?(k) }.last
           case upload_type
           when "media"
             if options[:body] || options[:body_object]

data/lib/google/api_client/version.rb

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

data/spec/google/api_client/discovery_spec.rb

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

metadata

@@ -1,194 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google-api-client
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.4.6
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 5
-  version: 0.4.5
 platform: ruby
-authors: 
+authors:
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: signet
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70246409434540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409434540
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70246409433420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409433420
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &70246409432480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: autoparse
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409432480
+- !ruby/object:Gem::Dependency
+  name: autoparse
+  requirement: &70246409428540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409428540
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: &70246409427660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409427660
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70246409412260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: extlib
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409412260
+- !ruby/object:Gem::Dependency
+  name: extlib
+  requirement: &70246409411440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 0
-        - 9
-        - 15
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.15
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409411440
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &70246409410540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409410540
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70246409409820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70246409409820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70246409409120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id010
-description: |
-  The Google API Ruby Client makes it trivial to discover and access supported
+  prerelease: false
+  version_requirements: *70246409409120
+description: ! 'The Google API Ruby Client makes it trivial to discover and access
+  supported
+
   APIs.
 
+'
 email: bobaman@google.com
-executables: 
+executables:
 - google-api
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
+- lib/compat/multi_json.rb
 - lib/google/api_client/batch.rb
 - lib/google/api_client/client_secrets.rb
 - lib/google/api_client/discovery/api.rb
@@ -222,44 +168,34 @@ files:
 - tasks/yard.rake
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.md
 - bin/google-api
 homepage: http://code.google.com/p/google-api-ruby-client/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-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: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Package Summary
 test_files: []
-

data/Gemfile.lock

@@ -1,80 +0,0 @@
-PATH
-  remote: .
-  specs:
-    google-api-client (0.4.5)
-      addressable (>= 2.3.2)
-      autoparse (>= 0.3.2)
-      extlib (>= 0.9.15)
-      faraday (~> 0.8.1)
-      launchy (>= 2.1.1)
-      multi_json (>= 1.0.0)
-      signet (>= 0.4.1)
-      uuidtools (>= 2.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.2)
-    autoparse (0.3.2)
-      addressable (>= 2.3.1)
-      extlib (>= 0.9.15)
-      multi_json (>= 1.0.0)
-    diff-lcs (1.1.3)
-    extlib (0.9.15)
-    faraday (0.8.1)
-      multipart-post (~> 1.1)
-    idn (0.0.2)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
-    launchy (2.1.1)
-      addressable (~> 2.3)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    redcarpet (2.1.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
-    signet (0.4.1)
-      addressable (>= 2.2.3)
-      faraday (~> 0.8.1)
-      jwt (>= 0.1.5)
-      multi_json (>= 1.0.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-    uuidtools (2.1.3)
-    yard (0.8.2.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  addressable (>= 2.3.2)
-  autoparse (>= 0.3.2)
-  extlib (>= 0.9.15)
-  faraday (~> 0.8.1)
-  google-api-client!
-  idn
-  jruby-openssl
-  launchy (>= 2.1.1)
-  multi_json (>= 1.0.0)
-  rake (>= 0.9.0)
-  rcov (>= 0.9.9)
-  redcarpet
-  rspec (>= 2.11.0)
-  signet (>= 0.4.1)
-  sinatra
-  uuidtools (>= 2.1.0)
-  yard