hyper-state 1.0.alpha1.5 → 1.0.pre.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbfec87cc6da586fe45f940f9d45f0cd75c4fd1c310fbff4369a122d2227f5c8
-  data.tar.gz: 67b6304b162a71b483791b94552d349ed7156c40c102423cabbd6f439570d1ce
+  metadata.gz: ba8256138d1f2055844b402e5a17a8b0331d1b2f14e28c176bf497d45f2e7b77
+  data.tar.gz: 1dc6ebdacba52e9c202425e184d60716deb3b6060ae6c77de56ae7c6e11f525c
 SHA512:
-  metadata.gz: 7c4931c8b4020f833b41389669d7a57e4790a1a6dc7149d1403bc71cc73b1c7624611cb4a0663a7aa71a5c35123c365ebd1ee348c78abf1e236a3dc3aabb63ff
-  data.tar.gz: 290f3579a58e7549759fe4a4692548e9686dc1ea724df2dd9fd0b015dda7dc611a4c0e5981f49cf0fb0939a867750205c68e18086f13ed0e416699fd401f2525
+  metadata.gz: 00b0c167d148cedbbeee3986f18e98900d38ca12f1b7866c23f2564c9e393709f62fce429e56f493a0bc07969dd24850a6f0eadb0f24bc27b398badd5799af00
+  data.tar.gz: af662d79a2cab41dc405480588f29a902a87b82ec117e9c70917bbf27ca557873f315f1302ab9a6aadb32e25135d466071944d63c4316646817af6fe162df303

data/.gitignore

@@ -11,6 +11,7 @@ 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
@@ -50,7 +51,3 @@ 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

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'hyperstack-config', Hyperstack::State::VERSION
   spec.add_dependency 'opal', '>= 0.11.0', '< 0.12.0'
-  spec.add_development_dependency 'bundler', ['>= 1.17.3', '< 2.1']
+  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.2.4'
+  spec.add_development_dependency 'mini_racer', '~> 0.1.15'
   spec.add_development_dependency 'opal-browser', '~> 0.2.0'
   spec.add_development_dependency 'opal-rails', '~> 0.9.4'
   spec.add_development_dependency 'pry-byebug'
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   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', '~> 1.3.6' # see https://github.com/rails/rails/issues/35153
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop', '~> 0.8.1'
 
 end

data/lib/hyper-state.rb

@@ -5,7 +5,6 @@ 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.when_file_updates(&block); end
+          def self.record(*args); end
         end
       end
       def self.included(base)
@@ -11,15 +11,13 @@ module Hyperstack
       end
 
       def run_callback(name, *args)
-        self.class.callbacks_for(name).flatten.each do |callback|
-          result = if callback.is_a?(Proc)
-                     instance_exec(*args, &callback)
-                   else
-                     send(callback, *args)
-                   end
-          args = yield(result) if block_given?
+        self.class.callbacks_for(name).each do |callback|
+          if callback.is_a?(Proc)
+            instance_exec(*args, &callback)
+          else
+            send(callback, *args)
+          end
         end
-        args
       end
 
       module ClassMethods
@@ -29,11 +27,9 @@ module Hyperstack
             Context.set_var(self, "@#{wrapper_name}", force: true) { [] }
           end
           define_singleton_method(callback_name) do |*args, &block|
-            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
+            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
           end
         end
@@ -46,10 +42,6 @@ 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,18 +102,6 @@ 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
@@ -219,10 +207,9 @@ module Hyperstack
           # case that the object being updated is themselves.
 
           def delay_updates?(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)
+            @bulk_update_flag ||
+              (Hyperstack.on_client? &&
+                (@immediate_update != @current_observer || @current_observer != object))
           end
 
           # schedule_delayed_updater adds a new set to the

data/lib/hyperstack/state/observable.rb

@@ -11,21 +11,14 @@ module Hyperstack
           base.send(:"define_#{kind}", :receives) do |*args, &block|
             Internal::Receiver.mount(self, *args, &block)
           end
-          base.send(:"define_#{kind}", :observe) do |*args, &block|
-            result = block && block.call || args.last
+          base.send(:"define_#{kind}", :observe) do |&block|
+            result = block.call if block
             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 && 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))
+            result = block.call if block
             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.5'
+    VERSION = '1.0-alpha1'
   end
 end

data/notes.md

@@ -1,6 +1,6 @@
 typically we see this:
 
-`State::Variable.get(obj_or_class, key)` and  `State::Variable.set(obj_or_class, key, val)`
+`State.get_state(obj_or_class, key)` and  `State.set_state(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::Variable.get(self, self)
+  State.get_state(self, self)
 end
 
 def mutated!
-  State::Variable.set(self, self, self)
+  State.set_state(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.5
+  version: 1.0.pre.alpha1
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2018-11-12 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.5
+        version: 1.0.pre.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.pre.alpha1
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +80,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.pre.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.pre.alpha1
 - !ruby/object:Gem::Dependency
   name: hyper-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.pre.alpha1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.pre.alpha1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +122,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.1.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -314,16 +308,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -358,7 +352,6 @@ 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
@@ -382,7 +375,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Flux Stores and more for Hyperloop

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

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