strongbolt 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d2d10e16e058d8de08c3b8bfad0d4a0fc26326a
-  data.tar.gz: 3e9e1ab3a667b3e3fe3b793b2f63f7b0f0f38628
+  metadata.gz: 7327ac274c00438b501748f6f93f57237710e630
+  data.tar.gz: ba02bcccd69e25f437e0d9cee195bf8b326c1b83
 SHA512:
-  metadata.gz: 20a4dc9f2d28742bad737f88f7119d372b5508d2bf12811883269e35bebd1bc89ebd651debe5827a13629be8b85deab51afe231f0246a155f7181ecf38f584c3
-  data.tar.gz: bfdae782dc0ebd0e2ecb36cf160bf9660e1636aa10f5a1770810f0e0a76cae96850e51ff269bcb7d79e3768e2f99c995d230f35627931519841361083a56fa91
+  metadata.gz: 2699cb99bba155a48cf9bc82281d0fe2f1babc575bdb82ba88b5af722e0f8f471b5e835a25f872fcbe608a3d895e3fe039b74bb3b0559719c2e0cd997e73c0b2
+  data.tar.gz: d70f5117422b493c5cf568970adab8c3ffee464aaa16c9049d56e93b0473bcc995c71f3856acd31de09e3c9da7833fdc6cb9b8a11c070652cd0028c95bd9ca11

data/.rubocop.yml

@@ -0,0 +1,56 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - 'bin/**/*'
+    - 'vendor/**/*'
+    - 'lib/generators/strongbolt/templates/strongbolt.rb'
+    - 'spec/dummy/db/schema.rb'
+
+  # Cop names are not displayed in offense messages by default. Change behavior
+  # by overriding DisplayCopNames, or by giving the -D/--display-cop-names
+  # option.
+  DisplayCopNames: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/ClassVars:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/RedundantSelf:
+  Enabled: false
+

data/.rubocop_todo.yml

@@ -0,0 +1,91 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-07-10 16:50:49 +0200 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/strongbolt/bolted_controller.rb'
+    - 'spec/support/helpers.rb'
+
+# Offense count: 1
+Lint/LiteralInCondition:
+  Exclude:
+    - 'lib/strongbolt/rspec/user.rb'
+
+# Offense count: 1
+Lint/ShadowingOuterLocalVariable:
+  Exclude:
+    - 'lib/strongbolt/tenantable.rb'
+
+# Offense count: 1
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/strongbolt/user_abilities.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'lib/strongbolt/rails/routes.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Exclude:
+    - 'spec/strongbolt/bolted_controller_spec.rb'
+
+# Offense count: 8
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/strongbolt/bolted_controller.rb'
+    - 'lib/strongbolt/capability.rb'
+    - 'lib/strongbolt/configuration.rb'
+    - 'lib/strongbolt/role.rb'
+    - 'lib/strongbolt/rspec/user.rb'
+    - 'lib/strongbolt/tenantable.rb'
+
+# Offense count: 5
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/strongbolt/rspec/user.rb'
+    - 'lib/strongbolt/user_abilities.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: line_count_dependent, lambda, literal
+Style/Lambda:
+  Exclude:
+    - 'lib/strongbolt/capability.rb'
+    - 'lib/strongbolt/tenantable.rb'
+
+# Offense count: 1
+Style/MethodMissing:
+  Exclude:
+    - 'lib/strongbolt/configuration.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/strongbolt/role.rb'
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/strongbolt/user_abilities.rb'

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in strongbolt.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strongbolt (0.3.11)
+    strongbolt (0.3.12)
       awesome_nested_set (~> 3.1.0)
       grant (~> 3.0)
       simple_form (~> 3.0)
@@ -36,6 +36,7 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
+    ast (2.3.0)
     awesome_nested_set (3.1.1)
       activerecord (>= 4.0.0, < 5.1)
     builder (3.2.2)
@@ -57,6 +58,10 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     minitest (5.9.0)
+    parallel (1.11.2)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -75,6 +80,8 @@ GEM
       activesupport (= 4.1.15)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.2)
