signet 0.3.4 → 0.4.0

data/spec/signet/oauth_1/services/google_spec.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
+$:.unshift(spec_dir)
+$:.uniq!
+
 require 'spec_helper'
 
 require 'signet/oauth_1/client'
@@ -203,7 +207,7 @@ describe Signet::OAuth1::Client, 'configured for standard Google APIs' do
     @client.token_credential_secret = 'Ew3YHAY4bcBryiOUvbdHGa57'
     response = @client.fetch_protected_resource(
       :connection => connection,
-      :request => Faraday::Request.create(:get) do |req|
+      :request => Faraday.default_connection.build_request(:get) do |req|
         req.url(
           'http://www-opensocial.googleusercontent.com/api/people/@me/@self'
         )

data/spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../.."))
+$:.unshift(spec_dir)
+$:.uniq!
+
 require 'spec_helper'
 
 require 'signet'

data/spec/signet/oauth_1_spec.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+spec_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+$:.unshift(spec_dir)
+$:.uniq!
+
 require 'spec_helper'
 
 require 'signet/oauth_1'

data/spec/signet/oauth_2/client_spec.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+spec_dir = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
+$:.unshift(spec_dir)
+$:.uniq!
+
 require 'spec_helper'
 
 require 'signet/oauth_2/client'
@@ -20,6 +24,8 @@ require 'openssl'
 gem 'jwt', '~> 0.1.4'
 require 'jwt'
 
+conn = Faraday.default_connection
+
 describe Signet::OAuth2::Client, 'unconfigured' do
   before do
     @client = Signet::OAuth2::Client.new
@@ -429,7 +435,7 @@ JSON
     request = @client.generate_authenticated_request(
       :connection => connection,
       :realm => 'Example',
-      :request => Faraday::Request.create(:get) do |req|
+      :request => conn.build_request(:get) do |req|
         req.url('https://www.googleapis.com/oauth2/v1/userinfo?alt=json')
       end
     )
@@ -461,14 +467,12 @@ JSON
     @client.client_id = 'client-12345'
     @client.client_secret = 'secret-12345'
     @client.access_token = '12345'
-    (lambda do
-      @client.generate_authenticated_request(
-        :realm => 'Example',
-        :request => Faraday::Request.create(:get) do |req|
-          req.url('https://www.googleapis.com/oauth2/v1/userinfo?alt=json')
-        end
-      )
-    end).should_not raise_error
+    request = @client.generate_authenticated_request(
+      :realm => 'Example',
+      :request => conn.build_request(:get) do |req|
+        req.url('https://www.googleapis.com/oauth2/v1/userinfo?alt=json')
+      end
+    )
   end
 
   it 'should raise an error if not enough information ' +

data/spec/signet/oauth_2_spec.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+spec_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+$:.unshift(spec_dir)
+$:.uniq!
+
 require 'spec_helper'
 
 require 'signet/oauth_2'

data/spec/signet_spec.rb

@@ -12,6 +12,10 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+spec_dir = File.expand_path(File.join(File.dirname(__FILE__)))
+$:.unshift(spec_dir)
+$:.uniq!
+
 require 'spec_helper'
 
 require 'signet/oauth_2'

data/spec/spec.opts

@@ -1,2 +1,2 @@
 --colour
---format specdoc
+--format documentation

data/spec/spec_helper.rb

@@ -3,9 +3,11 @@ root_dir = File.expand_path(File.join(spec_dir, ".."))
 lib_dir = File.expand_path(File.join(root_dir, "lib"))
 compat_dir = File.expand_path(File.join(spec_dir, "force_compat"))
 
+$:.unshift(spec_dir)
 $:.unshift(lib_dir)
 $:.unshift(compat_dir)
 $:.uniq!
 
 require 'rubygems'
 require 'signet'
+require 'rspec'

data/tasks/gem.rake

@@ -21,14 +21,14 @@ namespace :gem do
     s.extra_rdoc_files = %w( README.md )
     s.rdoc_options.concat ["--main",  "README.md"]
 
-    s.add_runtime_dependency("addressable", "~> 2.2.3")
-    s.add_runtime_dependency("faraday", "~> 0.7.0")
+    s.add_runtime_dependency("addressable", ">= 2.2.3")
+    s.add_runtime_dependency("faraday", "~> 0.8.1")
     s.add_runtime_dependency("multi_json", ">= 1.0.0")
-    s.add_runtime_dependency("jwt", ">= 0.1.4")
+    s.add_runtime_dependency("jwt", ">= 0.1.5")
 
-    s.add_development_dependency("rake", "~> 0.8.3")
-    s.add_development_dependency("rspec", "~> 1.1.11")
-    s.add_development_dependency("launchy", "~> 2.0.0")
+    s.add_development_dependency("rake", ">= 0.9.0")
+    s.add_development_dependency("rspec", ">= 2.11.0")
+    s.add_development_dependency("launchy", ">= 2.0.0")
 
     s.require_path = "lib"
   end

data/tasks/spec.rake

@@ -1,78 +1,59 @@
-require 'spec/rake/verify_rcov'
+require 'rspec/core/rake_task'
+require 'rake/clean'
+
+CLOBBER.include('coverage', 'specdoc')
 
 namespace :spec do
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color', '--format', 'specdoc']
-    if RCOV_ENABLED
-      if `which rcov`.strip == ""
-        STDERR.puts "Please install rcov:"
-        STDERR.puts "sudo gem install relevance-rcov"
-        exit(1)
-      end
-      t.rcov = true
-    else
-      t.rcov = false
-    end
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ['--color', '--format', 'documentation']
+
+    t.rcov = RCOV_ENABLED
     t.rcov_opts = [
       '--exclude', 'lib\\/compat',
-      '--exclude', 'lib\\/signet\\/ssl_config\\.rb',
       '--exclude', 'spec',
       '--exclude', '\\.rvm\\/gems',
       '--exclude', '1\\.8\\/gems',
       '--exclude', '1\\.9\\/gems',
       '--exclude', '\\.rvm',
-      '--exclude', '\\/Library\\/Ruby'
+      '--exclude', '\\/Library\\/Ruby',
+      '--exclude', 'addressable\\/idna' # environment dependant
     ]
   end
 
-  Spec::Rake::SpecTask.new(:normal) do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color', '--format', 'specdoc']
+  RSpec::Core::RakeTask.new(:normal) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb'].exclude(/compat/)
+    t.rspec_opts = ['--color', '--format', 'documentation']
     t.rcov = false
   end
 
-  if RCOV_ENABLED
-    RCov::VerifyTask.new(:verify) do |t|
-      t.threshold = 100.0
-      t.index_html = 'coverage/index.html'
-    end
-
-    task :verify => :rcov
+  RSpec::Core::RakeTask.new(:all) do |t|
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ['--color', '--format', 'documentation']
+    t.rcov = false
   end
 
   desc "Generate HTML Specdocs for all specs"
-  Spec::Rake::SpecTask.new(:specdoc) do |t|
+  RSpec::Core::RakeTask.new(:specdoc) do |t|
     specdoc_path = File.expand_path(
-      File.join(File.dirname(__FILE__), '../specdoc/'))
+      File.join(File.dirname(__FILE__), '..', 'documentation')
+    )
     Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
 
     output_file = File.join(specdoc_path, 'index.html')
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
+    t.pattern = FileList['spec/**/*_spec.rb']
+    t.rspec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
     t.fail_on_error = false
   end
 
   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"
