arpa 0.2.0 → 0.3.0

data/lib/arpa/services/profiles/profile_manager_creator.rb

@@ -15,7 +15,6 @@ module Arpa
         def profile_creator
           @profile_creator ||= Arpa::Services::Profiles::Create::ProfileCreator.new
         end
-
       end
     end
   end

data/lib/arpa/services/profiles/profile_manager_remover.rb

@@ -17,7 +17,6 @@ module Arpa
         def profile_remover
           @profile_remover ||= Arpa::Services::Profiles::Remove::ProfileRemover.new
         end
-
       end
     end
   end

data/lib/arpa/services/profiles/profile_manager_updater.rb

@@ -15,7 +15,6 @@ module Arpa
         def profile_updater
           @profile_updater ||= Arpa::Services::Profiles::Update::ProfileUpdater.new
         end
-
       end
     end
   end

data/lib/arpa/services/profiles/remove/profile_remover.rb

@@ -3,7 +3,6 @@ module Arpa
     module Profiles
       module Remove
         class ProfileRemover
-
           def remove(entity, disable = false)
             if disable
               remover_repo.disable(entity)
@@ -17,7 +16,6 @@ module Arpa
           def remover_repo
             @remover_repo ||= Arpa::Repositories::Profiles::Remover.new
           end
-
         end
       end
     end

data/lib/arpa/services/profiles/update/profile_updater.rb

@@ -3,7 +3,6 @@ module Arpa
     module Profiles
       module Update
         class ProfileUpdater
-
           def update(params)
             profile = profile_instance(params)
             validate_profile(profile)
@@ -24,7 +23,6 @@ module Arpa
           def updater_repo
             @updater_repo ||= Arpa::Repositories::Profiles::Updater.new
           end
-
         end
       end
     end

data/lib/arpa/services/resources/create/resource_creator.rb

@@ -3,7 +3,6 @@ module Arpa
     module Resources
       module Create
         class ResourceCreator
-
           def create(resourceable)
             resource = resource_instance(resourceable)
 
@@ -34,7 +33,6 @@ module Arpa
           def creator_repo
             @creator_repo ||= Arpa::Repositories::Resources::Creator.new
           end
-
         end
       end
     end

data/lib/arpa/services/resources/remove/resource_remover.rb

@@ -3,15 +3,13 @@ module Arpa
     module Resources
       module Remove
         class ResourceRemover
-
           def remove_nonexistent_resources(resourceables)
-            resourceables_names = resourceables.map { |r| r.to_s }
+            resourceables_names = resourceables.map(&:to_s)
 
             finder_repo.all.each do |resource|
               exist = resourceables_names.include?(resource.full_name)
               remover_repo.destroy(resource) unless exist
             end
-
           end
 
           private
@@ -23,7 +21,6 @@ module Arpa
           def remover_repo
             @remover_repo ||= Arpa::Repositories::Resources::Remover.new
           end
-
         end
       end
     end

data/lib/arpa/services/resources/resource_manager_creator.rb

@@ -42,10 +42,9 @@ module Arpa
         end
 
         def action_params(resource, resourceable, except_action_methods)
-          actions_names = resourceable.action_methods.select{ |action| !except_action_methods.include?(action) }
+          actions_names = resourceable.action_methods.reject { |action| except_action_methods.include?(action) }
           { resource: resource, actions_names: actions_names }
         end
-
       end
     end
   end

data/lib/arpa/services/roles/create/role_creator.rb

@@ -3,7 +3,6 @@ module Arpa
     module Roles
       module Create
         class RoleCreator
-
           def create(params)
             role = role_instance(params)
             validate_role(role)
@@ -24,10 +23,8 @@ module Arpa
           def creator_repo
             @creator_repo ||= Arpa::Repositories::Roles::Creator.new
           end
-
         end
       end
     end
   end
 end
-

data/lib/arpa/services/roles/remove/role_remover.rb

@@ -3,7 +3,6 @@ module Arpa
     module Roles
       module Remove
         class RoleRemover
-
           def remove(entity)
             if entity.has_profile?
               remover_repo.disable(entity)
@@ -17,7 +16,6 @@ module Arpa
           def remover_repo
             @remover_repo ||= Arpa::Repositories::Roles::Remover.new
           end
