opro 0.0.1 → 0.0.2

data/test/integration/docs_controller_test.rb

@@ -1,8 +1,16 @@
 require 'test_helper'
 
 class DocsControllerTest < ActiveSupport::IntegrationCase
-  test 'renders' do
+  test 'renders index' do
     visit oauth_docs_path
     assert_equal '/oauth_docs', current_path
   end
+
+  test 'renders show' do
+    [:curl, :oauth, :quick_start].each do |doc|
+      doc_path = oauth_doc_path(:id => doc)
+      visit doc_path
+      assert_equal doc_path, current_path
+    end
+  end
 end

data/test/integration/oauth_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class OauthTest < ActiveSupport::IntegrationCase
+class CapybaraOauthTest < ActiveSupport::IntegrationCase
 
   test 'invalid auth_token should do nothing' do
     visit '/'
@@ -15,7 +15,4 @@ class OauthTest < ActiveSupport::IntegrationCase
     assert has_content?('User is logged in')
   end
 
-  test 'blacklisted route should not show user logged in' do
-    #TODO
-  end
 end

data/test/integration/refresh_token_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+class CapybaraRefreshTokenTest < ActiveSupport::IntegrationCase
+
+  setup do
+    Timecop.freeze(Time.now)
+    Opro.setup do |config|
+      config.require_refresh_within = 1.month
+    end
+
+    @user         = create_user
+    @auth_grant   = create_auth_grant_for_user(@user)
+    @client_app   = @auth_grant.application
+  end
+
+  teardown do
+    Timecop.return # "turn off" Timecop
+  end
+
+  test "clients with an expired token do not get logged in" do
+    user         = create_user
+    auth_grant   = create_auth_grant_for_user(user)
+    access_token = auth_grant.access_token
+
+    Timecop.travel(5.months.from_now)
+    visit "/?access_token=#{access_token}"
+
+    assert has_content?('NO logged in users')
+    assert auth_grant.expired?
+  end
+
+end

data/test/support/integration_case.rb

@@ -2,4 +2,13 @@
 class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
   include Capybara::DSL
   include Rails.application.routes.url_helpers
-end
+
+  teardown do
+    DatabaseCleaner.clean       # Truncate the database
+    Capybara.reset_sessions!    # Forget the (simulated) browser state
+    Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
+  end
+
+
+end
+

data/test/test_helper.rb

@@ -7,6 +7,9 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
 require 'mocha'
+require 'timecop'
+require 'database_cleaner'
+DatabaseCleaner.strategy = :truncation
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -45,7 +48,7 @@ include Warden::Test::Helpers
 Warden.test_mode!
 
 def rand_name
-  'foo' + Time.now.to_f.to_s
+  'foo' + Time.now.to_f.to_s + rand(10000).to_s
 end
 
 
@@ -56,7 +59,7 @@ end
 def create_client_app(options= {})
   user = options[:user] || create_user
   name = options[:name] || rand_name
-  Oauth::ClientApplication.create_with_user_and_name(user, name)
+  Oauth::ClientApp.create_with_user_and_name(user, name)
 end
 
 def user_with_client_app
@@ -68,9 +71,10 @@ end
 def create_auth_grant_for_user(user = nil, app = nil)
   app  ||= create_client_app
   user ||= create_user
-  Oauth::AccessGrant.create(:user => user, :application => app)
+  Oauth::AuthGrant.create(:user => user, :application => app)
 end
 
+
 # Will run the given code as the user passed in
 def as_user(user=nil, &block)
   current_user = user || create_user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000Z
+date: 2012-06-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70350386690460 !ruby/object:Gem::Requirement
+  requirement: &70290860455720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70350386690460
+  version_requirements: *70290860455720
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70350386683340 !ruby/object:Gem::Requirement
+  requirement: &70290860454680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70350386683340
+  version_requirements: *70290860454680
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70350386682740 !ruby/object:Gem::Requirement
+  requirement: &70290860453740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70350386682740
+  version_requirements: *70290860453740
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70350386682120 !ruby/object:Gem::Requirement
+  requirement: &70290860453040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350386682120
+  version_requirements: *70290860453040
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70290860452260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70290860452260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70350386681480 !ruby/object:Gem::Requirement
+  requirement: &70290860451340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70350386681480
+  version_requirements: *70290860451340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70350386680760 !ruby/object:Gem::Requirement
+  requirement: &70290860450280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70350386680760
+  version_requirements: *70290860450280
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70350386679900 !ruby/object:Gem::Requirement
+  requirement: &70290860449360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70350386679900
+  version_requirements: *70290860449360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70350386678780 !ruby/object:Gem::Requirement
+  requirement: &70290860448620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350386678780
+  version_requirements: *70290860448620
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70350386678200 !ruby/object:Gem::Requirement
+  requirement: &70290860448000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350386678200
+  version_requirements: *70290860448000
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70350386677300 !ruby/object:Gem::Requirement
+  requirement: &70290860447380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350386677300
+  version_requirements: *70290860447380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70350386676560 !ruby/object:Gem::Requirement
+  requirement: &70290860446620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350386676560
+  version_requirements: *70290860446620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70350386675920 !ruby/object:Gem::Requirement
+  requirement: &70290860446000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350386675920
+  version_requirements: *70290860446000
 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
@@ -159,20 +170,23 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/oauth/auth_controller.rb
-- app/controllers/oauth/client_application_controller.rb
+- app/controllers/oauth/client_app_controller.rb
 - app/controllers/oauth/docs_controller.rb
 - app/controllers/oauth/tests_controller.rb
-- app/controllers/opro_application_controller.rb
+- app/controllers/oauth/token_controller.rb
+- app/controllers/opro_controller.rb
 - app/models/oauth/access_grant.rb
-- app/models/oauth/client_application.rb
+- app/models/oauth/client_appl.rb
 - app/views/oauth/auth/new.html.erb
-- app/views/oauth/client_application/create.html.erb
-- app/views/oauth/client_application/index.html.erb
-- app/views/oauth/client_application/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
 - config/routes.rb
@@ -186,8 +200,10 @@ files:
 - lib/opro/controllers/concerns/error_messages.rb
 - lib/opro/controllers/concerns/permissions.rb
 - lib/opro/engine.rb
+- lib/opro/rails/routes.rb
 - opro.gemspec
 - test/controllers/permissions_test.rb
+- test/controllers/refresh_token_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/pages_controller.rb
@@ -231,10 +247,14 @@ files:
 - test/dummy/public/javascripts/rails.js
 - test/dummy/public/stylesheets/.gitkeep
 - test/dummy/script/rails
+- test/integration/action_dispatch/auth_controller_test.rb
+- test/integration/action_dispatch/oauth_flow_test.rb
+- test/integration/action_dispatch/refresh_token_test.rb
 - test/integration/auth_controller_test.rb
-- test/integration/client_application_controller_test.rb
+- test/integration/client_app_controller_test.rb
 - test/integration/docs_controller_test.rb
 - test/integration/oauth_test.rb
+- test/integration/refresh_token_test.rb
 - test/opro_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
@@ -253,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2087592437685873043
+      hash: -3291297708449199104
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/controllers/oauth/client_application_controller.rb

@@ -1,21 +0,0 @@
-class Oauth::ClientApplicationController < ApplicationController
-  before_filter :opro_authenticate_user!
-
-  def new
-    @client_app = Oauth::ClientApplication.new
-  end
-
-  def create
-    @client_app = Oauth::ClientApplication.find_by_user_id_and_name(current_user.id, params[:oauth_client_application][:name])
-    @client_app ||= Oauth::ClientApplication.create_with_user_and_name(current_user, params[:oauth_client_application][:name])
-    if @client_app.save
-      # do nothing
-    else
-      render :new
-    end
-  end
-
-  def index
-    @client_apps = Oauth::ClientApplication.where(:user_id => current_user.id)
-  end
-end

data/app/controllers/opro_application_controller.rb

@@ -1,8 +0,0 @@
-class ApplicationController < ActionController::Base
-
-  # Any code that would/should go into ApplicationController is
-  # now in lib/opro/conrollers/application_controller_helper.rb
-  # it is loaded into ApplicationController in lib/opro/engine.rb
-  # thanks for visiting, come back soon
-
-end

data/test/integration/client_application_controller_test.rb

@@ -1,24 +0,0 @@
-require 'test_helper'
-
-class ClientApplicationControllerTest < ActiveSupport::IntegrationCase
-  test 'must be logged in' do
-    visit new_oauth_client_application_path
-    assert_equal '/users/sign_in', current_path
-  end
-
-  test 'create client application' do
-    user = create_user
-    as_user(user).visit new_oauth_client_application_path
-    assert_equal '/oauth_client_applications/new', current_path
-
-    fill_in 'oauth_client_application_name', :with => rand_name
-
-    click_button 'submitApp'
-    assert_equal '/oauth_client_applications', current_path
-
-    last_client = Oauth::ClientApplication.order(:created_at).last
-    assert has_content?(last_client.name)
-    assert has_content?(last_client.client_id)
-    assert has_content?(last_client.client_secret)
-  end
-end