signet 0.2.4 → 0.3.0

data/spec/signet/oauth_2_spec.rb

@@ -161,4 +161,26 @@ describe Signet::OAuth2 do
       ).should == 'Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ=='
     end
   end
+
+  describe 'when parsing a token response body' do
+    it 'should correctly handle just an access token' do
+      Signet::OAuth2.parse_json_credentials(
+        '{"access_token": "12345"}'
+      ).should == {"access_token" => "12345"}
+    end
+
+    it 'should raise an error for an invalid body' do
+      (lambda do
+        Signet::OAuth2.parse_json_credentials(
+          'This is not JSON.'
+        )
+      end).should raise_error(MultiJson::DecodeError)
+    end
+
+    it 'should raise an error for a bogus body' do
+      (lambda do
+        Signet::OAuth2.parse_json_credentials(:bogus)
+      end).should raise_error(TypeError)
+    end
+  end
 end

data/tasks/gem.rake

@@ -22,16 +22,15 @@ namespace :gem do
     s.extra_rdoc_files = %w( README.md )
     s.rdoc_options.concat ["--main",  "README.md"]
 
-    s.add_runtime_dependency("httpadapter", "~> 1.0.0")
     s.add_runtime_dependency("addressable", "~> 2.2.1")
-    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("jwt", ">= 0.1.4")
 
     s.add_development_dependency("rake", "~> 0.8.3")
     s.add_development_dependency("rspec", "~> 1.1.11")
-    s.add_development_dependency("launchy", "~> 0.3.2")
+    s.add_development_dependency("launchy", "~> 2.0.0")
     s.add_development_dependency("diff-lcs", "~> 1.1.2")
-    s.add_development_dependency("typhoeus", "~> 0.1.31")
 
     s.require_path = "lib"
   end

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

@@ -8,7 +8,7 @@ namespace :doc do
     rdoc.options << "--line-numbers" << "--inline-source" <<
       "--accessor" << "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
 

data/tasks/rubyforge.rake

@@ -13,7 +13,7 @@ namespace :gem do
     rf.login
 
     c = rf.userconfig
-    changelog = File.open("CHANGELOG") { |file| file.read }
+    changelog = File.open("CHANGELOG.md") { |file| file.read }
     c['release_changes'] = changelog
     c['preformatted'] = true
 

data/tasks/spec.rake

@@ -55,8 +55,13 @@ namespace :spec do
   namespace :rcov do
     desc "Browse the code coverage report."
     task :browse => "spec:rcov" do
+      coverage_path = File.expand_path(
+        File.join(File.dirname(__FILE__), '../coverage/'))
       require "launchy"
-      Launchy::Browser.run("coverage/index.html")
+      require "addressable/uri"
+      Launchy.open(
+        Addressable::URI.convert_path(File.join(coverage_path, "index.html"))
+      )
     end
   end
 end

data/tasks/wiki.rake

@@ -0,0 +1,38 @@
+$LOAD_PATH.unshift(
+  File.expand_path(File.join(File.dirname(__FILE__), '../yard/lib'))
+)
+$LOAD_PATH.unshift(File.expand_path('.'))
+$LOAD_PATH.uniq!
+
+require 'google/api_client'
+require 'rake'
+require 'rake/clean'
+
+CLOBBER.include('wiki')
+
+begin
+  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',
+        '-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

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

metadata

@@ -2,7 +2,7 @@
 name: signet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bob Aman
@@ -10,39 +10,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-10 00:00:00 Z
+date: 2012-01-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: httpadapter
+  name: addressable
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 2.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: faraday
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.1
+        version: 0.7.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: multi_json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.6
+        version: 1.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.2
+        version: 2.0.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -100,17 +100,6 @@ dependencies:
         version: 1.1.2
   type: :development
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: typhoeus
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.1.31
-  type: :development
-  version_requirements: *id009
 description: |
   Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
@@ -152,9 +141,10 @@ files:
 - tasks/rdoc.rake
 - tasks/rubyforge.rake
 - tasks/spec.rake
+- tasks/wiki.rake
 - tasks/yard.rake
 - website/index.html
-- CHANGELOG
+- CHANGELOG.md
 - LICENSE
 - Rakefile
 - README.md