strongbolt 0.3.12 → 0.3.13

data/app/controllers/strongbolt/security_controller.rb

@@ -1,8 +1,7 @@
 module Strongbolt
   class SecurityController < ::StrongboltController
-    self.model_for_authorization = "Strongbolt::Role"
+    self.model_for_authorization = 'Strongbolt::Role'
 
-    def index
-    end
+    def index; end
   end
 end

data/app/controllers/strongbolt/user_groups_controller.rb

@@ -1,76 +1,70 @@
 module Strongbolt
   class UserGroupsController < ::StrongboltController
-  	def index
-  		@user_groups = UserGroup.all
-  	end
+    def index
+      @user_groups = UserGroup.all
+    end
 
-  	def show
+    def show
       @user_group = UserGroup.find params[:id]
       # We select the users not yet in the user group
       @users = Strongbolt.user_class_constant
-        .joins("LEFT JOIN strongbolt_user_groups_users sugu ON sugu.user_id = #{Strongbolt.user_class_constant.table_name}.id")
-        .joins("LEFT JOIN strongbolt_user_groups sug ON sug.id = sugu.user_group_id")
-        .where("sug.id IS NULL OR sug.id != ?", @user_group.id)
-  	end
+                         .joins("LEFT JOIN strongbolt_user_groups_users sugu ON sugu.user_id = #{Strongbolt.user_class_constant.table_name}.id")
+                         .joins('LEFT JOIN strongbolt_user_groups sug ON sug.id = sugu.user_group_id')
+                         .where('sug.id IS NULL OR sug.id != ?', @user_group.id)
+    end
 
-  	def create
-      begin
-        @user_group = UserGroup.create! user_group_params
+    def create
+      @user_group = UserGroup.create! user_group_params
 
-        flash[:success] = "Use group was successfully created!"
-        redirect_to user_group_path(@user_group)
-      rescue ActiveRecord::RecordInvalid => e
-        flash[:danger] = "User Group could not be created, please review the errors below"
-        redirect_to new_user_group_path
-      rescue ActionController::ParameterMissing => e
-        flash[:danger] = "User Group could not be created: ERROR #{e}"
-        redirect_to new_user_group_path
-      end
-  	end
+      flash[:success] = 'Use group was successfully created!'
+      redirect_to user_group_path(@user_group)
+    rescue ActiveRecord::RecordInvalid
+      flash[:danger] = 'User Group could not be created, please review the errors below'
+      redirect_to new_user_group_path
+    rescue ActionController::ParameterMissing => e
+      flash[:danger] = "User Group could not be created: ERROR #{e}"
+      redirect_to new_user_group_path
+    end
 
-  	def update
-      begin
-        @user_group = UserGroup.find params[:id]
-        @user_group.update_attributes! user_group_params
-        
-        flash[:success] = "User group was successfully updated!"
-        redirect_to user_group_path params[:id]
-      rescue ActiveRecord::RecordInvalid => e
-        flash[:danger] = "User Group could not be modified, please review the errors below"
-        redirect_to edit_user_group_path(params[:id])
-      rescue ActionController::ParameterMissing => e
-        flash[:danger] = "User Group could not be updated: ERROR #{e}"
-        redirect_to edit_user_group_path(params[:id])
-      end
-  	end
+    def update
+      @user_group = UserGroup.find params[:id]
+      @user_group.update_attributes! user_group_params
 
-  	def destroy
-      begin
-        @user_group = UserGroup.find params[:id]
-        @user_group.destroy!
+      flash[:success] = 'User group was successfully updated!'
+      redirect_to user_group_path params[:id]
+    rescue ActiveRecord::RecordInvalid
+      flash[:danger] = 'User Group could not be modified, please review the errors below'
+      redirect_to edit_user_group_path(params[:id])
+    rescue ActionController::ParameterMissing => e
+      flash[:danger] = "User Group could not be updated: ERROR #{e}"
+      redirect_to edit_user_group_path(params[:id])
+    end
 
-        flash[:success] = "User group #{@user_group.name} successfully deleted"
-        
-        redirect_to user_groups_path
-      rescue ActiveRecord::DeleteRestrictionError
-        flash[:danger] = "User group #{@user_group.name} cannot be deleted because #{@user_group.users.size} users belong to it"
+    def destroy
+      @user_group = UserGroup.find params[:id]
+      @user_group.destroy!
 
-        redirect_to user_group_path(@user_group)
-      end
-  	end
+      flash[:success] = "User group #{@user_group.name} successfully deleted"
 
-  	def edit
+      redirect_to user_groups_path
+    rescue ActiveRecord::DeleteRestrictionError
+      flash[:danger] = "User group #{@user_group.name} cannot be deleted because #{@user_group.users.size} users belong to it"
+
+      redirect_to user_group_path(@user_group)
+    end
+
+    def edit
       @user_group = UserGroup.find params[:id]
-  	end
+    end
 
-  	def new
+    def new
       @user_group = UserGroup.new
-  	end
+    end
 
     private
 
     def user_group_params
-      params.require(:user_group).permit(:name, :role_ids => [])
+      params.require(:user_group).permit(:name, role_ids: [])
     end
   end
-end
+end

data/app/controllers/strongbolt/user_groups_users_controller.rb

@@ -1,7 +1,6 @@
 module Strongbolt
   class UserGroupsUsersController < ::StrongboltController
-
-    self.model_for_authorization = "Strongbolt::UserGroup"
+    self.model_for_authorization = 'Strongbolt::UserGroup'
 
     def create
       @user_group = UserGroup.find(params[:user_group_id])
@@ -24,7 +23,7 @@ module Strongbolt
       redirect_to request.referrer || user_group_path(@user_group)
     end
 
-    rescue_from ActiveRecord::RecordNotFound do |e|
+    rescue_from ActiveRecord::RecordNotFound do |_e|
       if @user_group.nil?
         flash[:danger] = "User Group ##{params[:user_group_id]} does not exist"
         redirect_to user_groups_path
@@ -33,6 +32,5 @@ module Strongbolt
         redirect_to user_group_path(@user_group)
       end
     end
-
   end
 end

data/app/controllers/strongbolt_controller.rb

@@ -1,2 +1,2 @@
 class StrongboltController < Strongbolt.parent_controller.constantize
-end
+end

data/circle.yml

@@ -0,0 +1,13 @@
+dependencies:
+  pre:
+    - gem install bundler
+
+database:
+  override:
+    # no need for a database right now
+    - echo "Skipping DB section."
+
+test:
+  override:
+    - bundle exec rspec --profile 10
+    - bundle exec rubocop

data/lib/generators/strongbolt/fix_generator.rb

@@ -1,4 +1,4 @@
-require "strongbolt/generators/migration"
+require 'strongbolt/generators/migration'
 
 module Strongbolt
   module Generators
@@ -11,13 +11,12 @@ module Strongbolt
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_fix
-        unless Strongbolt::UsersTenant.primary_key.nil?
-          puts"Strongbolt::UsersTenant already has a primary key, no need to use the fix"
+        if Strongbolt::UsersTenant.primary_key.nil?
+          copy_migration 'fix', 'fix_strongbolt_users_tenants_id'
         else
-          copy_migration "fix", "fix_strongbolt_users_tenants_id"
+          puts 'Strongbolt::UsersTenant already has a primary key, no need to use the fix'
         end
       end
-
     end
   end
-end
+end

data/lib/generators/strongbolt/fix_unique_group_members_generator.rb

@@ -1,4 +1,4 @@
-require "strongbolt/generators/migration"
+require 'strongbolt/generators/migration'
 
 module Strongbolt
   module Generators
@@ -12,9 +12,8 @@ module Strongbolt
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_fix
-        copy_migration "fix_unique_group_members", "fix_unique_group_members"
+        copy_migration 'fix_unique_group_members', 'fix_unique_group_members'
       end
-
     end
   end
 end

data/lib/generators/strongbolt/indexes_generator.rb

@@ -1,4 +1,4 @@
-require "strongbolt/generators/migration"
+require 'strongbolt/generators/migration'
 
 module Strongbolt
   module Generators
@@ -11,9 +11,8 @@ module Strongbolt
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_fix
-        copy_migration "indexes", "create_strongbolt_tables_indexes"
+        copy_migration 'indexes', 'create_strongbolt_tables_indexes'
       end
-
     end
   end
-end
+end

data/lib/generators/strongbolt/install_generator.rb

@@ -1,4 +1,4 @@
-require "strongbolt/generators/migration"
+require 'strongbolt/generators/migration'
 
 module Strongbolt
   module Generators
@@ -8,22 +8,21 @@ module Strongbolt
       source_root File.expand_path('../templates', __FILE__)
 
       def copy_migrations
-        copy_migration "migration", "create_strongbolt_tables"
+        copy_migration 'migration', 'create_strongbolt_tables'
       end
 
       def copy_initializer
         # Laods all the application models
         Rails.application.eager_load!
         # Copy the file
-        copy_file "strongbolt.rb", "config/initializers/strongbolt.rb"
+        copy_file 'strongbolt.rb', 'config/initializers/strongbolt.rb'
         # Fill in the list of models of the application
-        gsub_file "config/initializers/strongbolt.rb", '%MODELS%',
-          ActiveRecord::Base.descendants
-            .reject { |m| m.name =~ /^Strongbolt::/ }
-            .map    { |m| "'#{m.name}'"  }
-            .join(", ")
+        gsub_file 'config/initializers/strongbolt.rb', '%MODELS%',
+                  ActiveRecord::Base.descendants
+                                    .reject { |m| m.name =~ /^Strongbolt::/ }
+                                    .map    { |m| "'#{m.name}'" }
+                                    .join(', ')
       end
-
     end
   end
 end

data/lib/generators/strongbolt/templates/fix_unique_group_members.rb

@@ -1,5 +1,5 @@
 class FixUniqueGroupMembers < ActiveRecord::Migration[4.2]
   def change
-    add_index :strongbolt_user_groups_users, [:user_group_id, :user_id], unique: true, name: :index_strongbolt_user_groups_users_unique
+    add_index :strongbolt_user_groups_users, %i[user_group_id user_id], unique: true, name: :index_strongbolt_user_groups_users_unique
   end
 end

data/lib/generators/strongbolt/templates/indexes.rb

@@ -16,6 +16,6 @@ class CreateStrongboltTablesIndexes < ActiveRecord::Migration[4.2]
     add_index :strongbolt_users_tenants, :user_id
     add_index :strongbolt_users_tenants, :tenant_id
     add_index :strongbolt_users_tenants, :type
-    add_index :strongbolt_users_tenants, [:tenant_id, :type]
+    add_index :strongbolt_users_tenants, %i[tenant_id type]
   end
 end

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

@@ -1,18 +1,18 @@
 class CreateStrongboltTables < ActiveRecord::Migration[4.2]
   def change
-    create_table :strongbolt_capabilities, :force => true do |t|
+    create_table :strongbolt_capabilities, force: true do |t|
       t.string   :name
       t.string   :description
       t.string   :model
       t.string   :action
       t.string   :attr
-      t.boolean  :require_ownership, :default => false, :null => false
-      t.boolean  :require_tenant_access, :default => true, :null => false
+      t.boolean  :require_ownership, default: false, null: false
+      t.boolean  :require_tenant_access, default: true, null: false
 
       t.timestamps
     end
 
-    create_table :strongbolt_roles, :force => true do |t|
+    create_table :strongbolt_roles, force: true do |t|
       t.string   :name
       t.integer  :parent_id
       t.integer  :lft
@@ -22,29 +22,29 @@ class CreateStrongboltTables < ActiveRecord::Migration[4.2]
       t.timestamps
     end
 
-    create_table :strongbolt_user_groups, :force => true do |t|
+    create_table :strongbolt_user_groups, force: true do |t|
       t.string :name
       t.text :description
 
       t.timestamps
     end
 
-    create_table :strongbolt_user_groups_users, :force => true do |t|
+    create_table :strongbolt_user_groups_users, force: true do |t|
       t.integer :user_group_id
       t.integer :user_id
     end
 
-    create_table :strongbolt_roles_user_groups, :force => true do |t|
+    create_table :strongbolt_roles_user_groups, force: true do |t|
       t.integer :user_group_id
       t.integer :role_id
     end
 
-    create_table :strongbolt_capabilities_roles, :force => true do |t|
+    create_table :strongbolt_capabilities_roles, force: true do |t|
       t.integer  :role_id
       t.integer  :capability_id
     end
 
-    create_table :strongbolt_users_tenants, :force => true do |t|
+    create_table :strongbolt_users_tenants, force: true do |t|
       t.integer  :user_id
       t.integer  :tenant_id
       t.string   :type
@@ -67,9 +67,8 @@ class CreateStrongboltTables < ActiveRecord::Migration[4.2]
     add_index :strongbolt_users_tenants, :user_id
     add_index :strongbolt_users_tenants, :tenant_id
     add_index :strongbolt_users_tenants, :type
-    add_index :strongbolt_users_tenants, [:tenant_id, :type]
+    add_index :strongbolt_users_tenants, %i[tenant_id type]
 
