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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb10ec05b438da9beead09918566a05d03ad119dd9711507ea6073e7dd08bc12
-  data.tar.gz: 55bff91b14d242a57e1792deafcfe8204ca773c782f918fe005161ab28fac267
+  metadata.gz: 8a4e6861713a026b7878443bedaf51619c9c7152b62bc4a588d6ebd2744c6cb5
+  data.tar.gz: 0d4bb03e324e82feb7b59706a8a07fa51eaae50ecbf2069ae6db37307c14056c
 SHA512:
-  metadata.gz: 6f44826d393b99865fb6d5501d5beffbf7e01152557e19bd4e5269599b57b14cd52cba54e9de50f8446c10e950403c37d722997094866fe910dc8b5263d58b9a
-  data.tar.gz: 1bdce0a88d8c6307bea7ca9e1e286f547bc5927daf4eeff744bb06ee8b82fc4366a9baa1eb0753f7bf65f1c4781784a5a8acd1bfa86385867e23fca87d70aff8
+  metadata.gz: '09092aa06c724440995f34445310cdf526f0c03003c6fd5fee9b7b0af0dd9eb30534c3674a6ce7a967251bd0359a888d79c5f7a1993c8086e17013fef15a44ff'
+  data.tar.gz: '0081a14b941ccda9fcc54c5b2079e7dd384a9c20cac6ebbeb2884e151fd8803b26a90b77c619e3786c2dc2ce049954b5446ad060e925545100aaf6943a427447'

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/state/variable.rb

@@ -0,0 +1,174 @@
+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)
+            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

@@ -22,6 +22,13 @@ module Hyperstack
             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
           if RUBY_ENGINE == 'opal'
             base.send(:"define_#{kind}", :set) do |var|
               if Hyperstack.naming_convention == :prefix_state

data/lib/hyperstack/state/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   module State
-    VERSION = '1.0.alpha1.1'
+    VERSION = '1.0.alpha1.2'
   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.2
 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: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.2
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -80,28 +80,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.2
 - !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.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.1
+        version: 1.0.alpha1.2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +352,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