futurism 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e784a06ccd2401b46d5a8a0cffd44e194e3a69db8c10439a7bb1eb0a7cfcf3d8
-  data.tar.gz: 763001a24e053f55745e7560ce0fe446256328a01c758efaa4a3eb65424cd40e
+  metadata.gz: b49e6ebab4db767a2f7aaa4fbc6500ed4103787ea3abefc0489ef6a1536c4fec
+  data.tar.gz: 066ab614d937281fe22e5a6d17b8873370c29649815be1b966e2bc22e7cf4ed0
 SHA512:
-  metadata.gz: 1486c1e9d54f3e380c675f1fb5f79ec9dc4753446209dae14bbef9a15600f1635d81b0fd75415067019efd5c4b3df6110785da951ef4cc5076d5b9ae13febffc
-  data.tar.gz: d68ab7a3c7909206e92644b2d7b3e227ddf2e4d5d0c7d787bffbc9766dc48115bb785bd923aecf5dc64244a74dd419bc930148968ff72c827f3bf21d9c199031
+  metadata.gz: 638f1eb1bb3fb7304024282419ae2f3baa92a8e9cafe60d31ece08ba837925279005ce905b4acec2c68a6673f430b6b29fec8f4ee9fee5232539c2ea827f54ba
+  data.tar.gz: 5d9a0f5d66ee06ea62b6875b4cf19bab6a22c0b0f272ddacfbe2ad0f5d8f06b4a288c32a6863f5d9c4e65de4b9df3799343fff5a5086a06597e9b23a66c9ab53

data/lib/futurism.rb

@@ -3,6 +3,8 @@ require "action_cable"
 require "cable_ready"
 require "futurism/engine"
 require "futurism/message_verifier"
+require "futurism/resolver/controller"
+require "futurism/resolver/controller/renderer"
 require "futurism/channel"
 require "futurism/helpers"
 

data/lib/futurism/channel.rb

@@ -16,18 +16,20 @@ module Futurism
     end
 
     def receive(data)
-      resources = data.fetch_values("signed_params", "sgids", "signed_controllers") { |_key| Array.new(data["signed_params"].length, nil) }.transpose
+      resources = data.fetch_values("signed_params", "sgids", "signed_controllers", "urls") { |_key| Array.new(data["signed_params"].length, nil) }.transpose
 
-      resources.each do |signed_params, sgid, signed_controller|
+      resources.each do |signed_params, sgid, signed_controller, url|
         selector = "[data-signed-params='#{signed_params}']"
         selector << "[data-sgid='#{sgid}']" if sgid.present?
 
-        controller_lookup = ControllerLookup.from(signed_string: signed_controller)
-        controller_lookup.setup_env!(connection: connection)
-        controller = controller_lookup.controller
+        controller = Resolver::Controller.from(signed_string: signed_controller)
+        renderer = Resolver::Controller::Renderer.for(controller: controller,
+                                                      connection: connection,
+                                                      url: url,
+                                                      params: @params)
 
         resource = lookup_resource(signed_params: signed_params, sgid: sgid)
