role_core 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293e6cf06bd28270f0d19f2d20f57ea8387849067b324fcfea3fb627cb11c841
-  data.tar.gz: d1e32d432228cc32598e0309474179d7eaea3fc9734be71fc5f3717dd27b5ebb
+  metadata.gz: 63f9af3dc716a40099563d28bc8f409c0ae479eef42ece8ddd24fa3a90ab48c9
+  data.tar.gz: 44e757638be123b0877bf868814f712f920b48e5b8f3bb950fc83c1e4f649a62
 SHA512:
-  metadata.gz: 8c6d27326c402fe05183bd06840c84621093905efb98beafc9969c1d8847e9268f26e990ffaec62436ae9bc8316d10afe4080dac7eda9abe6e374de6edc1042e
-  data.tar.gz: 74385a5cce46f0202ea498916fa7471added4ad6185b13f19d2dcd7eac1d2810c9d159a0f535bf691d80fe6c5ffdc0dfcd06d59260e582c48c824396c346a4aa
+  metadata.gz: 4151358dfb0e084f9e5c3be912ba6e605610fe80ef1bce0af72c01120df8c8f9061554dc427f00fbcc611bc5050a59c512828b7b0945d128b45eaad0bfdb954f
+  data.tar.gz: 5827598c230b815ef22ba4db1d08f21136495d96419430a5e86c92f48d9790244a8988e0712c80485c8346a01027df2066dfd60032b70e0735a0ecd3dbf3889d

data/lib/generators/role_core/config/templates/role_core.en.yml

@@ -1,8 +1,8 @@
 en:
   role_core:
     models: # Defined by `group` place here
-#      project: Project
-#      task: Task
+#      project: Projects
+#      project/task: Tasks # A nested group
     attributes:
 #      global: # Top-level permissions
 #        foo: Foo
@@ -11,10 +11,11 @@ en:
 #        create: New project
 #        destroy: Destroy project
 #        update: Edit project
-#        read: Read project
-#        read_public: Read public project
-#      task:
+#        read: Read projects
+#        read_public: Read public projects
+#      project/task:
 #        create: New task
 #        destroy: Destroy task
 #        update: Edit task
 #        update_my_own: Edit my own task
+#        destroy_my_own: Destroy my own task

data/lib/generators/role_core/config/templates/role_core.rb

@@ -42,11 +42,11 @@ RoleCore.permission_set_class.draw do
   #   can :create, Project
   #   can :destroy, Plan
   #
-  # You can pass `priority` argument to `permission`
+  # You can pass `_priority` argument to `permission`
   #
   #   group :project, model_name: "Project" do
   #     permission :read_public,
-  #     permission :read, priority: 1
+  #     permission :read, _priority: 1
   #   end
   #
   # That will made 'read' prior than `read_public`.

data/lib/role_core/contrib/can_can_can_permission.rb

@@ -4,7 +4,7 @@ module RoleCore
   class CanCanCanPermission < RoleCore::Permission
     attr_reader :action, :options
 
-    def initialize(name, priority: 0, **options, &block)
+    def initialize(name, _namespace: [], _priority: 0, **options, &block)
       super
 
       @model = options[:model] || options.fetch(:model_name).constantize

data/lib/role_core/mapper.rb

@@ -4,6 +4,7 @@ module RoleCore
   class Mapper
     def initialize(set, **constraints) #:nodoc:
       @constraints = constraints
+      @constraints[:_namespace] ||= []
       @set = set
     end
 
@@ -16,11 +17,15 @@ module RoleCore
       raise ArgumentError, "`name` can't be blank" if name.blank?
       raise ArgumentError, "must provide a block" unless block_given?
 
+      constraints[:_namespace] ||= @constraints[:_namespace].dup
+      constraints[:_namespace] << name
+
       sub_permission_set_class =
         if @set.nested_classes.has_key?(name)
           @set.nested_classes[name]
         else
-          klass = PermissionSet.derive "#{name.to_s.classify}"
+          klass_name = constraints[:_namespace].map { |n| n.to_s.classify }.join("::")
+          klass = PermissionSet.derive klass_name
           @set.embeds_one(name, anonymous_class: klass)
 
           klass

data/lib/role_core/permission.rb

@@ -2,11 +2,12 @@
 
 module RoleCore
   class Permission
-    attr_reader :name, :priority
+    attr_reader :name, :namespace, :priority
 
-    def initialize(name, priority: 0, **options, &block)
+    def initialize(name, _namespace: [], _priority: 0, **options, &block)
       @name = name
-      @priority = priority
+      @namespace = _namespace
+      @priority = _priority
     end
 
     def call(context, *)

data/lib/role_core/permission_set.rb

@@ -20,6 +20,10 @@ module RoleCore
         :role_core
       end
 
+      def use_relative_model_naming?
+        true
+      end
+
       def permission_class
         @permission_class || RoleCore.permission_class
       end

data/lib/role_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RoleCore
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: role_core
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - jasl