doorkeeper 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6d9a384a7eea2de2b4c25ea45fa6143aa23f8e6
-  data.tar.gz: 6401bda0dec405b1acdf9fd0cd4db42ada6f7f97
+  metadata.gz: 5932eba602c89d1c69d2255da6feb6c617fe969c
+  data.tar.gz: bc86b1d997b36876f7f3adb05f6043b069c79528
 SHA512:
-  metadata.gz: d61715593d0cd03aa6c7f32c62fcbdb3d924f410c5635a8cc97d6510fb09b48b508417fe70f9dccbcf1d0d20be8c12c86a37085b5a448bbb0c71203f015640cb
-  data.tar.gz: 9f10eb154a27dbcc558672f8add080aaa79380a3fe4ec807ef28c33f51679c84f5cc7be7debe019e0f9d21d70ed88656cacbed47e2019943cc72229d01c54bb6
+  metadata.gz: 5e2cd77f86d3c8ca56317b562502f186e54633c6decc945fd50e52ca7ad34133f52190129db1171d59e014d878abb1390ae2082d0fb3438a18315a3c09d734b1
+  data.tar.gz: 6c484a19b386a02d24ffebbc62ad80d6c9e7cda67d94baa49afe25fd010a51eec4d4c8bfe0ef59f8fa95265ca66b6e7fbb337260f7473170d4502cbc3c96ee49

data/.gitignore

