futurism 1.2.0.pre2 → 1.2.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f16be3e103b54e5c6bbd9efaea16b7196d0e4a561bde8b61051989b1e74e59
-  data.tar.gz: 67c9a17bb4a80fcc12f830bf8ce39174086e336b93d041f822308a20359381dc
+  metadata.gz: 537c168d243e6e4f9f055772dffd97aaf232ebba99d1ab859727a53703c2cafb
+  data.tar.gz: 5292bc29b938014ee86630278d89fc0310d5f01abd28ad4a54ff59ceb364713b
 SHA512:
-  metadata.gz: ff6e67f624ad9ccd114800b457c4f7e48fa6232f87aa970f7f1513b59bd4ea3daedf05806e2582af057588d1cd19075e87ab81f8f4ffde23544f64b6e8ae2a5c
-  data.tar.gz: 1bafaacb876d3d50d020692a555946112a74bdb10b0cabac0e67b3b57f561b7935ba25024c0792102ec9f89addfa54fde03daf10101364cb27b51f687817956f
+  metadata.gz: 7f33c8434607ed9af5f0e0c5169a2f87c3a6efa90ea2164bbccee2a49b68646221f7d52981779dc7eaeae7146fc0a866f37e851309ef976407569f96868023e3
+  data.tar.gz: 811a2515f81c66c8d13a07eb81e4e42796427f2c70e96c0b8d22d5a4edf138cf3c63c5d21b80e1e75e46f2cf7583be80bd01ec4dc8eeec998c7fdef1a45ee54f

data/lib/futurism/helpers.rb~

@@ -28,12 +28,13 @@ module Futurism
 
         WrappingFuturismElement.new(extends: extends, placeholder: placeholder, options: options).render
       else
-        placeholder = capture(record, index, &block) if block_given?
-
         collection_class_name = collection.try(:klass).try(:name) || collection.first.class.to_s
         as = options.delete(:as) || collection_class_name.underscore
         broadcast_each = options.delete(:broadcast_each) || false
+
         collection.each_with_index.map { |record, index|
+          placeholder = capture(record, index, &block) if block_given?
+
           WrappingFuturismElement.new(extends: extends, placeholder: placeholder, options: options.deep_merge(
             broadcast_each: broadcast_each,
             locals: {as.to_sym => record, "#{as}_counter".to_sym => index}

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~

@@ -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.pre2"
+  VERSION = "1.2.0.pre6"
 end

data/lib/futurism/version.rb~

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.2.0.pre1"
+  VERSION = "1.2.0.pre5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futurism
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre2
+  version: 1.2.0.pre6
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-27 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: