futurism 1.2.0.pre1 → 1.2.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9159c27d53f4cb3a84298c2481e022d9f3979f67d1e580cba63918151bbd4011
-  data.tar.gz: f7f8b7b2e32c7d134a67084dfb431a2938f205129177ae45a78b868616fddf16
+  metadata.gz: fc29fd03d9fa515ea28181fe64200b9d7c4604d1c21054631d91ca27b05e427b
+  data.tar.gz: 71b988db5dc15ebe2e4b6f664eed63f8191d9862aa4908cd4f55488325dabb99
 SHA512:
-  metadata.gz: 7978fded05dd4f23e6a776b8b8c8a358ab61ca1b05d1c3d2c42b1502a32e1046419b254e26a5f2f727bb35b3d7f1eb58e656737cf657a8003e957cad898dfa29
-  data.tar.gz: 2b242632064a29721d40cb7d0b3e1f2d5be72bafc0078e48cda4dffdf2994944a1b36f7ed8a2be1692a8245df43f0907607fb43ecfc8aaa8e5ba78f17ae77d39
+  metadata.gz: d4af993ae0837c97ca3a3ebf5a98e49630c00fb08f754c2205241bcb1d305a3692cde29a496af14bcfa800ff8a01c28c29d9abe909551727ac44ff86cb81a7af
+  data.tar.gz: 2403ff29ef9a89291f615225ebb1618a3e221d2185672df6af02f54fdff98d1209fa4e74a61716c12213730dbd56917744136946ee3732bc0b312c97c33731a1

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.pre1"
+  VERSION = "1.2.0.pre5"
 end

data/lib/futurism/version.rb~

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.1.0"
+  VERSION = "1.2.0.pre4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futurism
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre1
+  version: 1.2.0.pre5
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-10-14 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.pre3
+        version: 5.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre3
+        version: 5.0.0.pre6
 description: Uses custom html elements with attached IntersectionObserver to automatically
   lazy load partials via websockets
 email: