command_proposal 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe3241c83226bc2aebbc46b3b8deaec5886dcd6ed8dea95d53e4d84510fb9c5
-  data.tar.gz: '09e82ce7d547624f6da07c2536c0c235e4205ff70e76bc8c4e20c07dcbb818da'
+  metadata.gz: 4d0b2ef7f0cf5f9044adaab75cb1b28b762086ff77ce659d461b976dd0533e3d
+  data.tar.gz: c4c50205f7e2260a9d7659e7c6938808366c07aa00f0e85511fd1269de768e95
 SHA512:
-  metadata.gz: 57055fced9213819d5d0b9dfbcd3d1d28430a3f34bae8ff6b16b7b48034d68ae71e50411d5d4db90c83502fa7a1bd7ceb02e6861da8f16a558f952d16dbba7d8
-  data.tar.gz: 2288b1576b1019d3d1c937d9fa6e346e2facc4b7e58756bed2b6517fb453733c2ec256eda3dec0973c9ffff6ac5331e7b3ff7ee8d8415c241b02543737fe1209
+  metadata.gz: 9ee3a6d919ea22545e62488fc0291d476b168b26412433288b6acde185d96bba8e4f9df313d13596faf508f7faabcea1d5d8539e7794a47d897eb117d4fe70e1
+  data.tar.gz: faca82d2f612e2a0ec8b78ac09655d794b9e04b108b93b075b2097aff0dd0959dc75c21410fa7a6be4d71fac93f52428d0e497298a66c71b4b7caa6d6930329a

data/app/helpers/command_proposal/permissions_helper.rb

@@ -1,12 +1,14 @@
 module CommandProposal
   module PermissionsHelper
     def can_command?(user=command_user)
+      return false unless permitted_to_use?
       return true unless cmd_config.approval_required?
 
       command_user.try("#{cmd_config.role_scope}?")
     end
 
     def can_approve?(iteration)
+      return false unless permitted_to_use?
       return true unless cmd_config.approval_required?
       return if iteration.nil?
 
@@ -14,15 +16,24 @@ module CommandProposal
     end
 
     def has_approval?(task)
+      return false unless permitted_to_use?
       return true unless cmd_config.approval_required?
 
       task&.approved?
     end
 
     def current_is_author?(iteration)
+      return false unless permitted_to_use?
+
       command_user&.id == iteration&.requester&.id
     end
 
+    def permitted_to_use?
+      return true if cmd_config.controller_var.blank?
+
+      command_user&.send("#{cmd_config.role_scope}?")
+    end
+
     def command_user(user=nil)
       @command_user ||= begin
         if user.present?

data/app/views/command_proposal/tasks/_task_detail_table.html.erb

@@ -8,8 +8,8 @@
   </thead>
   <tbody>
     <tr>
-      <td><%= @iteration&.requester_name %></td>
-      <td><%= @iteration&.approver_name %></td>
+      <td><%= @iteration&.requester_name.presence || "ID: #{@iteration&.requester_id}" if @iteration&.requester_id.present? %></td>
+      <td><%= @iteration&.approver_name.presence || "ID: #{@iteration&.approver_id}" if @iteration&.approver_id.present? %></td>
       <td><%= @iteration&.started_at&.strftime("%b %-d '%y, %-l:%M%P") %></td>
       <td data-iteration-status><%= @iteration&.status&.capitalize %></td>
       <td data-iteration-duration><%= humanized_duration(@iteration&.duration) %></td>

data/lib/command_proposal/configuration.rb

@@ -18,7 +18,7 @@ module CommandProposal
       # Default
       @approval_required = true
 
-      # Required (if approval needed)
+      # User details - highly recommended
       @user_class_name = nil
       @role_scope = nil
       @user_name = nil

data/lib/command_proposal/version.rb

@@ -4,5 +4,5 @@
 # gem push command_proposal-__.gem
 
 module CommandProposal
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/generators/command_proposal/install/templates/initializer.rb

@@ -1,4 +1,9 @@
 ::CommandProposal.configure do |config|
+  # Determines if a user needs a different user to approve their commands.
+  # Defaults to true, the recommended value.
+  # However, disabling in development could help with testing.
+  # config.approval_required = !Rails.env.development?
+
   # Change if your base user class has a different model name
   config.user_class_name = "User"
 
@@ -8,6 +13,8 @@
   # Scope for your user class that determines users who are permitted to interact with commands
   # It is highly recommended to make this very exclusive, as any users in this scope will be able
   # to interact with your database directly.
+  # Expected that the class will respond to `#{role_scope}` and
+  #   instances of the class respond to `#{role_scope}?`
   config.role_scope = :admin
 
   # Method called to display a user's name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_proposal
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Rocco Nicholls