From 6692b24fa9914b9e6a9b16c6d3c6fd8c723d4330 Mon Sep 17 00:00:00 2001
From: John Drago <jdrago.999@gmail.com>
Date: Wed, 17 Feb 2016 10:32:38 -0800
Subject: [PATCH 1/7] Update 'samples' link to 'samples' folder

The original samples link pointed to the (now) out of date examples for version 0.8 of this gem. I lost a few hours wondering why things were not working.

Hoping to save someone else the time I lost (and reap the karmic bounty thereof).
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a9b5af95f..f3fa5b32f 100644
--- a/README.md
+++ b/README.md
@@ -220,8 +220,8 @@ Samples for versions 0.9 and onward can be found in the `samples` directory.
 Contributions for additional samples are welcome. See [CONTRIBUTING](CONTRIBUTING.md).
 
 Samples for previous versions can be found in the
-[google-api-ruby-client-samples](https://github.com/google/google-api-ruby-client-samples)
-repository.
+[samples](samples)
+folder.
 
 
 ## Generating APIs

From b0173dc57a4fcd02dbfd6c75fbab7c991ef633cc Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Wed, 24 Feb 2016 02:55:55 +0900
Subject: [PATCH 2/7] Assign `open_timeout` option in `apply_request_options`

---
 lib/google/apis/core/http_command.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/google/apis/core/http_command.rb b/lib/google/apis/core/http_command.rb
index d18eb85f2..73b736dda 100644
--- a/lib/google/apis/core/http_command.rb
+++ b/lib/google/apis/core/http_command.rb
@@ -292,6 +292,7 @@ module Google
           end
           req.header.update(header)
           req.options.timeout = options.timeout_sec
+          req.options.open_timeout = options.open_timeout_sec
         end
 
         private

From 4b6f5d0a2b8e8019ea8045b681987f90af03c2d3 Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Thu, 25 Feb 2016 02:48:02 +0900
Subject: [PATCH 3/7] Fix Hash value assignment in JsonSupport#getter_fn

because current version cannot send `false` value.
If given parameter is `false`, current version does not use it.
---
 lib/google/apis/core/json_representation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/google/apis/core/json_representation.rb b/lib/google/apis/core/json_representation.rb
index 843038a02..9fbf4bf01 100644
--- a/lib/google/apis/core/json_representation.rb
+++ b/lib/google/apis/core/json_representation.rb
@@ -39,7 +39,7 @@ module Google
             ivar_name = "@#{name}".to_sym
             lambda do |_|
               if respond_to?(:[])
-                self[name] || instance_variable_get(ivar_name)
+                self.key?(name) ? self[name] : instance_variable_get(ivar_name)
               else
                 instance_variable_get(ivar_name)
               end

From fe7c37739930657353d2f4791bbcbb93d24d7a9e Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Thu, 25 Feb 2016 05:34:39 +0900
Subject: [PATCH 4/7] Add boolean test case

---
 .../apis/core/json_representation_spec.rb     | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/spec/google/apis/core/json_representation_spec.rb b/spec/google/apis/core/json_representation_spec.rb
index ebbe3e681..644a5ac0b 100644
--- a/spec/google/apis/core/json_representation_spec.rb
+++ b/spec/google/apis/core/json_representation_spec.rb
@@ -28,7 +28,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       attr_accessor :nil_value
       attr_accessor :numeric_value
       attr_accessor :string_value
-      attr_accessor :boolean_value
+      attr_accessor :boolean_value_true
+      attr_accessor :boolean_value_false
       attr_accessor :date_value
       attr_accessor :bytes_value
       attr_accessor :items
@@ -44,7 +45,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       property :nil_value, as: 'nilValue'
       property :numeric_value, as: 'numericValue'
       property :string_value, as: 'stringValue'
-      property :boolean_value, as: 'booleanValue'
+      property :boolean_value_true, as: 'booleanValueTrue'
+      property :boolean_value_false, as: 'booleanValueFalse'
       property :date_value, as: 'dateValue', type: DateTime
       property :bytes_value, as: 'bytesValue', base64: true
       property :items
@@ -75,7 +77,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
     end
 
     it 'serializes boolean values' do
-      expect(json).to be_json_eql(%(true)).at_path('booleanValue')
+      expect(json).to be_json_eql(%(true)).at_path('booleanValueTrue')
+      expect(json).to be_json_eql(%(false)).at_path('booleanValueFalse')
     end
 
     it 'serializes date values' do
@@ -107,7 +110,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       model.numeric_value = 123
       model.string_value = 'test'
       model.date_value = DateTime.new(2015, 5, 1, 12)
-      model.boolean_value = true
+      model.boolean_value_true = true
+      model.boolean_value_false = false
       model.bytes_value = 'Hello world'
       model.items = [1, 2, 3]
       model.child = child_class.new
@@ -127,7 +131,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
         string_value: 'test',
         numeric_value: 123,
         date_value: DateTime.new(2015, 5, 1, 12),
-        boolean_value: true,
+        boolean_value_true: true,
+        boolean_value_false: false,
         bytes_value: 'Hello world',
         items: [1, 2, 3],
         child: {
@@ -146,7 +151,8 @@ RSpec.describe Google::Apis::Core::JsonRepresentation do
       json = <<EOF
 { "stringValue": "test",
   "nilValue": null,
-  "booleanValue": true,
+  "booleanValueTrue": true,
+  "booleanValueFalse": false,
   "numericValue": 123,
   "dateValue": "2015-05-01T12:00:00+00:00",
   "bytesValue": "SGVsbG8gd29ybGQ=",
@@ -170,7 +176,8 @@ EOF
     end
 
     it 'deserializes boolean values' do
-      expect(model.boolean_value).to be_truthy
+      expect(model.boolean_value_true).to be_truthy
+      expect(model.boolean_value_false).to be_falsey
     end
 
     it 'deserializes date values' do

From 4b9a63c086c2a18136093ff46962f5fd436e100d Mon Sep 17 00:00:00 2001
From: James Healy <james@yob.id.au>
Date: Thu, 25 Feb 2016 13:27:33 +1100
Subject: [PATCH 5/7] replace multi_json dependency with regular stdlib JSON

JSON has been part of the ruby stdlib since 1.9.0 (see
https://github.com/ruby/ruby/commit/af1c4167), and the latest version of
google-api-client requires ruby 2.0 or better so we can assume it's available
---
 bin/generate-api                              | 1 -
 google-api-client.gemspec                     | 1 -
 lib/google/api_client/client_secrets.rb       | 7 +++----
 lib/google/apis/core/api_command.rb           | 4 ++--
 lib/google/apis/generator/annotator.rb        | 2 +-
 spec/google/api_client/client_secrets_spec.rb | 4 ++--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/bin/generate-api b/bin/generate-api
index 621f9329c..c16b6f957 100755
--- a/bin/generate-api
+++ b/bin/generate-api
@@ -6,7 +6,6 @@ require 'thor'
 require 'open-uri'
 require 'google/apis/discovery_v1'
 require 'google/apis/generator'
-require 'multi_json'
 require 'logger'
 
 module Google
diff --git a/google-api-client.gemspec b/google-api-client.gemspec
index ae510cd1e..3d94d5d23 100644
--- a/google-api-client.gemspec
+++ b/google-api-client.gemspec
@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib', 'generated', 'third_party']
 
   spec.add_runtime_dependency 'representable', '~> 2.3.0'
-  spec.add_runtime_dependency 'multi_json', '~> 1.11'
   spec.add_runtime_dependency 'retriable', '~> 2.0'
   spec.add_runtime_dependency 'activesupport', '>= 3.2'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
diff --git a/lib/google/api_client/client_secrets.rb b/lib/google/api_client/client_secrets.rb
index 5bb195393..64515efeb 100644
--- a/lib/google/api_client/client_secrets.rb
+++ b/lib/google/api_client/client_secrets.rb
@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-require 'compat/multi_json'
+require 'json'
 
 
 module Google
@@ -71,7 +70,7 @@ module Google
             search_path = File.expand_path(File.join(search_path, '..'))
           end
         end
-        data = File.open(filename, 'r') { |file| MultiJson.load(file.read) }
+        data = File.open(filename, 'r') { |file| JSON.load(file.read) }
         return self.new(data)
       end
 
@@ -119,7 +118,7 @@ module Google
       # @return [String]
       #   JSON
       def to_json
-        return MultiJson.dump(to_hash)
+        return Json.dump(to_hash)
       end
 
       def to_hash
diff --git a/lib/google/apis/core/api_command.rb b/lib/google/apis/core/api_command.rb
index 61ac0d853..2733ae13c 100644
--- a/lib/google/apis/core/api_command.rb
+++ b/lib/google/apis/core/api_command.rb
@@ -17,7 +17,7 @@ require 'addressable/uri'
 require 'addressable/template'
 require 'google/apis/core/http_command'
 require 'google/apis/errors'
-require 'multi_json'
+require 'json'
 require 'retriable'
 
 module Google
@@ -113,7 +113,7 @@ module Google
         #  HTTP response body
         # @return [Hash]
         def parse_error(body)
-          hash = MultiJson.load(body)
+          hash = JSON.load(body)
           hash['error']['errors'].first
         rescue
           nil
diff --git a/lib/google/apis/generator/annotator.rb b/lib/google/apis/generator/annotator.rb
index 1614cdddb..7105728d4 100644
--- a/lib/google/apis/generator/annotator.rb
+++ b/lib/google/apis/generator/annotator.rb
@@ -15,7 +15,7 @@
 require 'logger'
 require 'erb'
 require 'yaml'
-require 'multi_json'
+require 'json'
 require 'active_support/inflector'
 require 'google/apis/core/logging'
 require 'google/apis/generator/template'
diff --git a/spec/google/api_client/client_secrets_spec.rb b/spec/google/api_client/client_secrets_spec.rb
index 247004cfa..8964c7d94 100644
--- a/spec/google/api_client/client_secrets_spec.rb
+++ b/spec/google/api_client/client_secrets_spec.rb
@@ -23,7 +23,7 @@ FIXTURES_PATH = File.expand_path('../../../fixtures', __FILE__)
 RSpec.describe Google::APIClient::ClientSecrets do
   describe '::new' do
     let(:filename) { File.join(FIXTURES_PATH, 'files', 'client_secrets.json') }
-    let(:data) { File.open(filename, 'r') { |file| MultiJson.load(file.read) } }
+    let(:data) { File.open(filename, 'r') { |file| JSON.load(file.read) } }
 
     context 'without options' do
       subject { Google::APIClient::ClientSecrets.new(data) }
@@ -367,7 +367,7 @@ RSpec.describe Google::APIClient::ClientSecrets do
   context 'with invalid JSON file' do
     it 'should raise exception' do
       file = File.join(FIXTURES_PATH, 'files', 'invalid.json')
-      expect { Google::APIClient::ClientSecrets.load(file) }.to raise_exception(MultiJson::ParseError)
+      expect { Google::APIClient::ClientSecrets.load(file) }.to raise_exception(JSON::ParserError)
     end
   end
 

From 5d5dd98df80ece2c1a1ca4115036c7ecdd16fdb5 Mon Sep 17 00:00:00 2001
From: James Healy <james@yob.id.au>
Date: Thu, 25 Feb 2016 13:35:21 +1100
Subject: [PATCH 6/7] include ruby 2.3.0 in the CI build matrix

MRI 2.3.0 was released on 2015-12-25, so it'd be good to ensure
compatibility
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 65ec7dbe0..57023b0cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.3.0
   - 2.2
   - 2.0.0
   - 2.1

From 880b0f8acfe95deaa4bd17e8012800ecb76fa2d2 Mon Sep 17 00:00:00 2001
From: joker1007 <kakyoin.hierophant@gmail.com>
Date: Thu, 25 Feb 2016 12:19:42 +0900
Subject: [PATCH 7/7] Use Hash#fetch

---
 lib/google/apis/core/json_representation.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/google/apis/core/json_representation.rb b/lib/google/apis/core/json_representation.rb
index 9fbf4bf01..ab28e04e1 100644
--- a/lib/google/apis/core/json_representation.rb
+++ b/lib/google/apis/core/json_representation.rb
@@ -38,8 +38,8 @@ module Google
           def getter_fn(name)
             ivar_name = "@#{name}".to_sym
             lambda do |_|
-              if respond_to?(:[])
-                self.key?(name) ? self[name] : instance_variable_get(ivar_name)
+              if respond_to?(:fetch)
+                fetch(name, instance_variable_get(ivar_name))
               else
                 instance_variable_get(ivar_name)
               end