+      rake
     rake (11.2.2)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -97,6 +104,13 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
@@ -115,6 +129,7 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
 
 PLATFORMS
   ruby
@@ -127,9 +142,10 @@ DEPENDENCIES
   rails (~> 4.1.0)
   rake
   rspec-rails
+  rubocop
   shoulda-matchers (~> 2.7.0)
   sqlite3
   strongbolt!
 
 BUNDLED WITH
-   1.12.3
+   1.15.0

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/app/controllers/strongbolt/capabilities_controller.rb

@@ -1,7 +1,5 @@
 module Strongbolt
-  
   class CapabilitiesController < ::StrongboltController
-
     def index
       @capabilities = Capability.all
     end
@@ -11,67 +9,60 @@ module Strongbolt
     end
 
     def create
-      begin
-        @capability = Capability.where(capability_params).first_or_create
+      @capability = Capability.where(capability_params).first_or_create
 
-        # If we have a role id, we add the capability to the role
-        if params[:role_id].present?
-          @role = Role.find params[:role_id]
-          @role.capabilities << @capability
+      # If we have a role id, we add the capability to the role
+      if params[:role_id].present?
+        @role = Role.find params[:role_id]
+        @role.capabilities << @capability
 
-          respond_to do |format|
-            format.html { redirect_to role_path(@role) }
-            format.json { head :ok }
-          end
-        else
-          redirect_to capabilities_path
+        respond_to do |format|
+          format.html { redirect_to role_path(@role) }
+          format.json { head :ok }
         end
-      rescue ActionController::ParameterMissing => e
-        flash[:danger] = "Permission could not be created: ERROR #{e}"
+      else
         redirect_to capabilities_path
       end
+    rescue ActionController::ParameterMissing => e
+      flash[:danger] = "Permission could not be created: ERROR #{e}"
+      redirect_to capabilities_path
     end
 
     def destroy
-      begin
-
-        # If we're passed a role id
-        if params[:role_id].present?  
-          @role = Role.find params[:role_id]
+      # If we're passed a role id
+      if params[:role_id].present?
+        @role = Role.find params[:role_id]
 
-          if params[:id].present?
-            conditions = {id: params[:id]}
-          else
-            conditions = capability_params
-          end
+        conditions = if params[:id].present?
+                       { id: params[:id] }
+                     else
+                       capability_params
+                     end
 
-          @capability = @role.capabilities.find_by(conditions)
-          @role.capabilities.delete @capability
+        @capability = @role.capabilities.find_by(conditions)
+        @role.capabilities.delete @capability
 
-          respond_to do |format|
-            format.html { redirect_to role_path(@role) }
-            format.json { head :ok }
-          end
-        else
-          @capability = Capability.find params[:id]
-          @capability.destroy
-        
-          redirect_to capabilities_path
+        respond_to do |format|
+          format.html { redirect_to role_path(@role) }
+          format.json { head :ok }
         end
-      rescue ActiveRecord::DeleteRestrictionError
-        flash[:danger] = "Permission has roles using it, delete relationships before deleting it"
-      
-        redirect_to capability_path(@capability)
+      else
+        @capability = Capability.find params[:id]
+        @capability.destroy
+
+        redirect_to capabilities_path
       end
+    rescue ActiveRecord::DeleteRestrictionError
+      flash[:danger] = 'Permission has roles using it, delete relationships before deleting it'
+
+      redirect_to capability_path(@capability)
     end
 
     private
 
     def capability_params
       params.require(:capability).permit(:model, :action,
-        :require_ownership, :require_tenant_access)
+                                         :require_ownership, :require_tenant_access)
     end
-
   end
-
-end
+end

data/app/controllers/strongbolt/roles_controller.rb

@@ -1,9 +1,8 @@
 module Strongbolt
   class RolesController < ::StrongboltController
-    
     def index
       @roles = Role.includes(:parent)
-        .order('parent_id IS NOT NULL', 'parent_id', 'name')
+                   .order('parent_id IS NOT NULL', 'parent_id', 'name')
     end
 
     def new
