futurism 1.2.0.pre1 → 1.2.0.pre5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9159c27d53f4cb3a84298c2481e022d9f3979f67d1e580cba63918151bbd4011
4
- data.tar.gz: f7f8b7b2e32c7d134a67084dfb431a2938f205129177ae45a78b868616fddf16
3
+ metadata.gz: fc29fd03d9fa515ea28181fe64200b9d7c4604d1c21054631d91ca27b05e427b
4
+ data.tar.gz: 71b988db5dc15ebe2e4b6f664eed63f8191d9862aa4908cd4f55488325dabb99
5
5
  SHA512:
6
- metadata.gz: 7978fded05dd4f23e6a776b8b8c8a358ab61ca1b05d1c3d2c42b1502a32e1046419b254e26a5f2f727bb35b3d7f1eb58e656737cf657a8003e957cad898dfa29
7
- data.tar.gz: 2b242632064a29721d40cb7d0b3e1f2d5be72bafc0078e48cda4dffdf2994944a1b36f7ed8a2be1692a8245df43f0907607fb43ecfc8aaa8e5ba78f17ae77d39
6
+ metadata.gz: d4af993ae0837c97ca3a3ebf5a98e49630c00fb08f754c2205241bcb1d305a3692cde29a496af14bcfa800ff8a01c28c29d9abe909551727ac44ff86cb81a7af
7
+ data.tar.gz: 2403ff29ef9a89291f615225ebb1618a3e221d2185672df6af02f54fdff98d1209fa4e74a61716c12213730dbd56917744136946ee3732bc0b312c97c33731a1
@@ -28,12 +28,13 @@ module Futurism
28
28
 
29
29
  WrappingFuturismElement.new(extends: extends, placeholder: placeholder, options: options).render
30
30
  else
31
- placeholder = capture(record, index, &block) if block_given?
32
-
33
31
  collection_class_name = collection.try(:klass).try(:name) || collection.first.class.to_s
34
32
  as = options.delete(:as) || collection_class_name.underscore
35
33
  broadcast_each = options.delete(:broadcast_each) || false
34
+
36
35
  collection.each_with_index.map { |record, index|
36
+ placeholder = capture(record, index, &block) if block_given?
37
+
37
38
  WrappingFuturismElement.new(extends: extends, placeholder: placeholder, options: options.deep_merge(
38
39
  broadcast_each: broadcast_each,
39
40
  locals: {as.to_sym => record, "#{as}_counter".to_sym => index}
@@ -1,7 +1,11 @@
1
+ # frozen_string_literal: true
2
+
1
3
  module Futurism
2
4
  module Resolver
3
5
  class Controller
4
6
  class Renderer
7
+ HTTP_METHODS = [:get, :post, :put, :patch, :delete]
8
+
5
9
  def self.for(controller:, connection:, url:, params:)
6
10
  new(controller: controller, connection: connection, url: url, params: params).renderer
7
11
  end
@@ -30,7 +34,7 @@ module Futurism
30
34
  path = ActionDispatch::Journey::Router::Utils.normalize_path(uri.path)
31
35
  query_hash = Rack::Utils.parse_nested_query(uri.query)
32
36
 
33
- path_params = Rails.application.routes.recognize_path(path)
37
+ path_params = recognize_url(url) # use full url to be more likely to match a url with subdomain constraints
34
38
 
35
39
  self.renderer =
36
40
  renderer.new(
@@ -42,7 +46,7 @@ module Futurism
42
46
  Rack::PATH_INFO => path,
43
47
  Rack::REQUEST_PATH => path,
44
48
  Rack::QUERY_STRING => uri.query,
45
- ActionDispatch::Http::Parameters::PARAMETERS_KEY => path_params.reverse_merge(path_params)
49
+ ActionDispatch::Http::Parameters::PARAMETERS_KEY => params.symbolize_keys.merge(path_params).merge(query_hash)
46
50
  )
47
51
  end
48
52
 
@@ -51,6 +55,21 @@ module Futurism
51
55
  new_env = connection.env.merge(renderer.instance_variable_get(:@env))
52
56
  renderer.instance_variable_set(:@env, new_env)
53
57
  end
58
+
59
+ def recognize_url(url)
60
+ HTTP_METHODS.each do |http_method|
61
+ path = Rails.application.routes.recognize_path(url, method: http_method)
62
+ return path if path
63
+ rescue ActionController::RoutingError
64
+ # Route not matched, try next
65
+ end
66
+
67
+ warn "We were unable to find a matching rails route for '#{url}'. " \
68
+ "This may be because there are proc-based routing constraints for this particular url, or " \
69
+ "it truly is an unrecognizable url."
70
+
71
+ {}
72
+ end
54
73
  end
55
74
  end
56
75
  end
@@ -3,7 +3,7 @@ module Futurism
3
3
  class Resources
4
4
  include Futurism::MessageVerifier
5
5
 
6
- # resource definitions are an array of [signed_params, sgid, signed_controller, url]
6
+ # resource definitions are an array of [signed_params, sgid, signed_controller, url, broadcast_each]
7
7
  def initialize(resource_definitions:, connection:, params:)
8
8
  @connection = connection
9
9
  @params = params
@@ -16,7 +16,7 @@ module Futurism
16
16
  resolved_models.zip(@resources_with_sgids).each do |model, resource_definition|
17
17
  html = renderer_for(resource_definition: resource_definition).render(model)
18
18
 
19
- yield(resource_definition.selector, html)
19
+ yield(resource_definition.selector, html, resource_definition.broadcast_each)
20
20
  end
21
21
 
22
22
  @resources_without_sgids.each do |resource_definition|
@@ -29,7 +29,7 @@ module Futurism
29
29
  error_renderer.render(exception)
30
30
  end
31
31
 
32
- yield(resource_definition.selector, html)
32
+ yield(resource_definition.selector, html, resource_definition.broadcast_each)
33
33
  end
34
34
  end
35
35
 
@@ -43,7 +43,7 @@ module Futurism
43
43
  attr_reader :signed_params, :sgid, :signed_controller, :url
44
44
 
45
45
  def initialize(resource_definition)
46
- @signed_params, @sgid, @signed_controller, @url = resource_definition
46
+ @signed_params, @sgid, @signed_controller, @url, @broadcast_each = resource_definition
47
47
  end
48
48
 
49
49
  def selector
@@ -55,6 +55,10 @@ module Futurism
55
55
  def controller
56
56
  Resolver::Controller.from(signed_string: @signed_controller)
57
57
  end
58
+
59
+ def broadcast_each
60
+ @broadcast_each == "true"
61
+ end
58
62
  end
59
63
 
60
64
  class ErrorRenderer
@@ -1,3 +1,3 @@
1
1
  module Futurism
2
- VERSION = "1.2.0.pre1"
2
+ VERSION = "1.2.0.pre5"
3
3
  end
@@ -1,3 +1,3 @@
1
1
  module Futurism
2
- VERSION = "1.1.0"
2
+ VERSION = "1.2.0.pre4"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: futurism
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.pre1
4
+ version: 1.2.0.pre5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Julian Rubisch
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-09-14 00:00:00.000000000 Z
11
+ date: 2021-10-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -128,14 +128,14 @@ dependencies:
128
128
  requirements:
129
129
  - - '='
130
130
  - !ruby/object:Gem::Version
131
- version: 5.0.0.pre3
131
+ version: 5.0.0.pre6
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - '='
137
137
  - !ruby/object:Gem::Version
138
- version: 5.0.0.pre3
138
+ version: 5.0.0.pre6
139
139
  description: Uses custom html elements with attached IntersectionObserver to automatically
140
140
  lazy load partials via websockets
141
141
  email: