hyper-state 1.0.alpha1.1 → 1.0.alpha1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb10ec05b438da9beead09918566a05d03ad119dd9711507ea6073e7dd08bc12
-  data.tar.gz: 55bff91b14d242a57e1792deafcfe8204ca773c782f918fe005161ab28fac267
+  metadata.gz: acfff47e32791c6d2f2bb0d4f2b0f171db4a0b041f45ff8424d5695cc515a4cf
+  data.tar.gz: 62c00f7a40cd804b285d72b31465946498e5e4cd842daca9ac07b9d5fc9754cd
 SHA512:
-  metadata.gz: 6f44826d393b99865fb6d5501d5beffbf7e01152557e19bd4e5269599b57b14cd52cba54e9de50f8446c10e950403c37d722997094866fe910dc8b5263d58b9a
-  data.tar.gz: 1bdce0a88d8c6307bea7ca9e1e286f547bc5927daf4eeff744bb06ee8b82fc4366a9baa1eb0753f7bf65f1c4781784a5a8acd1bfa86385867e23fca87d70aff8
+  metadata.gz: 8e27eb935d489093c38b53fd05bcb1d03a9b34deeaf1729eb7427916b251f1dcd0b9ea7bec9718003a10f4bd436347f52be6762dad08a4fe11c7b8acc39491d8
+  data.tar.gz: bc0b139edc6a1f62f0d16766a7f20590b4a3ca71e54f9e2c9d3ec012e73869159c6e8ef4d6ec9725424a778b3b8e709e0dce068a6dd28097b0ed964b6f7f9ff8

data/.gitignore

@@ -11,7 +11,6 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
-Gemfile.lock
 
 # TODO Comment out these rules if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
@@ -51,3 +50,7 @@ bower.json
 
 # ignore IDE files
 .idea
+
+# ignore Gemfile.locks https://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
+/spec/test_app/Gemfile.lock
+/Gemfile.lock

data/hyper-state.gemspec

@@ -22,26 +22,25 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'hyperstack-config', Hyperstack::State::VERSION
-  spec.add_dependency 'opal', '>= 0.11.0', '< 0.12.0'
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'chromedriver-helper'
   spec.add_development_dependency 'hyper-component', Hyperstack::State::VERSION
   spec.add_development_dependency 'hyper-spec', Hyperstack::State::VERSION
   spec.add_development_dependency 'listen'
-  spec.add_development_dependency 'mini_racer', '~> 0.1.15'
+  # spec.add_development_dependency 'mini_racer', '~> 0.2.4'
   spec.add_development_dependency 'opal-browser', '~> 0.2.0'
-  spec.add_development_dependency 'opal-rails', '~> 0.9.4'
-  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'opal-rails', '>= 0.9.4', '< 2.0'
   spec.add_development_dependency 'pry-rescue'
+  spec.add_development_dependency 'pry-stack_explorer'
   spec.add_development_dependency 'puma'
-  spec.add_development_dependency 'rails', '>= 4.0.0'
+  spec.add_development_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
   spec.add_development_dependency 'rspec', '~> 3.7.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-steps', '~> 2.1.1'
   spec.add_development_dependency 'rubocop', '~> 0.51.0'
-  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'sqlite3', '~> 1.4.2' # see https://github.com/rails/rails/issues/35153
   spec.add_development_dependency 'timecop', '~> 0.8.1'
-
 end

data/lib/hyper-state.rb

@@ -5,6 +5,7 @@ require 'hyperstack/internal/callbacks'
 require 'hyperstack/internal/auto_unmount'
 
 require 'hyperstack/internal/state/mapper'
+require 'hyperstack/internal/state/variable'
 require 'hyperstack/internal/auto_unmount'
 require 'hyperstack/internal/receiver'
 require 'hyperstack/state/observable'

data/lib/hyperstack/internal/callbacks.rb

@@ -3,7 +3,7 @@ module Hyperstack
     module Callbacks
       if RUBY_ENGINE != 'opal'
         class Hyperstack::Hotloader
-          def self.record(*args); end
+          def self.when_file_updates(&block); end
         end
       end
       def self.included(base)
@@ -11,26 +11,31 @@ module Hyperstack
       end
 
       def run_callback(name, *args)
