rao-service_chain 0.0.38.pre → 0.0.39.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e5e8c17080f335d7dca5868c7ebb9b634ac4875dc3f0da34a980636bfefcb73
-  data.tar.gz: b0e57dd2954bfbbf1f4b2baeacc1f21a7f4e5163296547eea4073b61ad5ef65b
+  metadata.gz: e9e4b9efe0030c20f69357eeb371c6d282da891fc7c7643c950f2f405f0af7f3
+  data.tar.gz: 1aab9d9121f5703ef6d8a116b666cf6c5ffd9723c555c2e5f078cef85c62396e
 SHA512:
-  metadata.gz: 85191653db150a484fc6ec8af2146fc8d1d042711e775a45243ce7165a543753e1c18f3f06bba02b79151b0c8c1de27312837a5a42cd7d477ebf638084880907
-  data.tar.gz: 2b31b9257e8b961eca6f51c27084d72471b39dc8aa8b15a329f9568f137227f0e0b73902d89d5c455c0306ff0c89e17006d6a246b6fc4896ed9fe97c180bdf4a
+  metadata.gz: d6902664dd35ae70579c2c47948e31ea0447049b284743dfe8bce99f313d8d9c2c476039024d49cb3c387911cad3bf8c8d6b49e6540c1ef23b74d4ee002d37ed
+  data.tar.gz: bf67afcc6375b50586f07736cf1b15377282dfed438954fd5169cc54405612e16dcbfc1f4c9634e9f397145ae1048d2ee8a7f3b081827bd36cab04fd60b9bf53

data/app/service_steps/rao/service_chain/step/base.rb

@@ -25,6 +25,25 @@ module Rao
           @chain.instance_exec(@service, &@completed_if)
         end
 
+        def render_as_completed?(options = {})
+          render_previous_steps_as_pending = options.dig(:previous_steps, :render_as_pending)
+          render_next_step_as_pending = options.dig(:next_steps, :render_as_pending)
+
+          if @chain.before_actual?(self)
+            if render_previous_steps_as_pending
+              completed?
+            else
+              true
+            end
+          else
+            if render_next_step_as_pending
+              false
+            else
+              completed?
+            end
+          end
+        end
+        
         def pending?
           !completed?
         end

data/app/view_helpers/rao/service_chain/application_view_helper.rb

@@ -20,17 +20,23 @@ module Rao
       #
       def render_progress(service_chain, options = {})
         return if service_chain.nil?
-
-        options.reverse_merge!(
-          theme: :bootstrap4,
-          link_next_steps: true,
-          link_actual_step: false,
-          link_previous_steps: true
-        )
+        
+        options = default_options.deep_merge(options)
         theme = options.delete(:theme)
 
         c.render partial: "rao/service_chain/application_view_helper/render_progress/#{theme}", locals: { service_chain: service_chain, options: options }
       end
+
+      private
+
+      def default_options
+        {
+          theme: :bootstrap4,
+          next_steps: { render_as_pending: false, link: true },
+          actual_step: { link: false },
+          previous_steps: { render_as_pending: true, link: true }
+        }
+      end
     end
   end
 end

data/app/views/rao/service_chain/application_view_helper/render_progress/_bootstrap4.html.haml

@@ -8,19 +8,19 @@
             %span.wizard-step-marker.rounded-circle.bg-primary.text-white
               %i.fas.fa-play
             %span.wizard-step-label
-              - if options[:link_actual_step]
+              - if options.dig(:actual_step, :link)
                 = link_to(step.label, step.url(self))
               - else
                 = step.label
           - else
-            - if step.completed?
-              %span.wizard-step-marker.rounded-circle.bg-success.text-white
+            - if step.render_as_completed?(options)
+              %span.wizard-step-marker.rounded-circle.bg-success.text-white.render-completed
                 %i.fas.fa-check
             - else
-              %span.wizard-step-marker.rounded-circle.bg-secondary.text-white
+              %span.wizard-step-marker.rounded-circle.bg-secondary.text-white.render-pending
                 %i.fas.fa-circle
             %span.wizard-step-label
-              - if (service_chain.before_actual?(step) && options[:link_previous_steps]) || (service_chain.after_actual?(step) && options[:link_next_steps])
+              - if (service_chain.before_actual?(step) && options.dig(:previous_steps, :link)) || (service_chain.after_actual?(step) && options.dig(:next_steps, :link))
                 = link_to(step.label, step.url(self))
               - else
                 = step.label

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-service_chain
 version: !ruby/object:Gem::Version
-  version: 0.0.38.pre
+  version: 0.0.39.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Service Chains for Ruby on Rails.