doorkeeper 0.6.0.rc1 → 0.6.0

data/CHANGELOG.md

@@ -12,6 +12,7 @@
   - [#150] Introduce test redirect uri for applications
 - bugfixes
   - [#157] Response token status should be `:ok`, not `:success` [@theycallmeswift](https://github.com/theycallmeswift)
+  - [#159] Remove ActionView::Base.field_error_proc override (fixes #145)
 - internals
   - Update development dependencies
   - Several refactorings

data/README.md

@@ -32,7 +32,7 @@ For more information about the supported features, check out the related [page i
 Put this in your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 0.6.0.rc1'
+gem 'doorkeeper', '~> 0.6.0'
 ```
 
 Run the installation generator with:

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

@@ -1,8 +1,13 @@
-.error input {
+.field_with_errors {
+  display: inline;
+}
+
+.field_with_errors input {
   color: #B94A48;
   border-color: #EE5F5B;
 }
 
-.error .help-inline {
+.input .help-inline.error {
   color: #B94A48;
 }
+

data/app/controllers/doorkeeper/application_controller.rb

@@ -1,5 +1,7 @@
 module Doorkeeper
   class ApplicationController < ActionController::Base
     include Helpers::Controller
+
+    helper "doorkeeper/form_errors"
   end
 end

data/app/helpers/doorkeeper/form_errors_helper.rb

@@ -0,0 +1,9 @@
+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
+    end
+  end
+end

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

@@ -8,6 +8,7 @@
       <%= f.label :name %>
       <div class="input">
         <%= f.text_field :name %>
+        <%= errors_for application, :name %>
       </div>
     </div>
 
@@ -15,6 +16,7 @@
       <%= f.label :redirect_uri %>
       <div class="input">
         <%= f.text_field :redirect_uri %>
+        <%= errors_for application, :redirect_uri %>
         <% if Doorkeeper.configuration.test_redirect_uri %>
           <span class="help-inline">Use <%= Doorkeeper.configuration.test_redirect_uri %> for local tests</span>
         <% end %>

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.6.0.rc1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc1
-  prerelease: 6
+  version: 0.6.0
+  prerelease: 
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70365762857000 !ruby/object:Gem::Requirement
+  requirement: &70291103985780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70365762857000
+  version_requirements: *70291103985780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70365762854800 !ruby/object:Gem::Requirement
+  requirement: &70291104000920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70365762854800
+  version_requirements: *70291104000920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70365762875900 !ruby/object:Gem::Requirement
+  requirement: &70291103998100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.11.4
   type: :development
   prerelease: false
-  version_requirements: *70365762875900
+  version_requirements: *70291103998100
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70365762873160 !ruby/object:Gem::Requirement
+  requirement: &70291104056620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70365762873160
+  version_requirements: *70291104056620
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &70365762869900 !ruby/object:Gem::Requirement
+  requirement: &70291104052840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *70365762869900
+  version_requirements: *70291104052840
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70365762883120 !ruby/object:Gem::Requirement
+  requirement: &70291104065760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70365762883120
+  version_requirements: *70291104065760
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70365762880300 !ruby/object:Gem::Requirement
+  requirement: &70291104063100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.5.2
   type: :development
   prerelease: false
-  version_requirements: *70365762880300
+  version_requirements: *70291104063100
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70365762903440 !ruby/object:Gem::Requirement
+  requirement: &70291104059980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *70365762903440
+  version_requirements: *70291104059980
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70365762898500 !ruby/object:Gem::Requirement
+  requirement: &70291104084240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70365762898500
+  version_requirements: *70291104084240
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
 - felipe@applicake.com
@@ -136,6 +136,7 @@ files:
 - app/controllers/doorkeeper/authorized_applications_controller.rb
 - app/controllers/doorkeeper/token_info_controller.rb
 - app/controllers/doorkeeper/tokens_controller.rb
+- app/helpers/doorkeeper/form_errors_helper.rb
 - app/validators/redirect_uri_validator.rb
 - app/views/doorkeeper/applications/_form.html.erb
 - app/views/doorkeeper/applications/edit.html.erb
@@ -147,7 +148,6 @@ files:
 - app/views/doorkeeper/authorizations/show.html.erb
 - app/views/doorkeeper/authorized_applications/index.html.erb
 - app/views/layouts/doorkeeper/application.html.erb
-- config/initializers/form_errors.rb
 - config/locales/en.yml
 - doorkeeper.gemspec
 - lib/doorkeeper.rb
@@ -360,13 +360,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -115319410489160264
+      hash: -1014835453915892093
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -1014835453915892093
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12

data/config/initializers/form_errors.rb

@@ -1,14 +0,0 @@
-ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-  if html_tag.match("input")
-    message = (error = instance.error_message).respond_to?(:join) ? error.join(",") : error
-    %(<span class="error">
-        #{html_tag}
-        <span class="help-inline">
-          #{message}
-        </span>
-      </span>
-    ).html_safe
-  else
-    html_tag
-  end
-end