ecm_rbac 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1feb82ef4079a706e347f4d078baab0ce0c7b3f2
-  data.tar.gz: b687b68b10b41e56508f88f71f231baf40ed01d9
+  metadata.gz: 696bacc1b0dd1799b577487bb2c74ff765eb1f39
+  data.tar.gz: 7adf7dcd893a17b2f8acf30415c76760b11ee6e8
 SHA512:
-  metadata.gz: 815e397258d4666e729f822a2b138bc358d034075fad297b1cb9c4d7e9f342275a0e71044cdd883198525a2a075c3223de01d5a50aac9e86c42dbd230ce034ac
-  data.tar.gz: 71ccff3b7bb357614af83f010b00ce07350e57ea2bf98df4ddac62915a18fae2034050b43518d5c3b3fc7884686bcfecaa12c31bbae55d4d77df1f8b3787c6dd
+  metadata.gz: 4774a3d21f04dafd94cc30c44e1038c26a3c73574d798de3208a2372e9d5ec05e7deb547cf9d46686658314d14908e89be7e2885aa82332b0bfa84978211e663
+  data.tar.gz: 481f896cf39216c1b001fc353752101626dd43e1b770ee612ddfe3e7b592b371c38ab73507b0d51b60f1bab706e63df626d2290f3d26865140c6921b7b8bf1b7

data/app/models/ecm/rbac/role.rb

@@ -6,12 +6,12 @@ module Ecm::Rbac
 
     DEFAULTS = {
       enabled_from: '01.01.1900 00:00:00',
-      enabled_to: '31.12.9999 23:59:59'
+      enabled_to:   '31.12.9999 23:59:59'
     }
 
     # associations
     has_many :user_roles, class_name:  'Ecm::Rbac::UserRole', inverse_of: :role
-    has_many :users, through: :user_roles # , class_name: Ecm::Rbac::Configuration.user_class
+    has_many :users, through: :user_roles
 
     has_many :role_permissions, class_name: 'Ecm::Rbac::RolePermission'
     has_many :permissions, class_name: 'Ecm::Rbac::Permission', through: :role_permissions
@@ -37,7 +37,7 @@ module Ecm::Rbac
     def set_defaults
       return if persisted?
       self.enabled_from = DEFAULTS[:enabled_from]
-      self.enabled_to = DEFAULTS[:enabled_to]
+      self.enabled_to   = DEFAULTS[:enabled_to]
     end
   end
 end

data/app/models/ecm/rbac/role_permission.rb

@@ -6,9 +6,11 @@ module Ecm::Rbac
     has_many :user_roles, through: :role
     has_many :users, through: :user_roles
 
-    # belongs_to :enabled_permission, foreign_key: 'permission_id', class_name: 'Ecm::Rbac::Permission'
-
-    belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role'
+    if Rails.version >= '5.0.0'
+      belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role', optional: true
+    else
+      belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role'
+    end
     has_many :enabled_user_roles, through: :enabled_role, source: :user_roles
     has_many :enabled_users, through: :enabled_user_roles, source: :enabled_role_permissions
 

data/app/models/ecm/rbac/user_role.rb

@@ -2,10 +2,13 @@ module Ecm::Rbac
   class UserRole < ActiveRecord::Base
     # associations
     belongs_to :user, class_name: Ecm::Rbac::Configuration.user_class_name, foreign_key: 'user_id', inverse_of: :user_roles
-    # belongs_to :enabled_user, foreign_key: 'user_id', class_name: 'User'
     belongs_to :role, inverse_of: :user_roles
 
-    belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role'
+    if Rails.version >= '5.0.0'
+      belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role', optional: true
+    else
+      belongs_to :enabled_role, -> { enabled }, foreign_key: 'role_id', class_name: 'Ecm::Rbac::Role'
+    end
     has_many :enabled_role_permissions, through: :enabled_role, source: :user_roles, class_name: 'Ecm::Rbac::RolePermission'
     has_many :enabled_permissions, through: :enabled_role_permissions, class_name: 'Ecm::Rbac::Permission', source: :permission
 

data/config/initializers/inject_user_concern.rb

@@ -0,0 +1,6 @@
+Rails.configuration.to_prepare do
+  puts "Including Model::Ecm::Rbac::UserConcern in #{Ecm::Rbac.user_class_name}"
+  Ecm::Rbac.user_class_name.constantize.class_eval do
+    include Model::Ecm::Rbac::UserConcern
+  end
+end

data/config/locales/de.yml

@@ -2,6 +2,7 @@ de:
   activerecord:
     attributes:
       ecm/rbac/permission:
+        id: ID
         actions: Aktionen
         created_at: Erstellt am
         enabled?: Aktiv
@@ -10,6 +11,7 @@ de:
         identifier: Bezeichner
         updated_at: Aktualisiert am
       ecm/rbac/role:
+        id: ID
         actions: Aktionen
         created_at: Erstellt am
         enabled?: Aktiv
@@ -17,6 +19,22 @@ de:
         enabled_to: Aktiv bis
         identifier: Bezeichner
         updated_at: Aktualisiert am
+      ecm/rbac/role_permission:
+        id: ID
+        role: Rolle
+        role_id: Rolle
+        permission: Berechtigung
+        permission_id: Berechtigung
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
+      ecm/rbac/user_role:
+        id: ID
+        user: Benutzer
+        user_id: Benutzer
+        role: Rolle
+        role_id: Rolle
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
     models:
       ecm/rbac/permission:
         one: Berechtigung
@@ -24,6 +42,12 @@ de:
       ecm/rbac/role:
         one: Rolle
         other: Rollen
+      ecm/rbac/role_permission:
+        one: Rollen-Berechtigung
+        other: Rollen-Berechtigungen
+      ecm/rbac/user_role:
+        one: Benutzer-Rolle
+        other: Benutzer-Rollen
   classes:
     ecm/rbac/import_default_permissions_service: "Dienst zum Einrichten von Berechtigungen"
   routes:

data/config/locales/en.yml

@@ -0,0 +1,54 @@
+en:
+  activerecord:
+    attributes:
+      ecm/rbac/permission:
+        id: ID
+        actions: Actions
+        created_at: Created at
+        enabled?: Active
+        enabled_from: Enabled from
+        enabled_to: Enabled to
+        identifier: Identifier
+        updated_at: Updated at
+      ecm/rbac/role:
+        id: ID
+        actions: Actions
+        created_at: Created at
+        enabled?: Active
+        enabled_from: Enabled from
+        enabled_to: Enabled to
+        identifier: Identifier
+        updated_at: Updated at
+      ecm/rbac/role_permission:
+        id: ID
+        role: Role
+        role_id: Role
+        permission: Permission
+        permission_id: Permission
+        created_at: Created at
+        updated_at: Updated at
+      ecm/rbac/user_role:
+        id: ID
+        user: User
+        user_id: User
+        role: Role
+        role_id: Role
+        created_at: Created at
+        updated_at: Updated at
+    models:
+      ecm/rbac/permission:
+        one: Permission
+        other: Permissions
+      ecm/rbac/role:
+        one: Role
+        other: Roles
+      ecm/rbac/role_permission:
+        one: Role Permission
+        other: Role Permissions
+      ecm/rbac/user_role:
+        one: User Role
+        other: User Roles
+  classes:
+    ecm/rbac/import_default_permissions_service: "Import default permissions service"
+  routes:
+    ecm_rbac_engine: rbac

data/lib/ecm/rbac/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_rbac
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -46,7 +46,9 @@ files:
 - app/models/ecm/rbac/user_role.rb
 - app/services/ecm/rbac/import_default_permissions_service.rb
 - app/views/layouts/ecm/rbac/application.html.erb
+- config/initializers/inject_user_concern.rb
 - config/locales/de.yml
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20160301103116_create_ecm_rbac_roles.rb
 - db/migrate/20160301103202_create_ecm_rbac_user_roles.rb