oauth2-provider 0.0.18 → 0.0.19

data/examples/rails3-example/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    oauth2-provider (0.0.15)
-      activesupport (~> 3.0.1)
+    oauth2-provider (0.0.18)
+      activesupport (~> 3.0)
       addressable (~> 2.2)
 
 GEM
@@ -35,7 +35,7 @@ GEM
       activemodel (= 3.0.7)
       activesupport (= 3.0.7)
     activesupport (3.0.7)
-    addressable (2.2.5)
+    addressable (2.2.6)
     arel (2.0.9)
     builder (2.1.2)
     erubis (2.6.6)

data/examples/rails3-example/app/controllers/application_controller.rb

@@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
 
   def authenticate_account
     unless current_account
-      session[:return_url] = request.request_uri
+      session[:return_url] = request.fullpath
       redirect_to new_session_url
     end
   end

data/examples/rails3-example/app/controllers/authorization_controller.rb

@@ -3,6 +3,7 @@ class AuthorizationController < ApplicationController
 
   before_filter :authenticate_account
   before_filter :block_invalid_authorization_code_requests
+  before_filter :regrant_existing_authorization
 
   def new
     @client = oauth2_authorization_request.client
@@ -15,4 +16,10 @@ class AuthorizationController < ApplicationController
       deny_authorization_code
     end
   end
+
+  private
+
+  def regrant_existing_authorization
+    oauth2_authorization_request.grant_existing! current_account
+  end
 end

data/examples/rails3-example/app/views/home/show.html.erb

@@ -1 +1 @@
-Hello <%= current_account.login %>
+Hello <%= current_account ? current_account.login : "stranger" %>!

data/examples/rails3-example/app/views/layouts/application.html.erb

@@ -5,6 +5,7 @@
     body {
       background: #ddd;
     }
+  </style>
   <title>Rails3Example</title>
   <%= csrf_meta_tag %>
 </head>

data/examples/rails3-example/db/migrate/20110508151948_add_oauth2_tables.rb

@@ -4,6 +4,7 @@ class AddOauth2Tables < ActiveRecord::Migration
       t.string   'name'
       t.string   'oauth_identifier', :null => false
       t.string   'oauth_secret', :null => false
+      t.string   'oauth_redirect_uri'
     end
 
     create_table 'oauth_authorization_codes', :force => true do |t|
@@ -34,7 +35,6 @@ class AddOauth2Tables < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table 'example_resource_owners'
     drop_table 'oauth_access_tokens'
     drop_table 'oauth_authorizations'
     drop_table 'oauth_authorization_codes'

data/examples/rails3-example/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110508151948) do
+ActiveRecord::Schema.define(:version => 20110614224516) do
 
   create_table "accounts", :force => true do |t|
     t.string "login",    :null => false
@@ -45,8 +45,9 @@ ActiveRecord::Schema.define(:version => 20110508151948) do
 
   create_table "oauth_clients", :force => true do |t|
     t.string "name"
-    t.string "oauth_identifier", :null => false
-    t.string "oauth_secret",     :null => false
+    t.string "oauth_identifier",   :null => false
+    t.string "oauth_secret",       :null => false
+    t.string "oauth_redirect_uri"
   end
 
 end

data/lib/oauth2/provider/models.rb

@@ -37,4 +37,19 @@ module OAuth2::Provider::Models
       end
     end
   end
+
+  module RandomToken
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def random_token
+        OAuth2::Provider::Random.base62(48)
+      end
+
+      def unique_random_token(attribute)
+        key = random_token while (key.nil? || where(attribute => key).exists?)
+        key
+      end
+    end
+  end
 end

data/lib/oauth2/provider/models/access_token.rb

@@ -2,7 +2,7 @@ module OAuth2::Provider::Models::AccessToken
   extend ActiveSupport::Concern
 
   included do
-    include OAuth2::Provider::Models::TokenExpiry
+    include OAuth2::Provider::Models::TokenExpiry, OAuth2::Provider::Models::RandomToken
     self.default_token_lifespan = 1.month
 
     validates_presence_of :authorization, :access_token, :expires_at
@@ -13,8 +13,8 @@ module OAuth2::Provider::Models::AccessToken
 
   def initialize(*args, &block)
     super
-    self.access_token ||= OAuth2::Provider::Random.base62(32)
-    self.refresh_token ||= OAuth2::Provider::Random.base62(32)
+    self.access_token ||= self.class.unique_random_token(:access_token)
+    self.refresh_token ||= self.class.unique_random_token(:refresh_token)
   end
 
   def as_json(options = {})

data/lib/oauth2/provider/models/authorization_code.rb

@@ -2,16 +2,16 @@ module OAuth2::Provider::Models::AuthorizationCode
   extend ActiveSupport::Concern
 
   included do
-    include OAuth2::Provider::Models::TokenExpiry
+    include OAuth2::Provider::Models::TokenExpiry, OAuth2::Provider::Models::RandomToken
     self.default_token_lifespan = 1.minute
 
     delegate :client, :resource_owner, :to => :authorization
     validates_presence_of :authorization, :code, :expires_at, :redirect_uri
   end
 
-  def initialize(attributes = {})
+  def initialize(*args)
     super
-    self.code ||= OAuth2::Provider::Random.base62(32)
+    self.code ||= self.class.unique_random_token(:code)
   end
 
   module ClassMethods

data/lib/oauth2/provider/models/client.rb

@@ -4,14 +4,15 @@ module OAuth2::Provider::Models::Client
   extend ActiveSupport::Concern
 
   included do
+    include OAuth2::Provider::Models::RandomToken
     validates_presence_of :oauth_identifier, :oauth_secret, :name
     validates_uniqueness_of :oauth_identifier
   end
 
   def initialize(*args, &block)
     super
-    self.oauth_identifier ||= OAuth2::Provider::Random.base62(16)
-    self.oauth_secret ||= OAuth2::Provider::Random.base62(32)
+    self.oauth_identifier ||= self.class.unique_random_token(:oauth_identifier)
+    self.oauth_secret ||= self.class.unique_random_token(:oauth_secret)
   end
 
   def to_param
@@ -24,7 +25,7 @@ module OAuth2::Provider::Models::Client
 
   def allow_redirection?(uri)
     uri_host = Addressable::URI.parse(uri).host
-    if oauth_redirect_uri
+    unless oauth_redirect_uri.nil? or oauth_redirect_uri.empty?
       Addressable::URI.parse(oauth_redirect_uri).host == uri_host
     else
       !uri_host.nil? && true

data/lib/oauth2/provider/rack/resource_request.rb

@@ -2,7 +2,9 @@ require 'rack/auth/abstract/request'
 
 module OAuth2::Provider::Rack
   class ResourceRequest < Rack::Request
-   delegate :has_scope?, :to => :authorization
+    include Responses
+
+    delegate :has_scope?, :to => :authorization
 
     def token
       token_from_param || token_from_header
@@ -17,15 +19,13 @@ module OAuth2::Provider::Rack
     end
 
     def token_from_header
-      if @env[authorization_key] =~ /OAuth (.*)/
-        $1
+      if authorization_header.provided?
+        authorization_header.params
       end
     end
 
-    def authorization_key
-      @authorization_key ||= Rack::Auth::AbstractRequest::AUTHORIZATION_KEYS.detect do |key|
-        @env.has_key?(key)
-      end
+    def authorization_header
+      @authorization_header ||= Rack::Auth::AbstractRequest.new(env)
     end
 
     def authenticate_request!(options, &block)
@@ -53,26 +53,17 @@ module OAuth2::Provider::Rack
       authorization && authorization.resource_owner
     end
 
-    def authentication_required!(reason = nil)
-      env['warden'] && env['warden'].custom_failure!
-      throw_response Responses.unauthorized(reason)
-    end
-
-    def insufficient_scope!
-      throw_response Responses.json_error('insufficient_scope', :status => 403)
-    end
-
     def validate_token!
       if has_token? && @token_validated.nil?
         @token_validated = true