@@ -11,4 +11,4 @@ gemfiles/*.lock
 spec/generators/tmp
 .rvmrc
 *.swp
-
+.idea

data/.travis.yml

@@ -13,9 +13,9 @@ env:
   - rails=4.1.0.beta1
   - orm=mongoid2
   - orm=mongoid3
+  - orm=mongoid4
   - orm=mongo_mapper
+  - table_name_prefix=h_
+  - table_name_suffix=_h
 services:
   - mongodb
-matrix:
-  allow_failures:
-    - env: orm=mongoid2

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.1.0 (not yet released)
+
+- enhancements
+  - [#336] mongoid4 support.
+  - [#372] Allow users to set ActiveRecord table_name_prefix/suffix options
+- internals
+  - [#343] separate OAuth's admin and user end-point to different layouts, upgrade theme to Bootstrap 3.1.
+  - [#348] Move render_options in filter after `@error` has been set
+
 ## 1.0.0
 
 - bug (spec)

data/Gemfile

@@ -1,5 +1,5 @@
 # Defaults. For supported versions check .travis.yml
-ENV['rails'] ||= '3.2.13'
+ENV['rails'] ||= ENV['orm'] == "mongoid4" ? '4.0.2' : '3.2.13'
 ENV['orm']   ||= 'active_record'
 
 source 'https://rubygems.org'
@@ -20,6 +20,10 @@ when 'mongoid2'
 when 'mongoid3'
   gem 'mongoid', '3.0.10'
 
+when 'mongoid4'
+  gem 'mongoid', '4.0.0.beta1'
+  gem 'moped'
+
 when 'mongo_mapper'
   gem 'mongo_mapper', '0.12.0'
   gem 'bson_ext', '~> 1.7'

data/README.md

@@ -7,12 +7,39 @@
 
 Doorkeeper is a gem that makes it easy to introduce OAuth 2 provider functionality to your application.
 
-The gem is under constant development. It is based in the [version 22 of the OAuth specification](http://tools.ietf.org/html/draft-ietf-oauth-v2-22) and it still does not support all OAuth features.
+## Table of Contents
+
+- [Useful links](#useful-links)
+- [Requirements](#requirements)
+- [Installation](#installation)
+- [Configuration](#configuration)
+    - [Active Record](#active-record)
+    - [Mongoid / MongoMapper](#mongoid--mongomapper)
+        - [Mongoid indexes](#mongoid-indexes)
+        - [MongoMapper indexes](#mongomapper-indexes)
+    - [Routes](#routes)
+    - [Authenticating](#authenticating)
+- [Protecting resources with OAuth (a.k.a your API endpoint)](#protecting-resources-with-oauth-aka-your-api-endpoint)
+    - [ActionController::Metal integration and other integrations](#actioncontrollermetal-integration-and-other-integrations)
+    - [Access Token Scopes](#access-token-scopes)
+    - [Authenticated resource owner](#authenticated-resource-owner)
+    - [Applications list](#applications-list)
+- [Other customizations](#other-customizations)
+- [Upgrading](#upgrading)
+- [Development](#development)
+- [Contributing](#contributing)
+- [Other resources](#other-resources)
+    - [Wiki](#wiki)
+    - [Live demo](#live-demo)
+    - [Screencast](#screencast)
+    - [Client applications](#client-applications)
+    - [Contributors](#contributors)
+    - [License](#license)
 
 ## Useful links
 
 - For documentation, please check out our [wiki](https://github.com/applicake/doorkeeper/wiki)
-- For general questions, please post it in our [google groups](https://groups.google.com/forum/?fromgroups#!forum/doorkeeper-gem) or [stack overflow](http://stackoverflow.com/questions/tagged/doorkeeper)
+- For general questions, please post it in [stack overflow](http://stackoverflow.com/questions/tagged/doorkeeper)
 
 ## Requirements
 
@@ -25,7 +52,7 @@ The gem is under constant development. It is based in the [version 22 of the OAu
 Put this in your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 0.7.0'
+gem 'doorkeeper'
 ```
 
 Run the installation generator with:
@@ -52,7 +79,7 @@ Doorkeeper currently supports MongoMapper, Mongoid 2 and 3. To start using it, y
 
 ``` ruby
 Doorkeeper.configure do
-  orm :mongoid2 # or :mongoid3, :mongo_mapper
+  orm :mongoid2 # or :mongoid3, :mongoid4, :mongo_mapper
 end
 ```
 
@@ -234,7 +261,7 @@ The logic is the same as the `resource_owner_authenticator` block. **Note:** sin
 
 If you want to upgrade doorkeeper to a new version, check out the [upgrading notes](https://github.com/applicake/doorkeeper/wiki/Migration-from-old-versions) and take a look at the [changelog](https://github.com/applicake/doorkeeper/blob/master/CHANGELOG.md).
 
-### Development
+## Development
 
 To run the local engine server:
 
@@ -251,7 +278,7 @@ rails=3.2.8 orm=active_record bundle exec rake
 
 Or you might prefer to run `script/run_all` to integrate against all ORMs.
 
-### Contributing
+## Contributing
 
 Want to contribute and don't know where to start? Check out [features we're missing](https://github.com/applicake/doorkeeper/wiki/Supported-Features), create [example apps](https://github.com/applicake/doorkeeper/wiki/Example-Applications), integrate the gem with your app and let us know!
 
@@ -275,15 +302,6 @@ Check out this screencast from [railscasts.com](http://railscasts.com/): [#353 O
 
 After you set up the provider, you may want to create a client application to test the integration. Check out these [client examples](https://github.com/applicake/doorkeeper/wiki/Example-Applications) in our wiki or follow this [tutorial here](https://github.com/applicake/doorkeeper/wiki/Testing-your-provider-with-OAuth2-gem).
 
-### Supported ruby versions
-
-All supported ruby versions are [listed here](https://github.com/applicake/doorkeeper/wiki/Supported-Ruby-&-Rails-versions).
-
-### Maintainers
-
-- Felipe Elias Philipp - [coderwall.com/felipeelias](http://coderwall.com/felipeelias)
-- Piotr Jakubowski - [coderwall.com/piotrj](http://coderwall.com/piotrj)
-
 ### Contributors
 
 Thanks to all our [awesome contributors](https://github.com/applicake/doorkeeper/contributors)!

data/app/assets/stylesheets/doorkeeper/admin/application.css

@@ -0,0 +1,14 @@
+/*
+ *= require doorkeeper/bootstrap.min
+ *
+ *= require_self
+ *= require_tree .
+*/
+
+body {
+  padding-top: 60px;
+}
+
+td {
+    vertical-align: middle !important;
+}

data/app/assets/stylesheets/doorkeeper/application.css

@@ -6,13 +6,59 @@
 */
 
 body {
-  padding-top: 60px;
+    background-color: #eee;
+    font-size: 14px;
+}
+
+#container {
+    background-color: #fff;
+    border: 1px solid #999;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    border-radius: 6px;
+    -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
+    box-shadow: 0 3px 20px rgba(0, 0, 0, 0.3);
+    margin: 2em auto;
+    max-width: 600px;
+    outline: 0;
+    padding: 1em;
+    width: 80%;
+}
+
+.page-header {
+    margin-top: 20px;
+}
+
+#oauth-permissions {
+    width: 260px;
+}
+
+.actions {
+    border-top: 1px solid #eee;
+    margin-top: 1em;
+    padding-top: 9px;
+}
+
+.actions > form > .btn {
+    margin-top: 5px;
+}
+
+.separator {
+    color: #eee;
+    padding: 0 .5em;
 }
 
 .inline_block {
-  display: inline-block;
+    display: inline-block;
+}
+
+#oauth {
+    margin-bottom: 1em;
+}
+
+#oauth > .btn {
+    width: 7em;
 }
 
-table td {
-  vertical-align: middle;
+td {
+    vertical-align: middle !important;
 }

data/app/controllers/doorkeeper/applications_controller.rb

@@ -1,5 +1,6 @@
 module Doorkeeper
   class ApplicationsController < Doorkeeper::ApplicationController
+    layout 'doorkeeper/admin'
     respond_to :html
 
     before_filter :authenticate_admin!

data/app/helpers/doorkeeper/form_errors_helper.rb

@@ -1,9 +1,11 @@
 module Doorkeeper::FormErrorsHelper
   def errors_for(object, method)
     if object.errors[method].present?
-      content_tag(:span, :class => "error help-inline") do
-        object.errors[method].join(',')
-      end
+      object.errors[method].map do |msg|
+        content_tag(:span, :class => "help-block") do
+          msg.capitalize
+        end
+      end.reduce(&:join).html_safe
     end
   end
 end

data/app/views/doorkeeper/applications/_delete_form.html.erb

@@ -1,16 +1,5 @@
-<style>
-input[type=submit] {
-  padding: 0;
-  border: none;
-  box-shadow: none;
-  background: none;
-  color: #0069d6;
-}
-input[type=submit]:hover {
-  text-decoration: underline;
-}
-</style>
-<%= form_for [:oauth, application] do |f| %>
+<%- submit_btn_css ||= 'btn btn-link' %>
+<%= form_tag [:oauth, application] do %>
   <input type="hidden" name="_method" value="delete">
-  <%= f.submit value: 'Remove', onclick: "return confirm('Are you sure?')" %>
+  <%= submit_tag 'Destroy', onclick: "return confirm('Are you sure?')", class: submit_btn_css %>
 <% end %>

data/app/views/doorkeeper/applications/_form.html.erb

@@ -1,35 +1,37 @@
-<%= form_for([:oauth, application]) do |f| %>
-  <fieldset>
-    <% if application.errors.any? %>
-      <div class="alert-message error" data-alert><a class="close" href="#">×</a><p>Whoops! Check your form for possible errors</p></div>
-    <% end %>
+<%= form_for [:oauth, application], html: {class: 'form-horizontal', role: 'form'} do |f| %>
+  <% if application.errors.any? %>
+    <div class="alert alert-danger" data-alert><p>Whoops! Check your form for possible errors</p></div>
+  <% end %>
 
-    <div class="clearfix">
-      <%= f.label :name %>
-      <div class="input">
-        <%= f.text_field :name %>
-        <%= errors_for application, :name %>
-      </div>
+  <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do %>
+    <%= f.label :name, class: 'col-sm-2 control-label', for: 'application_name' %>
+    <div class="col-sm-10">
+      <%= f.text_field :name, class: 'form-control' %>
+      <%= errors_for application, :name %>
     </div>
+  <% end %>
 
-    <div class="clearfix">
-      <%= f.label :redirect_uri %>
-      <div class="input">
-        <%= f.text_area :redirect_uri %>
-        <%= errors_for application, :redirect_uri %>
-        <span class="help-inline">Please use one line per URI.</span>
-        <% if Doorkeeper.configuration.test_redirect_uri %>
-          <span class="help-inline">Use <%= Doorkeeper.configuration.test_redirect_uri %> for local tests</span>
-        <% end %>
-      </div>
+  <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" do %>
+    <%= f.label :redirect_uri, class: 'col-sm-2 control-label', for: 'application_redirect_uri' %>
+    <div class="col-sm-10">
+      <%= f.text_area :redirect_uri, class: 'form-control' %>
+      <%= errors_for application, :redirect_uri %>
+      <span class="help-block">
+         Use one line per URI
+        </span>
+      <% if Doorkeeper.configuration.test_redirect_uri %>
+          <span class="help-block">
+            Use <code><%= Doorkeeper.configuration.test_redirect_uri %></code> for local tests
+          </span>
+      <% end %>
     </div>
+  <% end %>
 
-    <div class="clearfix"></div>
-
-    <div class="actions">
-      <%= f.submit :Submit, :class => "btn primary" %>
-      <%= link_to "Cancel", oauth_applications_path, :class => "btn" %>
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <%= f.submit 'Submit', :class => "btn btn-primary" %>
+      <%= link_to "Cancel", oauth_applications_path, :class => "btn btn-default" %>
     </div>
-  </fieldset>
+  </div>
 <% end %>
 

data/app/views/doorkeeper/applications/edit.html.erb

@@ -1,13 +1,5 @@
-<div class="span16">
-  <header class="page-header"><h2>Edit application</h2></header>
-</div>
-
-<div class="span12">
-  <%= render 'form', :application => @application %>
-</div>
-
-<div class="span4">
-  <h3>Actions</h3>
-  <p><%= link_to 'Back to application list', oauth_applications_path %></p>
+<div class="page-header">
+  <h1>Edit application</h1>
 </div>
 
+<%= render 'form', :application => @application %>

data/app/views/doorkeeper/applications/index.html.erb

@@ -1,33 +1,26 @@
-<style>
-input[type=submit] {
-  margin-top: 15px;
-}
-</style>
-<div class="span16">
-  <header class="page-header">
-    <h2>Your applications</h2>
-  </header>
+<div class="page-header">
+  <h1>Your applications</h1>
+</div>
 
-  <p><%= link_to 'New Application', new_oauth_application_path %></p>
+<p><%= link_to 'New Application', new_oauth_application_path, class: 'btn btn-success' %></p>
 
-  <table class="zebra-striped">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th>Callback url</th>
-        <th></th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @applications.each do |application| %>
-        <tr id="application_<%= application.id %>">
-          <td><%= link_to application.name, [:oauth, application] %></td>
-          <td><%= application.redirect_uri %></td>
-          <td><%= link_to 'Edit', edit_oauth_application_path(application) %></td>
-          <td><%= render 'delete_form', application: application %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+<table class="table table-striped">
+  <thead>
+  <tr>
+    <th>Name</th>
+    <th>Callback URL</th>
+    <th></th>
+    <th></th>
+  </tr>
+  </thead>
+  <tbody>
+  <% @applications.each do |application| %>
+    <tr id="application_<%= application.id %>">
+      <td><%= link_to application.name, [:oauth, application] %></td>
+      <td><%= application.redirect_uri %></td>
+      <td><%= link_to 'Edit', edit_oauth_application_path(application), class: 'btn btn-link' %></td>
+      <td><%= render 'delete_form', application: application %></td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

data/app/views/doorkeeper/applications/new.html.erb

@@ -1,13 +1,5 @@
-<div class="span16">
-  <header class="page-header"><h2>New application</h2></header>
-</div>
-
-<div class="span12">
-  <%= render 'form', :application => @application %>
-</div>
-
-<div class="span4">
-  <h3>Actions</h3>
-  <p><%= link_to 'Back to application list', oauth_applications_path %></p>
+<div class="page-header">
+  <h1>New application</h1>
 </div>
 
+<%= render 'form', :application => @application %>