hyperstack-config 1.0.alpha1.2 → 1.0.alpha1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f1a48808eb59fa31bb665f8c1d280d7d711b491f5c77167d6e2313444f33cd
-  data.tar.gz: bb4b09439fbe1b66783c9e29c779d26f8cfc05c68c9eb34f684a91ec6f137eef
+  metadata.gz: 2dd271243b17fe6cd4c3a88780bf8663292ae58b0cc8f530bd631e02b869e452
+  data.tar.gz: f9b2b75988926440c03cd691c6df2296074dc140c5cd2a4184fefc62e9b02152
 SHA512:
-  metadata.gz: 454de46cd61b6f960be911960e8a1f8f8c8645c9aa556ed14aa06a2ee8ddcfa02243a71c76886980fd2095c3386d33aa403d8fd3d5e916363a72052aef4ea474
-  data.tar.gz: 840a5351d69e40f309a238ded585bd729d0c683072291e682347135ebd2f1b619b09a0e8076814ff740b6c7053ae65a658c491eb3c0683ec9610ac72d9354511
+  metadata.gz: a5f9d05f313ec2457860b32c3ae4b83e2c3f4d1230b9f3822e103858c7c0cc73a7b7d5cae6b263bbdc8c185bf6044e92096bce1ee0f25a882b05183c29aee484
+  data.tar.gz: 2b3d63c8286b3e4aa2469452b94cafabc57eb27637b92f49e3d678bd13474ea0cab43cec8f75f3fe844b5df1fdb9a94ba3848fd7fcfb5c2b5dcc0d846a5dda49

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../hyper-spec
   specs:
-    hyper-spec (1.0.alpha1.2)
+    hyper-spec (1.0.alpha1.3)
       capybara
       chromedriver-helper (= 1.2.0)
-      libv8 (~> 6.3.0)
+      libv8
       method_source
-      mini_racer (~> 0.1.15)
+      mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
       parser (>= 2.3.3.1)
       pry
@@ -14,16 +14,15 @@ PATH
       selenium-webdriver
       timecop (~> 0.8.1)
       uglifier
-      unparser
+      unparser (>= 0.2, < 0.4)
       webdrivers
 
 PATH
   remote: .
   specs:
-    hyperstack-config (1.0.alpha1.2)
-      libv8 (~> 6.3.0)
+    hyperstack-config (1.0.alpha1.3)
       listen (~> 3.0)
-      mini_racer (~> 0.1.15)
+      mini_racer (~> 0.2.4)
       opal (>= 0.11.0, < 0.12.0)
       opal-browser (~> 0.2.0)
       uglifier
@@ -84,7 +83,7 @@ GEM
     arel (9.0.0)
     ast (2.4.0)
     builder (3.2.3)