-        html = controller.render(resource)
+        html = renderer.render(resource)
 
         cable_ready[stream_name].outer_html(
           selector: selector,
@@ -47,41 +49,5 @@ module Futurism
         .verify(signed_params)
         .deep_transform_values { |value| value.is_a?(String) && value.start_with?("gid://") ? GlobalID::Locator.locate(value) : value }
     end
-
-    class ControllerLookup
-      include Futurism::MessageVerifier
-
-      def self.from(signed_string:)
-        new(signed_string)
-      end
-
-      def initialize(signed_string)
-        @signed_string = signed_string
-      end
-
-      def controller
-        if signed_string.present?
-          message_verifier
-            .verify(signed_string)
-            .to_s
-            .safe_constantize
-        else
-          default_controller
-        end
-      end
-
-      def setup_env!(connection:)
-        new_env = connection.env.merge(controller.renderer.instance_variable_get(:@env))
-        controller.renderer.instance_variable_set(:@env, new_env)
-      end
-
-      private
-
-      attr_reader :signed_string
-
-      def default_controller
-        Futurism.default_controller || ::ApplicationController
-      end
-    end
   end
 end

data/lib/futurism/channel.rb~

@@ -16,18 +16,20 @@ module Futurism
     end
 
     def receive(data)
-      resources = data.fetch_values("signed_params", "sgids", "signed_controllers") { |_key| Array.new(data["signed_params"].length, nil) }.transpose
+      resources = data.fetch_values("signed_params", "sgids", "signed_controllers", "urls") { |_key| Array.new(data["signed_params"].length, nil) }.transpose
 
-      resources.each do |signed_params, sgid, signed_controller|
+      resources.each do |signed_params, sgid, signed_controller, url|
         selector = "[data-signed-params='#{signed_params}']"
         selector << "[data-sgid='#{sgid}']" if sgid.present?
 
-        controller_lookup = ControllerLookup.from(signed_string: signed_controller)
-        controller_lookup.setup(connection: connection)
-        controller = controller_lookup.controller
+        controller = Resolver::Controller.from(signed_string: signed_controller)
+        renderer = Resolver::Controller::Renderer.for(controller: controller,
+                                                      connection: connection,
+                                                      url: url,
+                                                      params: @params)
 
         resource = lookup_resource(signed_params: signed_params, sgid: sgid)
-        html = controller.render(resource)
+        html = renderer.render(resource)
 
         cable_ready[stream_name].outer_html(
           selector: selector,
@@ -47,41 +49,5 @@ module Futurism
         .verify(signed_params)
         .deep_transform_values { |value| value.is_a?(String) && value.start_with?("gid://") ? GlobalID::Locator.locate(value) : value }
     end
-
-    class ControllerLookup
-      include Futurism::MessageVerifier
-
-      def self.from(signed_string:)
-        new(signed_string)
-      end
-
-      def initialize(signed_string)
-        @signed_string = signed_string
-      end
-
-      def controller
-        if signed_string.present?
-          message_verifier
-            .verify(signed_string)
-            .to_s
-            .safe_constantize
-        else
-          default_controller
-        end
-      end
-
-      def setup(connection:)
-        new_env = connection.env.merge(controller.renderer.instance_variable_get(:@env))
-        controller.renderer.instance_variable_set(:@env, new_env)
-      end
-
-      private
-
-      attr_reader :signed_string
-
-      def default_controller
-        Futurism.default_controller || ::ApplicationController
-      end
-    end
   end
 end

data/lib/futurism/helpers.rb~

@@ -3,11 +3,10 @@ module Futurism
     def futurize(records_or_string = nil, extends:, **options, &block)
       if Rails.env.test? && Futurism.skip_in_test
         if records_or_string.nil?
-          render options
+          return render(**options)
         else
-          render records_or_string, options
+          return render(records_or_string, **options)
         end
-        return
       end
 
       placeholder = capture(&block)
@@ -44,13 +43,15 @@ module Futurism
     # wraps functionality for rendering a futurism element
     class Element
       include ActionView::Helpers
+      include Futurism::MessageVerifier
 
-      attr_reader :extends, :placeholder, :html_options, :data_attributes, :model, :options, :eager
+      attr_reader :extends, :placeholder, :html_options, :data_attributes, :model, :options, :eager, :controller
 
       def initialize(extends:, placeholder:, options:)
         @extends = extends
         @placeholder = placeholder
         @eager = options.delete(:eager)
+        @controller = options.delete(:controller)
         @html_options = options.delete(:html_options) || {}
         @data_attributes = html_options.fetch(:data, {}).except(:sgid, :signed_params)
         @model = options.delete(:model)
@@ -61,7 +62,8 @@ module Futurism
         data_attributes.merge({
           signed_params: signed_params,
           sgid: model && model.to_sgid.to_s,
-          eager: eager.presence
+          eager: eager.presence,
+          signed_controller: signed_controller
         })
       end
 
@@ -87,7 +89,13 @@ module Futurism
       private
 
       def signed_params
-        Rails.application.message_verifier("futurism").generate(transformed_options)
+        message_verifier.generate(transformed_options)
+      end
+
+      def signed_controller
+        return unless controller.present?
+
+        message_verifier.generate(controller.to_s)
       end
     end
   end

data/lib/futurism/message_verifier.rb

@@ -1,6 +1,8 @@
 module Futurism
   module MessageVerifier
-    private
+    def self.message_verifier
+      @message_verifier ||= Rails.application.message_verifier("futurism")
+    end
 
     def message_verifier
       @message_verifier ||= Rails.application.message_verifier("futurism")

data/lib/futurism/resolver/controller.rb

@@ -0,0 +1,21 @@
+module Futurism
+  module Resolver
+    class Controller
+      def self.from(signed_string:)
+        if signed_string.present?
+          Futurism::MessageVerifier
+            .message_verifier
+            .verify(signed_string)
+            .to_s
+            .safe_constantize
+        else
+          default_controller
+        end
+      end
+
+      def self.default_controller
+        Futurism.default_controller || ::ApplicationController
+      end
+    end
+  end
+end

data/lib/futurism/resolver/controller/renderer.rb

@@ -0,0 +1,57 @@
+module Futurism
+  module Resolver
+    class Controller
+      class Renderer
+        def self.for(controller:, connection:, url:, params:)
+          new(controller: controller, connection: connection, url: url, params: params).renderer
+        end
+
+        def initialize(controller:, connection:, url:, params:)
+          @controller = controller
+          @connection = connection
+          @url = url || ""
+          @params = params || {}
+
+          setup_env!
+        end
+
+        def renderer
+          @renderer ||= controller.renderer
+        end
+
+        private
+
+        attr_reader :controller, :connection, :url, :params
+        attr_writer :renderer
+
+        def setup_env!
+          if url.present?
+            uri = URI.parse(url)
+            path = ActionDispatch::Journey::Router::Utils.normalize_path(uri.path)
+            query_hash = Rack::Utils.parse_nested_query(uri.query)
+
+            path_params = Rails.application.routes.recognize_path(path)
+
+            self.renderer =
+              renderer.new(
+                "rack.request.query_hash" => query_hash,
+                "rack.request.query_string" => uri.query,
+                "ORIGINAL_SCRIPT_NAME" => "",
+                "ORIGINAL_FULLPATH" => path,
+                Rack::SCRIPT_NAME => "",
+                Rack::PATH_INFO => path,
+                Rack::REQUEST_PATH => path,
+                Rack::QUERY_STRING => uri.query,
+                ActionDispatch::Http::Parameters::PARAMETERS_KEY => params.symbolize_keys.merge(path_params).merge(query_hash)
+              )
+          end
+
+          # Copy connection env to renderer to fix some RACK related issues from gems like
+          # Warden or Devise
+          new_env = connection.env.merge(renderer.instance_variable_get(:@env))
+          renderer.instance_variable_set(:@env, new_env)
+        end
+      end
+    end
+  end
+end

data/lib/futurism/resolver/controller/renderer.rb~

@@ -0,0 +1,57 @@
+module Futurism
+  module Resolver
+    class Controller
+      class Renderer
+        def self.for(controller:, connection:, url:, params:)
+          new(controller: controller, connection: connection, url: url, params: params).renderer
+        end
+
+        def initialize(controller:, connection:, url:, params:)
+          @controller = controller
+          @connection = connection
+          @url = url || ""
+          @params = params || {}
+
+          setup_env!
+        end
+
+        def renderer
+          @renderer ||= controller.renderer
+        end
+
+        private
+
+        attr_reader :controller, :connection, :url, :params
+        attr_writer :renderer
+
+        def setup_env!
+          if url.present?
+            uri = URI.parse(url)
+            path = ActionDispatch::Journey::Router::Utils.normalize_path(uri.path)
+            query_hash = Rack::Utils.parse_nested_query(uri.query)
+
+            path_params = Rails.application.routes.recognize_path(path)
+
+            self.renderer =
+              renderer.new(
+                "rack.request.query_hash" => query_hash,
+                "rack.request.query_string" => uri.query,
+                "ORIGINAL_SCRIPT_NAME" => "",
+                "ORIGINAL_FULLPATH" => path,
+                Rack::SCRIPT_NAME => "",
+                Rack::PATH_INFO => path,
+                Rack::REQUEST_PATH => path,
+                Rack::QUERY_STRING => uri.query,
+                ActionDispatch::Http::Parameters::PARAMETERS_KEY => path_params.reverse_merge(path_params)
+              )
+          end
+
+          # Copy connection env to renderer to fix some RACK related issues from gems like
+          # Warden or Devise
+          new_env = connection.env.merge(renderer.instance_variable_get(:@env))
+          renderer.instance_variable_set(:@env, new_env)
+        end
+      end
+    end
+  end
+end

data/lib/futurism/version.rb

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futurism
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: spy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +170,9 @@ files:
 - lib/futurism/helpers.rb
 - lib/futurism/helpers.rb~
 - lib/futurism/message_verifier.rb
+- lib/futurism/resolver/controller.rb
+- lib/futurism/resolver/controller/renderer.rb
+- lib/futurism/resolver/controller/renderer.rb~
 - lib/futurism/shims/deep_transform_values.rb
 - lib/futurism/version.rb
 - lib/tasks/futurism_tasks.rake