google-api-client 0.2.0 → 0.3.0

data/spec/google/api_client/parsers/json_parser_spec.rb

@@ -16,36 +16,40 @@ require 'spec_helper'
 
 require 'json'
 require 'google/api_client/parsers/json_parser'
+require 'google/api_client/parsers/json/error_parser'
+require 'google/api_client/parsers/json/pagination'
 
-describe Google::APIClient::JSONParser, 'generates json from hash' do
+describe Google::APIClient::JSONParser, 'with error data' do
   before do
-    @parser = Google::APIClient::JSONParser
-  end
-
-  it 'should translate simple hash to JSON string' do
-    @parser.serialize('test' => 23).should == '{"test":23}'
-  end
-
-  it 'should translate simple nested into to nested JSON string' do
-    @parser.serialize({
-      'test' => 23, 'test2' => {'foo' => 'baz', 12 => 3.14 }
-    }).should ==
-      '{"test2":{"12":3.14,"foo":"baz"},"test":23}'
+    @data = {
+      'error' => {
+        'code' => 401,
+        'message' => 'Token invalid - Invalid AuthSub token.',
+        'errors' => [
+          {
+            'location' => 'Authorization',
+            'domain' => 'global',
+            'locationType' => 'header',
+            'reason' => 'authError',
+            'message' => 'Token invalid - Invalid AuthSub token.'
+          }
+        ]
+      }
+    }
   end
-end
 
-describe Google::APIClient::JSONParser, 'parses json string into hash' do
-  before do
-    @parser = Google::APIClient::JSONParser
+  it 'should correctly match as an error' do
+    parser = Google::APIClient::JSONParser.match(@data)
+    parser.should == Google::APIClient::JSON::ErrorParser
   end
 
-  it 'should parse simple json string into hash' do
-    @parser.parse('{"test":23}').should == {'test' => 23}
+  it 'should be automatically handled as an error when parsed' do
+    data = Google::APIClient::JSONParser.parse(@data)
+    data.should be_kind_of(Google::APIClient::JSON::ErrorParser)
   end
 
-  it 'should parse nested json object into hash' do
-    @parser.parse('{"test":23, "test2":{"bar":"baz", "foo":3.14}}').should == {
-      'test' => 23, 'test2' => {'bar' => 'baz', 'foo' => 3.14}
-    }
+  it 'should correctly expose error message' do
+    data = Google::APIClient::JSONParser.parse(@data)
+    data.error.should == 'Token invalid - Invalid AuthSub token.'
   end
 end

data/spec/google/api_client_spec.rb

@@ -36,7 +36,7 @@ shared_examples_for 'configurable user agent' do
   it 'should not allow the user agent to be used with bogus values' do
     (lambda do
       @client.user_agent = 42
-      @client.transmit_request(
+      @client.transmit(
         ['GET', 'http://www.google.com/', [], []]
       )
     end).should raise_error(TypeError)
@@ -53,7 +53,7 @@ shared_examples_for 'configurable user agent' do
       end
       [200, [], ['']]
     end
-    @client.transmit_request(request, adapter)
+    @client.transmit(request, adapter)
   end
 end
 
@@ -63,11 +63,7 @@ describe Google::APIClient do
   end
 
   it 'should make its version number available' do
-    ::Google::APIClient::VERSION::STRING.should be_instance_of(String)
-  end
-
-  it 'should use the default JSON parser' do
-    @client.parser.should be(Google::APIClient::JSONParser)
+    Google::APIClient::VERSION::STRING.should be_instance_of(String)
   end
 
   it 'should default to OAuth 2' do
@@ -104,26 +100,4 @@ describe Google::APIClient do
     # TODO
     it_should_behave_like 'configurable user agent'
   end
-
-  describe 'with custom pluggable parser' do
-    before do
-      class FakeJsonParser
-        def serialize(value)
-          return "42"
-        end
-
-        def parse(value)
-          return 42
-        end
-      end
-
-      @client.parser = FakeJsonParser.new
-    end
-
-    it 'should use the custom parser' do
-      @client.parser.should be_instance_of(FakeJsonParser)
-    end
-
-    it_should_behave_like 'configurable user agent'
-  end
 end

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 namespace :gem do
   GEM_SPEC = Gem::Specification.new do |s|
@@ -9,30 +9,32 @@ namespace :gem do
 
     s.name = PKG_NAME
     s.version = PKG_VERSION
+    s.author = PKG_AUTHOR
+    s.email = PKG_AUTHOR_EMAIL
     s.summary = PKG_SUMMARY
     s.description = PKG_DESCRIPTION
 
     s.files = PKG_FILES.to_a
     s.executables << 'google-api'
 
-    s.has_rdoc = true
-    s.extra_rdoc_files = %w( README )
-    s.rdoc_options.concat ['--main',  'README']
+    s.extra_rdoc_files = %w( README.md )
+    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.0')
+    s.add_runtime_dependency('httpadapter', '~> 1.0.1')
+    s.add_runtime_dependency('autoparse', '~> 0.2.0')
     s.add_runtime_dependency('json', '>= 1.4.6')
     s.add_runtime_dependency('extlib', '>= 0.9.15')
 
     # Dependencies used in the CLI
-    s.add_runtime_dependency('launchy', '>= 0.3.2')
+    s.add_runtime_dependency('launchy', '>= 2.0.0')
 
     # Dependencies used in the examples
-    s.add_runtime_dependency('liquid', '>= 2.2.2')
+    s.add_development_dependency('sinatra', '>= 1.2.0')
 
-    s.add_development_dependency('rake', '>= 0.7.3')
+    s.add_development_dependency('rake', '>= 0.9.0')
     s.add_development_dependency('rspec', '~> 1.2.9')
     s.add_development_dependency('rcov', '>= 0.9.9')
     s.add_development_dependency('diff-lcs', '>= 1.1.2')
@@ -42,7 +44,7 @@ namespace :gem do
     s.homepage = PKG_HOMEPAGE
   end
 
-  Rake::GemPackageTask.new(GEM_SPEC) do |p|
+  Gem::PackageTask.new(GEM_SPEC) do |p|
     p.gem_spec = GEM_SPEC
     p.need_tar = true
     p.need_zip = true
@@ -53,6 +55,21 @@ namespace :gem do
     puts GEM_SPEC.to_ruby
   end
 
+  desc "Generates .gemspec file"
+  task :gemspec do
+    spec_string = GEM_SPEC.to_ruby
+
+    begin
+      Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join
+    rescue
+      abort "unsafe gemspec: #{$!}"
+    else
+      File.open("#{GEM_SPEC.name}.gemspec", 'w') do |file|
+        file.write spec_string
+      end
+    end
+  end
+
   desc 'Install the gem'
   task :install => ['clobber', 'gem:package'] do
     sh "#{SUDO} gem install --local pkg/#{GEM_SPEC.full_name}"

data/tasks/rdoc.rake

@@ -1,14 +1,21 @@
-require 'rake/rdoctask'
+require 'rubygems'
+begin
+  # We prefer to use the RDoc gem over the site version.
+  gem 'rdoc'
+rescue Gem::LoadError
+end unless defined?(RDoc)
+
+require 'rdoc/task'
 
 namespace :doc do
   desc 'Generate RDoc documentation'
-  Rake::RDocTask.new do |rdoc|
+  RDoc::Task.new do |rdoc|
     rdoc.rdoc_dir = 'doc'
     rdoc.title    = "#{PKG_NAME}-#{PKG_VERSION} Documentation"
-    rdoc.options << '--line-numbers' << '--inline-source' <<
-      '--accessor' << 'cattr_accessor=object' << '--charset' << 'utf-8'
+    rdoc.options << '--line-numbers' << 'cattr_accessor=object' <<
+      '--charset' << 'utf-8'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-    rdoc.rdoc_files.include('README', 'CHANGELOG', 'LICENSE')
+    rdoc.rdoc_files.include('README.md', 'CHANGELOG', 'LICENSE')
     rdoc.rdoc_files.include('lib/**/*.rb')
   end
 

data/tasks/spec.rake

@@ -17,11 +17,14 @@ namespace :spec do
       t.rcov = false
     end
     t.rcov_opts = [
+      '--exclude', 'lib\\/google\\/api_client\\/environment.rb',
+      '--exclude', 'lib\\/compat',
       '--exclude', 'spec',
       '--exclude', '\\.rvm\\/gems',
       '--exclude', '1\\.8\\/gems',
       '--exclude', '1\\.9\\/gems',
-      '--exclude', '\\.rvm'
+      '--exclude', '\\.rvm',
+      '--exclude', '\\/Library\\/Ruby',
     ]
   end
 

data/tasks/wiki.rake

@@ -0,0 +1,41 @@
+require 'google/api_client'
+
+CACHE_PREFIX =
+  "http://www.gmodules.com/gadgets/proxy/container=default&debug=0&nocache=0/"
+
+namespace :wiki do
+  desc 'Autogenerate wiki pages'
+  task :generate do
+    output = <<-WIKI
+#summary The list of supported APIs
+
+The Google API Client for Ruby is a small flexible client library for accessing
+the following Google APIs.
+
+WIKI
+    preferred_apis = {}
+    client = Google::APIClient.new
+    for api in client.discovered_apis
+      if !preferred_apis.has_key?(api.name)
+        preferred_apis[api.name] = api
+      elsif api.preferred
+        preferred_apis[api.name] = api
+      end
+    end
+    for api_name, api in preferred_apis
+      output += (
+        "||#{CACHE_PREFIX}#{api['icons']['x16']}||" +
+        "[#{api.documentation} #{api.title}]||" +
+        "#{api.description}||\n"
+      )
+    end
+    wiki_path = File.expand_path(
+      File.join(File.dirname(__FILE__), '../wiki/'))
+    Dir.mkdir(wiki_path) if !File.exist?(wiki_path)
+    File.open(File.join(wiki_path, 'SupportedAPIs.wiki'), 'w') do |file|
+      file.write(output)
+    end
+  end
+end
+
+# task 'clobber' => ['wiki:clobber_wiki']

data/tasks/yard.rake

@@ -10,7 +10,7 @@ begin
       yardoc.name = 'yard'
       yardoc.options = ['--verbose']
       yardoc.files = [
-        'lib/**/*.rb', 'ext/**/*.c', 'README', 'CHANGELOG', 'LICENSE'
+        'lib/**/*.rb', 'ext/**/*.c', 'README.md', 'CHANGELOG', 'LICENSE'
       ]
     end
   end

metadata

@@ -1,22 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: google-api-client
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
-authors: []
-
+authors: 
+- Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -07:00
-default_executable: 
+date: 2011-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: signet
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 2
-        - 2
         version: 0.2.2
   type: :runtime
   version_requirements: *id001
@@ -42,11 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
         version: 2.2.2
   type: :runtime
   version_requirements: *id002
@@ -58,158 +42,133 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: autoparse
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: extlib
+  name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 0
-        - 9
-        - 15
-        version: 0.9.15
+        version: 1.4.6
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: extlib
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
+        version: 0.9.15
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: liquid
+  name: launchy
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
+        version: 2.0.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: sinatra
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
-        version: 0.7.3
+        version: 1.2.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    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 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
         version: 1.1.2
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 description: |
   The Google API Ruby Client makes it trivial to discover and access supported
   APIs.
 
-email: 
+email: bobaman@google.com
 executables: 
 - google-api
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 files: 
+- lib/google/api_client/discovery/api.rb
+- lib/google/api_client/discovery/method.rb
+- lib/google/api_client/discovery/resource.rb
+- lib/google/api_client/discovery/schema.rb
 - 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
@@ -224,20 +183,20 @@ files:
 - tasks/metrics.rake
 - tasks/rdoc.rake
 - tasks/spec.rake
+- tasks/wiki.rake
 - tasks/yard.rake
 - CHANGELOG
 - LICENSE
 - Rakefile
-- README
+- README.md
 - bin/google-api
-has_rdoc: true
 homepage: http://code.google.com/p/google-api-ruby-client/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.md
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -245,23 +204,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Package Summary