hyper-model 0.99.6 → 1.0.alpha1

data/lib/reactive_record/active_record/reactive_record/base.rb

@@ -180,10 +180,10 @@ module ReactiveRecord
 
     def changed?(*args)
       if args.count == 0
-        React::State.get_state(self, "!CHANGED!")
+        Hyperstack::Internal::Store::State.get_state(self, "!CHANGED!")
         !changed_attributes.empty?
       else
-        React::State.get_state(self, args[0])
+        Hyperstack::Internal::Store::State.get_state(self, args[0])
         changed_attributes.include? args[0]
       end
     end
@@ -288,7 +288,7 @@ module ReactiveRecord
     end
 
     def saving!
-      React::State.set_state(self, self, :saving) unless data_loading?
+      Hyperstack::Internal::Store::State.set_state(self, self, :saving) unless data_loading?
       @saving = true
     end
 
@@ -306,9 +306,9 @@ module ReactiveRecord
       notify_waiting_for_save
       return self if save_only
       if errors.empty?
-        React::State.set_state(self, self, :saved)
+        Hyperstack::Internal::Store::State.set_state(self, self, :saved)
       elsif !data_loading?
-        React::State.set_state(self, self, :error)
+        Hyperstack::Internal::Store::State.set_state(self, self, :error)
       end
       self
     end
@@ -334,7 +334,7 @@ module ReactiveRecord
     end
 
     def saving?
-      React::State.get_state(self, self)
+      Hyperstack::Internal::Store::State.get_state(self, self)
       @saving
     end
 
@@ -387,7 +387,7 @@ module ReactiveRecord
         @catch_db_requests = true
         yield
       rescue DbRequestMade => e
-        React::IsomorphicHelpers.log "Warning: request for server side data during scope evaluation: #{e.message}", :warning
+        Hyperstack::Component::IsomorphicHelpers.log "Warning: request for server side data during scope evaluation: #{e.message}", :warning
         return_val
       ensure
         @catch_db_requests = false

data/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -132,7 +132,7 @@ To determine this sync_scopes first asks if the record being changed is in the s
         # the broadcast record and the value on the client is out of sync
         # not running set_pre_sync_related_records will cause sync scopes
         # to refresh all related scopes