-        block_bad_request
+        block_invalid_request
         block_invalid_token
       end
     end
 
-    def block_bad_request
+    def block_invalid_request
       if token_from_param && token_from_header && (token_from_param != token_from_header)
-        throw_response Responses.json_error('invalid_request', :description => 'both authorization header and oauth_token provided, with conflicting tokens')
+        invalid_request! 'both authorization header and oauth_token provided, with conflicting tokens'
       end
     end
 
@@ -81,11 +72,5 @@ module OAuth2::Provider::Rack
       @authorization = access_token.authorization if access_token
       authentication_required! 'invalid_token' if access_token.nil? || access_token.expired?
     end
-
-    private
-
-    def throw_response(response)
-      throw :oauth2, response
-    end
   end
 end

data/lib/oauth2/provider/rack/responses.rb

@@ -24,6 +24,19 @@ module OAuth2::Provider::Rack::Responses
     [302, {'Location' => append_to_uri(uri, :code => code)}, []]
   end
 
+  def insufficient_scope!
+    throw_response OAuth2::Provider::Rack::Responses.json_error('insufficient_scope', :status => 403)
+  end
+
+  def invalid_request!(description)
+    throw_response OAuth2::Provider::Rack::Responses.json_error('invalid_request', :description => description, :status => 401)
+  end
+
+  def authentication_required!(reason = nil)
+    env['warden'] && env['warden'].custom_failure!
+    throw_response OAuth2::Provider::Rack::Responses.unauthorized(reason)
+  end
+
   private
 
   def self.append_to_uri(uri, parameters = {})
@@ -31,4 +44,8 @@ module OAuth2::Provider::Rack::Responses
     u.query_values = (u.query_values || {}).merge(parameters)
     u.to_s
   end
+
+  def throw_response(response)
+    throw :oauth2, response
+  end
 end

data/lib/oauth2/provider/random.rb

@@ -1,4 +1,5 @@
 require 'oauth2/provider'
+require 'securerandom'
 
 module OAuth2::Provider::Random
   module Base62
@@ -18,12 +19,12 @@ module OAuth2::Provider::Random
   end
 
   def base62(length = 8)
-    number = ActiveSupport::SecureRandom.random_number(62 ** length)
+    number = SecureRandom.random_number(62 ** length)
     Base62.encode(number).rjust(length, '0')
   end
 
   def base36(length = 8)
-    ActiveSupport::SecureRandom.random_number(36 ** length).to_s(36).rjust(length, '0')
+    SecureRandom.random_number(36 ** length).to_s(36).rjust(length, '0')
   end
 
   module_function :base62, :base36

data/lib/oauth2/provider/version.rb

@@ -1,5 +1,5 @@
 module OAuth2
   module Provider
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
   end
 end

data/oauth2-provider.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'addressable', '~>2.2'
 
   s.add_development_dependency 'rack-test', '~>0.5.7'
-  s.add_development_dependency 'activerecord', '~>3.0.1'
+  s.add_development_dependency 'activerecord', '~>3.0'
   s.add_development_dependency 'rspec', '~>2.1.0'
   s.add_development_dependency 'mocha', '~>0.9.12'
-  s.add_development_dependency 'rake', '~>0.8.7'
+  s.add_development_dependency 'rake', '~>0.9.2'
   s.add_development_dependency 'sqlite3-ruby', '~>1.3.1'
   s.add_development_dependency 'timecop', '~>0.3.4'
   s.add_development_dependency 'yajl-ruby', '~>0.7.5'

data/spec/models/access_token_spec.rb

@@ -76,16 +76,11 @@ describe OAuth2::Provider.access_token_class do
       OAuth2::Provider.access_token_class.new
     end
 
-    it "is assigned a randomly generated access token" do
-      subject.access_token.should_not be_nil
-      OAuth2::Provider.access_token_class.new.access_token.should_not be_nil
-      subject.access_token.should_not == OAuth2::Provider.access_token_class.new.access_token
-    end
-
-    it "is assigned a randomly generated refresh token" do
-      subject.refresh_token.should_not be_nil
-      OAuth2::Provider.access_token_class.new.refresh_token.should_not be_nil
-      subject.access_token.should_not == OAuth2::Provider.access_token_class.new.refresh_token
+    it "uses .unique_random_token to assign random access and refresh tokens" do
+      OAuth2::Provider.access_token_class.stubs(:unique_random_token).with(:access_token).returns('random-access-token')
+      OAuth2::Provider.access_token_class.stubs(:unique_random_token).with(:refresh_token).returns('random-refresh-token')
+      subject.access_token.should eql('random-access-token')
+      subject.refresh_token.should eql('random-refresh-token')
     end
 
     it "expires in 1 month by default" do

data/spec/models/authorization_code_spec.rb

@@ -49,10 +49,9 @@ describe OAuth2::Provider.authorization_code_class do
       OAuth2::Provider.authorization_code_class.new
     end
 
-    it "is assigned a randomly generated code" do
-      subject.code.should_not be_nil
-      OAuth2::Provider.authorization_code_class.new.code.should_not be_nil
-      subject.code.should_not == OAuth2::Provider.authorization_code_class.new.code
+    it "uses .unique_random_token to assign a code" do
+      OAuth2::Provider.authorization_code_class.stubs(:unique_random_token).with(:code).returns('random-token')
+      OAuth2::Provider.authorization_code_class.new.code.should eql('random-token')
     end
 
     it "expires in 1 minute by default" do

data/spec/models/client_spec.rb

@@ -42,16 +42,11 @@ describe OAuth2::Provider.client_class do
       OAuth2::Provider.client_class.new :name => 'client'
     end
 
-    it "is assigned a randomly generated oauth identifier" do
-      subject.oauth_identifier.should_not be_nil
-      OAuth2::Provider.client_class.new.oauth_identifier.should_not be_nil
-      subject.oauth_identifier.should_not == OAuth2::Provider.client_class.new.oauth_identifier
-    end
-
-    it "is assigned a randomly generated oauth secret" do
-      subject.oauth_secret.should_not be_nil
-      OAuth2::Provider.client_class.new.oauth_secret.should_not be_nil
-      subject.oauth_secret.should_not == OAuth2::Provider.client_class.new.oauth_secret
+    it "uses .unique_random_token to assign random oauth identifier and secret" do
+      OAuth2::Provider.client_class.stubs(:unique_random_token).with(:oauth_identifier).returns('random-identifier')
+      OAuth2::Provider.client_class.stubs(:unique_random_token).with(:oauth_secret).returns('random-secret')
+      subject.oauth_identifier.should eql('random-identifier')
+      subject.oauth_secret.should eql('random-secret')
     end
 
     it "returns nil when to_param called" do
@@ -91,6 +86,20 @@ describe OAuth2::Provider.client_class do
         subject.allow_redirection?("a-load-of-rubbish").should be_false
       end
     end
+    
+    describe "on a client with an empty oauth_redirect_uri" do
+      subject do
+        OAuth2::Provider.client_class.new :name => 'client', :oauth_redirect_uri => ""
+      end
+
+      it "always returns true" do
+        subject.allow_redirection?("http://anything.example.com/any/path").should be_true
+      end
+
+      it "returns false if the provided uri isn't a valid uri" do
+        subject.allow_redirection?("a-load-of-rubbish").should be_false
+      end
+    end
 
     describe "on a client without an oauth_redirect_uri" do
       subject do

