opro 0.0.3 → 0.1.0

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.0
+
+- Refresh Token Support
+- Scoped permissions support
+- Docs, Test, and ClientApp controllers can be skipped or over-ridden
+
 ## 0.0.1
 
-Initial Release
+- Initial Release

data/README.md

@@ -1,10 +1,6 @@
-## Stop, Read This
-
-If you want to use this, do so at your own risk. I'm vetting it on some development and production applications, when it is ready for consumption and contribution, I'll remove this. If you want to be notified when that happens let me know [@schneems](http://twitter.com/schneems). For now this should be considered a toy, and enjoyed as such :)
-
 ## Opro
 
-A Rails Engine that turns your app into an [Oauth2](http://oauth.net/2/) Provider.
+A production ready Rails Engine that turns your app into an [Oauth2](http://oauth.net/2/) Provider.
 
   * [Demo OAuth Provider app with Opro](http://opro-demo.herokuapp.com/) on Heroku
   * [Built in Opro docs](http://opro-demo.herokuapp.com/oauth_docs)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/app/controllers/{oauth → opro/oauth}/auth_controller.rb

@@ -1,11 +1,11 @@
-class Oauth::AuthController < OproController
+class Opro::Oauth::AuthController < OproController
   before_filter      :opro_authenticate_user!
   before_filter      :ask_user!,                  :only   => [:create]
 
 
   def new
     @redirect_uri = params[:redirect_uri]
-    @client_app   = Oauth::ClientApp.find_by_app_id(params[:client_id])
+    @client_app   = Opro::Oauth::ClientApp.find_by_app_id(params[:client_id])
     @scopes       = scope_from_params(params)
   end
 
@@ -14,9 +14,9 @@ class Oauth::AuthController < OproController
   # :ask_user! is called before creating a new authorization, this allows us to redirect
   def create
     # find or create an auth_grant for a given user
-    application  =   Oauth::ClientApp.find_by_app_id(params[:client_id])
-    access_grant =   Oauth::AuthGrant.where( :user_id => current_user.id, :application_id => application.id).first
-    access_grant ||= Oauth::AuthGrant.create(:user => current_user,       :application => application)
+    application  =   Opro::Oauth::ClientApp.find_by_app_id(params[:client_id])
+    access_grant =   Opro::Oauth::AuthGrant.where( :user_id => current_user.id, :application_id => application.id).first
+    access_grant ||= Opro::Oauth::AuthGrant.create(:user => current_user,       :application => application)
 
 
     # add permission changes if there are any
@@ -41,14 +41,14 @@ class Oauth::AuthController < OproController
 
       # if the request did not come from a form within the application, render the user form
       @redirect_uri ||= params[:redirect_uri]
-      @client_app   ||= Oauth::ClientApp.find_by_app_id(params[:client_id])
+      @client_app   ||= Opro::Oauth::ClientApp.find_by_app_id(params[:client_id])
       redirect_to oauth_new_path(params)
     end
   end
 
   def user_granted_access_before?(user, params)
-    @client_app ||= Oauth::ClientApp.find_by_app_id(params[:client_id])
-    Oauth::AuthGrant.where(:application_id => @client_app.id, :user_id => user.id).present?
+    @client_app ||= Opro::Oauth::ClientApp.find_by_app_id(params[:client_id])
+    Opro::Oauth::AuthGrant.where(:application_id => @client_app.id, :user_id => user.id).present?
   end
 
 

data/app/controllers/opro/oauth/client_app_controller.rb

@@ -0,0 +1,24 @@
+class Opro::Oauth::ClientAppController < OproController
+  before_filter :opro_authenticate_user!
+
+  def new
+    @client_app = Opro::Oauth::ClientApp.new
+  end
+
+  # Show all client applications belonging to the current user
+  def index
+    @client_apps = Opro::Oauth::ClientApp.where(:user_id => current_user.id)
+  end
+
+
+  def create
+    @client_app = Opro::Oauth::ClientApp.find_by_user_id_and_name(current_user.id, params[:opro_oauth_client_app][:name])
+    @client_app ||= Opro::Oauth::ClientApp.create_with_user_and_name(current_user, params[:opro_oauth_client_app][:name])
+    if @client_app.save
+      # do nothing
+    else
+      render :new
+    end
+  end
+
+end

data/app/controllers/{oauth → opro/oauth}/docs_controller.rb

@@ -1,10 +1,10 @@
 require 'erb'
 require 'bluecloth'
 
-OPRO_MD_ROOT=File.join(File.dirname(__FILE__), '../../views/oauth/docs/markdown/')
+OPRO_MD_ROOT=File.join(File.dirname(__FILE__), '../../../views/opro/oauth/docs/markdown/')
 
 
-class Oauth::DocsController < OproController
+class Opro::Oauth::DocsController < OproController
   helper_method :render_doc
 
   def index

data/app/controllers/{oauth → opro/oauth}/tests_controller.rb

@@ -1,4 +1,4 @@
-class Oauth::TestsController < OproController
+class Opro::Oauth::TestsController < OproController
   allow_oauth!
   disallow_oauth! :only => [:destroy]
 

data/app/controllers/{oauth → opro/oauth}/token_controller.rb

@@ -1,14 +1,14 @@
 # This controller is where clients can exchange
 # codes and refresh_tokens for access_tokens
 
-class Oauth::TokenController < OproController
+class Opro::Oauth::TokenController < OproController
   before_filter      :opro_authenticate_user!,    :except => [:create]
   skip_before_filter :verify_authenticity_token,  :only   => [:create]
 
 
   def create
     # Find the client application
-    application = Oauth::ClientApp.authenticate(params[:client_id], params[:client_secret])
+    application = Opro::Oauth::ClientApp.authenticate(params[:client_id], params[:client_secret])
 
     if application.nil?
       render :json => {:error => "Could not find application based on client_id=#{params[:client_id]}
@@ -18,9 +18,9 @@ class Oauth::TokenController < OproController
 
 
     if params[:code]
-      auth_grant = Oauth::AuthGrant.authenticate(params[:code], application.id)
+      auth_grant = Opro::Oauth::AuthGrant.authenticate(params[:code], application.id)
     else
-      auth_grant = Oauth::AuthGrant.refresh_tokens!(params[:refresh_token], application.id)
+      auth_grant = Opro::Oauth::AuthGrant.refresh_tokens!(params[:refresh_token], application.id)
     end
 
     if auth_grant.nil?

data/app/models/{oauth/access_grant.rb → opro/oauth/auth_grant.rb}

@@ -1,6 +1,6 @@
-class Oauth::AuthGrant < ActiveRecord::Base
+class Opro::Oauth::AuthGrant < ActiveRecord::Base
 
-  self.table_name = :opro_access_grants
+  self.table_name = :opro_auth_grants
 
   belongs_to :user
   belongs_to :client_application, :class_name => "Oauth::ClientApp"

data/app/models/{oauth → opro/oauth}/client_app.rb

@@ -1,5 +1,5 @@
-class Oauth::ClientApp < ActiveRecord::Base
-  self.table_name = :opro_client_applications
+class Opro::Oauth::ClientApp < ActiveRecord::Base
+  self.table_name = :opro_client_apps
 
   belongs_to :user
   validates  :app_id, :uniqueness => true

data/app/views/{oauth → opro/oauth}/auth/new.html.erb

@@ -24,5 +24,5 @@ I Authorize <%= @client_app.name %> to:
   <%= f.submit 'Authorize This Application', :id => 'oauthAuthorize' %>
 <%- end -%>
 
-<%= button_to 'Decline this Request', request.referrer, :id => 'oauthNoAuthorize' %>
+<%= button_to 'Decline this Request', request.referrer||'/', :id => 'oauthNoAuthorize' %>
 

data/app/views/{oauth → opro/oauth}/client_app/new.html.erb

@@ -1,6 +1,6 @@
 <h2>Create An OAuth Client App</h2>
 <div>
-  <%= form_for @client_app do |f| %>
+  <%= form_for @client_app, :url => oauth_client_apps_path do |f| %>
     <%= f.label :name %>
     <%= f.text_field :name, :placeholder => 'App Name' %>
     <%= f.submit 'Create OAuth Client', :id => 'submitApp' %>

data/config/routes.rb

@@ -3,3 +3,6 @@
   # rails g opro:install
   # this functionality is added in `add_opro_routes` of
   # lib/generators/opro/install_generator.rb
+Opro::Engine.routes.draw do
+  mount_opro_oauth
+end

data/lib/generators/active_record/opro_generator.rb

@@ -20,8 +20,8 @@ module ActiveRecord
 
 
       def copy_migrations
-        migration_template "access_grants.rb",       "db/migrate/create_opro_access_grants.rb"
-        migration_template "client_applications.rb", "db/migrate/create_opro_client_applications.rb"
+        migration_template "auth_grants.rb", "db/migrate/create_opro_auth_grants.rb"
+        migration_template "client_apps.rb", "db/migrate/create_opro_client_apps.rb"
       end
     end
   end

data/{test/dummy/db/migrate/20120514060322_create_opro_access_grants.rb → lib/generators/active_record/templates/auth_grants.rb}

@@ -1,6 +1,6 @@
 class CreateOproAuthGrants < ActiveRecord::Migration
   def change
-    create_table  :opro_access_grants do |t|
+    create_table  :opro_auth_grants do |t|
       t.string    :code
       t.string    :access_token
       t.string    :refresh_token

data/lib/generators/active_record/templates/{client_applications.rb → client_apps.rb}

@@ -1,6 +1,6 @@
 class CreateOproClientApps < ActiveRecord::Migration
   def change
-    create_table :opro_client_applications do |t|
+    create_table :opro_client_apps do |t|
       t.string  :name
       t.string  :app_id
       t.string  :app_secret

data/lib/opro.rb

@@ -1,4 +1,6 @@
 module Opro
+  module Oauth
+  end
   module Controllers
     module Concerns
     end

data/lib/opro/controllers/application_controller_helper.rb

@@ -58,15 +58,17 @@ module Opro
       end
 
       def oauth_access_grant
-        @oauth_access_grant ||= Oauth::AuthGrant.find_for_token(params[:access_token])
+        @oauth_access_grant ||= Opro::Oauth::AuthGrant.find_for_token(params[:access_token])
       end
 
       def oauth_client_app
-        @oauth_client_app   ||= oauth_access_grant.client_application
+        return false      if oauth_access_grant.blank?
+        @oauth_client_app ||= oauth_access_grant.client_application
       end
 
       def oauth_user
-        @oauth_user         ||= oauth_access_grant.user
+        return false if oauth_access_grant.blank?
+        @oauth_user  ||= oauth_access_grant.user
       end
 
       def oauth_auth!

data/lib/opro/engine.rb

@@ -2,8 +2,6 @@ require 'opro/rails/routes'
 
 module Opro
   class Engine < Rails::Engine
-    isolate_namespace Opro
-
 
     initializer "opro.include_helpers" do
       Opro.include_helpers(Opro::Controllers)

data/lib/opro/rails/routes.rb

@@ -4,14 +4,16 @@ module ActionDispatch::Routing
     # generate all needed routes for oauth
     def mount_opro_oauth(options = {})
       skip_routes = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
+      controllers = options[:controllers] || {}
 
-      match 'oauth/new'          => 'oauth/auth#new',          :as => 'oauth_new'
-      match 'oauth/authorize'    => 'oauth/auth#create',       :as => 'oauth_authorize'
-      match 'oauth/token'        => 'oauth/token#create',      :as => 'oauth_token'
+      match 'oauth/new'          => 'opro/oauth/auth#new',          :as => 'oauth_new'
+      match 'oauth/authorize'    => 'opro/oauth/auth#create',       :as => 'oauth_authorize'
+      match 'oauth/token'        => 'opro/oauth/token#create',      :as => 'oauth_token'
 
-      resources :oauth_docs,        :controller => 'oauth/docs'       unless skip_routes.include?(:docs)
-      resources :oauth_tests,       :controller => 'oauth/tests'      unless skip_routes.include?(:tests)
-      resources :oauth_client_apps, :controller => 'oauth/client_app' unless skip_routes.include?(:client_apps)
+      resources :oauth_docs,        :controller => controllers[:oauth_docs]       ||'opro/oauth/docs'       unless skip_routes.include?(:docs)
+      resources :oauth_tests,       :controller => controllers[:oauth_tests]      ||'opro/oauth/tests'      unless skip_routes.include?(:tests)
+      resources :oauth_client_apps, :controller => controllers[:oauth_client_apps]||'opro/oauth/client_app' unless skip_routes.include?(:client_apps)
     end
   end
 end
+

data/opro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "opro"
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-06-18"
+  s.date = "2012-06-19"
   s.description = " Enable OAuth clients (iphone, android, web sites, etc.) to access and use your Rails application, what you do with it is up to you"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [
@@ -24,30 +24,30 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/controllers/oauth/auth_controller.rb",
-    "app/controllers/oauth/client_app_controller.rb",
-    "app/controllers/oauth/docs_controller.rb",
-    "app/controllers/oauth/tests_controller.rb",
-    "app/controllers/oauth/token_controller.rb",
+    "app/controllers/opro/oauth/auth_controller.rb",
+    "app/controllers/opro/oauth/client_app_controller.rb",
+    "app/controllers/opro/oauth/docs_controller.rb",
+    "app/controllers/opro/oauth/tests_controller.rb",
+    "app/controllers/opro/oauth/token_controller.rb",
     "app/controllers/opro_controller.rb",
-    "app/models/oauth/access_grant.rb",
-    "app/models/oauth/client_app.rb",
-    "app/views/oauth/auth/new.html.erb",
-    "app/views/oauth/client_app/create.html.erb",
-    "app/views/oauth/client_app/index.html.erb",
-    "app/views/oauth/client_app/new.html.erb",
-    "app/views/oauth/docs/index.html.erb",
-    "app/views/oauth/docs/markdown/curl.md.erb",
-    "app/views/oauth/docs/markdown/oauth.md.erb",
-    "app/views/oauth/docs/markdown/permissions.md.erb",
-    "app/views/oauth/docs/markdown/quick_start.md.erb",
-    "app/views/oauth/docs/markdown/refresh_tokens.md.erb",
-    "app/views/oauth/docs/show.html.erb",
-    "app/views/oauth/tests/index.html.erb",
+    "app/models/opro/oauth/auth_grant.rb",
+    "app/models/opro/oauth/client_app.rb",
+    "app/views/opro/oauth/auth/new.html.erb",
+    "app/views/opro/oauth/client_app/create.html.erb",
+    "app/views/opro/oauth/client_app/index.html.erb",
+    "app/views/opro/oauth/client_app/new.html.erb",
+    "app/views/opro/oauth/docs/index.html.erb",
+    "app/views/opro/oauth/docs/markdown/curl.md.erb",
+    "app/views/opro/oauth/docs/markdown/oauth.md.erb",
+    "app/views/opro/oauth/docs/markdown/permissions.md.erb",
+    "app/views/opro/oauth/docs/markdown/quick_start.md.erb",
+    "app/views/opro/oauth/docs/markdown/refresh_tokens.md.erb",
+    "app/views/opro/oauth/docs/show.html.erb",
+    "app/views/opro/oauth/tests/index.html.erb",
     "config/routes.rb",
     "lib/generators/active_record/opro_generator.rb",
-    "lib/generators/active_record/templates/access_grants.rb",
-    "lib/generators/active_record/templates/client_applications.rb",
+    "lib/generators/active_record/templates/auth_grants.rb",
+    "lib/generators/active_record/templates/client_apps.rb",
     "lib/generators/opro/install_generator.rb",
     "lib/generators/templates/opro.rb",
     "lib/opro.rb",
@@ -87,8 +87,8 @@ Gem::Specification.new do |s|
     "test/dummy/config/locales/en.yml",
     "test/dummy/config/routes.rb",
     "test/dummy/db/migrate/20120408163038_devise_create_users.rb",
-    "test/dummy/db/migrate/20120514060322_create_opro_access_grants.rb",
-    "test/dummy/db/migrate/20120514060323_create_opro_client_applications.rb",
+    "test/dummy/db/migrate/20120618085751_create_opro_auth_grants.rb",
+    "test/dummy/db/migrate/20120618085752_create_opro_client_apps.rb",
     "test/dummy/db/schema.rb",
     "test/dummy/public/404.html",
     "test/dummy/public/422.html",

data/test/controllers/permissions_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
-class Oauth::TestsControllerTest < ActionController::TestCase
-  tests Oauth::TestsController
+class Opro::Oauth::TestsControllerTest < ActionController::TestCase
+  tests Opro::Oauth::TestsController
   include Devise::TestHelpers
 
   setup do
@@ -13,7 +13,7 @@ class Oauth::TestsControllerTest < ActionController::TestCase
     permissions = {'write' => true}
     @auth_grant.update_attributes(:permissions => permissions)
 
-    post :create, access_token => @auth_grant.access_token, format => :json
+    post :create, :access_token => @auth_grant.access_token, :format => :json
     assert_response :success
   end
 
@@ -21,7 +21,7 @@ class Oauth::TestsControllerTest < ActionController::TestCase
   test "access_token with NO write ability can NOT POST" do
     permissions = {:write => false}
     @auth_grant.update_attributes(:permissions => permissions)
-    post :create, access_token => @auth_grant.access_token, format =>  :json
+    post :create, :access_token => @auth_grant.access_token, :format =>  :json
     assert_response 401
   end
 end

data/{lib/generators/active_record/templates/access_grants.rb → test/dummy/db/migrate/20120618085751_create_opro_auth_grants.rb}

@@ -1,6 +1,6 @@
 class CreateOproAuthGrants < ActiveRecord::Migration
   def change
-    create_table  :opro_access_grants do |t|
+    create_table  :opro_auth_grants do |t|
       t.string    :code
       t.string    :access_token
       t.string    :refresh_token

data/test/dummy/db/migrate/{20120514060323_create_opro_client_applications.rb → 20120618085752_create_opro_client_apps.rb}

@@ -1,6 +1,6 @@
 class CreateOproClientApps < ActiveRecord::Migration
   def change
-    create_table :opro_client_applications do |t|
+    create_table :opro_client_apps do |t|
       t.string  :name
       t.string  :app_id
       t.string  :app_secret

data/test/integration/action_dispatch/auth_controller_test.rb

@@ -43,7 +43,7 @@ class AuthControllerTest < ActionDispatch::IntegrationTest
     assert_equal 302, status
     follow_redirect!
     assert_equal @redirect_uri, path
-    auth_grant = Oauth::AuthGrant.find(auth_grant.id)
+    auth_grant = Opro::Oauth::AuthGrant.find(auth_grant.id)
 
     refute auth_grant.permissions.has_key?(permissions.keys.first)
   end

data/test/integration/action_dispatch/refresh_token_test.rb

@@ -45,7 +45,7 @@ class RefreshTokenTest < ActionDispatch::IntegrationTest
     refute_equal json_hash['expires_in'],     @auth_grant.expires_in
 
 
-    auth_grant = Oauth::AuthGrant.find(@auth_grant.id)
+    auth_grant = Opro::Oauth::AuthGrant.find(@auth_grant.id)
     assert_equal json_hash['access_token'],   auth_grant.access_token
     assert_equal json_hash['refresh_token'],  auth_grant.refresh_token
     assert_equal json_hash['expires_in'],     auth_grant.expires_in

data/test/integration/auth_controller_test.rb

@@ -21,7 +21,7 @@ class CapybaraAuthControllerTest < ActiveSupport::IntegrationCase
       click_button 'oauthAuthorize'
     end
 
-    access_grant = Oauth::AuthGrant.where(:user_id => @user.id, :application_id => @app.id).first
+    access_grant = Opro::Oauth::AuthGrant.where(:user_id => @user.id, :application_id => @app.id).first
     assert_equal @redirect_uri, current_path
     assert access_grant.present?
     assert access_grant.can?(:write) # write access is checked by default
@@ -32,7 +32,7 @@ class CapybaraAuthControllerTest < ActiveSupport::IntegrationCase
 
     uncheck('permissions_write') # uncheck write access
     click_button 'oauthAuthorize'
-    access_grant = Oauth::AuthGrant.where(:user_id => @user.id, :application_id => @app.id).first
+    access_grant = Opro::Oauth::AuthGrant.where(:user_id => @user.id, :application_id => @app.id).first
     refute access_grant.can?(:write)
   end
 end

data/test/integration/client_app_controller_test.rb

@@ -11,12 +11,12 @@ class ClientAppControllerTest < ActiveSupport::IntegrationCase
     as_user(user).visit new_oauth_client_app_path
     assert_equal '/oauth_client_apps/new', current_path
 
-    fill_in 'oauth_client_app_name', :with => rand_name
+    fill_in 'opro_oauth_client_app_name', :with => rand_name
 
     click_button 'submitApp'
     assert_equal '/oauth_client_apps', current_path
 
-    last_client = Oauth::ClientApp.order(:created_at).last
+    last_client = Opro::Oauth::ClientApp.order(:created_at).last
     assert has_content?(last_client.name)
     assert has_content?(last_client.client_id)
     assert has_content?(last_client.client_secret)

data/test/integration/oauth_test.rb

@@ -15,4 +15,13 @@ class CapybaraOauthTest < ActiveSupport::IntegrationCase
     assert has_content?('User is logged in')
   end
 
+  test 'invalid auth token shows user as logged OUT' do
+    user         = create_user
+    auth_grant   = create_auth_grant_for_user(user)
+    access_token = auth_grant.access_token + "foo"
+    visit "/?access_token=#{access_token}"
+    save_and_open_page
+    assert has_content?('NO logged in users')
+  end
+
 end

data/test/test_helper.rb

@@ -1,6 +1,10 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
+if RUBY_VERSION >= "1.9"
+  require 'simplecov'
+  SimpleCov.start 'rails'
+end
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
@@ -59,7 +63,7 @@ end
 def create_client_app(options= {})
   user = options[:user] || create_user
   name = options[:name] || rand_name
-  Oauth::ClientApp.create_with_user_and_name(user, name)
+  Opro::Oauth::ClientApp.create_with_user_and_name(user, name)
 end
 
 def user_with_client_app
@@ -71,7 +75,7 @@ end
 def create_auth_grant_for_user(user = nil, app = nil)
   app  ||= create_client_app
   user ||= create_user
-  Oauth::AuthGrant.create(:user => user, :application => app)
+  Opro::Oauth::AuthGrant.create(:user => user, :application => app)
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opro
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000Z
+date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70164012622400 !ruby/object:Gem::Requirement
+  requirement: &70273794750300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70164012622400
+  version_requirements: *70273794750300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70164012621520 !ruby/object:Gem::Requirement
+  requirement: &70273794749360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70164012621520
+  version_requirements: *70273794749360
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70164012620020 !ruby/object:Gem::Requirement
+  requirement: &70273794748420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164012620020
+  version_requirements: *70273794748420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70164012618820 !ruby/object:Gem::Requirement
+  requirement: &70273794747460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012618820
+  version_requirements: *70273794747460
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70164012610620 !ruby/object:Gem::Requirement
+  requirement: &70273794746540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012610620
+  version_requirements: *70273794746540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70164012609560 !ruby/object:Gem::Requirement
+  requirement: &70273794745720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70164012609560
+  version_requirements: *70273794745720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70164012608080 !ruby/object:Gem::Requirement
+  requirement: &70273794745020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70164012608080
+  version_requirements: *70273794745020
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70164012606020 !ruby/object:Gem::Requirement
+  requirement: &70273794744280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70164012606020
+  version_requirements: *70273794744280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70164012604200 !ruby/object:Gem::Requirement
+  requirement: &70273794743560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012604200
+  version_requirements: *70273794743560
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70164012593620 !ruby/object:Gem::Requirement
+  requirement: &70273794742780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012593620
+  version_requirements: *70273794742780
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70164012590980 !ruby/object:Gem::Requirement
+  requirement: &70273794742200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012590980
+  version_requirements: *70273794742200
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70164012588060 !ruby/object:Gem::Requirement
+  requirement: &70273794741600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012588060
+  version_requirements: *70273794741600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70164012581780 !ruby/object:Gem::Requirement
+  requirement: &70273794740720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164012581780
+  version_requirements: *70273794740720
 description: ! ' Enable OAuth clients (iphone, android, web sites, etc.) to access
   and use your Rails application, what you do with it is up to you'
 email: richard.schneeman@gmail.com
@@ -170,30 +170,30 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/controllers/oauth/auth_controller.rb
-- app/controllers/oauth/client_app_controller.rb
-- app/controllers/oauth/docs_controller.rb
-- app/controllers/oauth/tests_controller.rb
-- app/controllers/oauth/token_controller.rb
+- app/controllers/opro/oauth/auth_controller.rb
+- app/controllers/opro/oauth/client_app_controller.rb
+- app/controllers/opro/oauth/docs_controller.rb
+- app/controllers/opro/oauth/tests_controller.rb
+- app/controllers/opro/oauth/token_controller.rb
 - app/controllers/opro_controller.rb
-- app/models/oauth/access_grant.rb
-- app/models/oauth/client_app.rb
-- app/views/oauth/auth/new.html.erb
-- app/views/oauth/client_app/create.html.erb
-- app/views/oauth/client_app/index.html.erb
-- app/views/oauth/client_app/new.html.erb
-- app/views/oauth/docs/index.html.erb
-- app/views/oauth/docs/markdown/curl.md.erb
-- app/views/oauth/docs/markdown/oauth.md.erb
-- app/views/oauth/docs/markdown/permissions.md.erb
-- app/views/oauth/docs/markdown/quick_start.md.erb
-- app/views/oauth/docs/markdown/refresh_tokens.md.erb
-- app/views/oauth/docs/show.html.erb
-- app/views/oauth/tests/index.html.erb
+- app/models/opro/oauth/auth_grant.rb
+- app/models/opro/oauth/client_app.rb
+- app/views/opro/oauth/auth/new.html.erb
+- app/views/opro/oauth/client_app/create.html.erb
+- app/views/opro/oauth/client_app/index.html.erb
+- app/views/opro/oauth/client_app/new.html.erb
+- app/views/opro/oauth/docs/index.html.erb
+- app/views/opro/oauth/docs/markdown/curl.md.erb
+- app/views/opro/oauth/docs/markdown/oauth.md.erb
+- app/views/opro/oauth/docs/markdown/permissions.md.erb
+- app/views/opro/oauth/docs/markdown/quick_start.md.erb
+- app/views/opro/oauth/docs/markdown/refresh_tokens.md.erb
+- app/views/opro/oauth/docs/show.html.erb
+- app/views/opro/oauth/tests/index.html.erb
 - config/routes.rb
 - lib/generators/active_record/opro_generator.rb
-- lib/generators/active_record/templates/access_grants.rb
-- lib/generators/active_record/templates/client_applications.rb
+- lib/generators/active_record/templates/auth_grants.rb
+- lib/generators/active_record/templates/client_apps.rb
 - lib/generators/opro/install_generator.rb
 - lib/generators/templates/opro.rb
 - lib/opro.rb
@@ -233,8 +233,8 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20120408163038_devise_create_users.rb
-- test/dummy/db/migrate/20120514060322_create_opro_access_grants.rb
-- test/dummy/db/migrate/20120514060323_create_opro_client_applications.rb
+- test/dummy/db/migrate/20120618085751_create_opro_auth_grants.rb
+- test/dummy/db/migrate/20120618085752_create_opro_client_apps.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -274,7 +274,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4595937084494564531
+      hash: -4287808992153183066
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/controllers/oauth/client_app_controller.rb

@@ -1,24 +0,0 @@
-class Oauth::ClientAppController < OproController
-  before_filter :opro_authenticate_user!
-
-  def new
-    @client_app = Oauth::ClientApp.new
-  end
-
-  # Show all client applications belonging to the current user
-  def index
-    @client_apps = Oauth::ClientApp.where(:user_id => current_user.id)
-  end
-
-
-  def create
-    @client_app = Oauth::ClientApp.find_by_user_id_and_name(current_user.id, params[:oauth_client_app][:name])
-    @client_app ||= Oauth::ClientApp.create_with_user_and_name(current_user, params[:oauth_client_app][:name])
-    if @client_app.save
-      # do nothing
-    else
-      render :new
-    end
-  end
-
-end