easy_flow 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 420a32e8886e881ee02d50a95fef57640e8a2d540d1d73313b2a9fdd66206d6b
-  data.tar.gz: 380a7ef18cf5f6af36ff32d5573a5ee7e70b680582e147ec30ede62d23635e5b
+  metadata.gz: f7f3a5cbb2c164df9c3c513c7de107dcb30123987e5392853e76554c242aff84
+  data.tar.gz: 320ffff05f4107aa8573b2be17a41b5a4e7aa49759b6228c74f7cd7905501b5a
 SHA512:
-  metadata.gz: ccb487775af4e1ec1737ac27be7a46a6bb53fd804c14c8ed41b7ba8102d5001fc61311d55830ae5570178df79cbca3223071d255c5b812a2b1f30e1a86e2eb23
-  data.tar.gz: 01445f50ff3f85db4b67c38e66911bc8960ea9d17741af9c5f144d5b2320e14d649d44c335f35385844706e2aca312f2ef9ffe6308bfd49d0f07bd9d6af6badf
+  metadata.gz: 40887692880f1f9f468d11818cac2912b2debb61bdce99a2e238d9be4338c4c915e61df7db046938f371c97eaf2e296ee2c8985a1a930960ef9ffc4bd45a25cb
+  data.tar.gz: e01daf58e09f740dd57a5e3690028755abd7c5b77f604bdf765c60637f0fb8974852eab79ed6ebc200225cca7ac4471fde33a75420ad7e00f87cd4ab786ac7f4

data/app/controllers/easy_flow/flows_controller.rb

@@ -1,6 +1,6 @@
 module EasyFlow
   class FlowsController < ApplicationController
-    helper_method :flow_start_path, :flow_step_path, :previewing?, :step_form, :carries_answers?
+    helper_method :flow_start_path, :flow_step_path, :previewing?, :step_form, :carries_answers?, :flow_address
 
     def show
       @flow = flow
@@ -60,6 +60,12 @@ module EasyFlow
       Run.start(flow)
     end
 
+    def flow_address(slug)
+      return slug unless flow_host.finds_flows_across_owners
+
+      (run&.flow || flow).public_code
+    end
+
     def flow_start_path(slug)
       flow_routes.flow_path(slug)
     end
@@ -75,7 +81,7 @@ module EasyFlow
     def step_form
       return { url: run_location(run), method: :patch } if run
 
-      { url: flow_step_path(@guide.slug), method: :get }
+      { url: flow_step_path(flow_address(@guide.slug)), method: :get }
     end
 
     def carries_answers?
@@ -109,13 +115,25 @@ module EasyFlow
     end
 
     def admitted_run
-      found = find_run(Run.where(flow: hosted_flows), params[:id])
+      found = find_run(Run.where(flow: visited_flows), params[:id])
 
       Admission.of_run(found, permitted: permitted?(found.flow))
     end
 
     def flow
-      @stored_flow ||= admit(hosted_flows.find_by(slug: params[:slug]))
+      @stored_flow ||= admit(visited_flow)
+    end
+
+    def visited_flow
+      return hosted_flows.find_by(slug: params[:slug]) unless flow_host.finds_flows_across_owners
+
+      visited_flows.find_by_public_code!(params[:slug])
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
+    def visited_flows
+      flow_host.finds_flows_across_owners ? flow_host.flows : hosted_flows
     end
 
     def flowing_definition(flow)

data/app/views/easy_flow/flows/complete.html.erb

@@ -1,6 +1,6 @@
 <% content_for(:title, "Complete") %>
 
-<% starting_over = flow_start_path(@guide.slug) %>
+<% starting_over = flow_start_path(flow_address(@guide.slug)) %>
 
 <%= ui_page(max_width: :md) do %>
   <%= ui_page_header(title: "That's everything", subtitle: "Thanks — here's what you told us") do |header| %>

data/app/views/easy_flow/flows/show.html.erb

@@ -6,11 +6,11 @@
   <%= ui_section do %>
     <div class="flex flex-wrap items-center gap-3">
       <% if @flow.each_step? && @flow.definition.present? && !previewing? %>
-        <%= ui_form(action: flow_routes.flow_runs_path(@flow.slug), method: :post) do %>
+        <%= ui_form(action: flow_routes.flow_runs_path(flow_address(@flow.slug)), method: :post) do %>
           <%= ui_button(label: @flow.start_label.presence || "Start", type: :submit) %>
         <% end %>
       <% else %>
-        <%= ui_button(label: @flow.start_label.presence || "Start", href: flow_step_path(@flow.slug)) %>
+        <%= ui_button(label: @flow.start_label.presence || "Start", href: flow_step_path(flow_address(@flow.slug))) %>
       <% end %>
     </div>
   <% end %>

data/app/views/easy_flow/flows/step.html.erb

@@ -1,7 +1,7 @@
 <% content_for(:title, @guide.headline) %>
 
 <%= ui_page(max_width: :md) do %>
-  <%= link_to "← Start over", flow_start_path(@guide.slug), class: "text-sm text-accent-600 hover:text-accent-700" %>
+  <%= link_to "← Start over", flow_start_path(flow_address(@guide.slug)), class: "text-sm text-accent-600 hover:text-accent-700" %>
 
   <div class="mt-6 mb-6">
     <%= ui_progress(value: @answers.size, max: [ @guide.steps_on_path(@answers).size, 1 ].max, label: "Question #{@answers.size + 1}") %>
@@ -14,7 +14,7 @@
   <% if @waiting %>
     <p class="ks-hint">Waiting for <%= @waiting %>.</p>
     <% if carries_answers? %>
-      <div class="mt-4"><%= ui_button(label: "Check again", href: "#{flow_step_path(@guide.slug)}?#{{ answers: @answers, completed_at: @progress.completed_at.transform_values(&:iso8601) }.to_query}", variant: :secondary) %></div>
+      <div class="mt-4"><%= ui_button(label: "Check again", href: "#{flow_step_path(flow_address(@guide.slug))}?#{{ answers: @answers, completed_at: @progress.completed_at.transform_values(&:iso8601) }.to_query}", variant: :secondary) %></div>
     <% end %>
   <% else %>
     <%= form_with url: step_form[:url], method: step_form[:method], multipart: true, data: { turbo: false } do %>

data/lib/easy_flow/host.rb

@@ -2,7 +2,7 @@ module EasyFlow
   class Host
     attr_reader :name
     attr_writer :layout, :admin_layout, :offers, :allowed_answers
-    attr_accessor :admin_authentication_method, :visitor_authorization_method, :refusal_method, :owner_method
+    attr_accessor :admin_authentication_method, :visitor_authorization_method, :refusal_method, :owner_method, :finds_flows_across_owners
 
     def initialize(name)
       @name = name.to_s

data/lib/easy_flow/version.rb

@@ -1,3 +1,3 @@
 module EasyFlow
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_flow
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - tylercschneider