doorkeeper 2.0.0.rc3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6af4f799e8a70cbaf372a0fc40c916ef361b724
-  data.tar.gz: 6ec873aec540c727246755b3dbb3c910c97d4c98
+  metadata.gz: bb6985f71c5db8c5a96f9205a290aa6d36956177
+  data.tar.gz: 4d96f1493d890735bdeaf379c6345a949ecd0857
 SHA512:
-  metadata.gz: 59e4096fcacac6391f65fa6006dc9704cac6b8b8f85e1988bca2c731ecd70017b67916a96443671a585c05fefce61512936640dcbb9f8fb37d7cb0b68ba73ae7
-  data.tar.gz: 8a30f7ceeeb1d32c248e862c51e9ad0b504aadb8b82d01888a12ae0545c5ddd3fd3a8f6512f795f2b82fe3a68d085dd9b8deaa3bb841199c2511e94debe1b91f
+  metadata.gz: 0efb46569e591675b5a208a7cae0d72eb746a17ea99573359e7788374afdcc9b052ef38577abba6681aecb89ddc95e7d6dc0b09bb7201beeb2ac0c4f671d899f
+  data.tar.gz: c3786d7fb5f6c2867fddd0d67948bfdc0292451f82aec9fcb1075b08d37c1a439028984c11e2100f1a2cff7ddd8e223e0da8dfb11ae511085bec9fa9b5c1486a

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

@@ -4,7 +4,7 @@
   <% end %>
 
   <%= 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' %>
+    <%= f.label :name, class: 'col-sm-2 control-label' %>
     <div class="col-sm-10">
       <%= f.text_field :name, class: 'form-control' %>
       <%= doorkeeper_errors_for application, :name %>
@@ -12,7 +12,7 @@
   <% end %>
 
   <%= 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' %>
+    <%= f.label :redirect_uri, class: 'col-sm-2 control-label' %>
     <div class="col-sm-10">
       <%= f.text_area :redirect_uri, class: 'form-control' %>
       <%= doorkeeper_errors_for application, :redirect_uri %>

data/lib/doorkeeper/config.rb

@@ -8,6 +8,7 @@ module Doorkeeper
   def self.configure(&block)
     @config = Config::Builder.new(&block).build
     enable_orm
+    check_for_missing_columns
     setup_application_owner if @config.enable_application_owner?
   end
 
@@ -15,6 +16,20 @@ module Doorkeeper
     @config || (fail MissingConfiguration.new)
   end
 
+  def self.check_for_missing_columns
+    if Doorkeeper.configuration.orm == :active_record &&
+        !Application.new.attributes.include?("scopes")
+
+      puts <<-MSG.squish
+[doorkeeper] Missing column: `applications.scopes`.
+If you are using ActiveRecord run `rails generate doorkeeper:application_scopes
+&& rake db:migrate` to add it.
+      MSG
+    end
+  rescue ActiveRecord::StatementInvalid
+    # trap error when DB is not yet setup
+  end
+
   def self.enable_orm
     class_name = "doorkeeper/orm/#{configuration.orm}".classify
     class_name.constantize.initialize_models!
@@ -208,10 +223,6 @@ and that your `initialize_models!` method doesn't raise any errors.\n
       @scopes ||= default_scopes + optional_scopes
     end
 
-    def orm_name
-      [:mongoid2, :mongoid3, :mongoid4].include?(orm.to_sym) ? :mongoid : orm
-    end
-
     def client_credentials_methods
       @client_credentials ||= [:from_basic, :from_params]
     end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = '2.0.0.rc3'
+  VERSION = '2.0.0'
 end

data/spec/spec_helper_integration.rb

@@ -3,7 +3,7 @@ TABLE_NAME_PREFIX = ENV['table_name_prefix'] || nil
 TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil
 
 orm = ENV['BUNDLE_GEMFILE'].match(/Gemfile\.(.+)\.rb/)
-DOORKEEPER_ORM = (orm && orm[1]) || :active_record
+DOORKEEPER_ORM = (orm && orm[1] || :active_record).to_sym
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
@@ -24,7 +24,11 @@ end
 Rails.logger.info "====> Rails version: #{Rails.version}"
 Rails.logger.info "====> Ruby version: #{RUBY_VERSION}"
 
-require "support/orm/#{Doorkeeper.configuration.orm_name}"
+if [:mongoid2, :mongoid3, :mongoid4].include?(DOORKEEPER_ORM)
+  require "support/orm/mongoid"
+else
+  require "support/orm/#{DOORKEEPER_ORM}"
+end
 
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -439,9 +439,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2