futurism 1.2.0.pre6 → 1.2.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537c168d243e6e4f9f055772dffd97aaf232ebba99d1ab859727a53703c2cafb
-  data.tar.gz: 5292bc29b938014ee86630278d89fc0310d5f01abd28ad4a54ff59ceb364713b
+  metadata.gz: 63b1ff17b81590446065de7fb4bf679605514bfaac06d59522f42d83fb6e771a
+  data.tar.gz: 5643e6051b11724edcf0274fb863c5d09a0d9fdfe82fd056c25bbdaaae901b69
 SHA512:
-  metadata.gz: 7f33c8434607ed9af5f0e0c5169a2f87c3a6efa90ea2164bbccee2a49b68646221f7d52981779dc7eaeae7146fc0a866f37e851309ef976407569f96868023e3
-  data.tar.gz: 811a2515f81c66c8d13a07eb81e4e42796427f2c70e96c0b8d22d5a4edf138cf3c63c5d21b80e1e75e46f2cf7583be80bd01ec4dc8eeec998c7fdef1a45ee54f
+  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/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/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/version.rb

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

data/lib/futurism/version.rb~

@@ -1,3 +1,3 @@
 module Futurism
-  VERSION = "1.2.0.pre5"
+  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.pre6
+  version: 1.2.0.pre7
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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