motion 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d428a43d143191e5faba15d7b7aa25376bf375820eacc283c0aeb4148653e1
-  data.tar.gz: 3471947a7f72af5df84b13a2d995998201102c8174fd7a7dfee6a27a08a86a79
+  metadata.gz: d25829b24f8c2781bcc44f9132061532d3c5b3466e60e69ab646407d27c32519
+  data.tar.gz: c3e69af9595e1fe7b659a6ed51a57c252d2028581aa4f154e4a150ee2a74b12c
 SHA512:
-  metadata.gz: ea47401782fe8331ee73c8201263de1ad75853842d14c57f68a416d821ae92416ac3c9bd5e6859bd6a10dc8785f8ecfe71a8e84417f02461afef3a8fda69ab0f
-  data.tar.gz: 8ce1dc79f7344bbf14b8537c806ff1b66e2dd6cfdddfc995925081edb2e7fdbc3ca10a9fdd5b04d9addbd78a8ba1333e7c324bb0a50644d71fbd515548d11f3b
+  metadata.gz: f1bb6c0022e3636d62d6ba054aeac9e16c353bc5d646aa83c460a0eaf1f0fc0774efd71b03d3eb47456a033a66521907fc3e23e29fc02c4d09124a03732e940c
+  data.tar.gz: aa336213b2487da46b868b8c89f74ff55ec745078ffdb1e75fdeafe7d7707870f8f140013d8d9218e68998f89911813f9e0437d75f9261ccc29ec957990b6b02

data/lib/generators/motion/templates/motion.js

@@ -1,5 +1,5 @@
-import { createClient } from '@unabridged/motion';
-import consumer from './channels/consumer';
+import { createClient } from '@unabridged/motion'
+import consumer from './channels/consumer'
 
 export default createClient({
 
@@ -11,7 +11,7 @@ export default createClient({
   // Motion can log information about the lifecycle of components to the
   // browser's console. It is recommended to turn this feature off outside of
   // development.
-  logging: process.env["RAILS_ENV"] === "development",
+  logging: process.env.RAILS_ENV === 'development'
 
   // This function will be called for every motion, and the return value will be
   // made available at `Motion::Event#extra_data`:
@@ -30,8 +30,8 @@ export default createClient({
   // The data attributes used by Motion can be customized, but these values must
   // also be updated in the Ruby initializer:
   //
-  //    keyAttribute: "data-motion-key",
-  //    stateAttribute: "data-motion-state",
-  //    motionAttribute: "data-motion",
+  //    keyAttribute: 'data-motion-key',
+  //    stateAttribute: 'data-motion-state',
+  //    motionAttribute: 'data-motion',
 
-});
+})

data/lib/motion.rb

@@ -19,41 +19,43 @@ module Motion
   autoload :Serializer, "motion/serializer"
   autoload :TestHelpers, "motion/test_helpers"
 
-  def self.configure(&block)
-    raise AlreadyConfiguredError if @config
-
-    @config = Configuration.new(&block)
-  end
-
-  def self.config
-    @config ||= Configuration.default
-  end
-
-  singleton_class.alias_method :configuration, :config
-
-  def self.serializer
-    @serializer ||= Serializer.new
-  end
-
-  def self.markup_transformer
-    @markup_transformer ||= MarkupTransformer.new
-  end
-
-  def self.build_renderer_for(websocket_connection)
-    config.renderer_for_connection_proc.call(websocket_connection)
-  end
-
-  def self.notify_error(error, message)
-    config.error_notification_proc&.call(error, message)
-  end
-
-  # This method only exists for testing. Changing configuration while Motion is
-  # in use is not supported. It is only safe to call this method when no
-  # components are currently mounted.
-  def self.reset_internal_state_for_testing!(new_configuration = nil)
-    @config = new_configuration
-    @serializer = nil
-    @markup_transformer = nil
+  class << self
+    def configure(&block)
+      raise AlreadyConfiguredError if @config
+
+      @config = Configuration.new(&block)
+    end
+
+    def config
+      @config ||= Configuration.default
+    end
+
+    alias_method :configuration, :config
+
+    def serializer
+      @serializer ||= Serializer.new
+    end
+
+    def markup_transformer
+      @markup_transformer ||= MarkupTransformer.new
+    end
+
+    def build_renderer_for(websocket_connection)
+      config.renderer_for_connection_proc.call(websocket_connection)
+    end
+
+    def notify_error(error, message)
+      config.error_notification_proc&.call(error, message)
+    end
+
+    # This method only exists for testing. Changing configuration while Motion
+    # is in use is not supported. It is only safe to call this method when no
+    # components are currently mounted.
+    def reset_internal_state_for_testing!(new_configuration = nil)
+      @config = new_configuration
+      @serializer = nil
+      @markup_transformer = nil
+    end
   end
 end
 

data/lib/motion/component/broadcasts.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
-require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/object/to_param"
 require "active_support/core_ext/hash/except"
 
@@ -12,6 +11,9 @@ module Motion
     module Broadcasts
       extend ActiveSupport::Concern
 
+      DEFAULT = {}.freeze
+      private_constant :DEFAULT
+
       # Analogous to `module_function` (available on both class and instance)
       module ModuleFunctions
         def stream_from(broadcast, handler)
@@ -37,14 +39,6 @@ module Motion
         end
       end
 
-      included do
-        class_attribute :_broadcast_handlers,
-          instance_reader: false,
-          instance_writer: false,
-          instance_predicate: false,
-          default: {}.freeze
-      end
-
       class_methods do
         include ModuleFunctions
 
@@ -56,6 +50,15 @@ module Motion
           serialize_broadcasting([name, model])
         end
 
+        attr_writer :_broadcast_handlers
+
+        def _broadcast_handlers
+          return @_broadcast_handlers if defined?(@_broadcast_handlers)
+          return superclass._broadcast_handlers if superclass.respond_to?(:_broadcast_handlers)
+
+          DEFAULT
+        end
+
         private
 
         # This definition is copied from ActionCable::Channel::Broadcasting

data/lib/motion/component/lifecycle.rb

@@ -105,8 +105,7 @@ module Motion
 
         run_callbacks(:action, &block)
       ensure
-        # `@_action_callback_context = nil` would still appear in the state
-        remove_instance_variable(:@_action_callback_context)
+        @_action_callback_context = nil
       end
     end
   end

data/lib/motion/component/motions.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
-require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/hash/except"
 
 require "motion"
@@ -11,6 +10,9 @@ module Motion
     module Motions
       extend ActiveSupport::Concern
 
+      DEFAULT = {}.freeze
+      private_constant :DEFAULT
+
       # Analogous to `module_function` (available on both class and instance)
       module ModuleFunctions
         def map_motion(motion, handler = motion)
@@ -28,16 +30,17 @@ module Motion
         end
       end
 
-      included do
-        class_attribute :_motion_handlers,
-          instance_reader: false,
-          instance_writer: false,
-          instance_predicate: false,
-          default: {}.freeze
-      end
-
       class_methods do
         include ModuleFunctions
+
+        attr_writer :_motion_handlers
+
+        def _motion_handlers
+          return @_motion_handlers if defined?(@_motion_handlers)
+          return superclass._motion_handlers if superclass.respond_to?(:_motion_handlers)
+
+          DEFAULT
+        end
       end
 
       include ModuleFunctions

data/lib/motion/component/periodic_timers.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/concern"
-require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/hash/except"
 
 require "motion"
@@ -11,6 +10,9 @@ module Motion
     module PeriodicTimers
       extend ActiveSupport::Concern
 
+      DEFAULT = {}.freeze
+      private_constant :DEFAULT
+
       # Analogous to `module_function` (available on both class and instance)
       module ModuleFunctions
         def every(interval, handler, name: handler)
@@ -32,16 +34,17 @@ module Motion
         end
       end
 
-      included do
-        class_attribute :_periodic_timers,
-          instance_reader: false,
-          instance_writer: false,
-          instance_predicate: false,
-          default: {}.freeze
-      end
-
       class_methods do
         include ModuleFunctions
+
+        attr_writer :_periodic_timers
+
+        def _periodic_timers
+          return @_periodic_timers if defined?(@_periodic_timers)
+          return superclass._periodic_timers if superclass.respond_to?(:_periodic_timers)
+
+          DEFAULT
+        end
       end
 
       include ModuleFunctions

data/lib/motion/component/rendering.rb

@@ -5,27 +5,34 @@ require "motion"
 module Motion
   module Component
     module Rendering
-      # Use the presence/absence of the ivar instead of true/false to avoid
-      # extra serialized state (Note that in this scheme, the presence of
-      # the ivar will never be serialized).
-      RERENDER_MARKER_IVAR = :@__awaiting_forced_rerender__
-      private_constant :RERENDER_MARKER_IVAR
-
-      # Some changes to Motion's state are specifically supported during render.
-      ALLOWED_NEW_IVARS_DURING_RENDER = %i[
-        @_broadcast_handlers
-        @_stable_instance_identifier_for_callbacks
-        @_motion_handlers
-        @_periodic_timers
+      STATE_EXCLUDED_IVARS = %i[
+        @_action_callback_context
+        @_awaiting_forced_rerender
+        @_routes
+
+        @view_context
+        @lookup_context
+        @view_renderer
+        @view_flow
+        @virtual_path
+        @variant
+        @current_template
+        @output_buffer
+
+        @helpers
+        @controller
+        @request
+        @tag_builder
       ].freeze
-      private_constant :ALLOWED_NEW_IVARS_DURING_RENDER
+
+      private_constant :STATE_EXCLUDED_IVARS
 
       def rerender!
-        instance_variable_set(RERENDER_MARKER_IVAR, true)
+        @_awaiting_forced_rerender = true
       end
 
       def awaiting_forced_rerender?
-        instance_variable_defined?(RERENDER_MARKER_IVAR)
+        @_awaiting_forced_rerender
       end
 
       # * This can be overwritten.
@@ -43,7 +50,7 @@ module Motion
           _run_action_callbacks(context: :render) {
             _clear_awaiting_forced_rerender!
 
-            view_context.capture { _without_new_instance_variables { super } }
+            view_context.capture { super }
           }
 
         raise RenderAborted, self if html == false
@@ -54,21 +61,19 @@ module Motion
       private
 
       def _clear_awaiting_forced_rerender!
-        return unless awaiting_forced_rerender?
-
-        remove_instance_variable(RERENDER_MARKER_IVAR)
+        @_awaiting_forced_rerender = false
       end
 
-      def _without_new_instance_variables
-        existing_instance_variables = instance_variables
+      def marshal_dump
+        (instance_variables - STATE_EXCLUDED_IVARS)
+          .map { |ivar| [ivar, instance_variable_get(ivar)] }
+          .to_h
+      end
 
-        yield
-      ensure
-        (
-          instance_variables -
-          existing_instance_variables -
-          ALLOWED_NEW_IVARS_DURING_RENDER
-        ).each(&method(:remove_instance_variable))
+      def marshal_load(instance_variables)
+        instance_variables.each do |ivar, value|
+          instance_variable_set(ivar, value)
+        end
       end
     end
   end

data/lib/motion/event.rb

@@ -18,7 +18,7 @@ module Motion
       raw["type"]
     end
 
-    alias name type
+    alias_method :name, :type
 
     def details
       raw.fetch("details", {})
@@ -34,14 +34,12 @@ module Motion
       @target = Motion::Element.from_raw(raw["target"])
     end
 
-    def current_target
-      return @current_target if defined?(@current_target)
+    def element
+      return @element if defined?(@element)
 
-      @current_target = Motion::Element.from_raw(raw["currentTarget"])
+      @element = Motion::Element.from_raw(raw["element"])
     end
 
-    alias element current_target
-
     def form_data
       element&.form_data
     end

data/lib/motion/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motion
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Alec Larsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: lz4-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -102,7 +102,7 @@ metadata:
   source_code_uri: https://github.com/unabridged/motion
 post_install_message: |
   Friendly reminder: When updating the motion gem, don't forget to update the
-  NPM package as well (`bin/yarn add '@unabridged/motion@0.4.2'`).
+  NPM package as well (`bin/yarn add '@unabridged/motion@0.4.3'`).
 rdoc_options: []
 require_paths:
 - lib
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="