demo_mode 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e781b6e2b4017d8efb8260570397d61579e8dd03d553bbe720f7964dae74bb53
-  data.tar.gz: 9a1e6e3af03b1155dc9bc059d1366afb35ae1ef1a6aabe2caf86e8802eeea9d5
+  metadata.gz: 4bd782c3af4723645221a5df708ba1acde6e07a0d6d875f8644f201db1b19e02
+  data.tar.gz: 45fc4c48119fd8af020ec131243431178436c5ae247339a0fd9c9e3602bf4f2a
 SHA512:
-  metadata.gz: a976ad663436a8b25d20ffca633b400fb1bcd36acb62f669122159d70e4aefdc97b4c2ea6fef4f9af0135c8f55eee6456e606342acac70fd23baa799bd90d71c
-  data.tar.gz: 88aa9c77999969cbad123ba5fdf36b4c4d92320c05833f502ec4cbc6e6a02179a6d591ae3d33463a10e1d7112c31ec957578ea65b8f19d8ff7b29c0c24c34f8e
+  metadata.gz: 7fcc0016139912a257d9e507abc30c0c2c63771483f2573372d40b6bcf553cedd9d9c2041b636f9d06a7265e7af22a55b3f6192aaf11d5be33f43cf01432d654
+  data.tar.gz: 16503560feaa837f466bf8dd05307175ac715847250012d43c29f75f54b7ad1e1eeb7afec0fce008ed2c8e4ed1457e05a76bb7e4725317726b081dfdbf6586ed

data/app/controllers/concerns/demo_mode/demoable.rb

@@ -12,7 +12,14 @@ module DemoMode
     def current_demo_session
       if session.key?(:demo_session)
         @current_demo_session = nil if @current_demo_session&.id != session[:demo_session]['id']
-        @current_demo_session ||= Session.find(session[:demo_session]['id'])
+        @current_demo_session ||= Session.find_by(id: session[:demo_session]['id'])
+
+        if @current_demo_session.nil?
+          session.delete(:demo_session)
+          sign_out
+        end
+
+        @current_demo_session
       end
     end
 

data/app/controllers/demo_mode/sessions_controller.rb

@@ -25,7 +25,7 @@ module DemoMode
 
     def create
       @session = Session.new(create_params)
-      @session.save!
+      @session.save_and_generate_account!
       session[:demo_session] = { 'id' => @session.id, 'last_request_at' => Time.zone.now }
       respond_to do |f|
         f.html { redirect_to @session }

data/app/jobs/demo_mode/account_generation_job.rb

@@ -4,7 +4,7 @@ module DemoMode
   class AccountGenerationJob < DemoMode.base_job_name.constantize
     def perform(session)
       session.with_lock do
-        persona = persona(session)
+        persona = session.persona
         raise "Unknown persona: #{session.persona_name}" if persona.blank?
 
         signinable = persona.generate!(variant: session.variant, password: session.signinable_password)
@@ -12,11 +12,5 @@ module DemoMode
       end
       raise "Failed to create signinable persona!" if session.signinable.blank?
     end
-
-    private
-
-    def persona(session)
-      DemoMode.personas.find { |p| p.name.to_s == session.persona_name.to_s }
-    end
   end
 end

data/app/models/demo_mode/session.rb

@@ -5,10 +5,10 @@ module DemoMode
     attribute :variant, default: :default
 
     validates :persona_name, :variant, presence: true
+    validates :persona, presence: { message: :required }, on: :create, if: :persona_name?
     belongs_to :signinable, polymorphic: true, optional: true
 
     before_create :set_password!
-    after_create -> { AccountGenerationJob.perform_later(self) }
 
     delegate :begin_demo,
              :custom_sign_in?,
@@ -20,15 +20,22 @@ module DemoMode
       signinable.public_send(DemoMode.signinable_username_method)
     end
 
+    # Heads up: finding a persona is not guaranteed (e.g. past sessions)
+    def persona
+      DemoMode.personas.find { |p| p.name.to_s == persona_name.to_s }
+    end
+
+    def save_and_generate_account!
+      transaction do
+        save!
+        AccountGenerationJob.perform_later(self)
+      end
+    end
+
     private
 
     def set_password!
       self.signinable_password ||= DemoMode.current_password
     end
-
-    # Heads up: finding a persona is not guaranteed (e.g. past sessions)
-    def persona
-      DemoMode.personas.find { |p| p.name.to_s == persona_name.to_s }
-    end
   end
 end

data/lib/demo_mode/cli.rb

@@ -48,12 +48,12 @@ class DemoMode::Cli
                 puts "👉 #{feature}"
               end
 
-              named_tags = SemanticLogger.named_tags
+              named_tags = SemanticLogger.named_tags if defined?(SemanticLogger)
 
               variant = variant_for(persona, persona_name)
 
               CLI::UI::Spinner.spin("generating account...") do |spinner|
-                SemanticLogger.push_named_tags(named_tags)
+                SemanticLogger.push_named_tags(named_tags) if defined?(SemanticLogger)
                 password = DemoMode.current_password
                 signinable = persona.generate!(variant: variant)
                 spinner.update_title('done!')

data/lib/demo_mode/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DemoMode
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: demo_mode
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Nathan Griffith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui