doorkeeper 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deaa5b8594c905718666747b34f68ce23d2ee707
-  data.tar.gz: c6a694f036f968c415ab2ecf9345a91e99273abb
+  metadata.gz: 1d6335a06e80f4b3c0deaf0df17f7179c454024e
+  data.tar.gz: f0fcb5b41952e00cb778207346bbd3fa60ae837a
 SHA512:
-  metadata.gz: 550da7f4937a9ae9786072d0c23c7fd07347336da752232f03a28200c9edb0793e58763c29efc74b9ea52fd4e2278b926f323c1cd5e5356c8090e8dd24123859
-  data.tar.gz: 13fa74a7326c592fe6f2a2a60ab81318ca923fcc3f6e7a79111ca1ffd718dc27ff76cd2483e38676d28f37443d495573746aca18ce5ae00cf78e064355b16fa2
+  metadata.gz: 10eb65f7b258c5408c176f5fc7c4f348ddb66a27f5254ab7aeab0f166766f4fcbf5a804b411093add7d62d38f7861493d205893937932a2beed4b573a8263922
+  data.tar.gz: 0e2a01becb02cee6f520e1c180d234e8bc1262d67330239cb5034ebe6ff89442daa44cc45201895eb4d92689f7e3e0823874d8723247593eca179d3c45b67131

data/NEWS.md

@@ -4,6 +4,18 @@ User-visible changes worth mentioning.
 
 ---
 
+## 2.2.2
+
+- [#654] Fixed `check_requirements` not to abort when ActiveRecord
+    `oauth_applications` table does not have the `scopes` column.
+    (Issue #653)
+- [#599] Included MassAssignmentSecurity in mixins if
+    ::ProtectedAttributes is defined.
+- [#650] Only fallback i18n when it is not set.
+- [#541] Fixed `undefined method attr_accessible` problem on Rails 4
+    (happens only when ProtectedAttributes gem is used) in #599
+- [#689] Allow scopes to me resetted to empty in Mongoid
+
 ## 2.2.1
 
 - [#636] `custom_access_token_expires_in` bugfixes

data/README.md

@@ -129,7 +129,6 @@ This will mount following routes:
     GET       /oauth/authorize/:code
     GET       /oauth/authorize
     POST      /oauth/authorize
-    PUT       /oauth/authorize
     DELETE    /oauth/authorize
     POST      /oauth/token
     POST      /oauth/revoke

data/lib/doorkeeper/engine.rb

@@ -5,7 +5,9 @@ module Doorkeeper
     end
 
     initializer "doorkeeper.locales" do |app|
-      app.config.i18n.fallbacks = [:en]
+      if app.config.i18n.fallbacks.blank?
+        app.config.i18n.fallbacks = [:en]
+      end
     end
 
     initializer "doorkeeper.routes" do

data/lib/doorkeeper/models/access_grant_mixin.rb

@@ -7,11 +7,12 @@ module Doorkeeper
     include Models::Revocable
     include Models::Accessible
     include Models::Scopes
+    include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
 
     included do
       belongs_to :application, class_name: 'Doorkeeper::Application', inverse_of: :access_grants
 
-      if ::Rails.version.to_i < 4 || defined?(::ProtectedAttributes)
+      if respond_to?(:attr_accessible)
         attr_accessible :resource_owner_id, :application_id, :expires_in, :redirect_uri, :scopes
       end
 

data/lib/doorkeeper/models/access_token_mixin.rb

@@ -7,6 +7,7 @@ module Doorkeeper
     include Models::Revocable
     include Models::Accessible
     include Models::Scopes
+    include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
 
     included do
       belongs_to :application,
@@ -18,7 +19,7 @@ module Doorkeeper
 
       attr_writer :use_refresh_token
 
-      if ::Rails.version.to_i < 4 || defined?(::ProtectedAttributes)
+      if respond_to?(:attr_accessible)
         attr_accessible :application_id, :resource_owner_id, :expires_in,
                         :scopes, :use_refresh_token
       end

data/lib/doorkeeper/models/application_mixin.rb

@@ -4,6 +4,7 @@ module Doorkeeper
 
     include OAuth::Helpers
     include Models::Scopes
+    include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
 
     included do
       has_many :access_grants, dependent: :destroy, class_name: 'Doorkeeper::AccessGrant'
@@ -15,7 +16,7 @@ module Doorkeeper
 
       before_validation :generate_uid, :generate_secret, on: :create
 
-      if ::Rails.version.to_i < 4 || defined?(::ProtectedAttributes)
+      if respond_to?(:attr_accessible)
         attr_accessible :name, :redirect_uri
       end
     end

data/lib/doorkeeper/orm/active_record.rb

@@ -25,11 +25,12 @@ module Doorkeeper
              Doorkeeper::Application.table_name
            )
           unless Doorkeeper::Application.new.attributes.include?("scopes")
-            fail <<-MSG.squish
+            migration_path = '../../../generators/doorkeeper/templates/add_scopes_to_oauth_applications.rb'
+            puts <<-MSG.squish
 [doorkeeper] Missing column: `oauth_applications.scopes`.
-Run `rails generate doorkeeper:application_scopes
-&& rake db:migrate` to add it.
+Create the following migration and run `rake db:migrate`.
             MSG
+            puts File.read(File.expand_path(migration_path, __FILE__))
           end
         end
       end

data/lib/doorkeeper/orm/mongoid2/concerns/scopes.rb

@@ -21,7 +21,7 @@ module Doorkeeper
           end
 
           def scopes=(value)
-            write_attribute :scopes, value if value.present?
+            write_attribute :scopes, value
           end
         end
       end

data/lib/doorkeeper/orm/mongoid3/concerns/scopes.rb

@@ -21,7 +21,7 @@ module Doorkeeper
           end
 
           def scopes=(value)
-            write_attribute :scopes, value if value.present?
+            write_attribute :scopes, value
           end
         end
       end

data/lib/doorkeeper/orm/mongoid4/concerns/scopes.rb

@@ -9,7 +9,7 @@ module Doorkeeper
         end
 
         def scopes=(value)
-          write_attribute :scopes, value if value.present?
+          write_attribute :scopes, value
         end
       end
     end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

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

@@ -21,7 +21,9 @@ when "mongo_mapper"
 end
 
 class User
-  if ::Rails.version.to_i < 4 || defined?(::ProtectedAttributes)
+  include ActiveModel::MassAssignmentSecurity if defined?(::ProtectedAttributes)
+
+  if respond_to?(:attr_accessible)
     attr_accessible :name, :password
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -571,3 +571,4 @@ test_files:
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
 - spec/validators/redirect_uri_validator_spec.rb
+has_rdoc: