opro 0.4.3 → 0.5.0

data/lib/opro/controllers/concerns/rate_limits.rb

@@ -11,8 +11,7 @@ module Opro::Controllers::Concerns::RateLimits
   end
 
   def oauth_client_rate_limited?(client_id, params)
-
-
+    # implement your rate limiting algorithm here
   end
 
 

data/lib/opro/rails/routes.rb

@@ -7,9 +7,9 @@ module ActionDispatch::Routing
       controllers = options[:controllers] || {}
 
       oauth_new_controller = controllers[:oauth_new] || 'opro/oauth/auth'
-      match 'oauth/new'          => "#{oauth_new_controller}#new",  :as => 'oauth_new'
-      match 'oauth/authorize'    => 'opro/oauth/auth#create',       :as => 'oauth_authorize'
-      match 'oauth/token'        => 'opro/oauth/token#create',      :as => 'oauth_token'
+      get  'oauth/new'          => "#{oauth_new_controller}#new",  :as => 'oauth_new'
+      post 'oauth/authorize'    => 'opro/oauth/auth#create',       :as => 'oauth_authorize'
+      post 'oauth/token'        => 'opro/oauth/token#create',      :as => 'oauth_token'
 
       unless skip_routes.include?(:client_apps)
         oauth_client_apps = controllers[:oauth_client_apps] ||'opro/oauth/client_app'

data/opro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "opro"
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-11-17"
+  s.date = "2013-05-15"
   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 = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
     ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
-    "Gemfile.lock",
     "MIT-LICENSE",
     "README.md",
     "Rakefile",
@@ -53,6 +52,7 @@ Gem::Specification.new do |s|
     "lib/generators/opro/install_generator.rb",
     "lib/generators/templates/opro.rb",
     "lib/opro.rb",
+    "lib/opro/auth_provider/devise.rb",
     "lib/opro/controllers/application_controller_helper.rb",
     "lib/opro/controllers/concerns/error_messages.rb",
     "lib/opro/controllers/concerns/permissions.rb",
