vidibus-oauth2_server 0.0.5 → 0.0.6

data/Rakefile

@@ -1,36 +1,17 @@
-require "rubygems"
-require "rake"
-require "rake/rdoctask"
-require "rspec"
-require "rspec/core/rake_task"
+require 'bundler'
+require 'rdoc/task'
+require 'rspec'
+require 'rspec/core/rake_task'
 
-begin
-  require "jeweler"
-  Jeweler::Tasks.new do |gem|
-    gem.name = "vidibus-oauth2_server"
-    gem.summary = %Q{OAuth2 server for Rails 3 with Mongoid.}
-    gem.description = %Q{OAuth2 server for Rails 3 with Mongoid.}
-    gem.email = "andre@vidibus.com"
-    gem.homepage = "http://github.com/vidibus/vidibus-oauth2_server"
-    gem.authors = ["Andre Pankratz"]
-    # 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
+Bundler::GemHelper.install_tasks
 
-Rspec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = "spec/**/*_spec.rb"
-  t.rcov = true
-  t.rcov_opts = ["--exclude", "^spec,/gems/"]
-end
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'vidibus/oauth2_server/version'
 
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?("VERSION") ? File.read("VERSION") : ""
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "vidibus-oauth2_server #{version}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-  rdoc.options << "--charset=utf-8"
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "vidibus-oauth2_server #{Vidibus::Oauth2Server::VERSION}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.options << '--charset=utf-8'
 end

data/app/controllers/oauth2/authentication_controller.rb

@@ -14,7 +14,7 @@ class Oauth2::AuthenticationController < Oauth2Controller
     args = params.slice(:client_id, :redirect_url)
     args[:user_id] = current_user.uuid
     token = Oauth2Token.create!(args)
-    uri_params = { :code => token.code }
+    uri_params = {:code => token.code}
     uri_params[:state] = params[:state] if params.has_key?(:state)
     uri = params[:redirect_url].with_params(uri_params)
     redirect_to(uri)
@@ -22,7 +22,7 @@ class Oauth2::AuthenticationController < Oauth2Controller
 
   def access_token
     token = Oauth2Token.find!(params)
-    render :text => { :access_token => token.token }.to_uri, :type => :url_encoded_form, :status => :ok
+    render :text => {:access_token => token.token}.to_uri, :type => :url_encoded_form, :status => :ok
   end
 
   protected
@@ -61,31 +61,31 @@ class Oauth2::AuthenticationController < Oauth2Controller
     begin
       yield
     rescue Vidibus::Oauth2Server::MissingTypeError
-      error = "missing_type"
+      error = 'missing_type'
     rescue Vidibus::Oauth2Server::UnsupportedTypeError
-      error = "unsupported_type"
+      error = 'unsupported_type'
     rescue Vidibus::Oauth2Server::MissingClientIdError
-      error = "missing_client_id"
+      error = 'missing_client_id'
     rescue Vidibus::Oauth2Server::InvalidClientIdError
-      error = "invalid_client_id"
+      error = 'invalid_client_id'
     rescue Vidibus::Oauth2Server::InvalidClientSecretError
-      error = "invalid_client_secret"
+      error = 'invalid_client_secret'
     rescue Vidibus::Oauth2Server::MissingRedirectUrlError
-      error = "missing_redirect_url"
+      error = 'missing_redirect_url'
     rescue Vidibus::Oauth2Server::MalformedRedirectUrlError
-      error = "malformed_redirect_url"
+      error = 'malformed_redirect_url'
     rescue Vidibus::Oauth2Server::InvalidRedirectUrlError
-      error = "invalid_redirect_url"
+      error = 'invalid_redirect_url'
     rescue Vidibus::Oauth2Server::MissingCodeError
-      error = "missing_code"
+      error = 'missing_code'
     rescue Vidibus::Oauth2Server::InvalidCodeError
-      error = "invalid_code"
+      error = 'invalid_code'
     rescue Vidibus::Oauth2Server::ExpiredCodeError
-      error = "expired_code"
+      error = 'expired_code'
     rescue Vidibus::Oauth2Server::InvalidTokenError
-      error = "invalid_token"
+      error = 'invalid_token'
     rescue Vidibus::Oauth2Server::ExpiredTokenError