-      require "addressable/uri"
-      Launchy.open(
-        Addressable::URI.convert_path(File.join(coverage_path, "index.html"))
-      )
+      Launchy::Browser.run("coverage/index.html")
     end
   end
 end
 
-if RCOV_ENABLED
-  desc "Alias to spec:verify"
-  task "spec" => "spec:verify"
-else
-  desc "Alias to spec:normal"
-  task "spec" => "spec:normal"
-end
-
-task "clobber" => ["spec:clobber_rcov"]
+desc "Alias to spec:normal"
+task "spec" => "spec:normal"

data/tasks/yard.rake

@@ -1,26 +1,20 @@
-require 'rake'
+require 'rake/clean'
 
-begin
-  require 'yard'
-  require 'yard/rake/yardoc_task'
+CLOBBER.include('doc')
 
-  namespace :doc do
-    desc 'Generate Yardoc documentation'
-    YARD::Rake::YardocTask.new do |yardoc|
-      yardoc.name = 'yard'
-      yardoc.options = ['--verbose', '--markup', 'markdown']
-      yardoc.files = [
-        'lib/**/*.rb', 'ext/**/*.c', 'README.md', 'CHANGELOG.md', 'LICENSE'
-      ]
-    end
-  end
-
-  task 'clobber' => ['doc:clobber_yard']
+require 'yard'
+require 'yard/rake/yardoc_task'
 
