Merge branch 'master' of https://github.com/google/google-api-ruby-client

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

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

lib/google/apis/core/http_command.rb

@@ -303,6 +303,7 @@ module Google
           end
           req.header.update(header)
           req.options.timeout = options.timeout_sec
+          req.options.open_timeout = options.open_timeout_sec
         end
 
         private

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[name] || instance_variable_get(ivar_name)
+              if respond_to?(:fetch)
+                fetch(name, instance_variable_get(ivar_name))
               else
                 instance_variable_get(ivar_name)
               end

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'