-
         end
       end
     end

data/lib/arpa/services/roles/role_manager_creator.rb

@@ -15,9 +15,7 @@ module Arpa
         def role_creator
           @role_creator ||= Arpa::Services::Roles::Create::RoleCreator.new
         end
-
       end
     end
   end
 end
-

data/lib/arpa/services/roles/role_manager_remover.rb

@@ -16,7 +16,6 @@ module Arpa
         def role_remover
           @role_remover ||= Arpa::Services::Roles::Remove::RoleRemover.new
         end
-
       end
     end
   end

data/lib/arpa/services/roles/role_manager_updater.rb

@@ -15,7 +15,6 @@ module Arpa
         def role_updater
           @role_updater ||= Arpa::Services::Roles::Update::RoleUpdater.new
         end
-
       end
     end
   end

data/lib/arpa/services/roles/update/role_updater.rb

@@ -3,7 +3,6 @@ module Arpa
     module Roles
       module Update
         class RoleUpdater
-
           def update(params)
             role = role_instance(params)
             validate_role(role)
@@ -24,7 +23,6 @@ module Arpa
           def updater_repo
             @updater_repo ||= Arpa::Repositories::Roles::Updater.new
           end
-
         end
       end
     end

data/lib/arpa/services/verifier.rb

@@ -1,7 +1,6 @@
 module Arpa
   module Services
     class Verifier
-
       def initialize(current_user)
         @current_user = current_user
       end

data/lib/arpa/validators/action_validator.rb

@@ -11,7 +11,6 @@ module Arpa
         @name        = action.name
         @resource_id = action.resource_id
       end
-
     end
   end
 end

data/lib/arpa/validators/profile_validator.rb

@@ -13,7 +13,6 @@ module Arpa
         @description = profile.description
         @role_ids    = profile.role_ids
       end
-
     end
   end
 end

data/lib/arpa/validators/resource_validator.rb

@@ -11,7 +11,6 @@ module Arpa
         @full_name = resource.full_name
         @name      = resource.name
       end
-
     end
   end
 end

data/lib/arpa/validators/role_validator.rb

@@ -8,13 +8,11 @@ module Arpa
       validates :name, :description, presence: true
       validates :action_ids, presence: { message: :many_blank }
 
-
       def initialize(role)
         @name        = role.name
         @description = role.description
         @action_ids  = role.action_ids
       end
-
     end
   end
 end

data/lib/arpa/version.rb

@@ -1,3 +1,3 @@
 module Arpa
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'.freeze
 end

data/lib/generators/arpa/controllers_generator.rb

@@ -1,7 +1,7 @@
 module Arpa
   module Generators
     class ControllersGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_resources_views_files
         copy_file 'views/resources/index.html.erb', 'app/views/arpa/resources/index.html.erb'
@@ -31,29 +31,28 @@ module Arpa
       end
 
       def add_routes
-        route <<-RUBY
-scope module: :arpa do
-    resources :resources do
-      collection do
-        get 'generate_resources_and_actions'
-      end
-    end
-
-    resources :roles do
-      collection do
-        delete ':id', to: 'roles#remove'
-      end
-    end
-
-    resources :profiles do
-      collection do
-        delete ':id', to: 'profiles#remove'
-      end
-    end
-  end
+        route <<~RUBY
+          scope module: :arpa do
+              resources :resources do
+                collection do
+                  get 'generate_resources_and_actions'
+                end
+              end
+
+              resources :roles do
+                collection do
+                  delete ':id', to: 'roles#remove'
+                end
+              end
+
+              resources :profiles do
+                collection do
+                  delete ':id', to: 'profiles#remove'
+                end
+              end
+            end
         RUBY
       end
-
     end
   end
 end

data/lib/generators/arpa/install_generator.rb

@@ -3,7 +3,7 @@ module Arpa
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      source_root File.expand_path("..", __FILE__)
+      source_root File.expand_path(__dir__)
 
       desc <<-DESC.strip_heredoc
        The Name of table to create the associate table.
@@ -11,7 +11,7 @@ module Arpa
        E.g. users, admins.
 
        By default is 'users'
-       DESC
+      DESC
 
       argument :associate_table, required: false
 
