closes #166 #165 #164 #160

catmando · catmando · commit 2d15be1e0f6f · 2019-04-14T23:06:41.000-04:00
diff --git a/ruby/examples/misc/stock-tickers/.ruby-version b/ruby/examples/misc/stock-tickers/.ruby-version
diff --git a/ruby/examples/misc/stock-tickers/Gemfile b/ruby/examples/misc/stock-tickers/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.4.1'
+#ruby '2.4.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.1'
diff --git a/ruby/examples/misc/stock-tickers/Gemfile.lock b/ruby/examples/misc/stock-tickers/Gemfile.lock
@@ -1,9 +1,9 @@
 PATH
   remote: ../../../hyper-component
   specs:
-    hyper-component (1.0.alpha1.3)
-      hyper-state (= 1.0.alpha1.3)
-      hyperstack-config (= 1.0.alpha1.3)
+    hyper-component (1.0.alpha1.4)
+      hyper-state (= 1.0.alpha1.4)
+      hyperstack-config (= 1.0.alpha1.4)
       libv8 (~> 6.7.0)
       mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
@@ -13,7 +13,7 @@ PATH
 PATH
   remote: ../../../hyper-spec
   specs:
-    hyper-spec (1.0.alpha1.3)
+    hyper-spec (1.0.alpha1.4)
       capybara
       chromedriver-helper (= 1.2.0)
       libv8
@@ -26,26 +26,26 @@ PATH
       selenium-webdriver
       timecop (~> 0.8.1)
       uglifier
-      unparser (>= 0.2, < 0.4)
+      unparser (>= 0.4.2)
       webdrivers
 
 PATH
   remote: ../../../hyper-state
   specs:
-    hyper-state (1.0.alpha1.3)
-      hyperstack-config (= 1.0.alpha1.3)
+    hyper-state (1.0.alpha1.4)
+      hyperstack-config (= 1.0.alpha1.4)
       opal (>= 0.11.0, < 0.12.0)
 
 PATH
   remote: ../../../hyper-trace
   specs:
-    hyper-trace (1.0.alpha1.3)
-      hyperstack-config (= 1.0.alpha1.3)
+    hyper-trace (1.0.alpha1.4)
+      hyperstack-config (= 1.0.alpha1.4)
 
 PATH
   remote: ../../../hyperstack-config
   specs:
-    hyperstack-config (1.0.alpha1.3)
+    hyperstack-config (1.0.alpha1.4)
       listen (~> 3.0)
       mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
@@ -164,7 +164,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    libv8 (6.7.288.46.1-x86_64-darwin-15)
+    libv8 (6.7.288.46.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -324,7 +324,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.1.19)
       execjs (>= 0.3.0, < 3)
-    unparser (0.2.8)
+    unparser (0.4.2)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
@@ -337,7 +337,7 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webdrivers (3.6.0)
+    webdrivers (3.7.2)
       net_http_ssl_fix
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
@@ -383,8 +383,5 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
 
-RUBY VERSION
-   ruby 2.4.1p111
-
 BUNDLED WITH
    2.0.1
diff --git a/ruby/examples/misc/stock-tickers/app/hyperstack/components/app.rb b/ruby/examples/misc/stock-tickers/app/hyperstack/components/app.rb
@@ -8,9 +8,9 @@ class App < HyperComponent
 
   before_mount { @symbols = Set.new }
 
-  def add_symbol
-    mutate @symbols << @_symbol_input.value.upcase
-    @_symbol_input.value = ''
+  mutator :add_symbol do
+    @symbols << jQ[@symbol_input].value.upcase
+    jQ[@symbol_input].value = ''
   end
 
   render do
@@ -22,7 +22,7 @@ def add_symbol
       BS::Row(style: { marginTop: 20 }) do
         BS::Col(sm: 4) do
           BS::InputGroup(class: 'mb-3') do
-            BS::FormControl(ref: set_jq(:_symbol_input), placeholder: 'New Stock Market Symbol')
+            @symbol_input = BS::FormControl(placeholder: 'New Stock Market Symbol')
             .on(:enter) { add_symbol }
             BS::InputGroup::Append() { BS::Button() { 'Add' } }
             .on(:click) { add_symbol }
diff --git a/ruby/examples/misc/stock-tickers/app/views/layouts/application.html.erb b/ruby/examples/misc/stock-tickers/app/views/layouts/application.html.erb
@@ -49,8 +49,6 @@
 
   <body>
     <%= yield %>
-    <script src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.js" crossorigin></script>
-
-
+    <script src="https://unpkg.com/react-bootstrap@1.0.0-beta.5/dist/react-bootstrap.js" crossorigin></script>
   </body>
 </html>
diff --git a/ruby/hyper-component/lib/hyperstack/component/element.rb b/ruby/hyper-component/lib/hyperstack/component/element.rb
@@ -39,18 +39,25 @@ def _update_ref(x)
       end
 
       def ref
-        @ref || raise("#{self} has not been mounted yet")
+        return @ref if @ref
+        raise("The instance of #{self.type} has not been mounted yet") if properties[:ref]
+        raise("Attempt to get a ref on #{self.type} which is a static component.")
       end
 
       def dom_node
-        @type.is_a?(String) ? ref : ref.dom_node
+        `typeof #{ref}.$dom_node == 'function'` ? ref.dom_node : ref
       end
 
-      # Attach event handlers.
+      # Attach event handlers. skip false, nil and blank event names
 
       def on(*event_names, &block)
-        event_names.each { |event_name| merge_event_prop!(event_name, &block) }
-        @native = `React.cloneElement(#{@native}, #{@properties.shallow_to_n})`
+        any_found = false
+        event_names.each do |event_name|
+          next unless event_name && event_name.strip != ''
+          merge_event_prop!(event_name, &block)
+          any_found = true
+        end
+        @native = `React.cloneElement(#{@native}, #{@properties.shallow_to_n})` if any_found
         self
       end
 
diff --git a/ruby/hyper-component/lib/hyperstack/ext/component/element.rb b/ruby/hyper-component/lib/hyperstack/ext/component/element.rb
@@ -1,10 +1,16 @@
 Element.instance_eval do
   def self.find(selector)
-    selector = begin
-      selector.dom_node
-    rescue
-      selector
-    end if `#{selector}.$dom_node !== undefined`
+    # the following rescue should no longer be needed,
+    # and it prevents bubbling up necessary error messages
+    # for improper use of refs.
+
+    # selector = begin
+    #   selector.dom_node
+    # rescue
+    #   selector
+    # end if `#{selector}.$dom_node !== undefined`
+
+    selector = selector.dom_node if `#{selector}.$dom_node !== undefined`
     `$(#{selector})`
   end
 
diff --git a/ruby/hyper-component/spec/client_features/element_spec.rb b/ruby/hyper-component/spec/client_features/element_spec.rb
@@ -18,13 +18,13 @@
   end
 
   describe "Event Subscription" do
-    it "keeps the original params" do
+    it "keeps the original params, and ignores false, nil, and blank event names" do
       client_option render_on: :both
       mount 'Foo' do
         class Foo
           include Hyperstack::Component
           render do
-            INPUT(value: nil, type: 'text').on(:change) {}
+            INPUT(value: nil, type: 'text').on(:change, false, nil, " ") {}
           end
         end
       end
diff --git a/ruby/hyper-component/spec/client_features/refs_element_method_spec.rb b/ruby/hyper-component/spec/client_features/refs_element_method_spec.rb
@@ -34,7 +34,7 @@ class AnotherComponent < HyperComponent
         render(DIV) { "another component"}
       end
       class TestComponent < HyperComponent
-        after_mount { raise "Failed" unless jQ[@another_component].html == 'another component' }
+        after_mount { raise 'Failure' unless jQ[@another_component].html == 'another component' }
         render do
           @another_component = AnotherComponent()
         end
@@ -43,14 +43,40 @@ class TestComponent < HyperComponent
     expect(page).to have_content('another component')
   end
 
+  it "the ref method has a dom_node method that works with native react components" do
+    mount 'TestComponent' do
+      JS.call(:eval,
+        <<-JSCODE
+          window.NativeComponent = class extends React.Component {
+            constructor(props) {
+              super(props);
+              this.displayName = "aNativeComponent";
+            }
+            render() { return React.createElement("div", null, "a native component"); }
+          }
+        JSCODE
+      )
+      class AnotherComponent < Hyperloop::Component
+        imports "NativeComponent"
+      end
+      class TestComponent < HyperComponent
+        after_mount { raise 'Failure' unless jQ[@another_component].html == 'a native component' }
+        render do
+          @another_component = AnotherComponent()
+        end
+      end
+    end
+    expect(page).to have_content('a native component')
+  end
+
   it 'the ref method has a dom_node method that works with application components' do
     mount 'TestComponent' do
       class AnotherComponent < HyperComponent
         other :others
         render(DIV) { "another component named #{@Others[:foo]}"}
       end
       class TestComponent < HyperComponent
-        after_mount { raise "Failed" unless @ref_1.ref == @ref_2.ref }
+        after_mount { debugger unless @ref_1.ref == @ref_2.ref; nil }
         render do
           @ref_1 = AnotherComponent().as_node
           @ref_2 = @ref_1.render(foo: :bar)
diff --git a/ruby/hyper-model/lib/active_record_base.rb b/ruby/hyper-model/lib/active_record_base.rb
@@ -255,7 +255,7 @@ def has_many(name, *args, &block)
           pre_syncromesh_has_many name, *args, opts.except(:regulate), &block
         end
 
-        %i[belongs_to has_one].each do |macro|
+        %i[belongs_to has_one composed_of].each do |macro|
           alias_method :"pre_syncromesh_#{macro}", macro
           define_method(macro) do |name, *aargs, &block|
             define_method(:"__secure_remote_access_to_#{name}") do |this, _acting_user, *args|
diff --git a/ruby/hyper-model/lib/reactive_record/server_data_cache.rb b/ruby/hyper-model/lib/reactive_record/server_data_cache.rb
@@ -451,6 +451,13 @@ def self.load_from_json(tree, target = nil)
             loaded_collection[0].backing_record.sync_attributes(attrs)
           end
           target.replace loaded_collection
+          # we need to notify any observers of the collection.  collection#replace
+          # will not notify if we are data_loading (which we are) so we will do it
+          # here.  BUT we want the notification to occur after the current event
+          # completes so we wrap it a bulk_update
+          Hyperstack::Internal::State::Mapper.bulk_update do
+            Hyperstack::Internal::State::Variable.set(target, :collection, target.collection)
+          end
         end
 
         if id_value = tree["id"] and id_value.is_a? Array

-Original file line number
+Diff line change
   <body>
     <%= yield %>
 -    <script src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.js" crossorigin></script>
+-
+-
 +    <script src="https://unpkg.com/[email protected]/dist/react-bootstrap.js" crossorigin></script>
   </body>
 </html>