rao-service_chain 0.0.32.pre → 0.0.33.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187d7fe20ee4289c8658dbe126437830c9597f9b0f5c3c2f1ddac1debb83f405
-  data.tar.gz: fa4fdbfd74b2483bb44b7ee841c4862aa18545a78022b27cffbf14caffcc1654
+  metadata.gz: c82f8ba7c5b0c6192eebfacec29a38d73fb1ce973844b36ee2300f5bebbc3ba6
+  data.tar.gz: 4e710a446cbe4214290043927a5aa48658a02a36077205a7b2cdbdcfc12ac0a3
 SHA512:
-  metadata.gz: 582b57d52ed71d38a76f14fe65dbcadb9895ef05ed702036c864de89255cd09e75203d70d6ba72accbc26647b1049bdc4aaed1f88ef92b6ed260ce4436b47232
-  data.tar.gz: 60a7ae46d160c9b8515889fdd9b9719bb805c79803aaf830474f7658e83f995155b74b9adc7930cd8a547123376546cd580f449fe3c71aef351578467513eb42
+  metadata.gz: d84c12dbc52f51e12cf369475c2c5b409e6531581b471eafaceafbd9c2ffa127b1946e807fd4c5cc1bd79dc412f78ebd3f0f4c04098fe2c36e3304e1688c73ff
+  data.tar.gz: d266ead3ff08893eb2eb8f8a3408c1f615bfdeedb01af13065a166fd2a0a836460ad604756772a8ad8a3afac74d52d8eaaa0d393aa07507415ad7ac8a424831f

data/app/concerns/rao/service/chain/controller_concern.rb

@@ -37,7 +37,7 @@ module Rao
         extend ActiveSupport::Concern
 
         included do
-          before_action :load_service_chain#
+          before_action :load_service_chain
           helper_method :service_chain
         end
 

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

@@ -1,53 +1,55 @@
 module Rao
-	module ServiceChain
-		module Step
-			class Base
-				attr_accessor :service, :service_name, :label, :chain
+  module ServiceChain
+    module Step
+      class Base
+        attr_accessor :service, :service_name, :label, :chain
 
-				def initialize(options = {})
-					@service = options.delete(:service)
-					@chain = options.delete(:chain)
-					@completed_if = options.delete(:completed_if)
-					@service_name = @service.try(:name)
-					@label = service.try(:model_name).try(:human)
-				end
+        def initialize(options = {})
+          @service = options.delete(:service)
+          @chain = options.delete(:chain)
+          @completed_if = options.delete(:completed_if)
+          @service_name = @service.try(:name)
+          @label = service.try(:model_name).try(:human)
+          @url = options.delete(:url)
+        end
 
-				def url(context = nil)
-					return nil if context.nil?
-					@url ||= context.url_for([:new, @service, only_path: true])
-				end
+        def url(context = nil)
+          return nil if context.nil?
+          return context.instance_exec(@service, &@url) if @url.respond_to?(:call)
+          @url ||= context.url_for([:new, @service, only_path: true])
+        end
 
-				def completed?
-					return nil unless @completed_if.respond_to?(:call)
-					@chain.instance_exec(@service, &@completed_if)
-				end
+        def completed?
+          return nil unless @completed_if.respond_to?(:call)
+          @chain.instance_exec(@service, &@completed_if)
+        end
 
-				def pending?
-					!completed?
-				end
+        def pending?
+          !completed?
+        end
 
-				def completion_status
-					completed? ? :completed : :pending
-				end
+        def completion_status
+          completed? ? :completed : :pending
+        end
 
-				def actual?
-					return false if @chain.actual_step.nil?
-					@chain.actual_step.service == @service
-				end
+        def actual?
+          return false if @chain.actual_step.nil?
+          @chain.actual_step.service == @service
+        end
 
-				def to_hash(context = nil)
-					{
-						service: service,
-						service_name: service.name,
-						label: label,
-						completed: completed?,
-						pending: pending?,
-						completion_status: completion_status,
-						actual: actual?,
-						url: url(context)
-					}
-				end
-			end
-		end
-	end
+        def to_hash(context = nil)
+          {
+            service: service,
+            service_name: service.name,
+            label: label,
+            completed: completed?,
+            pending: pending?,
+            completion_status: completion_status,
+            actual: actual?,
+            url: url(context)
+          }
+        end
+      end
+    end
+  end
 end

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

@@ -14,4 +14,4 @@
           - else
             %span.wizard-step-marker.rounded-circle.bg-secondary.text-white
               %i.fas.fa-circle
-          = link_to(step.label, [:new, step.service])
+          = link_to(step.label, step.url(self))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rao-service_chain
 version: !ruby/object:Gem::Version
-  version: 0.0.32.pre
+  version: 0.0.33.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,11 +164,11 @@ files:
 - app/assets/stylesheets/rao/service_chain/application.css
 - app/assets/stylesheets/rao/service_chain/application/wizard.css
 - app/concerns/rao/service/chain/controller_concern.rb
-- app/install_generator.rb
 - app/service_chains/rao/service_chain/base.rb
 - app/service_steps/rao/service_chain/step/base.rb
 - app/view_helpers/rao/service_chain/application_view_helper.rb
 - app/views/rao/service_chain/application_view_helper/render_progress/_bootstrap4.html.haml
+- lib/generators/rao/service_chain/install_generator.rb
 - lib/generators/rao/service_chain/templates/initializer.rb
 - lib/rao-service_chain.rb
 - lib/rao/service_chain.rb