bsm_oa 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5025b6ecca24e19622010e73f34aeb51ab6c41c
-  data.tar.gz: 509fddabc2da4dc37aac6fe107af71dd43dd9885
+  metadata.gz: ddc376432fcee2544323684d8630c60d07850f55
+  data.tar.gz: 96184f746bb222c599a9ac3aba2962a544ca8f5a
 SHA512:
-  metadata.gz: 2813cf35613dca6b1693216d3ca2f3f304eb28003e92f162d567657e7f6afc1033fa9dc8a33459b1e5bb377168e277ff91e6dfb779ed5e903866fc51e017df34
-  data.tar.gz: d497df0bc2375359c9cbcb49edda1034447350370c2bd626d0228d23232071cb20958de605b765776903f2159c6ed8a406ae4c701609722a9b2b6c0c4ade62e4
+  metadata.gz: 16dafd2b6d854c321d0d4da2412bd35d8d9c6eacd84610270598b750440362a901870836b593ed229733bfc004c5f8495e6faedae690983204e7f7ccaf068f9a
+  data.tar.gz: 8eb7d9eedae1e024315fe2bb9b723414a94b3500e6ca3795abbcb16224e9879755a8f0c89685abce7576a5d42d83a7bb2720b738c18b60ea71ba7d70ce9d8917

data/.travis.yml

@@ -2,4 +2,3 @@ language: ruby
 rvm:
   - 2.2.2
   - 2.1.3
-  - 1.9.3

data/Gemfile

@@ -1,3 +1,9 @@
 source 'https://rubygems.org'
 
 gemspec
+
+# TODO! shoulda matcher support for rails5 is on a specific branch
+# I needed to extract the dependency from the gemspec into the Gemfile to ensure it would include the correct one
+group :test do
+  gem 'shoulda-matchers', git: 'https://github.com/thoughtbot/shoulda-matchers.git', branch: 'rails-5'
+end

data/Gemfile.lock

@@ -1,180 +1,176 @@
+GIT
+  remote: https://github.com/thoughtbot/shoulda-matchers.git
+  revision: 4b160bd19ecca7f97d7ac22dccd5fde9b0da5a9f
+  branch: rails-5
+  specs:
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.2.0)
+
 PATH
   remote: .
   specs:
-    bsm_oa (0.3.1)
-      bsm-models
-      doorkeeper (~> 3.0.0.rc)
+    bsm_oa (0.4.0)
+      doorkeeper (~> 4.2.0)
       has_scope (~> 0.6)
-      jbuilder (~> 2.2)
-      jquery-rails
-      railties (>= 4.1, < 5.0)
-      responders (~> 2.0)
-      simple_form (~> 3.1)
+      railties (~> 5.0)
+      responders (~> 2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
+    actioncable (5.1.4)
+      actionpack (= 5.1.4)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.2)
-      activesupport (= 4.2.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.2)
-      activesupport (= 4.2.2)
-      globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.4)
+      actionview (= 5.1.4)
+      activesupport (= 5.1.4)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.4)
+      activesupport (= 5.1.4)
       builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
-      arel (~> 6.0)
-    activesupport (4.2.2)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.4)
+      activesupport (= 5.1.4)
+      globalid (>= 0.3.6)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activerecord (5.1.4)
+      activemodel (= 5.1.4)
+      activesupport (= 5.1.4)
+      arel (~> 8.0)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
-    bsm-models (0.8.2)
-      abstract
-      activerecord (>= 4.1.0, < 5.0.0)
-      railties (>= 4.1.0, < 5.0.0)
-    builder (3.2.2)
-    combustion (0.5.3)
+    arel (8.0.0)
+    builder (3.2.3)
+    combustion (0.7.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    database_cleaner (1.4.1)
-    diff-lcs (1.2.5)
-    doorkeeper (3.0.0.rc1)
-      railties (>= 3.2)
-    erubis (2.7.0)
-    factory_girl (4.5.0)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.6.1)
+    diff-lcs (1.3)
+    doorkeeper (4.2.6)
+      railties (>= 4.2)
+    erubi (1.6.1)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    faker (1.4.3)
+    faker (1.8.4)
       i18n (~> 0.5)
-    globalid (0.3.5)
-      activesupport (>= 4.1.0)
-    has_scope (0.6.0)
-      actionpack (>= 3.2, < 5)
-      activesupport (>= 3.2, < 5)
-    i18n (0.7.0)
-    jbuilder (2.3.0)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
-    jquery-rails (4.0.4)
-      rails-dom-testing (~> 1.0)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.3)
-    json_spec (1.1.4)
-      multi_json (~> 1.0)
-      rspec (>= 2.0, < 4.0)
-    loofah (2.0.2)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    has_scope (0.7.1)
+      actionpack (>= 4.1, < 5.2)
+      activesupport (>= 4.1, < 5.2)
+    i18n (0.8.6)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    multi_json (1.11.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rack (1.6.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    rack (2.0.3)
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
+    rails (5.1.4)
+      actioncable (= 5.1.4)
+      actionmailer (= 5.1.4)
+      actionpack (= 5.1.4)
+      actionview (= 5.1.4)
+      activejob (= 5.1.4)
+      activemodel (= 5.1.4)
+      activerecord (= 5.1.4)
+      activesupport (= 5.1.4)
+      bundler (>= 1.3.0)
+      railties (= 5.1.4)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+    railties (5.1.4)
+      actionpack (= 5.1.4)
+      activesupport (= 5.1.4)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rake (12.1.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    shoulda-matchers (2.8.0)
-      activesupport (>= 3.0.0)
-    simple_form (3.1.0)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.1)
+      rspec-support (~> 3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      railties (>= 3.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bsm_oa!
-  combustion (~> 0.5.3)
+  combustion (~> 0.7.0)
   database_cleaner
   factory_girl
   faker
-  json_spec
-  rails (>= 4.1)
+  rails (>= 5.0)
+  rails-controller-testing
   rspec-rails
-  shoulda-matchers
+  shoulda-matchers!
   sqlite3
+
+BUNDLED WITH
+   1.14.5

data/app/controllers/bsm_oa/accounts_controller.rb

@@ -1,12 +1,27 @@
 module BsmOa
-  class AccountsController < Doorkeeper::ApplicationController
+  class AccountsController < ActionController::Metal
+    include AbstractController::Callbacks
+    include ActionController::Head
+    include Doorkeeper::Rails::Helpers
+
     before_action :doorkeeper_authorize!
-    respond_to    :json
 
     # GET /me.json
     def show
-      @account = BsmOa.config.user_class.find doorkeeper_token.try(:resource_owner_id)
-      respond_with @account
+      self.content_type = Mime[:json]
+      self.response_body = account.respond_to?(:oa_json) ? account.oa_json : account.to_json
     end
+
+    private
+
+      def valid_doorkeeper_token?
+        !!account && super
+      end
+
+      def account
+        return @_account if defined?(@_account)
+        @_account = BsmOa.config.user_class.find_by_id doorkeeper_token.try(:resource_owner_id)
+      end
+
   end
 end

data/app/controllers/bsm_oa/admin_controller.rb

@@ -0,0 +1,5 @@
+module BsmOa
+  class AdminController < BaseController
+    before_action :authenticate_admin!
+  end
+end

data/app/controllers/bsm_oa/applications_controller.rb

@@ -1,34 +1,55 @@
 module BsmOa
-  class ApplicationsController < Doorkeeper::ApplicationsController
-    respond_to :html, :json
-    before_filter :redirect_to_index_on_html, only: [:show]
+  class ApplicationsController < AdminController
+    respond_to :html
+    respond_to :json, except: [:new, :edit]
+    has_scope  :ordered, default: true, only: [:index]
+
+    def index
+      @applications = apply_scopes(resource_scope)
+      respond_with @applications
+    end
+
+    def show
+      respond_with resource
+    end
+
+    def new
+      @application = resource_scope.new
+      respond_with @application
+    end
+
+    def edit
+      respond_with resource
+    end
 
     def create
-      @application = Doorkeeper::Application.create(application_params)
-      location = oauth_application_path(@application) if @application.persisted?
-      respond_with @application, location: location
+      @application = resource_scope.create permitted_params
+      respond_with @application
     end
 
     def update
-      @application.update(application_params)
-      respond_with @application, location: oauth_application_path(@application)
+      resource.update(permitted_params)
+      respond_with resource
     end
 
     def destroy
-      respond_with @application, location: oauth_applications_path
+      resource.destroy
+      respond_with resource, location: bsm_oa_applications_path
     end
 
     protected
 
-      def application_params
-        params.require(:doorkeeper_application).permit(:name, :redirect_uri, :permissions, :permissions_string, :uid, :secret)
+      def resource
+        @application ||= resource_scope.find params[:id]
       end
 
-      def redirect_to_index_on_html
-        return unless request.format.html?
+      # @return [ActiveRecord::Relation]
+      def resource_scope
+        BsmOa::Application.all
+      end
 
-        flash.keep
-        redirect_to oauth_applications_path
+      def permitted_params
+        params.require(:bsm_oa_application).permit(:name, :redirect_uri, :permissions, :uid, :secret)
       end
 
   end