stimulus_reflex 3.2.2.pre0 → 3.2.2.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9af85e63dfa792a38d7dd4a560f86c1bcca6898aa8f38882ccfea57e726dbd
-  data.tar.gz: d4fdcadaae536283af5db9e98551a5dbd1cd9aa3100bba806be82e5cf6aecd18
+  metadata.gz: 942a479c551dc9a4cbcb6b70e4b51b5bf1ae947ad8b5fd159f69bdb92c580349
+  data.tar.gz: 7e0eda3f0e7f50f132f8bcfa2528df67502afba73348393b795ed99e15ce6031
 SHA512:
-  metadata.gz: a64205414cfc3630ecb2c537abe5f0deacd0737f5abcf9d33873d57b317d5bf0dfccee6ae09706fdf1e38a5ca7ea6d3159272abd4a293523f9451600ce8d43f7
-  data.tar.gz: 81792f053d071fe1fc63db27609a53b4147b9d0f02f85714ba8c81f7cf7e937f94aca5037845badcdbb7b24e78992152549a991a3a1db5a1e1563d9b1f574713
+  metadata.gz: 2df9156de41dda64ff63b1faf2c4a14bd10f9c5fb492018c688438f901a0d16c3646303c1d01484efd7dbaefd7351b4c52ed284e4d4668e2043afe728cd2eb1a
+  data.tar.gz: 5afb2906a4b29e8649e77f488e779ec07e47607802a55eceeae56068db96db2a84cd8a12e921d16d01b7f007c380df92f341752779cf436e2ddfed1441154088

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## [Unreleased](https://github.com/hopsoft/stimulus_reflex/tree/HEAD)
 
-[Full Changelog](https://github.com/hopsoft/stimulus_reflex/compare/v3.2.1...HEAD)
+[Full Changelog](https://github.com/hopsoft/stimulus_reflex/compare/v3.2.2.pre0...HEAD)
+
+**Fixed bugs:**
+
+- Session lost after throw :abort [\#221](https://github.com/hopsoft/stimulus_reflex/issues/221)
+- Fix multipleInstances convenience method [\#220](https://github.com/hopsoft/stimulus_reflex/pull/220) ([julianrubisch](https://github.com/julianrubisch))
+
+**Merged pull requests:**
+
+- Always commit session [\#222](https://github.com/hopsoft/stimulus_reflex/pull/222) ([hopsoft](https://github.com/hopsoft))
+
+## [v3.2.2.pre0](https://github.com/hopsoft/stimulus_reflex/tree/v3.2.2.pre0) (2020-05-27)
+
+[Full Changelog](https://github.com/hopsoft/stimulus_reflex/compare/v3.2.1...v3.2.2.pre0)
 
 **Implemented enhancements:**
 
@@ -387,6 +400,7 @@
 
 - Add support to configure room via register option [\#52](https://github.com/hopsoft/stimulus_reflex/pull/52) ([hopsoft](https://github.com/hopsoft))
 - Move gitbook files to docs [\#49](https://github.com/hopsoft/stimulus_reflex/pull/49) ([hopsoft](https://github.com/hopsoft))
+- Allow override of default controller [\#37](https://github.com/hopsoft/stimulus_reflex/pull/37) ([hopsoft](https://github.com/hopsoft))
 
 **Closed issues:**
 
@@ -402,10 +416,10 @@
 - Updated Minimal Javascript Example in README.md [\#47](https://github.com/hopsoft/stimulus_reflex/pull/47) ([kobaltz](https://github.com/kobaltz))
 - Setup StimulusReflex controller callbacks [\#45](https://github.com/hopsoft/stimulus_reflex/pull/45) ([hopsoft](https://github.com/hopsoft))
 - add .vscode directory to .gitignore [\#42](https://github.com/hopsoft/stimulus_reflex/pull/42) ([andrewmcodes](https://github.com/andrewmcodes))
-- Allow override of default controller [\#37](https://github.com/hopsoft/stimulus_reflex/pull/37) ([hopsoft](https://github.com/hopsoft))
 - update the name of the actions per feedback [\#36](https://github.com/hopsoft/stimulus_reflex/pull/36) ([andrewmcodes](https://github.com/andrewmcodes))
 - update github templates [\#35](https://github.com/hopsoft/stimulus_reflex/pull/35) ([andrewmcodes](https://github.com/andrewmcodes))
 - Tighten up security of remote invocation [\#32](https://github.com/hopsoft/stimulus_reflex/pull/32) ([hopsoft](https://github.com/hopsoft))
+- Add Ruby magic comment [\#18](https://github.com/hopsoft/stimulus_reflex/pull/18) ([dixpac](https://github.com/dixpac))
 
 **Fixed bugs:**
 
@@ -439,7 +453,6 @@
 **Implemented enhancements:**
 
 - Implicitly send DOM attributes to reflex methods [\#21](https://github.com/hopsoft/stimulus_reflex/pull/21) ([hopsoft](https://github.com/hopsoft))
-- Add Ruby magic comment [\#18](https://github.com/hopsoft/stimulus_reflex/pull/18) ([dixpac](https://github.com/dixpac))
 - Add GitHub Actions for Linters [\#17](https://github.com/hopsoft/stimulus_reflex/pull/17) ([andrewmcodes](https://github.com/andrewmcodes))
 
 **Fixed bugs:**

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stimulus_reflex (3.2.2.pre0)
+    stimulus_reflex (3.2.2.pre1)
       cable_ready (>= 4.1.2)
       nokogiri
       rack
@@ -69,7 +69,7 @@ GEM
     builder (3.2.4)
     cable_ready (4.1.2)
       rails (>= 5.2)
-    coderay (1.1.2)
+    coderay (1.1.3)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
     erubi (1.9.0)

data/README.md

@@ -11,7 +11,7 @@
       <img alt="License: MIT" src="https://img.shields.io/badge/license-MIT-brightgreen.svg" target="_blank" />
     </a>
     <a href="http://blog.codinghorror.com/the-best-code-is-no-code-at-all/" target="_blank">
-      <img alt="Lines of Code" src="https://img.shields.io/badge/lines_of_code-923-brightgreen.svg?style=flat" />
+      <img alt="Lines of Code" src="https://img.shields.io/badge/lines_of_code-929-brightgreen.svg?style=flat" />
     </a>
     <a href="https://docs.stimulusreflex.com/" target="_blank">
       <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />

data/lib/stimulus_reflex/channel.rb

@@ -28,25 +28,29 @@ class StimulusReflex::Channel < ActionCable::Channel::Base
     params = data["params"] || {}
 
     begin
-      reflex_class = reflex_name.constantize.tap { |klass| raise ArgumentError.new("#{reflex_name} is not a StimulusReflex::Reflex") unless is_reflex?(klass) }
-      reflex = reflex_class.new(self, url: url, element: element, selectors: selectors, method_name: method_name, params: params)
-      delegate_call_to_reflex reflex, method_name, arguments
-    rescue => invoke_error
-      reflex.rescue_with_handler(invoke_error)
-      message = exception_message_with_backtrace(invoke_error)
-      return broadcast_message subject: "error", body: "StimulusReflex::Channel Failed to invoke #{target}! #{url} #{message}", data: data
-    end
-
-    if reflex.halted?
-      broadcast_message subject: "halted", data: data
-    else
       begin
-        render_page_and_broadcast_morph reflex, selectors, data
-      rescue => render_error
-        reflex.rescue_with_handler(render_error)
-        message = exception_message_with_backtrace(render_error)
-        broadcast_message subject: "error", body: "StimulusReflex::Channel Failed to re-render #{url} #{message}", data: data
+        reflex_class = reflex_name.constantize.tap { |klass| raise ArgumentError.new("#{reflex_name} is not a StimulusReflex::Reflex") unless is_reflex?(klass) }
+        reflex = reflex_class.new(self, url: url, element: element, selectors: selectors, method_name: method_name, params: params)
+        delegate_call_to_reflex reflex, method_name, arguments
+      rescue => invoke_error
+        reflex.rescue_with_handler(invoke_error)
+        message = exception_message_with_backtrace(invoke_error)
+        return broadcast_message subject: "error", body: "StimulusReflex::Channel Failed to invoke #{target}! #{url} #{message}", data: data
       end
+
+      if reflex.halted?
+        broadcast_message subject: "halted", data: data
+      else
+        begin
+          render_page_and_broadcast_morph reflex, selectors, data
+        rescue => render_error
+          reflex.rescue_with_handler(render_error)
+          message = exception_message_with_backtrace(render_error)
+          broadcast_message subject: "error", body: "StimulusReflex::Channel Failed to re-render #{url} #{message}", data: data
+        end
+      end
+    ensure
+      commit_session reflex if reflex
     end
   end
 
@@ -81,26 +85,17 @@ class StimulusReflex::Channel < ActionCable::Channel::Base
     broadcast_morphs selectors, data, html if html.present?
   end
 
-  def commit_session(request, response)
-    store = request.session.instance_variable_get("@by")
-    store.commit_session request, response
+  def commit_session(reflex)
+    store = reflex.request.session.instance_variable_get("@by")
+    store.commit_session reflex.request, reflex.controller.response
   rescue => e
     message = "Failed to commit session! #{exception_message_with_backtrace(e)}"
     logger.error "\e[31m#{message}\e[0m"
   end
 
   def render_page(reflex)
-    controller = reflex.request.controller_class.new
-    controller.instance_variable_set :"@stimulus_reflex", true
-    reflex.instance_variables.each do |name|
-      controller.instance_variable_set name, reflex.instance_variable_get(name)
-    end
-
-    controller.request = reflex.request
-    controller.response = ActionDispatch::Response.new
-    controller.process reflex.url_params[:action]
-    commit_session reflex.request, controller.response
-    controller.response.body
+    reflex.controller.process reflex.url_params[:action]
+    reflex.controller.response.body
   end
 
   def broadcast_morphs(selectors, data, html)

data/lib/stimulus_reflex/reflex.rb

@@ -82,6 +82,17 @@ class StimulusReflex::Reflex
     end
   end
 
+  def controller
+    @controller ||= begin
+      request.controller_class.new.tap do |c|
+        c.instance_variable_set :"@stimulus_reflex", true
+        instance_variables.each { |name| c.instance_variable_set name, instance_variable_get(name) }
+        c.request = request
+        c.response = ActionDispatch::Response.new
+      end
+    end
+  end
+
   def url_params
     @url_params ||= Rails.application.routes.recognize_path_with_request(request, request.path, request.env[:extras] || {})
   end

data/lib/stimulus_reflex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StimulusReflex
-  VERSION = "3.2.2.pre0"
+  VERSION = "3.2.2.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stimulus_reflex
 version: !ruby/object:Gem::Version
-  version: 3.2.2.pre0
+  version: 3.2.2.pre1
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack