para-acl 0.2.0.a → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7247c40349650b922ab484aa17f4b6147f345819
-  data.tar.gz: 568f9572af8b918f2989a5c61a3cfb0447aba148
+  metadata.gz: 6831e21dedb07eaaa49215ebbbacd35cacdbabb5
+  data.tar.gz: 7cbc10e24b9a67e20cf2bf2e22b6c46c809e0e09
 SHA512:
-  metadata.gz: 8c2f9809fe55b65e1065cf3cdac5d8690ddfdc418a41b1e503520b31bc50f40bb87226bd0c12914be5a1cd1bdbd19f27657aeac7d517dd33ee753080c4559147
-  data.tar.gz: f943c36fe06b38c145b6a71e101cd1bb28ea1aab6cbd13bed832fbcef2f9cb7a39774b101c32acd3327f6e31fc74bacd97f0fd3d73adbc6d75ac8fdf74a24b20
+  metadata.gz: 89aafe69c9079f39e77e6f7055218053dcf0658dbeda4154a757d853416f2e904a52f5709185263983b914ff2b5acba6c890d57e7808e0b52404d766b286d965
+  data.tar.gz: 73db47e95840e6576e51b9d7293fb3b6b78b9307f4b0069006ee90924f7674c1eb328853c5c8b2e82038a193eef112f4e1a0c1e7106311656eb998e53dc5d827

data/app/components/acl_roles_component.rb

@@ -1,4 +1,4 @@
-class AclRolesComponent < Para::Component::Crud
+class AclRolesComponent < Para::Component::Base
   register :acl_roles, self
 
   def resources
@@ -8,4 +8,8 @@ class AclRolesComponent < Para::Component::Crud
   def model_type
     '::Para::Acl::Role'
   end
+
+  def model
+    @model ||= model_type.constantize
+  end
 end

data/app/controllers/{admin/para/acl/roles_component_controller.rb → para/acl/admin/acl_roles_component_controller.rb}

@@ -1,7 +1,7 @@
-module Admin
-  module Para
-    module Acl
-      class RolesComponentController < ::Para::Admin::ComponentController
+module Para
+  module Acl
+    module Admin
+      class AclRolesComponentController < ::Para::Admin::ComponentController
         def show
           @components_roles = ::Para::Acl::ComponentRolesCollection.new
         end

data/app/controllers/para/acl/admin/roles_controller.rb

@@ -0,0 +1,9 @@
+module Para
+  module Acl
+    module Admin
+      class RolesController < ::Para::Admin::ResourcesController
+        resource :role, class: 'Para::Acl::Role'
+      end
+    end
+  end
+end

data/app/decorators/acl_roles_component_decorator.rb

@@ -1,9 +1,5 @@
 module AclRolesComponentDecorator
-  include Para::Component::CrudDecorator
-
-  def path(options = {})
-    find_path([:admin, self], options)
-  end
+  include Para::Component::BaseDecorator
 
   def name
     I18n.t('admin.acl_roles.name')

data/app/views/admin/para/acl/roles/_form.html.haml

@@ -1,4 +1,4 @@
-= para_form_for(resource) do |form|
+= para_form_for(resource, url: @component.relation_path(:role, id: resource.id)) do |form|
   = form.tabs do |tabs|
     = tabs.tab :role do
       = form.input :name
@@ -8,7 +8,7 @@
     - if resource.persisted?
       = tabs.tab :destroy_role do
         = form.input :id, label: t('para.shared.destroy') do
-          = link_to @component.relation_path(resource), method: :delete, class: 'btn btn-danger', data: { confirm: t('admin.acl_roles.destroy', role: resource.name) } do
+          = link_to @component.relation_path(:role, id: resource.id), method: :delete, class: 'btn btn-danger', data: { confirm: t('admin.acl_roles.destroy', role: resource.name) } do
             = fa_icon 'times'
             = t('para.shared.destroy')
 

data/app/views/{admin/para/acl/roles_component → para/acl/admin/acl_roles_component}/show.html.haml

@@ -9,7 +9,8 @@
   = para_form_for @components_roles, url: @component.path, as: :components_roles do |form|
     = panel do |panel|
       = panel.header do
-        = add_button_for(@component, :resources, @component.model)
+        = icon_link_to t('para.shared.add'), @component.relation_path(:role, action: :new), icon: 'plus', class: 'btn btn-primary add-button'
+
 
       = resources_table(component: @component, model: @component.model, actions: false) do |table|
         = table.header do
@@ -17,7 +18,7 @@
 
           - @components_roles.roles.each do |role|
             = table.header_for do
-              = link_to @component.relation_path(role, action: :edit) do
+              = link_to @component.relation_path(:role, id: role.id, action: :edit) do
                 = role.name
                 = fa_icon 'pencil'
 

data/lib/para/acl/ext/components_extension.rb

@@ -4,13 +4,10 @@ module Para
       extend ActiveSupport::Concern
 
       included do
-        before_destroy :clean_role_components
-      end
-
-      private
-
-      def clean_role_components
-        ::Para::Acl::RoleComponent.where(component: self).destroy_all
+        has_many :role_components, class_name: 'Para::Acl::RoleComponent',
+                                   foreign_key: :component_id,
+                                   dependent: :destroy
+        has_many :roles, through: :role_components
       end
     end
   end

data/lib/para/acl/routes.rb

@@ -3,9 +3,9 @@ module Para
     class Routes < Para::Plugins::Routes
       def draw
         plugin :acl do
-          component :roles, path: :roles
-          crud_component :roles, path: :roles
-          patch "roles/:component_id" => "roles_component#update"
+          component :acl_roles, path: :roles, actions: [:show, :update] do
+            resources :roles
+          end
         end
       end
     end

data/lib/para/acl/version.rb

@@ -1,5 +1,5 @@
 module Para
   module Acl
-    VERSION = "0.2.0.a"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para-acl
 version: !ruby/object:Gem::Version
-  version: 0.2.0.a
+  version: 0.3.0
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: para
@@ -92,14 +92,14 @@ files:
 - README.md
 - Rakefile
 - app/components/acl_roles_component.rb
-- app/controllers/admin/para/acl/role_resources_controller.rb
-- app/controllers/admin/para/acl/roles_component_controller.rb
+- app/controllers/para/acl/admin/acl_roles_component_controller.rb
+- app/controllers/para/acl/admin/roles_controller.rb
 - app/decorators/acl_roles_component_decorator.rb
 - app/models/para/acl/role.rb
 - app/models/para/acl/role_component.rb
 - app/models/para/acl/user_role.rb
 - app/views/admin/para/acl/roles/_form.html.haml
-- app/views/admin/para/acl/roles_component/show.html.haml
+- app/views/para/acl/admin/acl_roles_component/show.html.haml
 - bin/rails
 - config/locales/fr.yml
 - db/migrate/20151215160816_create_para_acl_roles.rb
@@ -138,9 +138,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/app/controllers/admin/para/acl/role_resources_controller.rb

@@ -1,8 +0,0 @@
-module Admin
-  module Para
-    module Acl
-      class RoleResourcesController < ::Para::Admin::CrudResourcesController
-      end
-    end
-  end
-end