active_admin_role 0.1.1 → 0.2.0

data/app/models/active_admin_role/can_can/ability.rb

@@ -0,0 +1,17 @@
+module ActiveAdminRole
+  module CanCan
+    module Ability
+      extend ActiveSupport::Concern
+
+      private
+
+        def register_role_based_abilities(user)
+          return if user.guest_user?
+
+          (::ActiveAdmin::Permission.indexed_cache[user.role] || []).select(&:active?).each do |permission|
+            send(*permission.to_condition)
+          end
+        end
+    end
+  end
+end

data/app/models/active_admin_role/dsl.rb

@@ -0,0 +1,7 @@
+module ActiveAdminRole
+  module Dsl
+    def role_based_authorizable
+      include ::ActiveAdminRole::RoleBasedAuthorizable
+    end
+  end
+end

data/app/models/active_admin_role/role_based_authorizable.rb

@@ -0,0 +1,43 @@
+module ActiveAdminRole
+  module RoleBasedAuthorizable
+    extend ActiveSupport::Concern
+
+    included do
+      enum role: config.roles
+      delegate :super_user_roles, :guest_user_roles, to: :class
+      validates :role, presence: true
+    end
+
+    def super_user?
+      role.in?(super_user_roles)
+    end
+
+    def guest_user?
+      role.in?(guest_user_roles)
+    end
+
+    class_methods do
+      def manageable_roles
+        @manageable_roles ||= roles.except(*manageless_roles)
+      end
+
+      def super_user_roles
+        @super_user_roles ||= config.super_user_roles.try(:map, &:to_s) || []
+      end
+
+      def guest_user_roles
+        @guest_user_roles ||= config.guest_user_roles.try(:map, &:to_s) || []
+      end
+
+      private
+
+        def manageless_roles
+          (super_user_roles + guest_user_roles).flatten.compact
+        end
+
+        def config
+          ::ActiveAdminRole.config
+        end
+    end
+  end
+end

data/gemfiles/{rails42.gemfile → 5.0.gemfile}

@@ -2,25 +2,25 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
-gem "activeadmin", "1.0.0.pre4"
-gem "devise", "~> 4.2.0"
-gem "pry"
 gem "appraisal"
+gem "devise"
+gem "jquery-ui-rails", "~> 4.2.1"
+gem "rails", "~> 5.0.0"
+
+group :development, :test do
+  gem "sqlite3", platforms: :mri
+end
 
 group :development do
-  gem "bundler", "~> 1.13.0"
-  gem "rake", "~> 10.0"
-  gem "rubocop", "~> 0.40.0"
+  gem "onkcop", require: false
 end
 
 group :test do
   gem "capybara"
-  gem "rspec-rails"
   gem "database_cleaner"
-  gem "shoulda-matchers"
-  gem "sqlite3", :platforms => :mri
   gem "poltergeist"
+  gem "rspec-rails"
+  gem "shoulda-matchers"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/5.1.gemfile

@@ -0,0 +1,26 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "devise"
+gem "jquery-ui-rails", "~> 4.2.1"
+gem "rails", "~> 5.1.0"
+
+group :development, :test do
+  gem "sqlite3", platforms: :mri
+end
+
+group :development do
+  gem "onkcop", require: false
+end
+
+group :test do
+  gem "capybara"
+  gem "database_cleaner"
+  gem "poltergeist"
+  gem "rspec-rails"
+  gem "shoulda-matchers"
+end
+
+gemspec path: "../"

data/gemfiles/5.2.gemfile

@@ -0,0 +1,26 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "devise"
+gem "jquery-ui-rails", "~> 4.2.1"
+gem "rails", "~> 5.2.0.rc2"
+
+group :development, :test do
+  gem "sqlite3", platforms: :mri
+end
+
+group :development do
+  gem "onkcop", require: false
+end
+
+group :test do
+  gem "capybara"
+  gem "database_cleaner"
+  gem "poltergeist"
+  gem "rspec-rails"
+  gem "shoulda-matchers"
+end
+
+gemspec path: "../"

data/lib/active_admin_role.rb

@@ -1,12 +1,4 @@
 require "active_admin"
-require "active_admin_role/active_admin/dsl"
-require "active_admin_role/active_admin/resource_controller"
-require "active_admin_role/can_can/ability"
-require "active_admin_role/config"
-require "active_admin_role/engine"
-require "active_admin_role/manageable_resource"
-require "active_admin_role/model"
-require "active_admin_role/role_based_authorizable"
 
 module ActiveAdminRole
   def self.configure
@@ -14,8 +6,9 @@ module ActiveAdminRole
   end
 
   def self.config
-    @_config ||= Config.new
+    @config ||= Config.new
   end
 end
 
-::ActiveAdmin::DSL.send :include, ActiveAdminRole::ActiveAdmin::DSL
+require "active_admin_role/config"
+require "active_admin_role/engine" if defined?(Rails)