@@ -124,55 +124,49 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/schneems/opro"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.25"
   s.summary = "oPRO turns your Rails application into an OAuth Provider"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
       s.add_runtime_dependency(%q<kramdown>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<bundler>, [">= 1.1.3"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<launchy>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
+      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 1.3.0.beta"])
       s.add_development_dependency(%q<jdbc-sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<devise>, [">= 0"])
+      s.add_development_dependency(%q<devise>, ["~> 2.2"])
     else
-      s.add_dependency(%q<activesupport>, [">= 3.1.0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
       s.add_dependency(%q<kramdown>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<bundler>, [">= 1.1.3"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
+      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 1.3.0.beta"])
       s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
-      s.add_dependency(%q<devise>, [">= 0"])
+      s.add_dependency(%q<devise>, ["~> 2.2"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 3.1.0"])
     s.add_dependency(%q<rails>, [">= 3.1.0"])
     s.add_dependency(%q<kramdown>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<bundler>, [">= 1.1.3"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
+    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 1.3.0.beta"])
     s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
-    s.add_dependency(%q<devise>, [">= 0"])
+    s.add_dependency(%q<devise>, ["~> 2.2"])
   end
 end
 

data/test/controllers/permissions_test.rb

@@ -11,7 +11,7 @@ class Opro::Oauth::TestsControllerTest < ActionController::TestCase
 
   test "access_token with write ability can :POST" do
     permissions = {'write' => true}
-    @auth_grant.update_attributes(:permissions => permissions)
+    @auth_grant.update_permissions(permissions)
 
     post :create, :access_token => @auth_grant.access_token, :format => :json
     assert_response :success
@@ -20,7 +20,7 @@ class Opro::Oauth::TestsControllerTest < ActionController::TestCase
 
   test "access_token with NO write ability can NOT POST" do
     permissions = {:write => false}
-    @auth_grant.update_attributes(:permissions => permissions)
+    @auth_grant.update_permissions(permissions)
     post :create, :access_token => @auth_grant.access_token, :format =>  :json
     assert_response 401
   end

data/test/dummy/app/models/user.rb

@@ -5,6 +5,8 @@ class User < ActiveRecord::Base
          :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
+  # attr_accessible :email, :password, :password_confirmation, :remember_me
+  attr_accessor :password_confirmation
+
   # attr_accessible :title, :body
 end

data/test/dummy/config/initializers/devise.rb

@@ -113,7 +113,7 @@ Devise.setup do |config|
 
   # If true, uses the password salt as remember token. This should be turned
   # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
+  # config.use_salt_as_remember_token = true
 
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.

data/test/integration/action_dispatch/oauth_flow_test.rb

@@ -32,7 +32,7 @@ class OauthTokenTest < ActionDispatch::IntegrationTest
 
   test 'header authorization token' do
     auth_grant   = create_auth_grant_for_user(@user)
-    auth_grant.update_attributes(:permissions => {:write => true})
+    auth_grant.update_permissions(:write => true)
 
     # curl -H "Authorization: token OAUTH-TOKEN" http://localhost:3000
     # sets request.env["HTTP_AUTHORIZATION"] to "token OAUTH-TOKEN"

data/test/integration/action_dispatch/rate_limits_test.rb

@@ -14,7 +14,7 @@ class RateLimitTest < ActionDispatch::IntegrationTest
     @params       = {:client_id      => @client_app.client_id ,
                      :client_secret  => @client_app.client_secret,
                      :access_token   => @auth_grant.access_token}
-    @auth_grant.update_attributes(:permissions => {:write => true})
+    @auth_grant.update_permissions(:write => true)
   end
 
   test "A rate limited app does not get a valid user" do

data/test/test_helper.rb

@@ -13,7 +13,7 @@ ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
-require 'mocha'
+require 'mocha/setup'
 require 'timecop'
 require 'database_cleaner'
 DatabaseCleaner.strategy = :truncation
@@ -60,7 +60,12 @@ end
 
 
 def create_user(options = {})
-  User.create(:email => rand_name + '@bar.com', :password => 'password', :password_confirm => 'password')
+  user = User.new
+  user.email = rand_name + '@bar.com'
+  user.password              = 'password'
+  user.password_confirmation = 'password'
+  user.save
+  user
 end
 
 def create_client_app(options= {})
@@ -78,7 +83,11 @@ end
 def create_auth_grant_for_user(user = nil, app = nil)
   app  ||= create_client_app
   user ||= create_user
-  Opro::Oauth::AuthGrant.create(:user => user, :application => app)
+  auth_grant = Opro::Oauth::AuthGrant.new
+  auth_grant.user        = user
+  auth_grant.application = app
+  auth_grant.save
+  auth_grant
 end
 
 alias :create_auth_grant :create_auth_grant_for_user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opro
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70297244933200 !ruby/object:Gem::Requirement
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70297244933200
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70297244932520 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70297244932520
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &70297244931780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297244931780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70297244931120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297244931120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70297244930600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297244930600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70297244930000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +85,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70297244930000
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70297244929400 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: *70297244929400
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70297244928580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +101,15 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70297244928580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70297244927960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297244927960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70297244927220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,21 +133,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297244927220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
-  requirement: &70297244926520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70297244926520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0.beta
 - !ruby/object:Gem::Dependency
   name: jdbc-sqlite3
-  requirement: &70297244925900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,18 +165,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297244925900
-- !ruby/object:Gem::Dependency
-  name: devise
-  requirement: &70297244925300 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70297244925300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 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
@@ -165,7 +198,6 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -199,6 +231,7 @@ files:
 - lib/generators/opro/install_generator.rb
 - lib/generators/templates/opro.rb
 - lib/opro.rb
+- lib/opro/auth_provider/devise.rb
 - lib/opro/controllers/application_controller_helper.rb
 - lib/opro/controllers/concerns/error_messages.rb
 - lib/opro/controllers/concerns/permissions.rb
@@ -281,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2443235425097345828
+      hash: -1215204679170587691
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: oPRO turns your Rails application into an OAuth Provider