-      error = "expired_token"
+      error = 'expired_token'
     ensure
       if error
         status ||= :bad_request

data/app/models/oauth2_token.rb

@@ -1,5 +1,3 @@
-require "active_support"
-
 class Oauth2Token
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -22,7 +20,7 @@ class Oauth2Token
   index :code
 
   validates :client_id, :redirect_url, :presence => true
-  validates :token, :code, :uniqueness => { :allow_blank => true }
+  validates :token, :code, :uniqueness => {:allow_blank => true}
 
   before_create :generate_code
 
@@ -58,7 +56,7 @@ class Oauth2Token
     raise Vidibus::Oauth2Server::ExpiredCodeError unless code_expires_at >= Time.now
     self.code = nil
     self.code_expires_at = nil
-    self.token = ActiveSupport::SecureRandom.hex(60)
+    self.token = SecureRandom.hex(60)
     self.token_expires_at = Time.now + TOKEN_EXPIRY if TOKEN_EXPIRY > 0
     save!
     return code
@@ -68,7 +66,7 @@ class Oauth2Token
 
   # Generate a random code
   def generate_code
-    self.code = ActiveSupport::SecureRandom.hex(60)
+    self.code = SecureRandom.hex(60)
     self.code_expires_at = Time.now + CODE_EXPIRY
   end
 end

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
-  get "/oauth/authorize" => "oauth2/authentication#authorize"
-  match "/oauth/access_token" => "oauth2/authentication#access_token", :via => [:get, :post]
-  match "/oauth/oauth_token" => "oauth2/authentication#access_token", :via => [:get, :post]
-  get "/oauth/user" => "oauth2/users#show"
+  get '/oauth/authorize' => 'oauth2/authentication#authorize'
+  match '/oauth/access_token' => 'oauth2/authentication#access_token', :via => [:get, :post]
+  match '/oauth/oauth_token' => 'oauth2/authentication#access_token', :via => [:get, :post]
+  get '/oauth/user' => 'oauth2/users#show'
 end

data/lib/vidibus-oauth2_server.rb

@@ -1,8 +1,5 @@
-require "vidibus-core_extensions"
-
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib", "vidibus"))
-require "oauth2_server"
-require "oauth2_server/extensions"
+require 'vidibus/oauth2_server'
+require 'vidibus/oauth2_server/extensions'
 
 module Vidibus::Oauth2Server
   class Engine < ::Rails::Engine; end

data/lib/vidibus/oauth2_server/extensions.rb

@@ -1,4 +1,4 @@
-require "oauth2_server/extensions/controller"
+require 'vidibus/oauth2_server/extensions/controller'
 
 ActiveSupport.on_load(:action_controller) do
   include Vidibus::Oauth2Server::Extensions::Controller

data/lib/vidibus/oauth2_server/extensions/controller.rb

@@ -7,17 +7,17 @@ module Vidibus
 
         # Authenticates user.
         def authenticate_user!
-          raise "Add a method #authenticate_user! to your ApplicationController that authenticates the user."
+          raise 'Add a method #authenticate_user! to your ApplicationController that authenticates the user.'
         end
 
         # Returns user with matching uuid.
         def find_user_by_uuid(uuid)
-          raise "Add a method #find_user_by_uuid to your ApplicationController to return a user with matching uuid."
+          raise 'Add a method #find_user_by_uuid to your ApplicationController to return a user with matching uuid.'
         end
 
         # Returns Oauth2 client application matching given id.
         def oauth2_client(id)
-          raise "Add a method #oauth2_client to your ApplicationController that returns the OAuth client application for given id."
+          raise 'Add a method #oauth2_client to your ApplicationController that returns the OAuth client application for given id.'
         end
       end
     end

data/lib/vidibus/oauth2_server/version.rb

@@ -0,0 +1,5 @@
+module Vidibus
+  module Oauth2Server
+    VERSION = '0.0.6'
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-oauth2_server
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  segments_generated: true
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -16,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-11 00:00:00 +01:00
+date: 2012-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,14 +29,13 @@ dependencies:
         hash: 5
         segments: 
         - 3
-        segments_generated: true
         version: "3"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mongoid
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,14 +43,13 @@ dependencies:
         hash: 7
         segments: 
         - 2
-        segments_generated: true
         version: "2"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: vidibus-core_extensions
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,14 +57,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: vidibus-uuid
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,14 +71,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id004
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: vidibus-validate_uri
   prerelease: false
-  type: :development
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,29 +85,29 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id005
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  type: :development
-  name: rake
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 1
         - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id006
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  type: :development
-  name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,14 +115,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id007
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  type: :development
-  name: rr
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,14 +129,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id008
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  type: :development
-  name: relevance-rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,14 +143,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id009
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  name: rr
   prerelease: false
-  type: :development
-  name: webmock
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -166,25 +157,23 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  requirement: *id010
+  type: :development
+  version_requirements: *id010
 description: OAuth2 server for Rails 3 with Mongoid.
 email: andre@vidibus.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .document
-- Gemfile
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
+- lib/vidibus/oauth2_server/extensions/controller.rb
+- lib/vidibus/oauth2_server/extensions.rb
+- lib/vidibus/oauth2_server/version.rb
+- lib/vidibus/oauth2_server.rb
+- lib/vidibus-oauth2_server.rb
 - app/controllers/oauth2/authentication_controller.rb
 - app/controllers/oauth2/users_controller.rb
 - app/controllers/oauth2_controller.rb
@@ -192,13 +181,11 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
-- lib/vidibus-oauth2_server.rb
-- lib/vidibus/oauth2_server.rb
-- lib/vidibus/oauth2_server/extensions.rb
-- lib/vidibus/oauth2_server/extensions/controller.rb
-- vidibus-oauth2_server.gemspec
+- LICENSE
+- README.rdoc
+- Rakefile
 has_rdoc: true
-homepage: http://github.com/vidibus/vidibus-oauth2_server
+homepage: https://github.com/vidibus/vidibus-oauth2_server
 licenses: []
 
 post_install_message: 
@@ -214,21 +201,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      segments_generated: true
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: vidibus-oauth2_server
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/Gemfile

@@ -1,16 +0,0 @@
-source :rubygems
-
-gem "rails", "~> 3"
-gem "mongoid", "~> 2"
-gem "vidibus-core_extensions"
-gem "vidibus-uuid"
-
-# Development dependecies
-group :development do
-  gem "jeweler"
-  gem "rake"
-  gem "rspec"
-  gem "rr"
-  gem "relevance-rcov"
-  gem "webmock"
-end

data/VERSION

@@ -1 +0,0 @@
-0.0.5

data/vidibus-oauth2_server.gemspec

@@ -1,84 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{vidibus-oauth2_server}
-  s.version = "0.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andre Pankratz"]
-  s.date = %q{2012-02-11}
-  s.description = %q{OAuth2 server for Rails 3 with Mongoid.}
-  s.email = %q{andre@vidibus.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "app/controllers/oauth2/authentication_controller.rb",
-    "app/controllers/oauth2/users_controller.rb",
-    "app/controllers/oauth2_controller.rb",
-    "app/models/oauth2_token.rb",
-    "config/locales/de.yml",
-    "config/locales/en.yml",
-    "config/routes.rb",
-    "lib/vidibus-oauth2_server.rb",
-    "lib/vidibus/oauth2_server.rb",
-    "lib/vidibus/oauth2_server/extensions.rb",
-    "lib/vidibus/oauth2_server/extensions/controller.rb",
-    "vidibus-oauth2_server.gemspec"
-  ]
-  s.homepage = %q{http://github.com/vidibus/vidibus-oauth2_server}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{OAuth2 server for Rails 3 with Mongoid.}
-
-  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<rails>, ["~> 3"])
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2"])
-      s.add_runtime_dependency(%q<vidibus-core_extensions>, [">= 0"])
-      s.add_runtime_dependency(%q<vidibus-uuid>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
-      s.add_development_dependency(%q<relevance-rcov>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, ["~> 3"])
-      s.add_dependency(%q<mongoid>, ["~> 2"])
-      s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
-      s.add_dependency(%q<vidibus-uuid>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<relevance-rcov>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, ["~> 3"])
-    s.add_dependency(%q<mongoid>, ["~> 2"])
-    s.add_dependency(%q<vidibus-core_extensions>, [">= 0"])
-    s.add_dependency(%q<vidibus-uuid>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<relevance-rcov>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-  end
-end
-