data/spec/models/random_token_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe OAuth2::Provider::Models::RandomToken do
+  describe ".unique_random_token(attribute)" do
+    let :model do
+      OAuth2::Provider.client_class
+    end
+
+    it "uses .random_token to generate a random token" do
+      model.stubs(:random_token).returns('random-token')
+      model.unique_random_token(:oauth_identifier).should eql('random-token')
+    end
+
+    it "calls .random_token repeatedly until unused token found" do
+      m1 = model.create! :name => 'anything'
+      m2 = model.create! :name => 'ignore'
+      model.stubs(:random_token).returns(m1.oauth_identifier).then.returns(m2.oauth_identifier).then.returns('3rd-random-token')
+      model.unique_random_token(:oauth_identifier).should eql('3rd-random-token')
+    end
+
+    it "only regards tokens used for same attribute as used" do
+      m1 = model.create! :name => 'anything'
+      model.stubs(:random_token).returns(m1.oauth_identifier).then.returns('2nd-random-token')
+      model.unique_random_token(:oauth_secret).should eql(m1.oauth_identifier)
+    end
+  end
+end

data/spec/requests/authentication_spec.rb

@@ -71,7 +71,7 @@ describe "A request for a protected resource" do
       get "/protected", {:oauth_token => @token.access_token}, {"HTTP_AUTHORIZATION" => "OAuth DifferentToken"}
     end
 
-    responds_with_json_error 'invalid_request', :description => 'both authorization header and oauth_token provided, with conflicting tokens', :status => 400
+    responds_with_json_error 'invalid_request', :description => 'both authorization header and oauth_token provided, with conflicting tokens', :status => 401
   end
 
   describe "with an invalid token" do

metadata

@@ -1,240 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oauth2-provider
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.0.19
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 18
-  version: 0.0.18
 platform: ruby
-authors: 
+authors:
 - Tom Ward
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-09-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70115702966000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  version_requirements: *id001
-  name: activesupport
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702966000
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70115702965500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-  version_requirements: *id002
-  name: addressable
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70115702965500
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70115702965020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.5.7
-  version_requirements: *id003
-  name: rack-test
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702965020
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70115702964560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 0
-        - 1
-        version: 3.0.1
-  version_requirements: *id004
-  name: activerecord
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702964560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70115702964080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  version_requirements: *id005
-  name: rspec
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702964080
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70115702963620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 9
-        - 12
+      - !ruby/object:Gem::Version
         version: 0.9.12
-  version_requirements: *id006
-  name: mocha
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702963620
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70115702963160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  version_requirements: *id007
-  name: rake
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702963160
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &70115702962700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.3.1
-  version_requirements: *id008
-  name: sqlite3-ruby
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702962700
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70115702962240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 3
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.3.4
-  version_requirements: *id009
-  name: timecop
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702962240
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70115702961780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.7.5
-  version_requirements: *id010
-  name: yajl-ruby
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702961780
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70115702961320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15424089
-        segments: 
-        - 2
-        - 0
-        - 0
-        - rc
-        - 6
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.0.0.rc.6
-  version_requirements: *id011
-  name: mongoid
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702961320
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: &70115702960860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.2.0
-  version_requirements: *id012
-  name: bson
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70115702960860
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70115702960400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.2.0
-  version_requirements: *id013
-  name: bson_ext
+  type: :development
   prerelease: false
+  version_requirements: *70115702960400
 description: OAuth2 Provider, extracted from api.hashblue.com
-email: 
+email:
 - tom@popdog.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -324,6 +250,7 @@ files:
 - spec/models/authorization_code_spec.rb
 - spec/models/authorization_spec.rb
 - spec/models/client_spec.rb
+- spec/models/random_token_spec.rb
 - spec/requests/access_tokens_controller_spec.rb
 - spec/requests/authentication_spec.rb
 - spec/requests/authorization_code_request_spec.rb
@@ -338,42 +265,40 @@ files:
 - spec/support/rack.rb
 homepage: http://tomafro.net
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2102773934062215418
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2102773934062215418
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: OAuth2 Provider, extracted from api.hashblue.com
-test_files: 
+test_files:
 - spec/models/access_token_spec.rb
 - spec/models/authorization_code_spec.rb
 - spec/models/authorization_spec.rb
 - spec/models/client_spec.rb
+- spec/models/random_token_spec.rb
 - spec/requests/access_tokens_controller_spec.rb
 - spec/requests/authentication_spec.rb
 - spec/requests/authorization_code_request_spec.rb