govuk-wizardry 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9d24e16cac679c4ee2c36dd8a8556dbe051ffabbfc8771c1dcddd5a00964c3
-  data.tar.gz: f7bf947d3cbb3e95b03c12d5f527805c1d005d09a6e12738ae7ec77fc4a644df
+  metadata.gz: 63518ea4a2c566ad33949be35f38ae906c74a76ccfe1b476733d4b44ef832472
+  data.tar.gz: f1841013e966dce14787c53a1968abe29c113da01eab96985cc2a0e1e8bd49c3
 SHA512:
-  metadata.gz: 47ac4127a0b74792a27812c48c5911cea6341a7f215714a6b95003443e8237dc70a9ac85129a8b7e88b9e91e98b276cc18fb5a532ef4fcf5e25ec2419967ffa4
-  data.tar.gz: 98515e090121ce5703f1058190a98ff2d487fa361703bfaefd8578d0c2463621a060ac47b81ba6af566fce3412eac07d4c6ccc62ec0fcc2a03e7f771cef61c07
+  metadata.gz: 524640ac8f8c936aaca7be0a3587eb170d451949e394e685e743518b74e040a0954d5ae9b10108f17134c216523675f2c2580a9a246c59fb3cb8065806edf47b
+  data.tar.gz: 6ca5e77eb8918d55fbaf68fd017395866f0d7876ed201ecb4d44a2c02091a25e14a18bca3d6bbb8c95d81da36ad74a749d6f2cd87ba4639d0457728ea92f1af7

data/app/helpers/wizardry_helper.rb

@@ -62,7 +62,7 @@ private
             tag.p do
               [
                 'Add a partial called',
-                tag.code(%(_completion.html.erb)),
+                tag.code(%(_completion_page.html.erb)),
                 'to override this message'
               ].join(' ').html_safe
             end

data/lib/wizardry/instance.rb

@@ -44,7 +44,7 @@ module Wizardry
     end
 
     def complete?
-      object.send(framework.completion_flag)
+      !!object.send(framework.completion_flag)
     end
 
   private

data/lib/wizardry/version.rb

@@ -1,3 +1,3 @@
 module Wizardry
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/lib/wizardry.rb

@@ -58,7 +58,7 @@ module Wizardry
           @wizard.current_page.after_update!(@wizard.object)
           Rails.logger.debug("🧙 Object saved and callbacks run, moving on")
 
-          finalize_object if @wizard.complete?
+          finish if @wizard.complete?
         end
 
         redirect_to send(@wizard.framework.edit_path_helper, @wizard.next_page.name.to_s.dasherize)
@@ -71,14 +71,22 @@ module Wizardry
 
   private
 
-    def finalize_object(finalize: :finalize!)
-      Rails.logger.debug("🧙 Wizard complete, finalizing object")
+    def finish
+      Rails.logger.debug("🧙 Wizard complete, finishing off")
 
-      if @wizard.object.respond_to?(finalize)
-        @wizard.object.send(finalize)
-        Rails.logger.debug("🧙 Wizard object finalized")
+      finalize_object!
+      clear_identifier!
+    end
+
+    def finalize_object!(finalize_method: :finalize!)
+      Rails.logger.debug("🧙 Trying to finalize object")
+
+      if @wizard.object.respond_to?(finalize_method)
+        Rails.logger.debug("🧙 Object has #{finalize_method} method - calling it")
+
+        @wizard.object.send(finalize_method)
       else
-        Rails.logger.warn("🧙 Wizard object has no #{finalize} method")
+        Rails.logger.warn("🧙 Wizard object has no #{finalize_method} method")
       end
     end
 
@@ -109,7 +117,21 @@ module Wizardry
     end
 
     def identifier
-      cookies.fetch(wizard.cookie_name) { cookies[wizard.cookie_name] = SecureRandom.uuid }
+      cookies.fetch(wizard.cookie_name) { set_identifier! }
+    end
+
+    def set_identifier!
+      identifier = SecureRandom.uuid
+
+      Rails.logger.debug("🧙 Setting cookie #{identifier}")
+
+      cookies[wizard.cookie_name] = identifier
+    end
+
+    def clear_identifier!
+      Rails.logger.debug("🧙 Clearing cookie")
+
+      cookies.delete(wizard.cookie_name)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-wizardry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-31 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk-components