diff --git a/google-api-client.gemspec b/google-api-client.gemspec index cced2ec63..39cea1eca 100644 --- a/google-api-client.gemspec +++ b/google-api-client.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('autoparse', '>= 0.3.3') s.add_runtime_dependency('faraday', '>= 0.9.0') s.add_runtime_dependency('multi_json', '>= 1.0.0') - s.add_runtime_dependency('extlib', '>= 0.9.15') + s.add_runtime_dependency('activesupport', '>= 3.2.0') s.add_runtime_dependency('jwt', '>= 0.1.5') s.add_runtime_dependency('retriable', '~> 1.4') s.add_runtime_dependency('launchy', '>= 2.1.1') diff --git a/lib/google/api_client/discovery/api.rb b/lib/google/api_client/discovery/api.rb index 4c58d7e10..be83f6279 100644 --- a/lib/google/api_client/discovery/api.rb +++ b/lib/google/api_client/discovery/api.rb @@ -15,7 +15,7 @@ require 'addressable/uri' require 'multi_json' -require 'google/inflection' +require 'active_support/inflector' require 'google/api_client/discovery/resource' require 'google/api_client/discovery/method' require 'google/api_client/discovery/media' @@ -41,13 +41,13 @@ module Google @discovery_document = discovery_document metaclass = (class << self; self; end) self.discovered_resources.each do |resource| - method_name = Google::INFLECTOR.underscore(resource.name).to_sym + method_name = ActiveSupport::Inflector.underscore(resource.name).to_sym if !self.respond_to?(method_name) metaclass.send(:define_method, method_name) { resource } end end self.discovered_methods.each do |method| - method_name = Google::INFLECTOR.underscore(method.name).to_sym + method_name = ActiveSupport::Inflector.underscore(method.name).to_sym if !self.respond_to?(method_name) metaclass.send(:define_method, method_name) { method } end diff --git a/lib/google/api_client/discovery/resource.rb b/lib/google/api_client/discovery/resource.rb index f6493ff40..9b757c684 100644 --- a/lib/google/api_client/discovery/resource.rb +++ b/lib/google/api_client/discovery/resource.rb @@ -15,7 +15,7 @@ require 'addressable/uri' -require 'google/inflection' +require 'active_support/inflector' require 'google/api_client/discovery/method' @@ -45,13 +45,13 @@ module Google @discovery_document = discovery_document metaclass = (class < 1 diff --git a/lib/google/inflection.rb b/lib/google/inflection.rb deleted file mode 100644 index 127a6d4e2..000000000 --- a/lib/google/inflection.rb +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2010 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -module Google - begin - require 'active_support/inflector' - INFLECTOR = ActiveSupport::Inflector - rescue LoadError - require 'extlib/inflection' - INFLECTOR = Extlib::Inflection - end -end