permissify 0.0.25 → 0.0.26

data/lib/generators/permissify/controller/controller_generator.rb

@@ -5,7 +5,6 @@ module Permissify
 
       def generate_controller
         copy_file "permissions_controller.rb", "app/controllers/permissions_controller.rb"
-        copy_file "permissified_controller.rb", "app/controllers/permissified_controller.rb"
       end
     end
   end

data/lib/generators/permissify/product/product_generator.rb

@@ -7,7 +7,7 @@ module Permissify
         
         copy_file "product.rb",   "app/models/product.rb"
         copy_file "products.rb",  "app/models/system_fixtures/products.rb"
-        copy_file "controller.rb","app/helpers/products_controller.rb"
+        copy_file "controller.rb","app/controllers/products_controller.rb"
         copy_file "helper.rb",    "app/helpers/products_helper.rb"
         
         directory "interface",    "app/models/permissified_products_interface"

data/lib/permissify/controller.rb

@@ -33,10 +33,27 @@ module Permissify
     end
     
     def permissified_model_permissions(applicablity)
-      permissified_model_method = self.class::PERMISSIFY[applicablity]
+
+      # There is some app-specific glue between the *applicability* tags specified when *abilities* are created (abilities.rb)
+      #   and the ability/permission applicability that a permissifed object obtained from an app-supplied controller method governs.
+      # In more tangible terms:
+      # - the User obtained from the controller method 'current_user'
+      #   contributes permissions for abilities which apply to the 'Role' applicability tag
+      # - the merchant (or brand or ...) obtained from the controller method 'current_entity'
+      #   contributes permissions for abilities which apply to the 'Product' applicability tag
+      
+      # Define PERMISSIFY in your application_controller when your app does not conform with the conventional_permissify_map.
+      
+      permissify_map = defined?(self.class::PERMISSIFY) ? self.class::PERMISSIFY : conventional_permissify_map
+      permissified_model_method = permissify_map[applicablity]
       permissified_model = send(permissified_model_method)
       permissified_model ? permissified_model.permissions : Hash.new({})
     end
     
+    def conventional_permissify_map
+      { Role::PERMISSIFIED_ABILITY_APPLICABILITY => :current_user,
+        Product::PERMISSIFIED_ABILITY_APPLICABILITY => :current_entity,
+      }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -69,5 +69,5 @@ class PermissifiedControllerish
   include Permissify::Controller
   PERMISSIFY =  { Userish::PERMISSIFIED_ABILITY_APPLICABILITY => :current_user,
                   Entityish::PERMISSIFIED_ABILITY_APPLICABILITY => :current_entity,
-                } # in lieu of 'include PermissifiedController'
+                }
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: permissify
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Frederick Fix
@@ -62,7 +62,6 @@ files:
 - lib/generators/permissify/ability/template/ability.rb
 - lib/generators/permissify/ability/USAGE
 - lib/generators/permissify/controller/controller_generator.rb
-- lib/generators/permissify/controller/template/permissified_controller.rb
 - lib/generators/permissify/controller/template/permissions_controller.rb
 - lib/generators/permissify/controller/USAGE
 - lib/generators/permissify/install/install_generator.rb

data/lib/generators/permissify/controller/template/permissified_controller.rb

@@ -1,10 +0,0 @@
-module PermissifiedController # Interfaces : override/rewrite as needed for your app
-  
-  # controller-accessible methods that app has implemented to access models that have been permissified.
-  PERMISSIFY = SPECIFY_PERMISSIFIED_MODEL_LIST_IN__APP__CONTROLLERS__PERMISSIFIED_CONTROLLER
-
-  # PERMISSIFY =  { User::PERMISSIFIED_ABILITY_APPLICABILITY => :current_user,
-  #                 Product::PERMISSIFIED_ABILITY_APPLICABILITY => :current_entity,
-  #               }
-  
-end