active_admin_role 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b1f254b92b8095871aeed483aa900a0d946976
-  data.tar.gz: c316f53a4ae5e9bdd97713b251c56e2c323ad3f9
+  metadata.gz: 50b0ce4d721281f6862803084c1bc877d0e16194
+  data.tar.gz: 3a68d53325063176c30fe76ac76eec1e33dc81e5
 SHA512:
-  metadata.gz: 3f620d97e1248ccd49aa487376652bd8f85ad186068529a939f942ce4971f38fd47467c5080f6a83d755131eb21cc02b3d822353c3a933de9c55f9b9919c644a
-  data.tar.gz: 181eea908a807136570b767cde786d0df6805148e1861f45d8466455a528d5bc3139a59a011832861c92238aea2af11dff928c7bf90ca1571c610ceaf0b17a17
+  metadata.gz: b95f322b9997282163ab7ea8e5ae97ceec3337317c6b862624c9477e563c8c346e3c135a7cba49d88edc4f5a2426a0e25a19169a64c86b0cd92604f650c5c9db
+  data.tar.gz: 16a35e6b5be3ee64c92bbc9ea8c95d0e6bb2c9ed1e6bbf3e24071b639b99cef6e52856703d176bfaba853f8b3197a4ace434d307541265656f28f7dbe069bb9b

data/Gemfile

@@ -9,7 +9,6 @@ gem "pry"
 gem "appraisal"
 
 group :development do
-  gem "bundler", "~> 1.13.0"
   gem "rake",    "~> 10.0"
   gem "rubocop", "~> 0.40.0"
 end

data/lib/active_admin_role/active_admin/dsl.rb

@@ -8,7 +8,7 @@ module ActiveAdminRole
 
         controller.resource_class.roles.each_key do |role|
           batch_action "assign as #{role}" do |ids|
-            formatted_ids = ids - [current_admin_user.id.to_s]
+            formatted_ids = ids - [active_admin_role_current_user.try!(:id).to_s]
             resource_class.where(id: formatted_ids).update_all(role: resource_class.roles[role])
 
             if Rails::VERSION::MAJOR >= 5

data/lib/active_admin_role/active_admin/resource_controller.rb

@@ -16,6 +16,14 @@ module ActiveAdminRole
       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_method_name
+        ActiveAdminRole.config.current_user_method_name
+      end
     end
   end
 end

data/lib/active_admin_role/config.rb

@@ -1,6 +1,6 @@
 module ActiveAdminRole
   class Config
-    attr_accessor :roles, :super_user_roles, :guest_user_roles, :user_class_name, :default_state
+    attr_accessor :roles, :super_user_roles, :guest_user_roles, :user_class_name, :default_state, :current_user_method_name
 
     def initialize
       @roles            = { guest: 0, support: 1, staff: 2, manager: 3, admin: 99 }
@@ -8,6 +8,7 @@ module ActiveAdminRole
       @super_user_roles = [:admin]
       @user_class_name  = "AdminUser"
       @default_state    = :cannot
+      @current_user_method_name = "current_admin_user"
     end
 
     def default_state=(value)

data/lib/active_admin_role/manageable_resource.rb

@@ -3,7 +3,8 @@ require "set"
 module ActiveAdminRole
   class ManageableResource
     def call
-      ::ActiveAdmin.application.namespaces[:admin].resources.inject([]) do |result, resource|
+      namespace = ::ActiveAdmin.application.default_namespace
+      ::ActiveAdmin.application.namespaces[namespace].resources.inject([]) do |result, resource|
         class_name = resource.controller.resource_class.to_s
         name       = resource.resource_name.name
         actions    = collect_defined_actions(resource)

data/lib/active_admin_role/version.rb

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

data/lib/generators/active_admin_role/templates/initializer.rb

@@ -12,6 +12,10 @@ ActiveAdminRole.configure do |config|
   # == User class name | default: 'AdminUser'
   config.user_class_name = "<%= model_class_name %>"
 
+  # [Optional:String]
+  # == method name of #current_user in Controller
+  config.current_user_method_name = "current_<%= model_class_name.underscore.tr('/', '_') %>"
+
   # [Optional:Symbol]
   # == Default permission | default: :cannot
   config.default_state = :cannot

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_role
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yoshiyuki Hirano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Role based authorization with CanCanCan for Active Admin