-  desc 'Alias to doc:yard'
-  task 'doc' => 'doc:yard'
-rescue LoadError
-  # If yard isn't available, it's not the end of the world
-  desc 'Alias to doc:rdoc'
-  task 'doc' => 'doc:rdoc'
+namespace :doc do
+  desc 'Generate Yardoc documentation'
+  YARD::Rake::YardocTask.new do |yardoc|
+    yardoc.name = 'yard'
+    yardoc.options = ['--verbose', '--markup', 'markdown']
+    yardoc.files = [
+      'lib/**/*.rb', 'ext/**/*.c', 'README.md', 'CHANGELOG.md', 'LICENSE'
+    ]
+  end
 end
+
+desc 'Alias to doc:yard'
+task 'doc' => 'doc:yard'

metadata

@@ -1,107 +1,151 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: signet
-version: !ruby/object:Gem::Version
-  version: 0.3.4
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
-authors:
+authors: 
 - Bob Aman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: &2156909880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 2
+        - 3
         version: 2.2.3
   type: :runtime
-  prerelease: false
-  version_requirements: *2156909880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: &2156909220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2156909220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: &2156908540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2156908540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: jwt
-  requirement: &2156907900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 1
+        - 5
+        version: 0.1.5
   type: :runtime
-  prerelease: false
-  version_requirements: *2156907900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2156907300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
   type: :development
-  prerelease: false
-  version_requirements: *2156907300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2156906600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.11
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 2
+        - 11
+        - 0
+        version: 2.11.0
   type: :development
-  prerelease: false
-  version_requirements: *2156906600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: launchy
-  requirement: &2156905940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :development
-  prerelease: false
-  version_requirements: *2156905940
-description: ! 'Signet is an OAuth 1.0 / OAuth 2.0 implementation.
+  version_requirements: *id007
+description: |
+  Signet is an OAuth 1.0 / OAuth 2.0 implementation.
 
-'
 email: bobaman@google.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - lib/compat/digest/hmac.rb
 - lib/compat/securerandom.rb
 - lib/signet/errors.rb
 - lib/signet/oauth_1/client.rb
 - lib/signet/oauth_1/credential.rb
+- lib/signet/oauth_1/server.rb
 - lib/signet/oauth_1/signature_methods/hmac_sha1.rb
 - lib/signet/oauth_1.rb
 - lib/signet/oauth_2/client.rb
@@ -113,6 +157,7 @@ files:
 - spec/force_compat/securerandom.rb
 - spec/signet/oauth_1/client_spec.rb
 - spec/signet/oauth_1/credential_spec.rb
+- spec/signet/oauth_1/server_spec.rb
 - spec/signet/oauth_1/services/google_spec.rb
 - spec/signet/oauth_1/signature_methods/hmac_sha1_spec.rb
 - spec/signet/oauth_1_spec.rb
@@ -137,28 +182,37 @@ files:
 - README.md
 homepage: http://code.google.com/p/oauth-signet/
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Package Summary
 test_files: []
+