opro 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## master
 
+## 0.4.2
+- Fix jRuby compatibility in `Opro.convert_to_lambda`
 
 ## 0.4.1
 

data/Gemfile

@@ -12,13 +12,13 @@ group :development, :test do
   gem 'jeweler',  "~> 1.6.4"
   gem "bundler",  ">= 1.1.3"
 
-
   gem "capybara", ">= 0.4.0"
 
   gem "launchy"
 
   gem "sqlite3",                          :platform => [:ruby, :mswin, :mingw]
   gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
+  gem "jdbc-sqlite3",                     :platform => :jruby
 
   gem 'devise'
 end

data/Gemfile.lock

@@ -22,6 +22,10 @@ GEM
       activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2.1)
+    activerecord-jdbcsqlite3-adapter (1.2.2.1)
+      activerecord-jdbc-adapter (~> 1.2.2.1)
+      jdbc-sqlite3 (~> 3.7.2)
     activeresource (3.2.6)
       activemodel (= 3.2.6)
       activesupport (= 3.2.6)
@@ -54,6 +58,7 @@ GEM
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
+    jdbc-sqlite3 (3.7.2)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -141,6 +146,7 @@ DEPENDENCIES
   capybara (>= 0.4.0)
   database_cleaner
   devise
+  jdbc-sqlite3
   jeweler (~> 1.6.4)
   kramdown
   launchy

data/README.md

@@ -220,6 +220,39 @@ You could pull out the auth token using the regular expression `/cUsTomAuthHeade
 
 Now when a client sends your custom auth header, it will be parsed correctly. Custom authorization headers should not be used for security through obscurity. They may be exposed in the docs or tests in a later iteration of oPRO. If you have strong feelings against this, then please open a pull request or send me a message stating your case.
 
+## Customizing Views & Controllers
+
+By default oPRO ships with views and controllers much like Devise. You can use the built in oPRO views, and change styles: all oPRO views should be wrapped with an `opro` class you can use for styling. For more control you can override oPRO views with your own views. To do this you will need to provide your own routes/controllers/views. You can override `oauth_docs_controller`, `oauth_docs_controller`, and `oauth_client_apps_controller`.
+
+
+Currently this is a manual process to give you control and understanding of what is happening behind the scenes, if you want to work on a generator, I will be happy to help you...ping me [@schneems](http://twitter.com/schneems). To make things a little more clear we are going to be referencing the [oPRO demo rails app](https://github.com/opro/opro_rails_demo).
+
+To start out overriding a controller we need to specify the new controller in your routes inside of `mount_opro_oauth`, for example if you wanted to over-ride the oauth_client_apps controller with a controller in `app/controllers/oauth/client_apps_controller.rb` you could specify it like this:
+
+
+    mount_opro_oauth :controllers => {:oauth_client_apps => 'oauth/client_apps'}
+
+
+You can see an example of [setting the routes](https://github.com/opro/opro_rails_demo/blob/master/config/routes.rb) in the [oPRO demo rails app](https://github.com/opro/opro_rails_demo). Of course you then need to create the controller, it needs to inherit from the original controller `Opro::Oauth::ClientAppController` like this:
+
+    class Oauth::ClientAppsController < Opro::Oauth::ClientAppController
+    end
+
+
+You can see an example of a: [custom oPRO controller](https://github.com/opro/opro_rails_demo/blob/master/app/controllers/oauth/client_apps_controller.rb). Once you've got your controller finished, you need to specify your [custom oPRO views](https://github.com/opro/opro_rails_demo/tree/master/app/views/oauth/client_apps).
+
+It may help to look at the [current oPRO controllers](https://github.com/opro/opro/tree/master/app/controllers/opro/oauth) and [current oPRO views](https://github.com/opro/opro/tree/master/app/views/opro/oauth). Again, if you get stuck take a look at the [oPRO demo rails app](https://github.com/opro/opro_rails_demo).
+
+
+
+## Skipping Views
+
+If you do not wish for test, docs, or client_apps views & controllers to be available, you can skip them using `except` in your `mount_opro_oauth` like this:
+
+    mount_opro_oauth :except => [:oauth_client_apps]
+
+We recommend against doing this, but we aren't your mother.
+
 
 
 ## Assumptions

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/opro.rb

@@ -133,11 +133,16 @@ module Opro
   end
 
 
-  # Grossssss, don't use, needed to support `return` from the blocks provided to `find_user_for_auth`
+  # Needed to `return` from the blocks provided to `find_user_for_auth`
   def self.convert_to_lambda &block
-    obj = Object.new
-    obj.define_singleton_method(:_, &block)
-    return obj.method(:_).to_proc
+    if RUBY_ENGINE && RUBY_ENGINE == "jruby"
+      return lambda(&block)
+    else
+      # Grossssss, don't use
+      obj = Object.new
+      obj.define_singleton_method(:_, &block)
+      return obj.method(:_).to_proc
+    end
   end
 
   # holds an Array of authentication blocks is called by find_user_for_all_auths! in token controller

data/lib/opro/rails/routes.rb

@@ -11,15 +11,15 @@ module ActionDispatch::Routing
       match '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'
+        oauth_client_apps = controllers[:oauth_client_apps] ||'opro/oauth/client_app'
         resources :oauth_client_apps, :controller => oauth_client_apps
       end
       unless skip_routes.include?(:docs)
-        oauth_docs = controllers[:oauth_docs]||'opro/oauth/docs'
+        oauth_docs = controllers[:oauth_docs] ||'opro/oauth/docs'
         resources :oauth_docs,        :controller => oauth_docs, :only => [:index, :show]
       end
       unless skip_routes.include?(:tests)
-        oauth_tests = controllers[:oauth_tests]      ||'opro/oauth/tests'
+        oauth_tests = controllers[:oauth_tests] ||'opro/oauth/tests'
         resources :oauth_tests,       :controller => oauth_tests, :only => [:index, :show, :create, :destroy]
       end
     end

data/opro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "opro"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-10-30"
+  s.date = "2012-11-07"
   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 = [
@@ -142,6 +142,7 @@ Gem::Specification.new do |s|
       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<jdbc-sqlite3>, [">= 0"])
       s.add_development_dependency(%q<devise>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.1.0"])
@@ -155,6 +156,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
+      s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
       s.add_dependency(%q<devise>, [">= 0"])
     end
   else
@@ -169,6 +171,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
+    s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
     s.add_dependency(%q<devise>, [">= 0"])
   end
 end

metadata

@@ -1,208 +1,240 @@
 --- !ruby/object:Gem::Specification
 name: opro
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  prerelease:
+  version: 0.4.2
 platform: ruby
 authors:
 - schneems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: jdbc-sqlite3
   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
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: devise
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 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
@@ -318,29 +350,32 @@ files:
 homepage: http://github.com/schneems/opro
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3824248644036353497
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: oPRO turns your Rails application into an OAuth Provider
 test_files: []
+...