@@ -26,58 +25,52 @@ module Strongbolt
     end
 
     def create
-      begin
-        @role = Role.create! role_params
-
-        flash[:success] = "Role was successfully created!"
-        redirect_to role_path(@role)
-      rescue ActiveRecord::RecordInvalid => e
-        flash[:danger] = "Role could not be created, please review the errors below"
-        redirect_to new_role_path
-      rescue ActionController::ParameterMissing => e
-        flash[:danger] = "Role could not be created: ERROR #{e}"
-        redirect_to new_role_path
-      rescue ActiveRecord::ActiveRecordError => e
-        flash[:danger] = "The parent you selected leads to an impossible configuration"
-        redirect_to edit_role_path(@role)
-      end
+      @role = Role.create! role_params
+
+      flash[:success] = 'Role was successfully created!'
+      redirect_to role_path(@role)
+    rescue ActiveRecord::RecordInvalid
+      flash[:danger] = 'Role could not be created, please review the errors below'
+      redirect_to new_role_path
+    rescue ActionController::ParameterMissing => e
+      flash[:danger] = "Role could not be created: ERROR #{e}"
+      redirect_to new_role_path
+    rescue ActiveRecord::ActiveRecordError
+      flash[:danger] = 'The parent you selected leads to an impossible configuration'
+      redirect_to edit_role_path(@role)
     end
 
     def update
-      begin
-        @role = Role.find params[:id]
-        @role.update_attributes! role_params
-
-        flash[:success] = "Role was successfully updated!"
-        redirect_to role_path(@role)
-      rescue ActiveRecord::RecordInvalid => e
-        flash[:danger] = "Role could not be updated, please review the errors below"
-        redirect_to edit_role_path(@role)
-      rescue ActionController::ParameterMissing => e
-        flash[:danger] = "Role could not be updated: ERROR #{e}"
-        redirect_to edit_role_path(@role)
-      rescue ActiveRecord::ActiveRecordError => e
-        flash[:danger] = "The parent you selected leads to an impossible configuration"
-        redirect_to edit_role_path(@role)
-      end
+      @role = Role.find params[:id]
+      @role.update_attributes! role_params
+
+      flash[:success] = 'Role was successfully updated!'
+      redirect_to role_path(@role)
+    rescue ActiveRecord::RecordInvalid
+      flash[:danger] = 'Role could not be updated, please review the errors below'
+      redirect_to edit_role_path(@role)
+    rescue ActionController::ParameterMissing => e
+      flash[:danger] = "Role could not be updated: ERROR #{e}"
+      redirect_to edit_role_path(@role)
+    rescue ActiveRecord::ActiveRecordError
+      flash[:danger] = 'The parent you selected leads to an impossible configuration'
+      redirect_to edit_role_path(@role)
     end
 
     def destroy
-      begin
-        @role = Role.find params[:id]
-        @role.destroy!
+      @role = Role.find params[:id]
+      @role.destroy!
 
-        flash[:success] = "Role #{@role.name} successfully deleted"
+      flash[:success] = "Role #{@role.name} successfully deleted"
 
-        redirect_to roles_path
-      rescue ActiveRecord::DeleteRestrictionError
-        flash[:danger] = "Role #{@role.name} could not be deleted because #{@role.user_groups.size} user groups rely on it"
-        redirect_to role_path(@role)
-      end
+      redirect_to roles_path
+    rescue ActiveRecord::DeleteRestrictionError
+      flash[:danger] = "Role #{@role.name} could not be deleted because #{@role.user_groups.size} user groups rely on it"
+      redirect_to role_path(@role)
     end
 
-    rescue_from ActiveRecord::RecordNotFound do |e|
-      flash[:danger] = "Could not find role."
+    rescue_from ActiveRecord::RecordNotFound do |_e|
+      flash[:danger] = 'Could not find role.'
       redirect_to roles_path
     end
 
@@ -85,8 +78,7 @@ module Strongbolt
 
     def role_params
       params.require(:role).permit(:name, :parent_id, :description,
-        :capability_ids => [])
+                                   capability_ids: [])
     end
-
   end
-end
+end