data/lib/active_admin_role/active_admin/dsl.rb

@@ -1,11 +1,10 @@
 module ActiveAdminRole
   module ActiveAdmin
-    module DSL
+    module Dsl
       def role_changeable
         scope(:all, default: true)
 
         controller.resource_class.roles.each_key(&method(:scope))
-
         controller.resource_class.roles.each_key do |role|
           batch_action "assign as #{role}" do |ids|
             formatted_ids = ids - [active_admin_role_current_user.try!(:id).to_s]

data/lib/active_admin_role/active_admin/resource_controller.rb

@@ -4,26 +4,26 @@ module ActiveAdminRole
       def self.included(klass)
         klass.class_eval do
           if Rails::VERSION::MAJOR >= 4
-            before_action :authorize_access_resource!, except: %i(index new create show edit update destroy)
+            before_action :authorize_access_resource!, except: %i[index new create show edit update destroy]
           else
-            before_filter :authorize_access_resource!, except: %i(index new create show edit update destroy)
+            before_filter :authorize_access_resource!, except: %i[index new create show edit update destroy]
           end
         end
       end
 
       private
 
-      def authorize_access_resource!
-        authorize_resource!(active_admin_config.resource_class)
-      end
+        def authorize_access_resource!
+          authorize_resource!(active_admin_config.resource_class)
+        end
 
-      def active_admin_role_current_user
-        send(active_admin_role_current_user_method_name)
-      end
+        def active_admin_role_current_user
+          send(active_admin_role_current_user_method_name)
+        end
 
-      def active_admin_role_current_user_method_name
-        ActiveAdminRole.config.current_user_method_name
-      end
+        def active_admin_role_current_user_method_name
+          ActiveAdminRole.config.current_user_method_name
+        end
     end
   end
 end

data/lib/active_admin_role/config.rb

@@ -1,6 +1,7 @@
 module ActiveAdminRole
   class Config
-    attr_accessor :roles, :super_user_roles, :guest_user_roles, :user_class_name, :default_state, :current_user_method_name
+    attr_accessor :roles, :super_user_roles, :guest_user_roles, :user_class_name, :current_user_method_name
+    attr_reader :default_state
 
     def initialize
       @roles            = { guest: 0, support: 1, staff: 2, manager: 3, admin: 99 }
@@ -12,7 +13,7 @@ module ActiveAdminRole
     end
 
     def default_state=(value)
-      @default_state = value.to_s == "can" ? :can : :cannot
+      @default_state = (value.to_s == "can") ? :can : :cannot
     end
   end
 end

data/lib/active_admin_role/engine.rb

@@ -4,11 +4,14 @@ module ActiveAdminRole
   class Engine < ::Rails::Engine
     initializer "active_admin_role" do
       ActiveSupport.on_load :active_record do
-        ActiveRecord::Base.send :extend, ::ActiveAdminRole::Model
+        extend ActiveAdminRole::Dsl
       end
 
       ActiveSupport.on_load :after_initialize do
-        ::ActiveAdmin::ResourceController.send :include, ::ActiveAdminRole::ActiveAdmin::ResourceController
+        require "active_admin_role/active_admin/dsl"
+        require "active_admin_role/active_admin/resource_controller"
+        ::ActiveAdmin::DSL.send :include, ActiveAdminRole::ActiveAdmin::Dsl
+        ::ActiveAdmin::ResourceController.send :include, ActiveAdminRole::ActiveAdmin::ResourceController
       end
     end
   end

data/lib/active_admin_role/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminRole
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.0".freeze
 end

data/lib/generators/active_admin_role/helper.rb

@@ -7,58 +7,58 @@ module ActiveAdminRole
 
       private
 
-      def model_class_name
-        options[:model] ? options[:model].classify : "AdminUser"
-      end
-
-      def model_file_path
-        model_name.underscore
-      end
+        def model_class_name
+          options[:model] ? options[:model].classify : "AdminUser"
+        end
 
-      def model_path
-        @model_path ||= File.join("app", "models", "#{model_file_path}.rb")
-      end
+        def model_file_path
+          model_name.underscore
+        end
 
-      def namespace
-        Rails::Generators.namespace if Rails::Generators.respond_to?(:namespace)
-      end
+        def model_path
+          @model_path ||= File.join("app", "models", "#{model_file_path}.rb")
+        end
 
-      def namespaced?
-        !!namespace
-      end
+        def namespace
+          Rails::Generators.namespace if Rails::Generators.respond_to?(:namespace)
+        end
 
-      def model_name
-        if namespaced?
-          [namespace.to_s] + [model_class_name]
-        else
-          [model_class_name]
-        end.join("::")
-      end
+        def namespaced?
+          !!namespace
+        end
 
