ecm_rbac 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 696bacc1b0dd1799b577487bb2c74ff765eb1f39
-  data.tar.gz: 7adf7dcd893a17b2f8acf30415c76760b11ee6e8
+  metadata.gz: 9c8b02d4a0eaf040af21b2231717895fd91d5ac9
+  data.tar.gz: 28e37f1b4a9f72e7b01ef2680303eef2fba980fc
 SHA512:
-  metadata.gz: 4774a3d21f04dafd94cc30c44e1038c26a3c73574d798de3208a2372e9d5ec05e7deb547cf9d46686658314d14908e89be7e2885aa82332b0bfa84978211e663
-  data.tar.gz: 481f896cf39216c1b001fc353752101626dd43e1b770ee612ddfe3e7b592b371c38ab73507b0d51b60f1bab706e63df626d2290f3d26865140c6921b7b8bf1b7
+  metadata.gz: 9dfc2054a5bfc480127a46d2406768fb10c3fa38f0a6133c7e422c3805466445dbaa47ad4558d5cdb1d949bbd5ccfb5fc24b5c99840d2f63d0df4e40f005b12d
+  data.tar.gz: 493aa5e35112db5f9c0f5ced6df6db8428dfb73b4291b0b762933efa063555a707e2a3eb48cc1a5c600d120f46aad5da5db1c30e1eb7b6de0e0056e3ec76cbf7

data/app/services/ecm/rbac/application_service.rb

@@ -0,0 +1,8 @@
+module Ecm
+  module Rbac
+    class ApplicationService < Rails::AddOns::Service::Base
+      class Result < Rails::AddOns::Service::Result::Base
+      end
+    end
+  end
+end

data/app/services/ecm/rbac/import_default_permissions_service.rb

@@ -2,8 +2,8 @@ require_dependency 'itsf_services'
 require_dependency 'active_model/validations/file_readability_validator'
 
 module Ecm::Rbac
-  class ImportDefaultPermissionsService < Itsf::Services::V2::Service::Base
-    class Response < Itsf::Services::V2::Response::Base
+  class ImportDefaultPermissionsService < ApplicationService
+    class Result < ApplicationService::Result
       attr_accessor :permissions, :roles, :role_permissions
     end
 
@@ -11,27 +11,24 @@ module Ecm::Rbac
 
     validates :filename, file_readability: true
 
-    def do_work
-      say 'Start'
-      say 'Validating input', indent: 1
-      unless valid?
-        say "Inputs are invalid. Errors: #{errors.full_messages.to_sentence}", indent: 1
-        say 'Aborted'
-        return response 
+    def _perform
+      say 'Validating input' do
+        unless valid?
+          say "Inputs are invalid. Errors: #{errors.full_messages.to_sentence}"
+          say 'Aborted'
+          return
+        end
       end
-      say 'Input is valid', indent: 1
 
-      return response unless load_yaml
-      return response unless yaml_structure_valid?
+      return unless load_yaml
+      return unless yaml_structure_valid?
 
       load_permissions
       load_roles
 
-      response.permissions = create_or_update_permissions
-      response.roles = create_or_update_roles
-      response.role_permissions = create_or_update_role_permissions
-      say 'Done'
-      respond
+      @result.permissions = create_or_update_permissions
+      @result.roles = create_or_update_roles
+      @result.role_permissions = create_or_update_role_permissions
     end
 
     private
@@ -46,7 +43,7 @@ module Ecm::Rbac
           permission.save!
         end
       end
-      say "Saved #{permissions.count} permissions", indent: 1
+      say "Saved #{permissions.count} permissions"
       permissions
     end
 
@@ -56,14 +53,14 @@ module Ecm::Rbac
           role.save!
         end
       end
-      say "Saved #{roles.count} roles", indent: 1
+      say "Saved #{roles.count} roles"
       roles
     end
 
     def create_or_update_role_permissions
       role_permissions = @roles.collect do |role_identifier, permissions|
         role = Ecm::Rbac::Role.where(identifier: role_identifier).first
-        permissions.collect do |permission_identifier|
+        (permissions ||[]).collect do |permission_identifier|
           permission = Ecm::Rbac::Permission.where(identifier: permission_identifier).first
 
           Ecm::Rbac::RolePermission.where(role_id: role, permission_id: permission).first_or_initialize.tap do |role_permission|
@@ -71,33 +68,33 @@ module Ecm::Rbac
           end
         end
       end.flatten
-      say "Saved #{role_permissions.count} role permissions", indent: 1
+      say "Saved #{role_permissions.count} role permissions"
       role_permissions
     end
 
     def load_permissions
-      @permissions = @yaml[:defaults][:permissions]
-      say "Loaded #{@permissions.size} permissions", indent: 1
+      @permissions = @yaml[:defaults][:permissions] || []
+      say "Loaded #{@permissions.size} permissions"
     end
 
     def load_roles
-      @roles = @yaml[:defaults][:roles]
-      say "Loaded #{@roles.size} roles", indent: 1
+      @roles = @yaml[:defaults][:roles] || []
+      say "Loaded #{@roles.size} roles"
     end
 
     def load_yaml
       yaml = YAML.load_file(filename)
       if yaml
-        say "Loaded YAML from #{filename}", indent: 1
+        say "Loaded YAML from #{filename}"
         @yaml = yaml.with_indifferent_access
       else
-        say "Could not load YAML from #{filename}", indent: 1
+        say "Could not load YAML from #{filename}"
         @yaml = yaml
       end
     end
 
     def yaml_structure_valid?
-      say "Checking for valid YAML structure", indent: 1
+      say "Checking for valid YAML structure"
       unless @yaml.is_a?(Hash)
         add_error_and_say(:yaml_file, "Expected file content of #{filename} to parse to a Hash, but was #{@yaml.class}")
         return false

data/app/views/ecm/rbac/_current_user_additional_table_rows.haml

@@ -0,0 +1,2 @@
+= table.association Ecm::Rbac::Role.model_name.human(count: :other) do |resource|
+  - resource.roles.map(&:identifier).join(', ')

data/lib/ecm/rbac/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Rbac
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/lib/ecm_rbac.rb

@@ -1,2 +1,4 @@
+require 'rails-add_ons'
+
 require 'ecm/rbac'
 require 'ecm/rbac/engine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_rbac
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,7 +44,9 @@ files:
 - app/models/ecm/rbac/role.rb
 - app/models/ecm/rbac/role_permission.rb
 - app/models/ecm/rbac/user_role.rb
+- app/services/ecm/rbac/application_service.rb
 - app/services/ecm/rbac/import_default_permissions_service.rb
+- app/views/ecm/rbac/_current_user_additional_table_rows.haml
 - app/views/layouts/ecm/rbac/application.html.erb
 - config/initializers/inject_user_concern.rb
 - config/locales/de.yml