google-api-client 0.3.0 → 0.4.0

data/spec/google/api_client_spec.rb

@@ -14,9 +14,12 @@
 
 require 'spec_helper'
 
+gem 'faraday', '~> 0.7.0'
+require 'faraday'
+require 'faraday/utils'
+
+gem 'signet', '~> 0.3.0'
 require 'signet/oauth_1/client'
-require 'httpadapter/adapters/net_http'
-require 'httpadapter/adapters/mock'
 
 require 'google/api_client'
 require 'google/api_client/version'
@@ -44,16 +47,22 @@ shared_examples_for 'configurable user agent' do
 
   it 'should transmit a User-Agent header when sending requests' do
     @client.user_agent = 'Custom User Agent/1.2.3'
-    request = ['GET', 'http://www.google.com/', [], []]
-    adapter = HTTPAdapter::MockAdapter.create do |request_ary, connection|
-      method, uri, headers, body = request_ary
-      headers.should be_any { |k, v| k.downcase == 'user-agent' }
-      headers.each do |k, v|
-        v.should == @client.user_agent if k.downcase == 'user-agent'
+    request = Faraday::Request.new(:get) do |req|
+      req.url('http://www.google.com/')
+    end
+    stubs = Faraday::Adapter::Test::Stubs.new do |stub|
+      stub.get('/') do |env|
+        headers = env[:request_headers]
+        headers.should have_key('User-Agent')
+        headers['User-Agent'].should == @client.user_agent
+        [200, {}, ['']]
       end
-      [200, [], ['']]
     end
-    @client.transmit(request, adapter)
+    connection = Faraday.new(:url => 'https://www.google.com') do |builder|
+      builder.adapter(:test, stubs)
+    end
+    @client.transmit(:request => request, :connection => connection)
+    stubs.verify_stubbed_calls
   end
 end
 

data/tasks/gem.rake

@@ -1,4 +1,7 @@
 require 'rubygems/package_task'
+require 'rake/clean'
+
+CLOBBER.include('pkg')
 
 namespace :gem do
   GEM_SPEC = Gem::Specification.new do |s|
@@ -21,11 +24,11 @@ namespace :gem do
     s.rdoc_options.concat ['--main',  'README.md']
 
     # Dependencies used in the main library
-    s.add_runtime_dependency('signet', '~> 0.2.2')
-    s.add_runtime_dependency('addressable', '~> 2.2.2')
-    s.add_runtime_dependency('httpadapter', '~> 1.0.1')
+    s.add_runtime_dependency('signet', '~> 0.3.1')
+    s.add_runtime_dependency('addressable', '~> 2.2.3')
     s.add_runtime_dependency('autoparse', '~> 0.2.0')
-    s.add_runtime_dependency('json', '>= 1.4.6')
+    s.add_runtime_dependency('faraday', '~> 0.7.0')
+    s.add_runtime_dependency('multi_json', '>= 1.0.0')
     s.add_runtime_dependency('extlib', '>= 0.9.15')
 
     # Dependencies used in the CLI
@@ -93,5 +96,3 @@ end
 
 desc 'Alias to gem:package'
 task 'gem' => 'gem:package'
-
-task 'clobber' => ['gem:clobber_package']

data/tasks/git.rake

@@ -10,7 +10,7 @@ namespace :git do
 
     desc 'Create a new tag in the Git repository'
     task :create do
-      changelog = File.open('CHANGELOG', 'r') { |file| file.read }
+      changelog = File.open('CHANGELOG.md', 'r') { |file| file.read }
       puts '-' * 80
       puts changelog
       puts '-' * 80

data/tasks/rdoc.rake

@@ -6,6 +6,10 @@ rescue Gem::LoadError
 end unless defined?(RDoc)
 
 require 'rdoc/task'
+require 'rake/clean'
+
+CLOBBER.include('doc', 'ri')
+CLOBBER.uniq!
 
 namespace :doc do
   desc 'Generate RDoc documentation'
@@ -15,7 +19,7 @@ namespace :doc do
     rdoc.options << '--line-numbers' << 'cattr_accessor=object' <<
       '--charset' << 'utf-8'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-    rdoc.rdoc_files.include('README.md', 'CHANGELOG', 'LICENSE')
+    rdoc.rdoc_files.include('README.md', 'CHANGELOG.md', 'LICENSE')
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 
@@ -23,11 +27,4 @@ namespace :doc do
   task :ri do
     sh 'rdoc --ri -o ri .'
   end
-
-  desc 'Remove ri products'
-  task :clobber_ri do
-    rm_r 'ri' rescue nil
-  end
 end
-
-task 'clobber' => ['doc:clobber_rdoc', 'doc:clobber_ri']

data/tasks/spec.rake

@@ -1,4 +1,7 @@
 require 'spec/rake/verify_rcov'
+require 'rake/clean'
+
+CLOBBER.include('coverage', 'specdoc')
 
 namespace :spec do
   Spec::Rake::SpecTask.new(:rcov) do |t|
@@ -79,5 +82,3 @@ else
   desc 'Alias to spec:all'
   task 'spec' => 'spec:all'
 end
-
-task 'clobber' => ['spec:clobber_rcov']

data/tasks/wiki.rake

@@ -1,11 +1,15 @@
 require 'google/api_client'
+require 'rake'
+require 'rake/clean'
+
+CLOBBER.include('wiki')
 
 CACHE_PREFIX =
   "http://www.gmodules.com/gadgets/proxy/container=default&debug=0&nocache=0/"
 
 namespace :wiki do
   desc 'Autogenerate wiki pages'
-  task :generate do
+  task :supported_apis do
     output = <<-WIKI
 #summary The list of supported APIs
 
@@ -23,12 +27,15 @@ WIKI
       end
     end
     for api_name, api in preferred_apis
-      output += (
-        "||#{CACHE_PREFIX}#{api['icons']['x16']}||" +
-        "[#{api.documentation} #{api.title}]||" +
-        "#{api.description}||\n"
-      )
+      if api.documentation.to_s != "" && api.title != ""
+        output += (
+          "||#{CACHE_PREFIX}#{api['icons']['x16']}||" +
+          "[#{api.documentation} #{api.title}]||" +
+          "#{api.description}||\n"
+        )
+      end
     end
+    output.gsub!(/-32\./, "-16.")
     wiki_path = File.expand_path(
       File.join(File.dirname(__FILE__), '../wiki/'))
     Dir.mkdir(wiki_path) if !File.exist?(wiki_path)
@@ -36,6 +43,40 @@ WIKI
       file.write(output)
     end
   end
+
+  task 'generate' => ['wiki:supported_apis']
 end
 
-# task 'clobber' => ['wiki:clobber_wiki']
+begin
+  $LOAD_PATH.unshift(
+    File.expand_path(File.join(File.dirname(__FILE__), '../yard/lib'))
+  )
+  $LOAD_PATH.unshift(File.expand_path('.'))
+  $LOAD_PATH.uniq!
+
+  require 'yard'
+  require 'yard/rake/wikidoc_task'
+
+  namespace :wiki do
+    desc 'Generate Wiki Documentation with YARD'
+    YARD::Rake::WikidocTask.new do |yardoc|
+      yardoc.name = 'reference'
+      yardoc.options = [
+        '--verbose',
+        '--markup', 'markdown',
+        '-e', 'yard/lib/yard-google-code.rb',
+        '-p', 'yard/templates',
+        '-f', 'wiki',
+        '-o', 'wiki'
+      ]
+      yardoc.files = [
+        'lib/**/*.rb', 'ext/**/*.c', '-', 'README.md', 'CHANGELOG.md'
+      ]
+    end
+
+    task 'generate' => ['wiki:reference', 'wiki:supported_apis']
+  end
+rescue LoadError
+  # If yard isn't available, it's not the end of the world
+  warn('YARD unavailable. Cannot fully generate wiki.')
+end

data/tasks/yard.rake

@@ -1,4 +1,8 @@
 require 'rake'
+require 'rake/clean'
+
+CLOBBER.include('doc', '.yardoc')
+CLOBBER.uniq!
 
 begin
   require 'yard'
@@ -8,15 +12,14 @@ begin
     desc 'Generate Yardoc documentation'
     YARD::Rake::YardocTask.new do |yardoc|
       yardoc.name = 'yard'
-      yardoc.options = ['--verbose']
+      yardoc.options = ['--verbose', '--markup', 'markdown']
       yardoc.files = [
-        'lib/**/*.rb', 'ext/**/*.c', 'README.md', 'CHANGELOG', 'LICENSE'
+        'lib/**/*.rb', 'ext/**/*.c', '-',
+        'README.md', 'CHANGELOG.md', 'LICENSE'
       ]
     end
   end
 
-  task 'clobber' => ['doc:clobber_yard']
-
   desc 'Alias to doc:yard'
   task 'doc' => 'doc:yard'
 rescue LoadError

metadata

@@ -2,7 +2,7 @@
 name: google-api-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bob Aman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: signet
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.2
+        version: 0.3.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,40 +31,40 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.2
+        version: 2.2.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: httpadapter
+  name: autoparse
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.1
+        version: 0.2.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: autoparse
+  name: faraday
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: multi_json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.6
+        version: 1.0.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -163,21 +163,15 @@ files:
 - lib/google/api_client/discovery.rb
 - lib/google/api_client/environment.rb
 - lib/google/api_client/errors.rb
-- lib/google/api_client/parser.rb
-- lib/google/api_client/parsers/json/error_parser.rb
-- lib/google/api_client/parsers/json/pagination.rb
-- lib/google/api_client/parsers/json_parser.rb
 - lib/google/api_client/reference.rb
 - lib/google/api_client/result.rb
 - lib/google/api_client/version.rb
 - lib/google/api_client.rb
 - lib/google/inflection.rb
 - spec/google/api_client/discovery_spec.rb
-- spec/google/api_client/parsers/json_parser_spec.rb
 - spec/google/api_client_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/clobber.rake
 - tasks/gem.rake
 - tasks/git.rake
 - tasks/metrics.rake
@@ -185,7 +179,7 @@ files:
 - tasks/spec.rake
 - tasks/wiki.rake
 - tasks/yard.rake
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - Rakefile
 - README.md

data/CHANGELOG

@@ -1,36 +0,0 @@
-== 0.3.0
-
-* updated to use v1 of the discovery API
-* updated to use httpadapter 1.0.0
-* added OAuth 2 support to the command line tool
-* renamed some switches in the command line tool
-* added additional configuration capabilities
-* fixed a few deprecation warnings from dependencies
-* added gemspec to source control
-
-== 0.2.0
-
-* updated to use v1 of the discovery API
-* updated to use httpadapter 1.0.0
-* added OAuth 2 support to the command line tool
-* renamed some switches in the command line tool
-* added additional configuration capabilities
-
-== 0.1.3
-
-* added support for manual overrides of the discovery URI
-* added support for manual overrides of the API base
-* added support for xoauth_requestor_id
-
-== 0.1.2
-
-* added support for two-legged OAuth
-* moved some development dependencies into runtime
-
-== 0.1.1
-
-* substantial improvements to the command line interface
-
-== 0.1.0
-
-* initial release

data/lib/google/api_client/parser.rb

@@ -1,59 +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.
-
-
-require 'json'
-
-module Google
-  class APIClient
-    module Parser
-      def content_type(content_type)
-        @@content_type_mapping ||= {}
-        @@content_type_mapping[content_type] = self
-      end
-
-      def self.match_content_type(content_type)
-        # TODO(bobaman): Do this more efficiently.
-        mime_type_regexp = /^([^\/]+)(?:\/([^+]+\+)?([^;]+))?(?:;.*)?$/
-        if @@content_type_mapping[content_type]
-          # Exact match
-          return @@content_type_mapping[content_type]
-        else
-          media_type, extension, sub_type =
-            content_type.scan(mime_type_regexp)[0]
-          for pattern, parser in @@content_type_mapping
-            # We want to match on subtype first
-            pattern_media_type, pattern_extension, pattern_sub_type =
-              pattern.scan(mime_type_regexp)[0]
-            next if pattern_extension != nil
-            if media_type == pattern_media_type && sub_type == pattern_sub_type
-              return parser
-            end
-          end
-          for pattern, parser in @@content_type_mapping
-            # We failed to match on the subtype
-            # Try to match only on the media type
-            pattern_media_type, pattern_extension, pattern_sub_type =
-              pattern.scan(mime_type_regexp)[0]
-            next if pattern_extension != nil || pattern_sub_type != nil
-            if media_type == pattern_media_type
-              return parser
-            end
-          end
-        end
-        return nil
-      end
-    end
-  end
-end

data/lib/google/api_client/parsers/json/error_parser.rb

@@ -1,34 +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.
-
-
-require 'google/api_client/parsers/json_parser'
-
-module Google
-  class APIClient
-    module JSON
-      ##
-      # A module which provides a parser for error responses.
-      class ErrorParser
-        include Google::APIClient::JSONParser
-
-        matches_fields 'error'
-
-        def error
-          return self['error']['message']
-        end
-      end
-    end
-  end
-end