-      def inject_into_model
-        indents = "  " * (namespaced? ? 2 : 1)
-        inject_into_class model_path, model_class_name, "#{indents}role_based_authorizable\n"
-      end
+        def model_name
+          if namespaced?
+            [namespace.to_s] + [model_class_name]
+          else
+            [model_class_name]
+          end.join("::")
+        end
 
-      def migration_class_name
-        if Rails::VERSION::MAJOR >= 5
-          "ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        else
-          "ActiveRecord::Migration"
+        def inject_into_model
+          indents = "  " * (namespaced? ? 2 : 1)
+          inject_into_class model_path, model_class_name, "#{indents}role_based_authorizable\n"
         end
-      end
 
-      module ClassMethods
-        # Define the next_migration_number method (necessary for the migration_template method to work)
-        def next_migration_number(dirname)
-          if ActiveRecord::Base.timestamped_migrations
-            sleep 1 # make sure each time we get a different timestamp
-            Time.new.utc.strftime("%Y%m%d%H%M%S")
+        def migration_class_name
+          if Rails::VERSION::MAJOR >= 5
+            "ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
           else
-            format("%.3d", (current_migration_number(dirname) + 1))
+            "ActiveRecord::Migration"
+          end
+        end
+
+        module ClassMethods
+          # Define the next_migration_number method (necessary for the migration_template method to work)
+          def next_migration_number(dirname)
+            if ActiveRecord::Base.timestamped_migrations
+              sleep 1 # make sure each time we get a different timestamp
+              Time.new.utc.strftime("%Y%m%d%H%M%S")
+            else
+              "%.3d" % (current_migration_number(dirname) + 1)
+            end
           end
         end
-      end
     end
   end
 end

data/lib/generators/active_admin_role/install_generator.rb

@@ -6,9 +6,7 @@ module ActiveAdminRole
     class InstallGenerator < ::Rails::Generators::Base
       include Rails::Generators::Migration
       include ActiveAdminRole::Generators::Helper
-
-      source_root File.expand_path("../templates", __FILE__)
-
+      source_root File.expand_path("./templates", __dir__)
       class_option :model, optional: true,
                            type:     :string,
                            banner:   "model",
@@ -16,22 +14,27 @@ module ActiveAdminRole
                            default:  "AdminUser"
 
       def copy_initializer_file
-        template "initializer.rb", "config/initializers/active_admin_role.rb"
+        template "initializer.tt", "config/initializers/active_admin_role.rb"
       end
 
       def configure_model
-        generate :"active_admin:install #{model_class_name}" unless model_class_name.safe_constantize
         inject_into_model
       end
 
       def copy_migration_files
-        migration_template "migration/add_role_to_admin_users.rb", "db/migrate/add_role_to_#{model_class_name.tableize}.rb", migration_class_name: migration_class_name
-        migration_template "migration/create_active_admin_managed_resources.rb", "db/migrate/create_active_admin_managed_resources.rb", migration_class_name: migration_class_name
-        migration_template "migration/create_active_admin_permissions.rb", "db/migrate/create_active_admin_permissions.rb", migration_class_name: migration_class_name
+        migration_template "migration/add_role_to_admin_users.tt",
+                           "db/migrate/add_role_to_#{model_class_name.tableize}.rb",
+                           migration_class_name: migration_class_name
+        migration_template "migration/create_active_admin_managed_resources.tt",
+                           "db/migrate/create_active_admin_managed_resources.rb",
+                           migration_class_name: migration_class_name
+        migration_template "migration/create_active_admin_permissions.tt",
+                           "db/migrate/create_active_admin_permissions.rb",
+                           migration_class_name: migration_class_name
       end
 
       def copy_model_file
-        template "model/ability.rb", "app/models/ability.rb"
+        template "model/ability.tt", "app/models/ability.rb"
       end
 
       def configure_active_admin
@@ -40,12 +43,12 @@ module ActiveAdminRole
                   "config.authorization_adapter = ActiveAdmin::CanCanAdapter"
       end
 
-      def copy_admin_permission_file
-        template "admin/permission.rb", "app/admin/permission.rb"
+      def copy_admin_permissions_file
+        template "admin/permissions.tt", "app/admin/permissions.rb"
       end
 
-      def configure_admin_user_file
-        inject_into_file "app/admin/#{model_file_path}.rb",
+      def configure_admin_users_file
+        inject_into_file "app/admin/#{model_class_name.tableize}.rb",
                          "  role_changeable\n",
                          after: "ActiveAdmin.register #{model_class_name} do\n"
       end

data/lib/generators/active_admin_role/templates/admin/{permission.rb → permissions.tt}

@@ -62,7 +62,7 @@ ActiveAdmin.register ::ActiveAdmin::Permission, as: "Permission" do
     selectable_column
     column :role
     column(:state) do |record|
-      status_tag(record.state, record.can? ? :ok : nil)
+      status_tag(record.state, class: record.can? ? "completed ok" : "null", label: record.state)
     end
     column :action
     column :name