futurism 1.2.0.pre3 → 1.2.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e0ce6e5c458215afe4266493a6644a029b75f005bfbadcdc181b82325e0d43
-  data.tar.gz: 902744214a43cee7e28c57f1999e52191aaf2d2022860c53c4784ba9fda200fd
+  metadata.gz: 63b1ff17b81590446065de7fb4bf679605514bfaac06d59522f42d83fb6e771a
+  data.tar.gz: 5643e6051b11724edcf0274fb863c5d09a0d9fdfe82fd056c25bbdaaae901b69
 SHA512:
-  metadata.gz: a8638ce1768afd2da09199dc9e033b32168b54c401fd5ab2b26e20e127b38e4c172b93d8846cca8cc0adb28078073fb0bcd2554d70a5d070e60f631d1d596e5b
-  data.tar.gz: cf8c0a7ecd8451b15f7d71f496bd0e49adb358e1bf9770449424e4d4780709b410ba197f8c459a71468f46c3d7961b4ae331bd9e61e4d0e1d959720b46a7dd88
+  metadata.gz: c6803e1178cf5aab943cd1d7dfc7b1cea6a41342484a4e3d77235e8a4486925edbeccce713c95135e6f8b9df500cdad44d414c3208298c39739eb7f11b1e4f28
+  data.tar.gz: fba50ae48ee6c3100619cd62bc784f7e8e75c74698300fcd9e14dadf13d66987577badae393863e4da7dbe589c2c9016dde2296bbcf045e8193b91f5cde51d34

data/lib/futurism/helpers.rb

@@ -55,6 +55,7 @@ module Futurism
     class WrappingFuturismElement
       include ActionView::Helpers
       include Futurism::MessageVerifier
+      include Futurism::OptionsTransformer
 
       attr_reader :extends, :placeholder, :html_options, :data_attributes, :model, :options, :eager, :broadcast_each, :controller
 
@@ -92,14 +93,7 @@ module Futurism
       end
 
       def transformed_options
-        require_relative "shims/deep_transform_values" unless options.respond_to? :deep_transform_values
-
-        options.deep_transform_values do |value|
-          next(value) unless value.respond_to?(:to_global_id)
-          next(value) if value.is_a?(ActiveRecord::Base) && value.new_record?
-
-          value.to_global_id.to_s
-        end
+        dump_options(options)
       end
 
       private

data/lib/futurism/helpers.rb~

@@ -56,7 +56,7 @@ module Futurism
       include ActionView::Helpers
       include Futurism::MessageVerifier
 
-      attr_reader :placeholder, :html_options, :data_attributes, :model, :options, :eager, :broadcast_each, :controller
+      attr_reader :extends, :placeholder, :html_options, :data_attributes, :model, :options, :eager, :broadcast_each, :controller
 
       def initialize(extends:, placeholder:, options:)
         @extends = extends
@@ -81,7 +81,14 @@ module Futurism
       end
 
       def render
-        content_tag :"futurism-element", placeholder, html_options.deep_merge({data: dataset, extends: extends})
+        case extends
+        when :li
+          content_tag :li, placeholder, html_options.deep_merge({data: dataset, is: "futurism-li"})
+        when :tr
+          content_tag :tr, placeholder, html_options.deep_merge({data: dataset, is: "futurism-table-row"})
+        else
+          content_tag :"futurism-element", placeholder, html_options.deep_merge({data: dataset})
+        end
       end
 
       def transformed_options
@@ -106,15 +113,6 @@ module Futurism
 
         message_verifier.generate(controller.to_s)
       end
-
-      def extends
-        # TODO remove this in the next major version
-        case @extends
-        when :li then "list-item"
-        when :tr then "table-row"
-        else @extends
-        end
-      end
     end
   end
 end

data/lib/futurism/options_transformer.rb

@@ -0,0 +1,20 @@
+module Futurism
+  module OptionsTransformer
+    def dump_options(options)
+      require_relative "shims/deep_transform_values" unless options.respond_to? :deep_transform_values
+
+      options.deep_transform_values do |value|
+        next(value) unless value.respond_to?(:to_global_id)
+        next(value) if value.is_a?(ActiveRecord::Base) && value.new_record?
+
+        value.to_global_id.to_s
+      end
+    end
+
+    def load_options(options)
+      require_relative "shims/deep_transform_values" unless options.respond_to? :deep_transform_values
+
+      options.deep_transform_values { |value| value.is_a?(String) && value.start_with?("gid://") ? GlobalID::Locator.locate(value) : value }
+    end
+  end
+end

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

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module Futurism
   module Resolver
     class Controller
       class Renderer
+        HTTP_METHODS = [:get, :post, :put, :patch, :delete]
+
         def self.for(controller:, connection:, url:, params:)
           new(controller: controller, connection: connection, url: url, params: params).renderer
         end
@@ -30,7 +34,7 @@ module Futurism
             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)
+            path_params = recognize_url(url) # use full url to be more likely to match a url with subdomain constraints
 
             self.renderer =
               renderer.new(
@@ -42,7 +46,7 @@ module Futurism
                 Rack::PATH_INFO => path,
                 Rack::REQUEST_PATH => path,
                 Rack::QUERY_STRING => uri.query,
-                ActionDispatch::Http::Parameters::PARAMETERS_KEY => path_params.reverse_merge(path_params)
+                ActionDispatch::Http::Parameters::PARAMETERS_KEY => params.symbolize_keys.merge(path_params).merge(query_hash)
               )
           end
 
@@ -51,6 +55,21 @@ module Futurism
           new_env = connection.env.merge(renderer.instance_variable_get(:@env))
           renderer.instance_variable_set(:@env, new_env)
         end
+
+        def recognize_url(url)
+          HTTP_METHODS.each do |http_method|
+            path = Rails.application.routes.recognize_path(url, method: http_method)
+            return path if path
+          rescue ActionController::RoutingError
+            # Route not matched, try next
+          end
+
+          warn "We were unable to find a matching rails route for '#{url}'. " \
+               "This may be because there are proc-based routing constraints for this particular url, or " \
+               "it truly is an unrecognizable url."
+
+          {}
+        end
       end
     end
   end

data/lib/futurism/resolver/resources.rb

@@ -2,6 +2,7 @@ module Futurism
   module Resolver
     class Resources
       include Futurism::MessageVerifier
+      include Futurism::OptionsTransformer
 
       # resource definitions are an array of [signed_params, sgid, signed_controller, url, broadcast_each]
       def initialize(resource_definitions:, connection:, params:)
@@ -20,11 +21,11 @@ module Futurism
         end
 
         @resources_without_sgids.each do |resource_definition|
-          resource = lookup_resource(resource_definition)
+          options = options_from_resource(resource_definition)
           renderer = renderer_for(resource_definition: resource_definition)
           html =
             begin
-              renderer.render(resource)
+              renderer.render(options)
             rescue => exception
               error_renderer.render(exception)
             end
@@ -91,10 +92,9 @@ module Futurism
         GlobalID::Locator.locate_many_signed @resources_with_sgids.map(&:sgid)
       end
 
-      def lookup_resource(resource_definition)
-        message_verifier
-          .verify(resource_definition.signed_params)
-          .deep_transform_values { |value| value.is_a?(String) && value.start_with?("gid://") ? GlobalID::Locator.locate(value) : value }
+      def options_from_resource(resource_definition)
+        load_options(message_verifier
+          .verify(resource_definition.signed_params))
       end
     end
   end

data/lib/futurism/resolver/resources.rb~

@@ -3,7 +3,7 @@ module Futurism
     class Resources
       include Futurism::MessageVerifier
 
-      # resource definitions are an array of [signed_params, sgid, signed_controller, url]
+      # resource definitions are an array of [signed_params, sgid, signed_controller, url, broadcast_each]
       def initialize(resource_definitions:, connection:, params:)
         @connection = connection
         @params = params
@@ -16,7 +16,7 @@ module Futurism
         resolved_models.zip(@resources_with_sgids).each do |model, resource_definition|
           html = renderer_for(resource_definition: resource_definition).render(model)
 
-          yield(resource_definition.selector, html)
+          yield(resource_definition.selector, html, resource_definition.broadcast_each)
         end
 
         @resources_without_sgids.each do |resource_definition|
@@ -29,7 +29,7 @@ module Futurism
               error_renderer.render(exception)
             end
 
-          yield(resource_definition.selector, html)
+          yield(resource_definition.selector, html, resource_definition.broadcast_each)
         end
       end
 
@@ -43,7 +43,7 @@ module Futurism
         attr_reader :signed_params, :sgid, :signed_controller, :url
 
         def initialize(resource_definition)
-          @signed_params, @sgid, @signed_controller, @url = resource_definition
+          @signed_params, @sgid, @signed_controller, @url, @broadcast_each = resource_definition
         end
 
         def selector
@@ -55,6 +55,10 @@ module Futurism
         def controller
           Resolver::Controller.from(signed_string: @signed_controller)
         end
+
+        def broadcast_each
+          @broadcast_each == "true"
+        end
       end
 
       class ErrorRenderer

data/lib/futurism/version.rb

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.2.0.pre3"
+  VERSION = "1.2.0.pre7"
 end

data/lib/futurism/version.rb~

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.2.0.pre2"
+  VERSION = "1.2.0.pre6"
 end

data/lib/futurism.rb

@@ -3,6 +3,7 @@ require "action_cable"
 require "cable_ready"
 require "futurism/engine"
 require "futurism/message_verifier"
+require "futurism/options_transformer"
 require "futurism/resolver/resources"
 require "futurism/resolver/controller"
 require "futurism/resolver/controller/renderer"

data/lib/futurism.rb~

@@ -3,6 +3,7 @@ require "action_cable"
 require "cable_ready"
 require "futurism/engine"
 require "futurism/message_verifier"
+require "futurism/resolver/resources"
 require "futurism/resolver/controller"
 require "futurism/resolver/controller/renderer"
 require "futurism/channel"
@@ -20,7 +21,10 @@ module Futurism
     (@@default_controller || "::ApplicationController").to_s.constantize
   end
 
-  ActiveSupport.on_load(:action_view) {
+  ActiveSupport.on_load(:action_view) do
     include Futurism::Helpers
-  }
+  end
+
+  mattr_accessor :logger
+  self.logger ||= Rails.logger ? Rails.logger.new : Logger.new($stdout)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futurism
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre3
+  version: 1.2.0.pre7
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre4
+        version: 5.0.0.pre7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre4
+        version: 5.0.0.pre7
 description: Uses custom html elements with attached IntersectionObserver to automatically
   lazy load partials via websockets
 email:
@@ -156,6 +156,8 @@ files:
 - lib/futurism/helpers.rb
 - lib/futurism/helpers.rb~
 - lib/futurism/message_verifier.rb
+- lib/futurism/options_transformer.rb
+- lib/futurism/options_transformer.rb~
 - lib/futurism/resolver/controller.rb
 - lib/futurism/resolver/controller.rb~
 - lib/futurism/resolver/controller/renderer.rb