-        React::State.bulk_update do
+        Hyperstack::Internal::State::Mapper.bulk_update do
           record = broadcast.record_with_current_values
           apply_to_all_collections(
             :set_pre_sync_related_records,
@@ -292,7 +292,7 @@ To determine this sync_scopes first asks if the record being changed is in the s
     # end of stuff to move
 
     def reload_from_db(force = nil)
-      if force || React::State.has_observers?(self, :collection)
+      if force || Hyperstack::Internal::Store::State.observed?(self, :collection)
         @out_of_date = false
         ReactiveRecord::Base.load_from_db(nil, *@vector, '*all') if @collection
         ReactiveRecord::Base.load_from_db(nil, *@vector, '*count')
@@ -308,15 +308,15 @@ To determine this sync_scopes first asks if the record being changed is in the s
         @observing = true
         link_to_parent
         reload_from_db(true) if @out_of_date
-        React::State.get_state(self, :collection)
+        Hyperstack::Internal::Store::State.get_state(self, :collection)
       ensure
         @observing = false
       end
     end
 
     def set_count_state(val)
-      unless ReactiveRecord::WhileLoading.has_observers?
-        React::State.set_state(self, :collection, collection, true)
+      unless ReactiveRecord::WhileLoading.observed?
+        Hyperstack::Internal::Store::State.set_state(self, :collection, collection, true)
       end
       @count = val
     end
@@ -549,7 +549,7 @@ To determine this sync_scopes first asks if the record being changed is in the s
     end
 
     def notify_of_change(value = nil)
-      React::State.set_state(self, "collection", collection) unless ReactiveRecord::Base.data_loading?
+      Hyperstack::Internal::Store::State.set_state(self, "collection", collection) unless ReactiveRecord::Base.data_loading?
       value
     end
 

data/lib/reactive_record/active_record/reactive_record/getters.rb

@@ -99,7 +99,7 @@ module ReactiveRecord
       else
         virtual_fetch_on_server_warning(attribute) if on_opal_server? && changed?
         yield false, attribute
-      end.tap { |value| React::State.get_state(self, attribute) unless data_loading? }
+      end.tap { |value| Hyperstack::Internal::Store::State.get_state(self, attribute) unless data_loading? }
     end
 
     def find_association(association, id)

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -4,7 +4,7 @@ module ReactiveRecord
 
   class Base
 
-    include React::IsomorphicHelpers
+    include Hyperstack::Component::IsomorphicHelpers
 
     before_first_mount do |context|
       if RUBY_ENGINE != 'opal'
@@ -132,7 +132,7 @@ module ReactiveRecord
     end
 
     def self.schedule_fetch
-      React::State.set_state(WhileLoading, :quiet, false) # moved from while loading module see loading! method
+      Hyperstack::Internal::Store::State.set_state(WhileLoading, :quiet, false) # moved from while loading module see loading! method
       return if @fetch_scheduled
       @current_fetch_id = Time.now
       @fetch_scheduled = after(0) do
@@ -242,7 +242,7 @@ module ReactiveRecord
           end if record.new? || record.changed? || (record == record_being_saved && force)
           record_index += 1
         end
-        [models.sort_by { |model| model[:id] }, associations, backing_records]
+        [models, associations, backing_records]
       end
 
       def save_or_validate(save, validate, force, &block)
@@ -308,7 +308,6 @@ module ReactiveRecord
           backing_records.each { |_id, record| record.saved!(true) rescue nil } if save
         end
       rescue Exception => e
-        debugger
         log("Exception raised while saving - #{e}", :error)
         yield false, e.message, [] if block
         promise.resolve({success: false, message: e.message, models: []})
@@ -481,7 +480,7 @@ module ReactiveRecord
           saved_models = reactive_records.collect do |reactive_record_id, model|
             messages = model.errors.messages if validate && !model.valid?
             all_messages << [model, messages] if save && messages
-            attributes = model.__hyperloop_secure_attributes(acting_user)
+            attributes = model.__hyperstack_secure_attributes(acting_user)
             [reactive_record_id, model.class.name, attributes, messages]
           end
 

data/lib/reactive_record/active_record/reactive_record/operations.rb

@@ -7,7 +7,7 @@ module ReactiveRecord
 
   module Operations
     # to make debug easier we convert all the object_id strings to be hex representation
-    class Base < Hyperloop::ControllerOp
+    class Base < Hyperstack::ControllerOp
       param :acting_user, nils: true
 
       FORMAT = '0x%x'
@@ -66,7 +66,7 @@ module ReactiveRecord
       end
       failed do |e|
         # AccessViolations are already sent to on_error
-        Hyperloop.on_error(e, :fetch_error, params.to_h) unless e.is_a? Hyperloop::AccessViolation
+        Hyperstack.on_error(e, :fetch_error, params.to_h) unless e.is_a? Hyperstack::AccessViolation
         raise e
       end
     end

data/lib/reactive_record/active_record/reactive_record/setters.rb

@@ -92,7 +92,7 @@ module ReactiveRecord
           @attributes[attr] = new_value
           if !data_loading? ||
              (on_opal_client? && had_key && current_value.loaded? && current_value != new_value)
-            React::State.set_state(self, attr, new_value, data_loading?)
+            Hyperstack::Internal::Store::State.set_state(self, attr, new_value, data_loading?)
           end
         end
       end
@@ -101,7 +101,7 @@ module ReactiveRecord
     def set_change_status_and_notify_only(attr, changed)
       return if @virgin
       change_status_and_notify_helper(attr, changed) do
-        React::State.set_state(self, attr, nil) unless data_loading?
+        Hyperstack::Internal::Store::State.set_state(self, attr, nil) unless data_loading?
       end
     end
 
@@ -117,7 +117,7 @@ module ReactiveRecord
       yield @attributes.key?(attr), @attributes[attr]
       return unless empty_before != changed_attributes.empty?
       if on_opal_client? && !data_loading?
-        React::State.set_state(self, '!CHANGED!', !changed_attributes.empty?, true)
+        Hyperstack::Internal::Store::State.set_state(self, '!CHANGED!', !changed_attributes.empty?, true)
       end
       return unless aggregate_owner
       aggregate_owner.set_change_status_and_notify_only(
@@ -135,7 +135,7 @@ module ReactiveRecord
       return if value.nil?
       value.attributes[inverse_attr] = @ar_instance
       return if data_loading?
-      React::State.set_state(value.backing_record, inverse_attr, @ar_instance)
+      Hyperstack::Internal::Store::State.set_state(value.backing_record, inverse_attr, @ar_instance)
     end
 
     def update_inverse_collections(association, value)

data/lib/reactive_record/active_record/reactive_record/while_loading.rb

@@ -24,7 +24,7 @@ module ReactiveRecord
     @loads_pending = @load_stack.pop
     promise
   rescue Exception => e
-    React::IsomorphicHelpers.log "ReactiveRecord.load exception raised during initial load: #{e}", :error
+    Hyperstack::Component::IsomorphicHelpers.log "ReactiveRecord.load exception raised during initial load: #{e}", :error
   end
 
   def self.loads_pending!
@@ -62,7 +62,7 @@ module ReactiveRecord
       end
     end
   rescue Exception => e
-    React::IsomorphicHelpers.log "ReactiveRecord.load exception raised during retry: #{e}", :error
+    Hyperstack::Component::IsomorphicHelpers.log "ReactiveRecord.load exception raised during retry: #{e}", :error
   end
 
 
@@ -76,7 +76,7 @@ module ReactiveRecord
 
   class WhileLoading
 
-    include React::IsomorphicHelpers
+    include Hyperstack::Component::IsomorphicHelpers
 
     before_first_mount do
       @css_to_preload = ""
@@ -92,7 +92,11 @@ module ReactiveRecord
     end
 
     def self.has_observers?
-      React::State.has_observers?(self, :loaded_at)
+      Hyperstack::Internal::Store::State.observed?(self, :loaded_at)
+    end
+
+    class << self
+      alias :observed? :has_observers?
     end
 
     prerender_footer do
@@ -105,7 +109,7 @@ module ReactiveRecord
       # -: You think wrong. add_style_sheet uses the jQuery $, after_mount too, others too
       # -: I removed those references. Now you think right.
 
-      include Hyperloop::Component::Mixin
+      include Hyperstack::Component
 
       param :loading
       param :loaded_children
@@ -121,29 +125,29 @@ module ReactiveRecord
         end
 
         def loading!
-          React::RenderingContext.waiting_on_resources = true
-          React::State.get_state(self, :loaded_at)
+          Hyperstack::Internal::Component::RenderingContext.waiting_on_resources = true
+          Hyperstack::Internal::Store::State.get_state(self, :loaded_at)
           # this was moved to where the fetch is actually pushed on to the fetch array in isomorphic base
-          # React::State.set_state(self, :quiet, false)
+          # Hyperstack::Internal::Store::State.set_state(self, :quiet, false)
           @is_loading = true
         end
 
         def loaded_at(loaded_at)
-          React::State.set_state(self, :loaded_at, loaded_at)
+          Hyperstack::Internal::Store::State.set_state(self, :loaded_at, loaded_at)
           @is_loading = false
         end
 
         def quiet?
-          React::State.get_state(self, :quiet)
+          Hyperstack::Internal::Store::State.get_state(self, :quiet)
         end
 
         def page_loaded?
-          React::State.get_state(self, :page_loaded)
+          Hyperstack::Internal::Store::State.get_state(self, :page_loaded)
         end
 
         def quiet!
-          React::State.set_state(self, :quiet, true)
-          after(1) { React::State.set_state(self, :page_loaded, true) } unless on_opal_server? or @page_loaded
+          Hyperstack::Internal::Store::State.set_state(self, :quiet, true)
+          after(1) { Hyperstack::Internal::Store::State.set_state(self, :page_loaded, true) } unless on_opal_server? or @page_loaded
           @page_loaded = true
         end
 
@@ -166,18 +170,18 @@ module ReactiveRecord
       before_mount do
         @uniq_id = WhileLoading.get_next_while_loading_counter
         WhileLoading.preload_css(
-          ".reactive_record_while_loading_container_#{@uniq_id} > :nth-child(1n+#{params.loaded_children.count+1}) {\n"+
+          ".reactive_record_while_loading_container_#{@uniq_id} > :nth-child(1n+#{@LoadedChildren.count+1}) {\n"+
           "  display: none;\n"+
           "}\n"
         )
       end
 
       after_mount do
-        @waiting_on_resources = params.loading
+        @waiting_on_resources = @Loading
         WhileLoading.add_style_sheet
         node = dom_node
         %x{
-          var nodes = node.querySelectorAll(':nth-child(-1n+'+#{params.loaded_children.count}+')');
+          var nodes = node.querySelectorAll(':nth-child(-1n+'+#{@LoadedChildren.count}+')');
           nodes.forEach(
             function(current_node, current_index, list_obj) {
               if (current_node.className.indexOf('reactive_record_show_when_loaded') === -1) {
@@ -185,7 +189,7 @@ module ReactiveRecord
               }
             }
           );
-          nodes = node.querySelectorAll(':nth-child(1n+'+#{params.loaded_children.count+1}+')');
+          nodes = node.querySelectorAll(':nth-child(1n+'+#{@LoadedChildren.count+1}+')');
           nodes.forEach(
             function(current_node, current_index, list_obj) {
               if (current_node.className.indexOf('reactive_record_show_while_loading') === -1) {
@@ -197,20 +201,20 @@ module ReactiveRecord
       end
 
       after_update do
-        @waiting_on_resources = params.loading
+        @waiting_on_resources = @Loading
       end
 
       def render
-        props = params.element_props.dup
+        props = @ElementProps.dup
         classes = [props[:class], props[:className], "reactive_record_while_loading_container_#{@uniq_id}"].compact.join(" ")
         props.merge!({
           "data-reactive_record_while_loading_container_id" => @uniq_id,
           "data-reactive_record_enclosing_while_loading_container_id" => @uniq_id,
           class: classes
         })
-        React.create_element(params.element_type[0], props) do
-          params.loaded_children + params.loading_children
-        end.tap { |e| e.waiting_on_resources = params.loading }
+        ReactAPI.create_element(@ElementType[0], props) do
+          @LoadedChildren + @LoadingChildren
+        end.tap { |e| e.waiting_on_resources = @Loading }
       end
 
     end
@@ -219,124 +223,124 @@ module ReactiveRecord
 
 end
 
-module React
+module Hyperstack
+  module Component
 
-  class Element
+    class Element
 
-    def while_loading(display = "", &loading_display_block)
-      loaded_children = []
-      loaded_children = block.call.dup if block
-      if display.respond_to? :as_node
-        display = display.as_node
-        loading_display_block = lambda { display.render }
-      elsif !loading_display_block
-        loading_display_block = lambda { display }
-      end
-      loading_children = RenderingContext.build do |buffer|
-        result = loading_display_block.call
-        result = result.to_s if result.try :acts_as_string?
-        result.span.tap { |e| e.waiting_on_resources = RenderingContext.waiting_on_resources } if result.is_a? String
-        buffer.dup
-      end
+      def while_loading(display = "", &loading_display_block)
+        loaded_children = []
+        loaded_children = block.call.dup if block
+        if display.respond_to? :as_node
+          display = display.as_node
+          loading_display_block = lambda { display.render }
+        elsif !loading_display_block
+          loading_display_block = lambda { display }
+        end
+        loading_children = Internal::Component::RenderingContext.build do |buffer|
+          result = loading_display_block.call
+          result = result.to_s if result.try :acts_as_string?
+          result.span.tap { |e| e.waiting_on_resources = Internal::Component::RenderingContext.waiting_on_resources } if result.is_a? String
+          buffer.dup
+        end
 
-     new_element = React.create_element(
-        ReactiveRecord::WhileLoading,
-        loading: waiting_on_resources,
-        loading_children: loading_children,
-        loaded_children: loaded_children,
-        element_type: [type],
-        element_props: properties)
+       new_element = ReactAPI.create_element(
+          ReactiveRecord::WhileLoading,
+          loading: waiting_on_resources,
+          loading_children: loading_children,
+          loaded_children: loaded_children,
+          element_type: [type],
+          element_props: properties)
 
-      RenderingContext.replace(self, new_element)
-    end
+        Internal::Component::RenderingContext.replace(self, new_element)
+      end
 
-    def hide_while_loading
-      while_loading
-    end
+      def hide_while_loading
+        while_loading
+      end
 
+    end
   end
 end
 
 if RUBY_ENGINE == 'opal'
-  module Hyperloop
-    class Component
-      module Mixin
+  module Hyperstack
+    module Component
 
-        alias_method :original_component_did_mount, :component_did_mount
+      alias_method :original_component_did_mount, :component_did_mount
 
-        def component_did_mount(*args)
-          original_component_did_mount(*args)
-          reactive_record_link_to_enclosing_while_loading_container
-          reactive_record_link_set_while_loading_container_class
-        end
+      def component_did_mount(*args)
+        original_component_did_mount(*args)
+        reactive_record_link_to_enclosing_while_loading_container
+        reactive_record_link_set_while_loading_container_class
+      end
 
-        alias_method :original_component_did_update, :component_did_update
+      alias_method :original_component_did_update, :component_did_update
 
-        def component_did_update(*args)
-          original_component_did_update(*args)
-          reactive_record_link_set_while_loading_container_class
-        end
+      def component_did_update(*args)
+        original_component_did_update(*args)
+        reactive_record_link_set_while_loading_container_class
+      end
 
-        def reactive_record_link_to_enclosing_while_loading_container
-          # Call after any component mounts - attaches the containers loading id to this component
-          # Fyi, the while_loading container is responsible for setting its own link to itself
-          node = dom_node
-          %x{
-              if (typeof node === "undefined" || node === null) return;
-              var node_wl_attr = node.getAttribute('data-reactive_record_enclosing_while_loading_container_id');
-              if (node_wl_attr === null || node_wl_attr === "") {
-                var while_loading_container = node.closest('[data-reactive_record_while_loading_container_id]');
-                if (while_loading_container !== null) {
-                  var container_id = while_loading_container.getAttribute('data-reactive_record_while_loading_container_id');
-                  node.setAttribute('data-reactive_record_enclosing_while_loading_container_id', container_id);
-                }
+      def reactive_record_link_to_enclosing_while_loading_container
+        # Call after any component mounts - attaches the containers loading id to this component
+        # Fyi, the while_loading container is responsible for setting its own link to itself
+        node = dom_node
+        %x{
+            if (typeof node === "undefined" || node === null) return;
+            var node_wl_attr = node.getAttribute('data-reactive_record_enclosing_while_loading_container_id');
+            if (node_wl_attr === null || node_wl_attr === "") {
+              var while_loading_container = node.closest('[data-reactive_record_while_loading_container_id]');
+              if (while_loading_container !== null) {
+                var container_id = while_loading_container.getAttribute('data-reactive_record_while_loading_container_id');
+                node.setAttribute('data-reactive_record_enclosing_while_loading_container_id', container_id);
               }
             }
-        end
+          }
+      end
 
-        def reactive_record_link_set_while_loading_container_class
-          node = dom_node
-          loading = (waiting_on_resources ? `true` : `false`)
-          %x{
-              if (typeof node === "undefined" || node === null) return;
-              var while_loading_container_id = node.getAttribute('data-reactive_record_while_loading_container_id');
-              if (#{!self.is_a?(ReactiveRecord::WhileLoading)} && while_loading_container_id !== null && while_loading_container_id !== "") {
-                return;
-              }
-              var enc_while_loading_container_id = node.getAttribute('data-reactive_record_enclosing_while_loading_container_id');
-              if (enc_while_loading_container_id !== null && enc_while_loading_container_id !== "") {
-                var while_loading_container = document.body.querySelector('[data-reactive_record_while_loading_container_id="'+enc_while_loading_container_id+'"]');
-                if (loading) {
-                  node.className = node.className.replace(/reactive_record_is_loaded/g, '').replace(/  /g, ' ');
-                  if (node.className.indexOf('reactive_record_is_loading') === -1) {
-                    node.className = node.className + ' reactive_record_is_loading';
-                  }
-                  if (while_loading_container !== null) {
-                    while_loading_container.className = while_loading_container.className.replace(/reactive_record_is_loaded/g, '').replace(/  /g, ' ');
-                    if (while_loading_container.className.indexOf('reactive_record_is_loading') === -1) {
-                      while_loading_container.className = while_loading_container.className + ' reactive_record_is_loading';
-                    }
+      def reactive_record_link_set_while_loading_container_class
+        node = dom_node
+        loading = (waiting_on_resources ? `true` : `false`)
+        %x{
+            if (typeof node === "undefined" || node === null) return;
+            var while_loading_container_id = node.getAttribute('data-reactive_record_while_loading_container_id');
+            if (#{!self.is_a?(ReactiveRecord::WhileLoading)} && while_loading_container_id !== null && while_loading_container_id !== "") {
+              return;
+            }
+            var enc_while_loading_container_id = node.getAttribute('data-reactive_record_enclosing_while_loading_container_id');
+            if (enc_while_loading_container_id !== null && enc_while_loading_container_id !== "") {
+              var while_loading_container = document.body.querySelector('[data-reactive_record_while_loading_container_id="'+enc_while_loading_container_id+'"]');
+              if (loading) {
+                node.className = node.className.replace(/reactive_record_is_loaded/g, '').replace(/  /g, ' ');
+                if (node.className.indexOf('reactive_record_is_loading') === -1) {
+                  node.className = node.className + ' reactive_record_is_loading';
+                }
+                if (while_loading_container !== null) {
+                  while_loading_container.className = while_loading_container.className.replace(/reactive_record_is_loaded/g, '').replace(/  /g, ' ');
+                  if (while_loading_container.className.indexOf('reactive_record_is_loading') === -1) {
+                    while_loading_container.className = while_loading_container.className + ' reactive_record_is_loading';
                   }
-                } else if (node.className.indexOf('reactive_record_is_loaded') === -1) {
-                  if (while_loading_container_id === null || while_loading_container_id === "") {
-                    node.className = node.className.replace(/reactive_record_is_loading/g, '').replace(/  /g, ' ');
-                    if (node.className.indexOf('reactive_record_is_loaded') === -1) {
-                      node.className = node.className + ' reactive_record_is_loaded';
-                    }
+                }
+              } else if (node.className.indexOf('reactive_record_is_loaded') === -1) {
+                if (while_loading_container_id === null || while_loading_container_id === "") {
+                  node.className = node.className.replace(/reactive_record_is_loading/g, '').replace(/  /g, ' ');
+                  if (node.className.indexOf('reactive_record_is_loaded') === -1) {
+                    node.className = node.className + ' reactive_record_is_loaded';
                   }
-                  if (while_loading_container.className.indexOf('reactive_record_is_loaded') === -1) {
-                    var loading_children = while_loading_container.querySelectorAll('[data-reactive_record_enclosing_while_loading_container_id="'+enc_while_loading_container_id+'"].reactive_record_is_loading');
-                    if (loading_children.length === 0) {
-                      while_loading_container.className = while_loading_container.className.replace(/reactive_record_is_loading/g, '').replace(/  /g, ' ');
-                      if (while_loading_container.className.indexOf('reactive_record_is_loaded') === -1) {
-                        while_loading_container.className = while_loading_container.className + ' reactive_record_is_loaded';
-                      }
+                }
+                if (while_loading_container.className.indexOf('reactive_record_is_loaded') === -1) {
+                  var loading_children = while_loading_container.querySelectorAll('[data-reactive_record_enclosing_while_loading_container_id="'+enc_while_loading_container_id+'"].reactive_record_is_loading');
+                  if (loading_children.length === 0) {
+                    while_loading_container.className = while_loading_container.className.replace(/reactive_record_is_loading/g, '').replace(/  /g, ' ');
+                    if (while_loading_container.className.indexOf('reactive_record_is_loaded') === -1) {
+                      while_loading_container.className = while_loading_container.className + ' reactive_record_is_loaded';
                     }
                   }
                 }
               }
             }
-        end
+          }
       end
     end
   end