@@ -25,11 +25,11 @@ module Arpa
       argument :associate_primary_key, required: false
 
       def self.next_migration_number(dirname)
-        return Time.new.utc.strftime("%Y%m%d%H%M%S") if ActiveRecord::Base.timestamped_migrations
-        "%.3d" % (current_migration_number(dirname) + 1)
+        return Time.new.utc.strftime('%Y%m%d%H%M%S') if ActiveRecord::Base.timestamped_migrations
+        format('%.3d', (current_migration_number(dirname) + 1))
       end
 
-      desc "Create a migrate file with all necessery tables including the associate table."
+      desc 'Create a migrate file with all necessery tables including the associate table.'
 
       def create_migrate_files
         @associate_table       ||= 'users'
@@ -40,7 +40,6 @@ module Arpa
       def copy_locales
         copy_file '../../config/locales/arpa.en.yml', 'config/locales/arpa.en.yml'
       end
-
     end
   end
 end

data/lib/generators/arpa/templates/controllers/profiles_controller.rb

@@ -1,6 +1,6 @@
 module Arpa
   class ProfilesController < ApplicationController
-    before_action :set_profile, only: [:show, :edit, :update, :remove]
+    before_action :set_profile, only: %i[show edit update remove]
 
     # GET /profiles
     def index
@@ -8,8 +8,7 @@ module Arpa
     end
 
     # GET /profiles/1
-    def show
-    end
+    def show; end
 
     # GET /profiles/new
     def new
@@ -24,49 +23,42 @@ module Arpa
 
     # POST /profiles
     def create
-      profile_creator.create({profile: profile_params}, {
-        success: -> (profile) {
-          redirect_to profile_path(profile.id), notice: I18n.t('flash.actions.create_profile.notice')
-        },
-        fail: -> (error) {
-          @profile = Arpa::Entities::Profile.new(profile_params)
-          @error = error
-          all_roles
-          render :new
-        }
-      })
+      profile_creator.create({ profile: profile_params },
+                             success: redirect_to_index(I18n.t('flash.actions.create_profile.notice')),
+                             fail: render_errors(:new))
     end
 
     # PATCH/PUT /profiles/1
     def update
-      profile_updater.update({profile: profile_params}, {
-        success: -> (profile) {
-          redirect_to profile_path(profile.id), notice: I18n.t('flash.actions.update_profile.notice')
-        },
-        fail: -> (error) {
-          @profile = Arpa::Entities::Profile.new(profile_params)
-          @error = error
-          all_roles
-          render :edit
-        }
-      })
+      profile_updater.update({ profile: profile_params },
+                             success: redirect_to_index(I18n.t('flash.actions.update_profile.notice')),
+                             fail: render_errors(:edit))
     end
 
     # DELETE /profiles/1
     def remove
-      profile_remover.remove({profile: @profile}, {
-        success: -> (profile) {
-          redirect_to profiles_path, notice: I18n.t('flash.actions.remove_profile.notice')
-        },
-        fail: -> (error) {
-          redirect_to profiles_path, notice: I18n.t('flash.actions.remove_profile.alert')
-        }
-      })
-
+      profile_remover.remove({ profile: @profile },
+                             success: redirect_to_index(I18n.t('flash.actions.remove_profile.notice')),
+                             fail: redirect_to_index(I18n.t('flash.actions.remove_profile.alert')))
     end
 
     private
 
+    def redirect_to_index(message)
+      lambda do |profile|
+        redirect_to profile_path(profile.id), notice: message
+      end
+    end
+
+    def render_errors(action_to_render)
+      lambda do |error|
+        @profile = Arpa::Entities::Profile.new(profile_params)
+        @error = error
+        all_roles
+        render action_to_render
+      end
+    end
+
     def profile_creator
       @profile_creator ||= Arpa::Services::Profiles::ProfileManagerCreator.new
     end
@@ -96,9 +88,11 @@ module Arpa
     end
 
     def profile_params
-      params.require(:profile).
-        permit(:id, :name, :description, :entity_id, :entity_class, role_ids: [])
-    end
+      permitted_params = %i[id name description entity_id entity_class]
 
+      params.require(:profile)
+            .permit(permitted_params, role_ids: [])
+            .to_h
+    end
   end
 end