arpa 0.2.0 → 0.3.0

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

@@ -8,27 +8,37 @@ module Arpa
     end
 
     # GET /resources/1
-    def show
-    end
+    def show; end
 
     # GET /generate_resources_and_actions
     def generate_resources_and_actions
       Rails.application.eager_load!
 
-      resource_creator.create({resourceables: ApplicationController.descendants, except_action_methods: ApplicationController.action_methods}, {
-        success: -> (resource) {
-          flash[:notice] = I18n.t('flash.actions.generate_resources_and_actions.notice')
-        },
-        fail: -> (error) {
-          flash[:alert] = I18n.t('flash.actions.generate_resources_and_actions.alert')
-        }
-      })
+      resource_params = {
+        resourceables: ApplicationController.descendants,
+        except_action_methods: ApplicationController.action_methods
+      }
+      resource_creator.create(resource_params,
+                              success: success_callback,
+                              fail: fail_callback)
 
       redirect_to resources_path
     end
 
     private
 
+    def success_callback
+      lambda do |_resource|
+        flash[:notice] = I18n.t('flash.actions.generate_resources_and_actions.notice')
+      end
+    end
+
+    def fail_callback
+      lambda do |_error|
+        flash[:alert] = I18n.t('flash.actions.generate_resources_and_actions.alert')
+      end
+    end
+
     def resource_creator
       @resource_creator ||= Arpa::Services::Resources::ResourceManagerCreator.new
     end
@@ -40,6 +50,5 @@ module Arpa
     def set_resource
       @resource = resource_finder.find(params[:id])
     end
-
   end
 end

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

@@ -1,6 +1,6 @@
 module Arpa
   class RolesController < ApplicationController
-    before_action :set_role, only: [:show, :edit, :update, :remove]
+    before_action :set_role, only: %i[show edit update remove]
 
     # GET /roles
     def index
@@ -8,8 +8,7 @@ module Arpa
     end
 
     # GET /roles/1
-    def show
-    end
+    def show; end
 
     # GET /roles/new
     def new
@@ -24,49 +23,42 @@ module Arpa
 
     # POST /roles
     def create
-      role_creator.create({role: role_params}, {
-        success: -> (role) {
-          redirect_to role_path(role.id), notice: I18n.t('flash.actions.create_role.notice')
-        },
-        fail: -> (error) {
-          @role = Arpa::Entities::Role.new(role_params)
-          @error = error
-          all_resources
-          render :new
-        }
-      })
+      role_creator.create({ role: role_params },
+                          success: redirect_to_index(I18n.t('flash.actions.create_role.notice')),
+                          fail: render_errors(:new))
     end
 
     # PATCH/PUT /roles/1
     def update
-      role_updater.update({role: role_params}, {
-        success: -> (role) {
-          redirect_to role_path(role.id), notice: I18n.t('flash.actions.update_role.notice')
-        },
-        fail: -> (error) {
-          @role = Arpa::Entities::Role.new(role_params)
-          @error = error
-          all_resources
-          render :edit
-        }
-      })
+      role_updater.update({ role: role_params },
+                          success: redirect_to_index(I18n.t('flash.actions.update_role.notice')),
+                          fail: render_errors(:edit))
     end
 
     # DELETE /roles/1
     def remove
-      role_remover.remove({role: @role}, {
-        success: -> (role) {
-          redirect_to roles_path, notice: I18n.t('flash.actions.remove_role.notice')
-        },
-        fail: -> (error) {
-          redirect_to roles_path, notice: I18n.t('flash.actions.remove_role.alert')
-        }
-      })
-
+      role_remover.remove({ role: @role },
+                          success: redirect_to_index(I18n.t('flash.actions.remove_role.notice')),
+                          fail: redirect_to_index(I18n.t('flash.actions.remove_role.alert')))
     end
 
     private
 
+    def redirect_to_index(message)
+      lambda do |_role|
+        redirect_to roles_path, notice: message
+      end
+    end
+
+    def render_errors(action_to_render)
+      lambda do |error|
+        @role = Arpa::Entities::Role.new(role_params)
+        @error = error
+        all_resources
+        render action_to_render
+      end
+    end
+
     def role_creator
       @role_creator ||= Arpa::Services::Roles::RoleManagerCreator.new
     end
@@ -96,9 +88,11 @@ module Arpa
     end
 
     def role_params
-      params.require(:role).
-        permit(:id, :name, :description, action_ids: [])
-    end
+      permitted_params = %i[id name description]
 
+      params.require(:role)
+            .permit(permitted_params, action_ids: [])
+            .to_h
+    end
   end
 end

data/lib/generators/arpa/templates/migration.rb

@@ -1,4 +1,4 @@
-class CreateArpaTables < ActiveRecord::Migration
+class CreateArpaTables < ActiveRecord::Migration[5.2]
   def change
 
     create_table :repository_resources, :force => true do |t|

data/spec/factories/repository_actions.rb

@@ -1,19 +1,18 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :repository_action, class: Arpa::Repositories::Actions::RepositoryAction do
-
     trait :index do
       name 'index'
-      resource { FactoryGirl.create(:repository_resource, :user) }
+      resource { FactoryBot.create(:repository_resource, :user) }
     end
 
     trait :show do
       name 'show'
-      resource { FactoryGirl.create(:repository_resource, :user) }
+      resource { FactoryBot.create(:repository_resource, :user) }
     end
 
     trait :with_complete_association do
       name 'index_new'
-      resource { FactoryGirl.create(:repository_resource, :user) }
+      resource { FactoryBot.create(:repository_resource, :user) }
     end
   end
 end

data/spec/factories/repository_profiles.rb

@@ -1,16 +1,15 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :repository_profile, class: Arpa::Repositories::Profiles::RepositoryProfile do
-
     name        'some_profile'
     description 'description_profile'
 
     trait :with_complete_association do
-      roles { [FactoryGirl.create(:repository_role, :with_complete_association)] }
+      roles { [FactoryBot.create(:repository_role, :with_complete_association)] }
     end
 
     trait :with_entity do
-      entity_id { FactoryGirl.create(:entity) }
-      entity_class { FactoryGirl.create(:entity).class.to_s }
+      entity_id { FactoryBot.create(:entity) }
+      entity_class { FactoryBot.create(:entity).class.to_s }
     end
   end
 end

data/spec/factories/repository_resources.rb

@@ -1,6 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :repository_resource, class: Arpa::Repositories::Resources::RepositoryResource do
-
     trait :user do
       full_name 'UsersController'
       name      'users'
@@ -10,6 +9,5 @@ FactoryGirl.define do
       full_name 'ContactsController'
       name      'contacts'
     end
-
   end
 end

data/spec/factories/repository_roles.rb

@@ -1,11 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :repository_role, class: Arpa::Repositories::Roles::RepositoryRole do
-
     name        'some_role'
     description 'description_role'
 
     trait :with_complete_association do
-      actions {[FactoryGirl.create(:repository_action, :with_complete_association)] }
+      actions { [FactoryBot.create(:repository_action, :with_complete_association)] }
     end
   end
 end

data/spec/factories/repository_test.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :entity, class: TestRepository do
     name 'some entity'
   end

data/spec/lib/arpa/additions/resource_spec.rb

@@ -1,14 +1,18 @@
 require 'spec_helper'
 
 class ResourceImplementation
-  def self.helper_method(args);end
+  def self.helper_method(args); end
   include Arpa::Additions::Resource
-  def session;'';end
-  def current_user;'';end
+  def session
+    ''
+  end
+
+  def current_user
+    ''
+  end
 end
 
 describe Arpa::Additions::Resource, type: :addition, fast: true do
-
   let(:resource_implementation) { ResourceImplementation.new }
 
   let(:verifier) { double }
@@ -21,7 +25,6 @@ describe Arpa::Additions::Resource, type: :addition, fast: true do
   end
 
   describe '#has_access?' do
-
     let(:setup) do
       allow(verifier).to receive(:has_access?)
       resource_implementation.has_access?(resource, action)
@@ -35,5 +38,4 @@ describe Arpa::Additions::Resource, type: :addition, fast: true do
       expect(verifier).to have_received(:has_access?).with(resource, action).once
     end
   end
