doorkeeper 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fcb07abcda6e9eed4a8cfec8203ef88dc243f50
-  data.tar.gz: fe23329643e7a1e88dfe432aa2c04314de90ac35
+  metadata.gz: 4ea51224993fe17eb8bce055c441a2b583a6d9b7
+  data.tar.gz: 366ca2f1d49a33433714f470c5c66dd5b0c84c9d
 SHA512:
-  metadata.gz: b169d9dbe8e64af11e65c2e505ca00ddc472ef8e33eb63bb1f9ea2651387f49dc14424e0e9e22148b6f5927519c995d26fde39ff45b18660de7ed211c1ac8cbf
-  data.tar.gz: 082d67eaa6f7b296ac9de89b9deb58612e7451bd95901ff4c989377ccea8f207cae006551e4f57346d3da3b251f2a7362aee3b3d70e8010ceb2ab247382c2d29
+  metadata.gz: 76fdba565bfa0a6b3382fb98a4cf5402794ab8b474ffe3324159b8ae7c1feee0f97e330d22e698fadeb7dc9551b6e56d5520cbc3949fa6ffd47b72fd1aaefd7e
+  data.tar.gz: 22f95b1680a08285831218530b4d8789c64c2e3170d6963d5f1c15f4118a05724ca9e8c4a7c50acce0c918f022f57b2e5bd77c101c6b3f97da818e668579766a

data/.travis.yml

@@ -15,8 +15,3 @@ services:
 matrix:
   allow_failures:
     - env: orm=mongoid2
-  exclude:
-    - rvm: 1.9.2
-      env: orm=mongoid3
-    - rvm: 1.9.2
-      env: rails=4.0.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.7.1
+
+- bug
+  - [#269] Rails 3.2 raised `ActiveModel::MassAssignmentSecurity::Error`.
+
 ## 0.7.0
 
 - enhancements

data/README.md

@@ -25,7 +25,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', '~> 0.7.1'
 ```
 
 Run the installation generator with:

data/app/controllers/doorkeeper/applications_controller.rb

@@ -4,7 +4,7 @@ module Doorkeeper
 
     before_filter :authenticate_admin!
     before_filter :set_application, :only => [:show, :edit, :update, :destroy]
-    
+
     def index
       @applications = Application.all
     end
@@ -44,11 +44,11 @@ module Doorkeeper
     end
 
     private
-    
+
     def set_application
       @application = Application.find(params[:id])
     end
-    
+
     def application_params
       if params.respond_to?(:permit)
         params.require(:application).permit(:name, :redirect_uri)

data/doorkeeper.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/applicake/doorkeeper"
   s.summary     = "Doorkeeper is an OAuth 2 provider for Rails."
   s.description = "Doorkeeper is an OAuth 2 provider for Rails."
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")

data/lib/doorkeeper/models/access_grant.rb

@@ -8,6 +8,10 @@ module Doorkeeper
 
     belongs_to :application, :class_name => "Doorkeeper::Application", :inverse_of => :access_grants
 
+    if ::Rails.version.to_i < 4
+      attr_accessible :resource_owner_id, :application_id, :expires_in, :redirect_uri, :scopes
+    end
+
     validates :resource_owner_id, :application_id, :token, :expires_in, :redirect_uri, :presence => true
     validates :token, :uniqueness => true
 

data/lib/doorkeeper/models/access_token.rb

@@ -13,6 +13,9 @@ module Doorkeeper
     validates :refresh_token, :uniqueness => true, :if => :use_refresh_token?
 
     attr_accessor :use_refresh_token
+    if ::Rails.version.to_i < 4
+      attr_accessible :application_id, :resource_owner_id, :expires_in, :scopes, :use_refresh_token
+    end
 
     before_validation :generate_token, :on => :create
     before_validation :generate_refresh_token, :on => :create, :if => :use_refresh_token?

data/lib/doorkeeper/models/application.rb

@@ -11,6 +11,10 @@ module Doorkeeper
 
     before_validation :generate_uid, :generate_secret, :on => :create
 
+    if ::Rails.version.to_i < 4
+      attr_accessible :name, :redirect_uri
+    end
+
     def self.model_name
       ActiveModel::Name.new(self, Doorkeeper, 'Application')
     end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/controllers/applications_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper_integration'
 module Doorkeeper
   describe ApplicationsController do
     context "when admin is not authenticated" do
-      before(:each) do
+      before do
         Doorkeeper.configuration.stub(:authenticate_admin => proc do
           redirect_to main_app.root_url
         end)
@@ -13,6 +13,38 @@ module Doorkeeper
         get :index
         expect(response).to redirect_to(controller.main_app.root_url)
       end
+
+      it "doesn't create application" do
+        expect do
+          post :create, application: {
+            name: 'Example',
+            redirect_uri: 'http://example.com' }
+        end.to_not change { Doorkeeper::Application.count }
+      end
+    end
+
+    context "when admin is authenticated" do
+      before do
+        Doorkeeper.configuration.stub(authenticate_admin: ->(arg) { true })
+      end
+
+      it "creates application" do
+        expect do
+          post :create, application: {
+            name: 'Example',
+            redirect_uri: 'http://example.com' }
+        end.to change { Doorkeeper::Application.count }.by(1)
+        expect(response).to be_redirect
+      end
+
+      it "updates application" do
+        application = FactoryGirl.create(:application)
+        put :update, id: application.id, application: {
+          name: 'Example',
+          redirect_uri: 'http://example.com' }
+        application.reload.name.should eq 'Example'
+      end
     end
+
   end
 end

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

@@ -21,6 +21,10 @@ when :mongo_mapper
 end
 
 class User
+  if ::Rails.version.to_i < 4
+    attr_accessible :name, :password
+  end
+
   def self.authenticate!(name, password)
     User.where(:name => name, :password => password).first
   end

data/spec/dummy/config/application.rb

@@ -30,6 +30,10 @@ module Dummy
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 
+    if defined?(ActiveRecord) && Rails.version.to_i < 4
+      config.active_record.whitelist_attributes = true
+    end
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -388,7 +388,8 @@ files:
 - spec/validators/redirect_uri_validator_spec.rb
 - vendor/assets/stylesheets/doorkeeper/bootstrap.min.css
 homepage: https://github.com/applicake/doorkeeper
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []