bsm_oa 0.3.1 → 0.4.0

data/app/controllers/bsm_oa/authorizations_controller.rb

@@ -1,9 +1,10 @@
  module BsmOa
-  class AuthorizationsController < Doorkeeper::ApplicationController
+  class AuthorizationsController < AdminController
     respond_to :html
     respond_to :json, except: [:new, :edit]
     respond_to :js, only: [:toggle]
-    before_filter :redirect_to_index_on_html, only: [:show]
+
+    before_action :redirect_to_index_on_html, only: [:show]
 
     def index
       @authorizations = apply_scopes(resource_scope)
@@ -33,19 +34,19 @@
     def update
       @authorization = resource_scope.find params[:id]
       @authorization.update(permitted_params)
-      respond_with @authorization, location: bsm_oa_authorization_path(@authorization)
+      respond_with @authorization
     end
 
     def toggle
       @authorization = resource_scope.find params[:id]
-      @authorization.toggle(params[:permission])
+      @authorization.toggle_permission!(params[:permission])
       respond_with @authorization
     end
 
     def destroy
       @authorization = resource_scope.find params[:id]
       @authorization.destroy
-      respond_with @authorization, location: bsm_oa_authorization_path(@authorization)
+      respond_with @authorization, location: @authorization.role
     end
 
     protected
@@ -65,7 +66,7 @@
     end
 
     def permitted_params
-      params.require(:authorization).permit :application_id, :permissions_string, :uid, :secret
+      params.require(:bsm_oa_authorization).permit :application_id, :uid, :secret
     end
 
     def redirect_to_index_on_html

data/app/controllers/bsm_oa/base_controller.rb

@@ -0,0 +1,5 @@
+module BsmOa
+  class BaseController < BsmOa.config.parent_controller.constantize
+    include Doorkeeper::Helpers::Controller
+  end
+end

data/app/controllers/bsm_oa/roles_controller.rb

@@ -1,9 +1,8 @@
 module BsmOa
-  class RolesController < Doorkeeper::ApplicationController
+  class RolesController < AdminController
     respond_to :html
     respond_to :json, except: [:new, :edit]
-
-    has_scope :ordered, default: true, only: [:index]
+    has_scope  :ordered, default: true, only: [:index]
 
     def index
       @roles = apply_scopes(resource_scope)
@@ -51,7 +50,7 @@ module BsmOa
     end
 
     def permitted_params
-      params.require(:role).permit :name, :description
+      params.require(:bsm_oa_role).permit :name, :description
     end
 
   end

data/app/views/bsm_oa/applications/_application.html.erb

@@ -9,7 +9,7 @@
       <span class="label label-info"><%= "#{pm}" %></span>
     <% end %>
   <td>
-    <%= link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(application), class: 'btn btn-default btn-xs' %>
-    <%= link_to 'Delete', oauth_application_path(application), data: { confirm: 'Are you sure?' }, method: :delete, class: 'btn btn-default btn-xs'%>
+    <%= link_to t('doorkeeper.applications.buttons.edit'), edit_doorkeeper_application_path(application), class: 'btn btn-default btn-xs' %>
+    <%= link_to 'Delete', application, data: { confirm: 'Are you sure?' }, method: :delete, class: 'btn btn-default btn-xs'%>
   </td>
 </tr>

data/app/views/bsm_oa/applications/_inputs.html.erb

@@ -1,11 +1,6 @@
-<%= f.input :name, placeholder: "Enter name"%>
-
-<%= f.input :uid, placeholder: "Enter application UID"%>
-
-<%= f.input :secret, placeholder: "Enter application secret"%>
-
-<%= f.input :redirect_uri, placeholder: "Enter redirect url"%>
-
-<%= f.input :permissions_string, placeholder: "Enter comma separated permissions"%>
-
-<%= f.button :submit %>
+<%= f.text_field :name, placeholder: "Enter name"%>
+<%= f.text_field :uid, placeholder: "Enter application UID"%>
+<%= f.password_field :secret, placeholder: "Enter application secret"%>
+<%= f.url_field :redirect_uri, placeholder: "Enter redirect url"%>
+<%= f.text_field :permissions, placeholder: "Enter comma separated permissions"%>
+<%= f.submit %>

data/app/views/bsm_oa/applications/edit.html.erb

@@ -1,10 +1,10 @@
 <div class="page-header">
   <div class="pull-right">
-    <%= link_to "&larr; Back".html_safe, oauth_applications_path, class: 'btn btn-lg btn-default'%>
+    <%= link_to "&larr; Back".html_safe, bsm_oa_applications_path, class: 'btn btn-lg btn-default'%>
   </div>
   <h1>Edit Application</h1>
 </div>
 
-<%= simple_form_for @application, url: oauth_application_url(@application) do |f| %>
+<%= form_for @application do |f| %>
   <%= render 'inputs', f: f %>
 <% end %>

data/app/views/bsm_oa/applications/index.html.erb

@@ -1,6 +1,6 @@
 <div class="page-header">
   <div class="pull-right">
-    <%= link_to 'New Application', new_oauth_application_path, class: 'btn btn-lg btn-primary' %>
+    <%= link_to 'New Application', new_bsm_oa_application_path, class: 'btn btn-lg btn-primary' %>
   </div>
   <h1>Applications</h1>
 </div>

data/app/views/bsm_oa/applications/new.html.erb

@@ -1,10 +1,10 @@
 <div class="page-header">
   <div class="pull-right">
-    <%= link_to "&larr; Back".html_safe, oauth_applications_path, class: 'btn btn-lg btn-default'%>
+    <%= link_to "&larr; Back".html_safe, bsm_oa_applications_path, class: 'btn btn-lg btn-default'%>
   </div>
   <h1>New Application</h1>
 </div>
 
-<%= simple_form_for @application, url: oauth_applications_url do |f| %>
+<%= form_for @application do |f| %>
   <%= render 'inputs', f: f %>
 <% end %>

data/app/views/bsm_oa/applications/show.html.erb

@@ -0,0 +1,40 @@
+<div class="page-header">
+  <div class="pull-right">
+    <%= link_to "&larr; Back".html_safe, bsm_oa_applications_path, class: 'btn btn-lg btn-default'%>
+  </div>
+  <h1><%= @application.name %></h1>
+</div>
+
+<h3>Details</h3>
+<div class="table-responsive">
+  <table class="table table-hover">
+    <tr>
+      <th>Name:</th>
+      <td><%= @application.name %></td>
+    </tr>
+    <tr>
+      <th>Callback URL:</th>
+      <td>
+        <%= @application.redirect_uri %>
+      </td>
+    </tr>
+    <tr>
+      <th>Permissions:</th>
+      <td>
+        <%= @application.permissions.to_sentence %>
+      </td>
+    </tr>
+    <tr>
+      <th>UID:</th>
+      <td>
+        <%= @application.uid %>
+      </td>
+    </tr>
+    <tr>
+      <th>Secret:</th>
+      <td>
+        <%= @application.secret %>
+      </td>
+    </tr>
+  </table>
+</div>

data/app/views/bsm_oa/authorizations/_inputs.html.erb

@@ -1,2 +1,2 @@
-<%= f.association :application, as: :select, collection: Doorkeeper::Application.ordered, prompt: true %>
-<%= f.button :submit %>
+<%= f.collection_select :application_id, BsmOa::Application.ordered, :id, :name, prompt: true %>
+<%= f.submit %>

data/app/views/bsm_oa/authorizations/edit.html.erb

@@ -5,6 +5,6 @@
   <h1>Edit Authorization</h1>
 </div>
 
-<%= simple_form_for @authorization, url: bsm_oa_authorization_url do |f| %>
+<%= form_for @authorization, url: bsm_oa_authorization_url do |f| %>
   <%= render 'inputs', f: f %>
 <% end %>

data/app/views/bsm_oa/authorizations/new.html.erb

@@ -5,7 +5,6 @@
   <h1>New Authorization</h1>
 </div>
 
-<%= simple_form_for [@parent, @authorization], url: bsm_oa_role_bsm_oa_authorizations_url do |f| %>
-  <%= f.association :application, as: :select, collection: Doorkeeper::Application.ordered, prompt: true %>
-  <%= f.button :submit %>
+<%= form_for [@parent, @authorization], url: bsm_oa_role_bsm_oa_authorizations_url do |f| %>
+  <%= render 'inputs', f: f %>
 <% end %>

data/app/views/bsm_oa/roles/_inputs.html.erb

@@ -1,5 +1,4 @@
-<%= f.input :name, placeholder: "Enter name" %>
-<%= f.input :description, placeholder: "Enter description" %>
-
-<%= f.button :submit %>
+<%= f.text_field :name, placeholder: "Enter name" %>
+<%= f.text_field :description, placeholder: "Enter description" %>
+<%= f.submit %>
 

data/app/views/bsm_oa/roles/edit.html.erb

@@ -5,6 +5,6 @@
   <h1>Edit Role</h1>
 </div>
 
-<%= simple_form_for @role, url: bsm_oa_role_url(@role) do |f| %>
+<%= form_for @role, url: bsm_oa_role_url(@role) do |f| %>
   <%= render 'inputs', f: f %>
 <% end %>

data/app/views/bsm_oa/roles/new.html.erb

@@ -5,6 +5,6 @@
   <h1>New Role</h1>
 </div>
 
-<%= simple_form_for @role, url: bsm_oa_roles_path do |f| %>
+<%= form_for @role, url: bsm_oa_roles_path do |f| %>
   <%= render 'inputs', f: f %>
 <% end %>

data/app/views/bsm_oa/roles/show.html.erb

@@ -24,7 +24,7 @@
 
 <h3>
   Authorizations
-  <%= link_to 'New', new_bsm_oa_role_bsm_oa_authorization_path(@role), class: 'btn btn-sm btn-primary' %>
+  <%= link_to 'New', [:new, @role, :bsm_oa_authorization], class: 'btn btn-sm btn-primary' %>
 </h3>
 <div class="table-responsive">
   <table class="table table-hover">

data/bsm_oa.gemspec

@@ -16,22 +16,17 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_dependency 'railties', '>= 4.1', '< 5.0'
-  s.add_dependency 'doorkeeper', '~> 3.0.0.rc'
-  s.add_dependency 'responders', '~> 2.0'
-  s.add_dependency 'jbuilder', '~> 2.2'
-  s.add_dependency 'bsm-models'
+  s.add_dependency 'railties', '~> 5.0'
+  s.add_dependency 'doorkeeper', '~> 4.2.0'
+  s.add_dependency 'responders', '~> 2.1'
   s.add_dependency 'has_scope', '~> 0.6'
-  s.add_dependency 'simple_form', '~> 3.1'
-  s.add_dependency 'jquery-rails'
 
-  s.add_development_dependency 'rails', '>= 4.1'
-  s.add_development_dependency 'combustion', '~> 0.5.3'
+  s.add_development_dependency 'rails', '>= 5.0'
+  s.add_development_dependency 'combustion', '~> 0.7.0'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'factory_girl'
-  s.add_development_dependency 'json_spec'
   s.add_development_dependency 'faker'
-  s.add_development_dependency 'shoulda-matchers'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'rails-controller-testing'
 end

data/db/migrate/20150507113313_bsm_oa_create_doorkeeper_tables.rb

@@ -1,4 +1,4 @@
-class BsmOaCreateDoorkeeperTables < ActiveRecord::Migration
+class BsmOaCreateDoorkeeperTables < ActiveRecord::Migration[5.0]
   def change
     create_table :oauth_applications do |t|
       t.string  :name,         null: false

data/db/migrate/20150513155732_bsm_oa_create_tables.rb

@@ -1,4 +1,4 @@
-class BsmOaCreateTables < ActiveRecord::Migration
+class BsmOaCreateTables < ActiveRecord::Migration[5.0]
   def change
     create_table :bsm_oa_authorizations do |t|
       t.integer :role_id, null: false

data/lib/bsm_oa.rb

@@ -1,9 +1,6 @@
 require 'doorkeeper'
-require 'bsm-models'
 require 'responders'
-require 'jbuilder'
 require 'has_scope'
-require 'simple_form'
 
 require 'bsm_oa/version'
 require 'bsm_oa/engine'

data/lib/bsm_oa/application.rb

@@ -0,0 +1,31 @@
+module BsmOa
+  class Application < Doorkeeper::Application
+
+    has_many :authorizations, class_name: 'BsmOa::Authorization', inverse_of: :application, dependent: :destroy
+    has_many :roles, inverse_of: :applications, class_name: 'BsmOa::Role', through: :authorizations, foreign_key: :role_id
+
+    serialize :permissions, JSON
+    validate  :must_have_simple_word_permissions
+
+    before_validation :normalize_permissions!
+
+    scope :ordered, -> { order(:name) }
+
+    # @param [Array|String] permissions
+    def permissions=(vals)
+      super Array.wrap(vals).map {|s| s.to_s.split(/[\s,]+/) }.flatten
+    end
+
+    protected
+
+      def must_have_simple_word_permissions
+        errors.add :permissions, :invalid if permissions.any? {|pm| pm =~ /[^a-z0-9]/ }
+      end
+
+      def normalize_permissions!
+        self.permissions = Array.wrap(permissions).reject(&:blank?).map(&:strip).map(&:downcase).uniq
+      end
+
+  end
+end
+

data/lib/bsm_oa/authorization.rb

@@ -4,10 +4,10 @@ module BsmOa
 
     # ---> ASSOCIATIONS
     belongs_to :role, inverse_of: :authorizations
-    belongs_to :application, inverse_of: :authorizations, class_name: Doorkeeper::Application, foreign_key: :application_id
+    belongs_to :application, inverse_of: :authorizations, class_name: 'BsmOa::Application', foreign_key: :application_id
 
     # ---> ATTRIBUTES
-    serialize :permissions, Bsm::Model::Coders::JsonColumn.new(Array)
+    serialize :permissions, JSON
     attr_readonly :application_id, :role_id, :application
 
     # ---> VALIDATIONS
@@ -21,26 +21,19 @@ module BsmOa
     scope :ordered, -> { order(id: :desc) }
 
     # @param [String] name permission name
-    def toggle(name)
-      if permissions.include?(name)
-        self.permissions = permissions - [name]
-      else
-        self.permissions = permissions + [name]
-      end
-      save
-    end
-
-    def permissions_string=(str)
-      self.permissions = str.split("\s")
+    def toggle_permission!(name)
+      update permissions: (permissions.include?(name) ? permissions - [name] : permissions + [name])
     end
 
-    def permissions_string
-      permissions.sort.join(' ')
+    # @param [Array|String] permissions
+    def permissions=(vals)
+      super Array.wrap(vals).map {|s| s.to_s.split(/[\s,]+/) }.flatten
     end
 
     protected
 
       def normalize_permissions!
+        self.permissions ||= []
         self.permissions = permissions.reject(&:blank?).map(&:strip).map(&:downcase).uniq
         self.permissions &= application.permissions if application
       end

data/lib/bsm_oa/config.rb

@@ -15,5 +15,10 @@ module BsmOa
       @user_attrs ||= [:id, :email]
     end
 
+    def parent_controller(name = nil)
+      @parent_controller = name if name
+      @parent_controller ||= "ApplicationController"
+    end
+
   end
 end

data/lib/bsm_oa/engine.rb

@@ -15,11 +15,9 @@ module BsmOa
 
     initializer "bsm_oa.models" do
       ActiveSupport.on_load(:active_record) do
-        require 'bsm_oa/application_mixin'
-        require 'bsm_oa/authorization'
+        require 'bsm_oa/application'
         require 'bsm_oa/role'
-
-        Doorkeeper::Application.send :include, ApplicationMixin
+        require 'bsm_oa/authorization'
       end
     end
 

data/lib/bsm_oa/role.rb

@@ -4,7 +4,7 @@ module BsmOa
 
     # ---> ASSOCIATIONS
     has_many :authorizations, inverse_of: :role, dependent: :destroy
-    has_many :applications, inverse_of: :roles, class_name: Doorkeeper::Application, through: :authorizations, foreign_key: :application_id
+    has_many :applications, inverse_of: :roles, class_name: 'BsmOa::Application', through: :authorizations, foreign_key: :application_id
 
     # ---> VALIDATIONS
     validates :name,

data/lib/bsm_oa/routes.rb

@@ -8,14 +8,40 @@ module BsmOa
     module Helper
 
       def mount_bsm_oa
-        get 'me(.:format)', to: 'bsm_oa/accounts#show', as: :bsm_oa_me
-        resources :roles, controller: 'bsm_oa/roles', as: :bsm_oa_roles do
+        mount_bsm_oa_me
+        mount_bsm_oa_admin
+        mount_bsm_oa_callbacks
+      end
+
+      def mount_bsm_oa_admin
+        mount_bsm_oa_applications
+        mount_bsm_oa_roles
+        mount_bsm_oa_authorizations
+      end
+
+      def mount_bsm_oa_me
+        get 'me(.:format)', to: BsmOa::AccountsController.action(:show), as: :bsm_oa_me
+      end
+
+      def mount_bsm_oa_applications
+        resources :applications, controller: 'bsm_oa/applications', as: :bsm_oa_applications
+      end
+
+      def mount_bsm_oa_roles
+        resources :roles, controller: 'bsm_oa/roles', as: :bsm_oa_roles
+      end
+
+      def mount_bsm_oa_authorizations
+        resources :roles, only: [], as: :bsm_oa_roles do
           resources :authorizations, controller: 'bsm_oa/authorizations', as: :bsm_oa_authorizations, shallow: true do
             put :toggle, on: :member, path: "toggle/:permission"
           end
         end
+      end
+
+      def mount_bsm_oa_callbacks
         use_doorkeeper do
-          controllers applications: 'bsm_oa/applications'
+          skip_controllers :applications, :authorized_applications
         end
       end