-
 end

data/spec/lib/arpa/data_mappers/action_mapper_spec.rb

@@ -4,7 +4,7 @@ describe Arpa::DataMappers::ActionMapper, type: :mapper, fast: true do
   let(:mapper) { Arpa::DataMappers::ActionMapper.instance }
 
   describe 'mapping to record instance' do
-    let(:entity)          { Arpa::Entities::Action.new(name: 'index', resource_id: 1)}
+    let(:entity)          { Arpa::Entities::Action.new(name: 'index', resource_id: 1) }
     let(:record_instance) { mapper.map_to_record(entity) }
 
     it 'record_instance should be an instance of ActiveRecord::Base' do
@@ -19,7 +19,6 @@ describe Arpa::DataMappers::ActionMapper, type: :mapper, fast: true do
       expect(record_instance.resource_id).to be == 1
       expect(record_instance.repository_resource_id).to be == 1
     end
-
   end
 
   describe 'mapping to entity instance' do
@@ -42,5 +41,4 @@ describe Arpa::DataMappers::ActionMapper, type: :mapper, fast: true do
       expect(entity_instance.resource).to be_an Arpa::Entities::Resource
     end
   end
-
 end

data/spec/lib/arpa/data_mappers/base_spec.rb

@@ -10,7 +10,6 @@ describe Arpa::DataMappers::Base, type: :mapper, fast: true do
   let(:mapper) { TestMapper.instance }
 
   context 'when initialize more than one Mapper' do
-
     let(:mapper_002) { TestMapper.instance }
 
     it 'the instances should use singleton pattern' do
@@ -43,5 +42,4 @@ describe Arpa::DataMappers::Base, type: :mapper, fast: true do
       expect(entity_instance.id).to be == record.id
     end
   end
-
 end

data/spec/lib/arpa/data_mappers/profile_mapper_spec.rb

@@ -4,7 +4,7 @@ describe Arpa::DataMappers::ProfileMapper, type: :mapper, fast: true do
   let(:mapper) { Arpa::DataMappers::ProfileMapper.instance }
 
   describe 'mapping to record instance' do
-    let(:entity)          { Arpa::Entities::Profile.new(name: 'some_profile')}
+    let(:entity)          { Arpa::Entities::Profile.new(name: 'some_profile') }
     let(:record_instance) { mapper.map_to_record(entity) }
 
     it 'record_instance should be an instance of Arpa::Repositories::Profiles::RepositoryProfile' do
@@ -37,7 +37,5 @@ describe Arpa::DataMappers::ProfileMapper, type: :mapper, fast: true do
     it 'entity_instance should fill the property :role_ids from record property' do
       expect(entity_instance.role_ids).to eq [role_record.id]
     end
-
   end
-
 end

data/spec/lib/arpa/data_mappers/resource_mapper_spec.rb

@@ -4,7 +4,7 @@ describe Arpa::DataMappers::ResourceMapper, type: :mapper, fast: true do
   let(:mapper) { Arpa::DataMappers::ResourceMapper.instance }
 
   describe 'mapping to record instance' do
-    let(:entity)          { Arpa::Entities::Resource.new(full_name: 'UsersController')}
+    let(:entity)          { Arpa::Entities::Resource.new(full_name: 'UsersController') }
     let(:record_instance) { mapper.map_to_record(entity) }
 
     it 'record_instance should be an instance of ActiveRecord::Base' do
@@ -32,7 +32,5 @@ describe Arpa::DataMappers::ResourceMapper, type: :mapper, fast: true do
     it 'entity_instance should fill the property :actions from record property' do
       expect(entity_instance.actions.first).to be_an Arpa::Entities::Action
     end
-
   end
-
 end

data/spec/lib/arpa/data_mappers/role_mapper_spec.rb

@@ -4,7 +4,7 @@ describe Arpa::DataMappers::RoleMapper, type: :mapper, fast: true do
   let(:mapper) { Arpa::DataMappers::RoleMapper.instance }
 
   describe 'mapping to record instance' do