-    add_index :strongbolt_user_groups_users, [:user_group_id, :user_id], unique: true, name: :index_strongbolt_user_groups_users_unique
+    add_index :strongbolt_user_groups_users, %i[user_group_id user_id], unique: true, name: :index_strongbolt_user_groups_users_unique
   end
 end
-

data/lib/generators/strongbolt/templates/strongbolt.rb

@@ -42,4 +42,4 @@ Strongbolt.setup do |config|
   # You can list here all the models of your application that doesn't indirectly belong to a tenant.
   #
   config.models = %MODELS%
-end
+end

data/lib/generators/strongbolt/views_generator.rb

@@ -3,14 +3,14 @@ require 'rails/generators/base'
 module Strongbolt
   module Generators
     class ViewsGenerator < Rails::Generators::Base
-      desc "Copies Strongbolt views to your application."
+      desc 'Copies Strongbolt views to your application.'
 
       argument :scope, required: false, default: nil,
-                       desc: "The scope to copy views to"
+                       desc: 'The scope to copy views to'
 
       public_task :copy_views
 
-      source_root File.expand_path("../../../../app/views", __FILE__)
+      source_root File.expand_path('../../../../app/views', __FILE__)
 
       def copy_views
         directory :strongbolt, target_path
@@ -23,4 +23,4 @@ module Strongbolt
       end
     end
   end
-end
+end

data/lib/strongbolt.rb

@@ -1,33 +1,33 @@
-require "active_record"
-require "awesome_nested_set"
-require "simple_form"
+require 'active_record'
+require 'awesome_nested_set'
+require 'simple_form'
 
-require "grant/grantable"
-require "grant/status"
+require 'grant/grantable'
+require 'grant/status'
 require 'grant/user'
 
-require "strongbolt/version"
-require "strongbolt/errors"
-require "strongbolt/configuration"
-require "strongbolt/tenantable"
-require "strongbolt/bolted"
-require "strongbolt/bolted_controller"
-require "strongbolt/user_abilities"
-require "strongbolt/base"
-require "strongbolt/capability"
-require "strongbolt/user_groups_user"
-require "strongbolt/roles_user_group"
-require "strongbolt/capabilities_role"
-require "strongbolt/role"
-require "strongbolt/user_group"
-require "strongbolt/users_tenant"
+require 'strongbolt/version'
+require 'strongbolt/errors'
+require 'strongbolt/configuration'
+require 'strongbolt/tenantable'
+require 'strongbolt/bolted'
+require 'strongbolt/bolted_controller'
+require 'strongbolt/user_abilities'
+require 'strongbolt/base'
+require 'strongbolt/capability'
+require 'strongbolt/user_groups_user'
+require 'strongbolt/roles_user_group'
+require 'strongbolt/capabilities_role'
+require 'strongbolt/role'
+require 'strongbolt/user_group'
+require 'strongbolt/users_tenant'
 
 #
 # Raise an error if version of AR not compatible (4.1.0 and 4.1.1)
 #
 ar_version = ActiveRecord.version.version
-if ar_version >= "4.1.0" && ar_version <= "4.1.1"
-  raise StandardError, "You cannot use Strongbolt with ActiveRecord versions 4.1.0 and 4.1.1. Please upgrade to >= 4.1.2"
+if ar_version >= '4.1.0' && ar_version <= '4.1.1'
+  raise StandardError, 'You cannot use Strongbolt with ActiveRecord versions 4.1.0 and 4.1.1. Please upgrade to >= 4.1.2'
 end
 
 #
@@ -38,7 +38,7 @@ ActiveRecord::Base.send :include, Strongbolt::Bolted
 #
 # Default behavior, when method current_user defined on controller
 #
-if defined?(ActionController) and defined?(ActionController::Base)
+if defined?(ActionController) && defined?(ActionController::Base)
 
   ActionController::Base.send :include, Strongbolt::BoltedController
 
@@ -49,7 +49,6 @@ end
 #
 require 'strongbolt/engine' if defined?(Rails::Engine)
 
-
 #
 # Main module
 #
@@ -62,20 +61,20 @@ module Strongbolt
 
   # Delegates to the configuration the access denied
   def_delegators Configuration, :access_denied, :logger, :tenants, :user_class, :user_class_constant,
-    :default_capabilities
+                 :default_capabilities
   module_function :access_denied, :logger, :tenants, :user_class, :user_class_constant,
-    :default_capabilities
+                  :default_capabilities
 
   # Delegates switching thread behavior
   def_delegators Grant::Status, :switch_to_multithread,