-    capybara (3.11.0)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -107,7 +106,7 @@ GEM
     equalizer (0.0.11)
     erubi (1.7.1)
     execjs (2.7.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     hike (1.2.3)
@@ -119,7 +118,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    libv8 (6.3.292.48.1)
+    libv8 (6.7.288.46.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -137,9 +136,10 @@ GEM
     mimemagic (0.3.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
-    mini_racer (0.1.15)
-      libv8 (~> 6.3)
+    mini_racer (0.2.4)
+      libv8 (>= 6.3)
     minitest (5.11.3)
+    net_http_ssl_fix (0.0.10)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -209,8 +209,8 @@ GEM
       rake
     rake (12.3.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     regexp_parser (1.3.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -261,7 +261,7 @@ GEM
     timecop (0.8.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
     unparser (0.2.8)
@@ -272,7 +272,8 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
-    webdrivers (3.4.3)
+    webdrivers (3.6.0)
+      net_http_ssl_fix
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (~> 3.0)
@@ -287,7 +288,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16.0)
+  bundler (>= 1.17.3, < 2.1)
   chromedriver-helper
   hyper-spec!
   hyperstack-config!
@@ -302,4 +303,4 @@ DEPENDENCIES
   timecop (~> 0.8.1)
 
 BUNDLED WITH
-   1.16.1
+   2.0.1

data/hyperstack-config.gemspec

@@ -22,16 +22,15 @@ Gem::Specification.new do |spec|
   spec.executables << 'hyperstack-hotloader'
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'libv8', '~> 6.3.0' # see https://github.com/discourse/mini_racer/issues/92
   spec.add_dependency 'listen', '~> 3.0'  # for hot loader
-  spec.add_dependency 'mini_racer', '~> 0.1.15'
+  spec.add_dependency 'mini_racer', '~> 0.2.4'
   spec.add_dependency 'opal', '>= 0.11.0', '< 0.12.0'
   spec.add_dependency 'opal-browser', '~> 0.2.0'
   spec.add_dependency 'uglifier'
   spec.add_dependency 'websocket' # for hot loader
 
 
-  spec.add_development_dependency 'bundler', '~> 1.16.0'
+  spec.add_development_dependency 'bundler', ['>= 1.17.3', '< 2.1']
   spec.add_development_dependency 'chromedriver-helper'
   spec.add_development_dependency 'opal-rails', '~> 0.9.4'
   spec.add_development_dependency 'pry'

data/lib/hyperstack/config/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   module Config
-    VERSION = '1.0.alpha1.2'
+    VERSION = '1.0.alpha1.3'
   end
 end

data/lib/hyperstack/hotloader.rb

@@ -15,35 +15,33 @@ end
 module Hyperstack
 
   class Hotloader
-    def self.callbackmaps
-      @@callbackmaps ||= Hash.new { |h, k| h[k] = Hash.new { |h1, k1| h1[k1] = Hash.new { |h2, k2| h2[k2] = Array.new }}}
+    def self.callbacks
+      @@callbacks ||= Hash.new { |h, k| h[k] = Array.new }
     end
 
-    def self.record(klass, instance_var, depth, *items)
-      if $_hyperstack_reloader_file_name
-        callbackmaps[$_hyperstack_reloader_file_name][klass][instance_var].concat items
-      else
-        callback = lambda do |stack_frames|
-          file_name = `#{stack_frames[depth]}.fileName`
-          match = /^(.+\/assets\/)(.+\/)\2/.match(file_name)
-          if match
-            file_name = file_name.gsub(match[1]+match[2], '')
-            callbackmaps[file_name][klass][instance_var].concat items
-          end
-        end
-        error = lambda do |err|
-          `console.error(#{"hyperstack hot loader could not find source file for callback: #{err}"})`
-        end
-        `StackTrace.get().then(#{callback}).catch(#{error})`
-       end
+    STACKDIRS = ['hyperstack/', 'corelib/']
+
+    def self.file_name(frame)
+      file_name = `#{frame}.fileName`
+      match = %r{^(.+\/assets\/)(.+\/)(.+\/)}.match(file_name)
+      return unless match && match[2] == match[3] && !STACKDIRS.include?(match[2])
+      file_name.gsub(match[1] + match[2], '')
     end
 
-    def self.remove(file_name)
-      callbackmaps[file_name].each do |klass, instance_vars|
-        instance_vars.each do |instance_var, items|
-          klass.instance_variable_get(instance_var).reject! { |item| items.include? item }
-        end
+    def self.when_file_updates(&block)
+      return callbacks[$_hyperstack_reloader_file_name] << block if $_hyperstack_reloader_file_name
+      callback = lambda do |frames|
+        frames.collect(&method(:file_name)).each { |name| callbacks[name] << block if name }
       end
+      error = lambda do |e|
+        `console.error(#{"hyperstack hot loader could not find source file for callback: #{e}"})`
+      end
+      `StackTrace.get().then(#{callback}).catch(#{error})`
+    end
+
+    def self.remove(file_name)
+      callbacks[file_name].each(&:call)
+      callbacks[file_name] = []
     end
 
     def connect_to_websocket(port)
@@ -82,7 +80,7 @@ module Hyperstack
         puts "Reloading #{reload_request[:filename]} (asset_path: #{reload_request[:asset_path]})"
         begin
           #Hyperstack::Context.reset! false
-          file_name = reload_request[:asset_path] #.gsub(/.+hyperstack\//, '')
+          file_name = reload_request[:asset_path].gsub(/.+hyperstack\//, '')  # this gsub we need sometimes????
           Hotloader.remove(file_name)
           $eval_proc.call file_name, reload_request[:source_code]
         rescue

data/lib/hyperstack/hotloader/add_error_boundry.rb

@@ -3,7 +3,7 @@ module Hyperstack
     module AddErrorBoundry
       def self.included(base)
         base.after_error do |*err|
-          @err = err
+          @err = Hyperstack::Internal::Component::RescueWrapper.after_error_args || err
           Hyperstack::Component.force_update!
         end
         base.define_method :render do

data/lib/hyperstack/hotloader/stub.rb

@@ -1,10 +1,12 @@
 # insure that stubs for Hyperstack::Hotloader.record and window.Hyperstack.hotloader are defined
 # importing 'hyperstack/hotloader' will define/redefine these
+# note that some internal hyperstack modules will use callbacks, which will call this, but it
+# doesn't matter...
 
 module Hyperstack
   unless defined? Hotloader
     class Hotloader
-      def self.record(klass, instance_var, depth, *items); end
+      def self.when_file_updates(&block); end
     end
   end
 end

data/lib/hyperstack/imports.rb

@@ -44,9 +44,19 @@ module Hyperstack
       import client_and_server_manifest.split("/").last, at_head: true if client_and_server_manifest
     end
 
+    def add_inflections(sys)
+      return [] unless sys
+      ["puts \"require 'config/initializers/inflections.rb'\""] +
+        File.open(Rails.root.join('config', 'initializers', 'inflections.rb'), &:readlines).tap do
+          puts "    require 'config/initializers/inflections.rb'"
+        end
+    rescue Errno::ENOENT
+      []
+    end
+
     def generate_requires(mode, sys, file)
       handle_webpack
-      import_list.collect do |value, cancelled, render_on_server, render_on_client, kind|
+      (import_list.collect do |value, cancelled, render_on_server, render_on_client, kind|
         next if cancelled
         next if (sys && kind == :tree) || (!sys && kind != :tree)
         next if mode == :client && !render_on_client
@@ -60,7 +70,7 @@ module Hyperstack
         else
           generate_directive(:require, value, file, render_on_server, render_on_client)
         end
-      end.compact.join("\n")
+      end + add_inflections(sys)).compact.join("\n")
     end
 
     def generate_directive(directive, to, file, render_on_server, render_on_client)

data/lib/hyperstack/on_error.rb

@@ -1,5 +1,5 @@
 module Hyperstack
-  def self.on_error(err, reason, details)
+  def self.on_error(err, reason, params, formatted_error_message)
     # do whatever you want here... i.e. log, debug, etc
   end
 end

data/lib/hyperstack/rail_tie.rb

@@ -2,7 +2,7 @@ module Hyperstack
 
   class Engine < ::Rails::Engine
   end
-  
+
   define_setting :add_hyperstack_paths, true
 
   define_setting :prerendering_files, ['hyperstack-prerender-loader.js']
@@ -20,6 +20,8 @@ module Hyperstack
             config.eager_load_paths += %W(#{config.root}/app/hyperstack/models)
             config.eager_load_paths += %W(#{config.root}/app/hyperstack/models/concerns)
             config.eager_load_paths += %W(#{config.root}/app/hyperstack/operations)
+            config.eager_load_paths += %W(#{config.root}/app/hyperstack/shared)
+
             # rails will add everything immediately below app to eager and auto load, so we need to remove it
             delete_first config.eager_load_paths, "#{config.root}/app/hyperstack"
 
@@ -27,6 +29,8 @@ module Hyperstack
               config.autoload_paths += %W(#{config.root}/app/hyperstack/models)
               config.autoload_paths += %W(#{config.root}/app/hyperstack/models/concerns)
               config.autoload_paths += %W(#{config.root}/app/hyperstack/operations)
+              config.autoload_paths += %W(#{config.root}/app/hyperstack/shared)
+
               # config.eager_load_paths += %W(#{config.root}/app/hyperstack/stores)
               # config.autoload_paths += %W(#{config.root}/app/hyperstack/stores)
               delete_first config.autoload_paths, "#{config.root}/app/hyperstack"
@@ -52,6 +56,9 @@ module Hyperstack
             # delete_first config.autoload_paths, "#{config.root}/app/hyperstack/stores"
             delete_first config.eager_load_paths, "#{config.root}/app/hyperstack/operations"
             delete_first config.autoload_paths, "#{config.root}/app/hyperstack/operations"
+            delete_first config.eager_load_paths, "#{config.root}/app/hyperstack/shared"
+            delete_first config.autoload_paths, "#{config.root}/app/hyperstack/shared"
+
 
             delete_first config.assets.paths, ::Rails.root.join('app', 'hyperstack').to_s
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperstack-config
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.2
+  version: 1.0.alpha1.3
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: libv8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -119,16 +105,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.17.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -342,8 +334,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.2
 signing_key: 
 specification_version: 4
 summary: Provides a single point configuration module for hyperstack gems