-    let(:entity)          { Arpa::Entities::Role.new(name: 'some_role')}
+    let(:entity)          { Arpa::Entities::Role.new(name: 'some_role') }
     let(:record_instance) { mapper.map_to_record(entity) }
 
     it 'record_instance should be an instance of Arpa::Repositories::Roles::RepositoryRole' do
@@ -41,7 +41,5 @@ describe Arpa::DataMappers::RoleMapper, type: :mapper, fast: true do
     it 'entity_instance should fill the property :profiles from record property' do
       expect(entity_instance.profiles.first).to be_an Arpa::Entities::Profile
     end
-
   end
-
 end

data/spec/lib/arpa/entities/action_spec.rb

@@ -1,24 +1,23 @@
 require 'spec_helper'
 
 describe Arpa::Entities::Action, type: :entity, fast: true do
-  subject { Arpa::Entities::Action.new resource: resource, name: 'index'}
+  subject { Arpa::Entities::Action.new resource: resource, name: 'index' }
 
   describe 'getting description by action name and resource name' do
     before do
-      I18n.backend.store_translations(:en, entities: { resources: { users: { actions: { description: { index: 'List of Users' } } } } } )
+      I18n.backend.store_translations(:en, entities: { resources: { users: { actions: { description: { index: 'List of Users' } } } } })
     end
 
     context 'when resource.name is "users" and action.name is "index"' do
       let(:resource) { double(name: 'users') }
 
       it 'description should be "List of Users"' do
-        expect(subject.description).to eql "List of Users"
+        expect(subject.description).to eql 'List of Users'
       end
     end
   end
 
   describe 'getting the resource name' do
-
     context 'when resource is not nil' do
       let(:resource) { double(name: 'users') }
 
@@ -33,7 +32,5 @@ describe Arpa::Entities::Action, type: :entity, fast: true do
         expect(subject.resource_name).to be_empty
       end
     end
-
   end
-
 end

data/spec/lib/arpa/entities/profile_spec.rb

@@ -1,13 +1,9 @@
 require 'spec_helper'
 
 describe Arpa::Entities::Profile, type: :entity, fast: true do
-
   describe 'initializing' do
-
     describe 'setting default values' do
-
       context 'when pass some parameters as nil' do
-
         it 'attribute :role_ids should be an empty Array' do
           expect(subject.role_ids).to eq []
         end
@@ -23,7 +19,7 @@ describe Arpa::Entities::Profile, type: :entity, fast: true do
     end
 
     context 'when pass some parameters as empty' do
-      let(:attrs) { {role_ids: '', roles: '', removed: ''} }
+      let(:attrs) { { role_ids: '', roles: '', removed: '' } }
       subject { Arpa::Entities::Profile.new attrs }
 
       it 'attribute :role_ids should be an empty Array' do
@@ -38,7 +34,5 @@ describe Arpa::Entities::Profile, type: :entity, fast: true do
         expect(subject.removed).to be_falsey
       end
     end
-
   end
-
 end

data/spec/lib/arpa/entities/resource_spec.rb

@@ -1,13 +1,9 @@
 require 'spec_helper'
 
 describe Arpa::Entities::Resource, type: :entity, fast: true do
-
   describe 'initializing' do
-
     describe 'setting default values' do
-
       context 'when pass :actions as nil' do
-
         it 'attribute :actions should be an empty Array' do
           expect(subject.actions).to eq []
         end
@@ -15,18 +11,16 @@ describe Arpa::Entities::Resource, type: :entity, fast: true do
     end
 
     context 'when pass :actions as empty' do
-      let(:attrs) { {actions: ''} }
+      let(:attrs) { { actions: '' } }
       subject { Arpa::Entities::Resource.new attrs }
 
       it 'attribute :actions should be an empty Array' do
         expect(subject.actions).to eq []
       end
     end
-
   end
 
   describe '#build_correct_name' do
-
     before { subject.build_correct_name }
 
     context 'when pass :full_name as "UsersController"' do
@@ -52,7 +46,5 @@ describe Arpa::Entities::Resource, type: :entity, fast: true do
         expect(subject.name).to eql 'authentication/someone/users'
       end
     end
-
   end
-
 end