-    :switch_to_monothread
+                 :switch_to_monothread
   module_function :switch_to_multithread, :switch_to_monothread
 
   #
   # Tje parent controller to all strongbolt controllers
   #
   mattr_accessor :parent_controller
-  @@parent_controller = "ApplicationController"
+  @@parent_controller = 'ApplicationController'
 
   #
   # Current User
@@ -86,13 +85,11 @@ module Strongbolt
 
   # We keep an hash so we don't have each time to test
   # if the module is included in the list
-  def self.current_user= user
+  def self.current_user=(user)
     # If user is an instance of something and different from what we have
     if user.present?
       # Raise error if wrong user class
-      unless valid_user? user
-        raise Strongbolt::WrongUserClass
-      end
+      raise Strongbolt::WrongUserClass unless valid_user? user
 
       # If the user class doesn't have included the module yet
       unless user.class.included_modules.include? Strongbolt::UserAbilities
@@ -107,7 +104,7 @@ module Strongbolt
   #
   # Setting up Strongbolt
   #
-  def self.setup &block
+  def self.setup(&block)
     # Configuration by user
     block.call Configuration
 
@@ -120,36 +117,36 @@ module Strongbolt
       logger.warn "User class #{Configuration.user_class} wasn't found"
     end
   rescue => e
-    error = <<-CONTENT
-[ERROR] Strongbolt could not initialized successfully.
-  This can happen when running migrations, and in this situation, you can ignore this message.
-  If it happens in test, make sure you've run `rake db:test:prepare` so that test database is ready.
-  Otherwise, please review the error below to check what happened:
+    error = <<~CONTENT
+      [ERROR] Strongbolt could not initialized successfully.
+        This can happen when running migrations, and in this situation, you can ignore this message.
+        If it happens in test, make sure you've run `rake db:test:prepare` so that test database is ready.
+        Otherwise, please review the error below to check what happened:
 
-Error message:
-  #{e.message}
+      Error message:
+        #{e.message}
 
-  #{e.backtrace.join("\n")}
+        #{e.backtrace.join("\n")}
     CONTENT
     logger.fatal error
     # Display in the console when error test env
     puts error if defined?(Rails) && Rails.env.test?
     # If not being done in a rake task, this should propagate the error
-    raise e unless $0 =~ /rake$/ # && ARGV.join(" ").include?("db:")
+    raise e unless $PROGRAM_NAME =~ /rake$/ # && ARGV.join(" ").include?("db:")
   end
 
   #
   # Perform the block without grant
   #
-  def self.without_authorization &block
-    Grant::Status.without_grant &block
+  def self.without_authorization(&block)
+    Grant::Status.without_grant(&block)
   end
 
   #
   # Perform the block with grant
   #
-  def self.with_authorization &block
-    Grant::Status.with_grant &block
+  def self.with_authorization(&block)
+    Grant::Status.with_grant(&block)
   end
 
   #
@@ -166,8 +163,9 @@ Error message:
   def self.enabled?
     Grant::Status.grant_enabled?
   end
+
   def self.disabled?
-    ! enabled?
+    !enabled?
   end
 
   #
@@ -175,7 +173,7 @@ Error message:
   # It checks whether the class or the base_class (in case of STI) of the instance class
   # has been configured as the user model
   #
-  def self.valid_user? user
+  def self.valid_user?(user)
     user.class.name == Strongbolt::Configuration.user_class ||
       user.class.base_class.name == Strongbolt::Configuration.user_class
   end
@@ -193,7 +191,7 @@ Error message:
   end
 
   # Not to use directly, only used in tests
-  def self.tenants= tenants
+  def self.tenants=(tenants)
     @@tenants = tenants
   end
   private_class_method :tenants=
@@ -204,13 +202,11 @@ end
 # should not have any authorization check perform
 #
 class Object
-  def self.perform_without_authorization *method_names
-    method_names.each {|name| setup_without_authorization name}
+  def self.perform_without_authorization(*method_names)
+    method_names.each { |name| setup_without_authorization name }
   end
 
-  private
-
-  def self.setup_without_authorization method_name
+  def self.setup_without_authorization(method_name)
     aliased_name = "_with_autorization_#{method_name}"
     alias_method aliased_name, method_name
     define_method method_name do |*args, &block|
@@ -219,4 +215,5 @@ class Object
       end
     end
   end
+  private_class_method :setup_without_authorization
 end