rack-oauth2 0.2.1 → 0.2.2

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format=documentation

data/Gemfile

@@ -0,0 +1 @@
+gemspec

data/Gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: .
+  specs:
+    rack-oauth2 (0.2.1)
+      activesupport (>= 2.3)
+      i18n
+      json (= 1.4.3)
+      rack (= 1.1)
+
+GEM
+  specs:
+    activesupport (3.0.1)
+    diff-lcs (1.1.2)
+    i18n (0.4.2)
+    json (1.4.3)
+    rack (1.1.0)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.3)
+  i18n
+  json (= 1.4.3)
+  rack (= 1.1)
+  rack-oauth2!
+  rake (>= 0.8)
+  rcov (>= 0.9)
+  rspec (>= 2.0)

data/Rakefile

@@ -1,48 +1,20 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'rack-oauth2'
-    gem.summary = %Q{Rack Middleware for OAuth2 Server}
-    gem.description = %Q{Rack Middleware for OAuth2. Currently support only Server/Provider, not Client/Consumer.}
-    gem.email = 'nov@matake.jp'
-    gem.homepage = 'http://github.com/nov/rack-oauth2'
-    gem.authors = ['nov matake']
-    gem.add_dependency 'json'
-    gem.add_dependency 'activesupport'
-    gem.add_development_dependency 'rspec', '>= 1.2.9'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
   spec.rcov_opts = ['--exclude spec,gems']
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ''
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = 'rack-oauth2 #{version}'
+  rdoc.title = "rack-oauth2 #{File.read('VERSION')}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rack/oauth2/server/error/authorize.rb

@@ -22,7 +22,7 @@ module Rack
           def invalid_request!(description = nil, options = {})
             error!(:invalid_request, description, options)
           end
-      
+
           def invalid_client!(description = nil, options = {})
             error!(:invalid_client, description, options)
           end

data/lib/rack/oauth2/server/error/resource.rb

@@ -30,7 +30,7 @@ module Rack
           def invalid_request!(description = nil, options = {})
             error!(:invalid_request, description, options)
           end
-      
+
           def invalid_token!(description = nil, options = {})
             error!(:invalid_token, description, options)
           end

data/lib/rack/oauth2/server/error/token.rb

@@ -27,7 +27,7 @@ module Rack
           def invalid_request!(description = nil, options = {})
             error!(:invalid_request, description, options)
           end
-      
+
           def invalid_client!(description = nil, options = {})
             error!(:invalid_client, description, options.merge(:unauthorized => via_authorization_header))
           end

data/rack-oauth2.gemspec

@@ -1,109 +1,23 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{rack-oauth2}
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name = "rack-oauth2"
+  s.version = File.read("VERSION")
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
-  s.date = %q{2010-10-04}
-  s.description = %q{Rack Middleware for OAuth2. Currently support only Server/Provider, not Client/Consumer.}
-  s.email = %q{nov@matake.jp}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/rack/oauth2.rb",
-     "lib/rack/oauth2/server.rb",
-     "lib/rack/oauth2/server/abstract.rb",
-     "lib/rack/oauth2/server/abstract/handler.rb",
-     "lib/rack/oauth2/server/abstract/request.rb",
-     "lib/rack/oauth2/server/abstract/response.rb",
-     "lib/rack/oauth2/server/authorize.rb",
-     "lib/rack/oauth2/server/authorize/code.rb",
-     "lib/rack/oauth2/server/authorize/code_and_token.rb",
-     "lib/rack/oauth2/server/authorize/token.rb",
-     "lib/rack/oauth2/server/error.rb",
-     "lib/rack/oauth2/server/error/authorize.rb",
-     "lib/rack/oauth2/server/error/resource.rb",
-     "lib/rack/oauth2/server/error/token.rb",
-     "lib/rack/oauth2/server/resource.rb",
-     "lib/rack/oauth2/server/token.rb",
-     "lib/rack/oauth2/server/token/assertion.rb",
-     "lib/rack/oauth2/server/token/authorization_code.rb",
-     "lib/rack/oauth2/server/token/password.rb",
-     "lib/rack/oauth2/server/token/refresh_token.rb",
-     "lib/rack/oauth2/server/util.rb",
-     "rack-oauth2.gemspec",
-     "spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
-     "spec/rack/oauth2/server/authorize/code_spec.rb",
-     "spec/rack/oauth2/server/authorize/token_spec.rb",
-     "spec/rack/oauth2/server/authorize_spec.rb",
-     "spec/rack/oauth2/server/error/authorize_spec.rb",
-     "spec/rack/oauth2/server/error/resource_spec.rb",
-     "spec/rack/oauth2/server/error/token_spec.rb",
-     "spec/rack/oauth2/server/error_spec.rb",
-     "spec/rack/oauth2/server/resource_spec.rb",
-     "spec/rack/oauth2/server/token/assertion_spec.rb",
-     "spec/rack/oauth2/server/token/authorization_code_spec.rb",
-     "spec/rack/oauth2/server/token/password_spec.rb",
-     "spec/rack/oauth2/server/token/refresh_token_spec.rb",
-     "spec/rack/oauth2/server/token_spec.rb",
-     "spec/rack/oauth2/server/util_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/nov/rack-oauth2}
+  s.description = %q{Rack Middleware for OAuth2 server}
+  s.summary = %q{Rack Middleware for OAuth2 server}
+  s.email = "nov@matake.jp"
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc"]
   s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/nov/rack-oauth2"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Rack Middleware for OAuth2 Server}
-  s.test_files = [
-    "spec/rack/oauth2/server/authorize/code_and_token_spec.rb",
-     "spec/rack/oauth2/server/authorize/code_spec.rb",
-     "spec/rack/oauth2/server/authorize/token_spec.rb",
-     "spec/rack/oauth2/server/authorize_spec.rb",
-     "spec/rack/oauth2/server/error/authorize_spec.rb",
-     "spec/rack/oauth2/server/error/resource_spec.rb",
-     "spec/rack/oauth2/server/error/token_spec.rb",
-     "spec/rack/oauth2/server/error_spec.rb",
-     "spec/rack/oauth2/server/resource_spec.rb",
-     "spec/rack/oauth2/server/token/assertion_spec.rb",
-     "spec/rack/oauth2/server/token/authorization_code_spec.rb",
-     "spec/rack/oauth2/server/token/password_spec.rb",
-     "spec/rack/oauth2/server/token/refresh_token_spec.rb",
-     "spec/rack/oauth2/server/token_spec.rb",
-     "spec/rack/oauth2/server/util_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.add_runtime_dependency "rack", "1.1"
+  s.add_runtime_dependency "json", "1.4.3"
+  s.add_runtime_dependency "activesupport", ">= 2.3"
+  s.add_runtime_dependency "i18n"
+  s.add_development_dependency "rake", ">= 0.8"
+  s.add_development_dependency "rcov", ">= 0.9"
+  s.add_development_dependency "rspec", ">= 2"
 end
-

data/spec/rack/oauth2/server/error/authorize_spec.rb

@@ -82,7 +82,6 @@ describe Rack::OAuth2::Server::Authorize::Request do
       lambda do
         @request.unsupported_response_type!
       end.should raise_error(Rack::OAuth2::Server::BadRequest) { |e|
-        p e
         e.error.should == :unsupported_response_type
         e.description.should == Rack::OAuth2::Server::Error::Authorize::DEFAULT_DESCRIPTION[:unsupported_response_type]
       }

data/spec/rack/oauth2/server/error_spec.rb

@@ -66,7 +66,7 @@ describe Rack::OAuth2::Server::Error, '#finish' do
     end
   end
 
-  context "when either redirect_uri nor realm isn't given" do
+  context "when neither redirect_uri nor realm isn't given" do
     before do
       @params = {
         :error => :invalid_request,

data/spec/spec_helper.rb

@@ -1,13 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rack/oauth2'
-require 'spec'
-require 'spec/autorun'
-require 'rack/mock'
 
-Spec::Runner.configure do |config|
-  
-end
+require 'rack/oauth2'
+require 'rspec'
 
 def simple_app
   lambda do |env|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - nov matake
@@ -15,27 +15,59 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +09:00
+date: 2010-11-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,24 +77,52 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        version: "2"
   type: :development
-  version_requirements: *id003
-description: Rack Middleware for OAuth2. Currently support only Server/Provider, not Client/Consumer.
+  version_requirements: *id007
+description: Rack Middleware for OAuth2 server
 email: nov@matake.jp
 executables: []
 
@@ -74,6 +134,9 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -115,7 +178,6 @@ files:
 - spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/rack/oauth2/server/token_spec.rb
 - spec/rack/oauth2/server/util_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/nov/rack-oauth2
@@ -140,17 +202,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Rack Middleware for OAuth2 Server
+summary: Rack Middleware for OAuth2 server
 test_files: 
 - spec/rack/oauth2/server/authorize/code_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/code_spec.rb

data/spec/spec.opts

@@ -1,3 +0,0 @@
---colour
---format
-specdoc