-        self.class.callbacks_for(name).each do |callback|
-          if callback.is_a?(Proc)
-            instance_exec(*args, &callback)
-          else
-            send(callback, *args)
-          end
+        self.class.callbacks_for(name).flatten.each do |callback|
+          callback = method(callback) unless callback.is_a? Proc
+          args = self.class.send("_#{name}_before_call_hook", name, self, callback, *args)
         end
+        args
       end
 
       module ClassMethods
-        def define_callback(callback_name, &after_define_hook)
+        def define_callback(callback_name, before_call_hook: nil, after_define_hook: nil)
           wrapper_name = "_#{callback_name}_callbacks"
           define_singleton_method(wrapper_name) do
             Context.set_var(self, "@#{wrapper_name}", force: true) { [] }
           end
+          before_call_hook ||= lambda do |_name, sself, proc, *args|
+            sself.instance_exec(*args, &proc)
+            args
+          end
+          define_singleton_method("_#{callback_name}_before_call_hook", &before_call_hook)
           define_singleton_method(callback_name) do |*args, &block|
-            send(wrapper_name).concat(args)
-            send(wrapper_name).push(block) if block_given?
-            Hotloader.record(self, "@#{wrapper_name}", 4, *args, block)
-            after_define_hook.call(*args, &block) if after_define_hook
+            args << block if block_given?
+            send(wrapper_name).push args
+            Hotloader.when_file_updates do
+              send(wrapper_name).delete_if { |item| item.equal? args }
+            end
+            after_define_hook.call(self) if after_define_hook
           end
         end
 
@@ -42,6 +47,10 @@ module Hyperstack
             []
           end + send(wrapper_name)
         end
+
+        def callbacks?(name)
+          callbacks_for(name).any?
+        end
       end
     end
   end

data/lib/hyperstack/internal/state/mapper.rb

@@ -102,6 +102,18 @@ module Hyperstack
             @bulk_update_flag = saved_bulk_update_flag
           end
 
+          # React already will batch together updates inside of event handlers
+          # so we don't have to, and having Hyperstack batch them outside of the
+          # event handler causes INPUT/TEXT/SELECT s not to work properly.
+          # This method is called by the Component event wrapper.
+          def ignore_bulk_updates(*args)
+            saved_ignore_bulk_update_flag = @ignore_bulk_update_flag
+            @ignore_bulk_update_flag = true
+            yield(*args)
+          ensure
+            @ignore_bulk_update_flag = saved_ignore_bulk_update_flag
+          end
+
           def ignore_mutations
             saved_ignore_mutations_flag = @ignore_mutations
             @ignore_mutations = true
@@ -207,9 +219,10 @@ module Hyperstack
           # case that the object being updated is themselves.
 
           def delay_updates?(object)
-            @bulk_update_flag ||
-              (Hyperstack.on_client? &&
-                (@immediate_update != @current_observer || @current_observer != object))
+            return false if @ignore_bulk_update_flag
+            return true  if @bulk_update_flag
+            return false unless Hyperstack.on_client?
+            (@immediate_update != @current_observer || @current_observer != object)
           end
 
           # schedule_delayed_updater adds a new set to the

data/lib/hyperstack/internal/state/variable.rb

@@ -0,0 +1,176 @@
+module Hyperstack
+  module Internal
+    module State
+      module Variable
+        class << self
+          def legacy_map
+            @legacy_map ||= Hash.new { |h, k| h[k] = Hash.new { |h2, k2| h2[k2] = Array.new }}
+          end
+
+          def get(obj, name)
+            map_object = legacy_map[obj][name]
+            Hyperstack::Internal::State::Mapper.observed!(map_object.object_id)
+            map_object[0]
+          end
+
+          def set(obj, name, value, _x = nil)
+            # _x is some legacy function, which I think queued up state changes to the end
+            # which is perhaps now the default.
+            map_object = legacy_map[obj][name]
+            map_object[0] = value
+            Hyperstack::Internal::State::Mapper.mutated!(map_object.object_id)
+            value
+          end
+
+          def observed?(obj, name)
+            map_object = legacy_map[obj][name]
+            Hyperstack::Internal::State::Mapper.observed?(map_object.object_id)
+          end
+        end
+      end
+    end
+  end
+end
+
+        # ALWAYS_UPDATE_STATE_AFTER_RENDER = Hyperstack.on_client? # if on server then we don't wait to update the state
+        # @rendering_level = 0
+        #
+        # class << self
+        #   attr_reader :current_observer
+        #
+        #   def has_observers?(object, name)
+        #     !observers_by_name[object][name].empty?
+        #   end
+        #
+        #   def bulk_update
+        #     saved_bulk_update_flag = @bulk_update_flag
+        #     @bulk_update_flag = true
+        #     yield
+        #   ensure
+        #     @bulk_update_flag = saved_bulk_update_flag
+        #   end
+        #
+        #   def set_state2(object, name, value, updates, exclusions = nil)
+        #     # set object's name state to value, tell all observers it has changed.
+        #     # Observers must implement update_react_js_state
+        #     object_needs_notification = object.respond_to?(:update_react_js_state)
+        #     observers_by_name[object][name].dup.each do |observer|
+        #       next if exclusions && exclusions.include?(observer)
+        #       updates[observer] += [object, name, value]
+        #       object_needs_notification = false if object == observer
+        #     end
+        #     updates[object] += [nil, name, value] if object_needs_notification
+        #   end
+        #
+        #   def initialize_states(object, initial_values) # initialize objects' name/value pairs
+        #     states[object].merge!(initial_values || {})
+        #   end
+        #
+        #   def get_state(object, name, current_observer = @current_observer)
+        #     # get current value of name for object, remember that the current object depends on this state,
+        #     # current observer can be overriden with last param
+        #     if current_observer && !new_observers[current_observer][object].include?(name)
+        #       new_observers[current_observer][object] << name
+        #     end
+        #     if @delayed_updates && @delayed_updates[object][name]
+        #       @delayed_updates[object][name][1] << current_observer
+        #     end
+        #     states[object][name]
+        #   end
+        #
+        #   # ReactDOM.unstable_batchedUpdates does not seem to improve things here, ill leave it here commented for reference
+        #   # and later investigation
+        #   #if `ReactDOM.unstable_batchedUpdates !== undefined`
+        #   #  %x{
+        #   #    ReactDOM.unstable_batchedUpdates(function(){
+        #   #      #{updates.each { |observer, args| observer.update_react_js_state(*args) }}
+        #   #    });
+        #   #  }
+        #   #else # run the other one
+        #   def set_state(object, name, value, delay=ALWAYS_UPDATE_STATE_AFTER_RENDER)
+        #     states[object][name] = value
+        #     delay = false if object.respond_to?(:set_state_synchronously?) && object.set_state_synchronously?
+        #     if delay || @bulk_update_flag
+        #       @delayed_updates ||= Hash.new { |h, k| h[k] = {} }
+        #       @delayed_updates[object][name] = [value, Set.new]
+        #       @delayed_updater ||= after(0.001) do
+        #         delayed_updates = @delayed_updates
+        #         @delayed_updates = Hash.new { |h, k| h[k] = {} } # could this be nil???
+        #         @delayed_updater = nil
+        #         updates = Hash.new { |hash, key| hash[key] = Array.new }
+        #         delayed_updates.each do |object, name_hash|
+        #           name_hash.each do |name, value_and_set|
+        #             set_state2(object, name, value_and_set[0], updates, value_and_set[1])
+        #           end
+        #         end
+        #         updates.each { |observer, args| observer.update_react_js_state(*args) }
+        #       end
+        #     elsif @rendering_level == 0
+        #       updates = Hash.new { |hash, key| hash[key] = Array.new }
+        #       set_state2(object, name, value, updates)
+        #       updates.each { |observer, args| observer.update_react_js_state(*args) }
+        #     end
+        #     value
+        #   end
+        #
+        #   def will_be_observing?(object, name, current_observer)
+        #     current_observer && new_observers[current_observer][object].include?(name)
+        #   end
+        #
+        #   def is_observing?(object, name, current_observer)
+        #     current_observer && observers_by_name[object][name].include?(current_observer)
+        #   end
+        #
+        #   def update_states_to_observe(current_observer = @current_observer)  # should be called after the last after_render callback, currently called after components render method
+        #     raise "update_states_to_observer called outside of watch block" unless current_observer
+        #     current_observers[current_observer].each do |object, names|
+        #       names.each do |name|
+        #         observers_by_name[object][name].delete(current_observer)
+        #       end
+        #     end
+        #     observers = current_observers[current_observer] = new_observers[current_observer]
+        #     new_observers.delete(current_observer)
+        #     observers.each do |object, names|
+        #       names.each do |name|
+        #         observers_by_name[object][name] << current_observer
+        #       end
+        #     end
+        #   end
+        #
+        #   def remove # call after component is unmounted
+        #     raise "remove called outside of watch block" unless @current_observer
+        #     current_observers[@current_observer].each do |object, names|
+        #       names.each do |name|
+        #         observers_by_name[object][name].delete(@current_observer)
+        #       end
+        #     end
+        #     current_observers.delete(@current_observer)
+        #   end
+        #
+        #   def set_state_context_to(observer, rendering = nil) # wrap all execution that may set or get states in a block so we know which observer is executing
+        #     saved_current_observer = @current_observer
+        #     @current_observer = observer
+        #     @rendering_level += 1 if rendering
+        #     return_value = yield
+        #     return_value
+        #   ensure
+        #     @current_observer = saved_current_observer
+        #     @rendering_level -= 1 if rendering
+        #     return_value
+        #   end
+        #
+        #   def states
+        #     @states ||= Hash.new { |h, k| h[k] = {} }
+        #   end
+        #
+        #   [:new_observers, :current_observers, :observers_by_name].each do |method_name|
+        #     define_method(method_name) do
+        #       instance_variable_get("@#{method_name}") ||
+        #       instance_variable_set("@#{method_name}", Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = [] } })
+        #     end
+#           end
+#         end
+#       end
+#     end
+#   end
+# end

data/lib/hyperstack/state/observable.rb

@@ -11,14 +11,21 @@ module Hyperstack
           base.send(:"define_#{kind}", :receives) do |*args, &block|
             Internal::Receiver.mount(self, *args, &block)
           end
-          base.send(:"define_#{kind}", :observe) do |&block|
-            result = block.call if block
+          base.send(:"define_#{kind}", :observe) do |*args, &block|
+            result = block ? block.call : args.last
             Internal::State::Mapper.observed! self
             result
           end
-          base.send(:"define_#{kind}", :mutate) do |*_args, &block|
+          base.send(:"define_#{kind}", :mutate) do |*args, &block|
             # any args will be ignored thus allowing us to say `mutate @foo = 123, @bar[:x] = 7` etc
-            result = block.call if block
+            result = block ? block.call : args.last
+            Internal::State::Mapper.mutated! self
+            result
+          end
+          base.send(:"define_#{kind}", :toggle) do |var|
+            # @var = !@var
+            var = "@#{var}"
+            result = instance_variable_set(var, !instance_variable_get(var))
             Internal::State::Mapper.mutated! self
             result
           end

data/lib/hyperstack/state/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   module State
-    VERSION = '1.0.alpha1.1'
+    VERSION = '1.0.alpha1.6'
   end
 end

data/notes.md

@@ -1,6 +1,6 @@
 typically we see this:
 
-`State.get_state(obj_or_class, key)` and  `State.set_state(obj_or_class, key, val)`
+`State::Variable.get(obj_or_class, key)` and  `State::Variable.set(obj_or_class, key, val)`
 
 we would like to see this:
 
@@ -66,11 +66,11 @@ internally without reaction
 so one approach would be to just provide two methods: `observed!` and `mutated!`
 ```ruby
 def observed!
-  State.get_state(self, self)
+  State::Variable.get(self, self)
 end
 
 def mutated!
-  State.set_state(self, self, self)
+  State::Variable.set(self, self, self)
 end
 ```
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-state
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.1
+  version: 1.0.alpha1.6
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
@@ -18,34 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
-- !ruby/object:Gem::Dependency
-  name: opal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: hyper-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -116,20 +96,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mini_racer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.15
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -148,18 +114,24 @@ dependencies:
   name: opal-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,7 +145,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-rescue
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -206,14 +178,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -308,16 +286,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +330,7 @@ files:
 - lib/hyperstack/internal/callbacks.rb
 - lib/hyperstack/internal/receiver.rb
 - lib/hyperstack/internal/state/mapper.rb
+- lib/hyperstack/internal/state/variable.rb
 - lib/hyperstack/state/observable.rb
 - lib/hyperstack/state/observer.rb
 - lib/hyperstack/state/version.rb
@@ -375,8 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Flux Stores and more for Hyperloop