rails-hyperstack 1.0.alpha1.5 → 1.0.alpha1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c8b7f53db3107e49c7b59eab1b4cc9d5548ef6cfee842fb971fa516b1b75469
-  data.tar.gz: b05b41840ccf479ff2011fa70dc35a879715100d99a4e33d2a1d1817d9c9e330
+  metadata.gz: f5c953e4e7193e6a181228ee9f26d393c2ff02d74db4ddfd723114c24058270c
+  data.tar.gz: fb1af29e5892577461c9872b239dfedc52b3662ae340bae24206fe425ad77a86
 SHA512:
-  metadata.gz: 2c1a4c77d0def6a0895879f776ede450bc63e33ff96d555df70a19e33b666c9f510cd8c96bdad218446477386c1d31ac51961daae461189274b4024cbaf5513e
-  data.tar.gz: aa53c533efc6d297c77a3f34ae5f2f0385868685270f1c7f5742b75d980d61a6f32dfda4ccd9137edd0abdda3a471ba39b2ba86973afdc5709dc33401625fc2a
+  metadata.gz: da214eb2d241d180c3fe25310ed3892ccb32778078ca00e6ab132609155525fed4cc3608cd81c9fccd1e40792e25b86096313dd740ef3cdb5fe0d8670fed3440
+  data.tar.gz: 1031939b40797726856d4cf56dbe2296e73493c82b19886f189117bf9ff81e934f5a1d96484971c5988be2bd9ed7815b3e438b45b371ca6449e567f85a1c6d3a

data/.gitignore

@@ -11,6 +11,7 @@ capybara-*.html
 **.orig
 rerun.txt
 pickle-email-*.html
+TestApp/
 
 # TODO Comment out these rules if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
@@ -50,3 +51,8 @@ bower.json
 # ignore Gemfile.locks https://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
 /spec/test_app/Gemfile.lock
 /Gemfile.lock
+
+node_modules
+package.json
+spec/test_app
+yarn.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/Gemfile

@@ -6,5 +6,6 @@ gem 'hyper-operation',   path: '../hyper-operation'
 gem 'hyper-model',       path: '../hyper-model'
 gem 'hyper-router',      path: '../hyper-router'
 gem 'hyper-spec',        path: '../hyper-spec'
-gem 'rails', '~> 5.2'
+gem 'webpacker'  # TODO: figure out why these two are necessary!
+gem 'turbolinks'
 gemspec

data/Rakefile

@@ -1,25 +1,35 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'pry'
 
 RSpec::Core::RakeTask.new(:spec)
 
 namespace :spec do
   task :prepare do
+    rails_version = `bundle info rails`.match(/\* rails \((.+)\)/)[1]
+    opal_version = `bundle info opal`.match(/\* opal \((.+)\)/)[1]
     Dir.chdir('spec') do
       sh('rm -rf test_app')
-      sh('bundle exec rails new test_app')
-      Dir.chdir('test_app') do
-        sh('bundle exec rails g hyperstack:install')
-        sh('mv Gemfile _Gemfile_')
-        sh('bundle exec rails generate model Sample name:string description:text')
-        sh('mv app/models/sample.rb app/hyperstack/models/sample.rb')
-        sh('bundle exec rake db:migrate')
-        sh('bundle exec rails dev:cache')
+      Bundler.with_unbundled_env do
+        sh("rails _#{rails_version}_ new test_app -T")
+      end
+      Bundler.with_unbundled_env do
+        Dir.chdir('test_app') do
+          sh('cat ../gems.rb >> Gemfile')
+          sh("echo 'gem \"opal\", \"#{opal_version}\"' >> Gemfile")
+          sh("bundle update")
+          sh('spring stop')
+          sh('bundle exec rails g hyperstack:install')
+          sh('bundle exec rails generate model Sample name:string description:text')
+          sh('mv app/models/sample.rb app/hyperstack/models/sample.rb')
+          sh("cat ../server_side_sample.rb >> app/models/sample.rb")
+          sh('bundle exec rake db:migrate')
+          sh('RAILS_ENV=test bundle exec rake db:setup')
+          # sh('bundle exec rails dev:cache') # not tested yet...
+        end
       end
     end
   end
 end
 
-task :default do
-  
-end
+task :default => :spec

data/lib/generators/hyper/templates/component_template.rb

@@ -37,7 +37,7 @@
 
 <%="  "* @indent %>  before_unmount do
 <%="  "* @indent %>    # cleanup any thing before component is destroyed
-<%="  "* @indent %>    # note timers are broadcast receivers are cleaned up
+<%="  "* @indent %>    # note timers and broadcast receivers are cleaned up
 <%="  "* @indent %>    # automatically
 <%="  "* @indent %>  end
 

data/lib/generators/hyperstack/install_generator.rb

@@ -9,17 +9,6 @@ module Hyperstack
     class_option 'webpack-only', type: :boolean
     class_option 'hyper-model-only', type: :boolean
 
-    def add_component
-      if skip_adding_component?
-        # normally this is handled by the hyper:component
-        # generator, but if we are skipping it we will check it
-        # now.
-        insure_hyperstack_loader_installed
-      else
-        generate 'hyper:router App --add-route'
-      end
-    end
-
     def add_hotloader
       return if skip_hotloader?
       unless Hyperstack.imported? 'hyperstack/hotloader'
@@ -37,82 +26,32 @@ hot-loader: bundle exec hyperstack-hotloader -p 25222 -d app/hyperstack
       end
     end
 
-    def insure_yarn_loaded
-      return if skip_webpack?
-      begin
-        yarn_version = `yarn --version`
-        raise Errno::ENOENT if yarn_version.blank?
-      rescue Errno::ENOENT
-        raise Thor::Error.new("please insure nodejs is installed and the yarn command is available if using webpacker")
-      end
-    end
-
-    def add_webpacker_manifests
-      return if skip_webpack?
-      create_file 'app/javascript/packs/client_and_server.js', <<-JAVASCRIPT
-//app/javascript/packs/client_and_server.js
-// these packages will be loaded both during prerendering and on the client
-React = require('react');                      // react-js library
-History = require('history');                  // react-router history library
-ReactRouter = require('react-router');         // react-router js library
-ReactRouterDOM = require('react-router-dom');  // react-router DOM interface
-ReactRailsUJS = require('react_ujs');          // interface to react-rails
-// to add additional NPM packages run `yarn add package-name@version`
-// then add the require here.
-      JAVASCRIPT
-      create_file 'app/javascript/packs/client_only.js', <<-JAVASCRIPT
-//app/javascript/packs/client_only.js
-// add any requires for packages that will run client side only
-ReactDOM = require('react-dom');               // react-js client side code
-jQuery = require('jquery');                    // remove if you don't need jQuery
-// to add additional NPM packages call run yarn add package-name@version
-// then add the require here.
-      JAVASCRIPT
-      append_file 'config/initializers/assets.rb' do
-        <<-RUBY
-Rails.application.config.assets.paths << Rails.root.join('public', 'packs', 'js').to_s
-        RUBY
-      end
-      inject_into_file 'config/environments/test.rb', before: /^end/ do
-        <<-RUBY
-
-  # added by hyperstack installer
-  config.assets.paths << Rails.root.join('public', 'packs-test', 'js').to_s
-        RUBY
-      end
-    end
-
-    def add_webpacks
-      return if skip_webpack?
-      yarn 'react', '16'
-      yarn 'react-dom', '16'
-      yarn 'react-router', '^5.0.0'
-      yarn 'react-router-dom', '^5.0.0'
-      # yarn 'history'#, '4.2' this will be brought in by react-router
-      yarn 'react_ujs', '^2.5.0'
-      yarn 'jquery', '^3.4.1'
-    end
+    def install_webpack
+      return super unless skip_webpack?
 
-    def cancel_react_source_import
-      return if skip_webpack?
       inject_into_initializer(
-        "Hyperstack.cancel_import 'react/react-source-browser' "\
-        '# bring your own React and ReactRouter via Yarn/Webpacker'
+        "Hyperstack.import 'react/react-source-browser' "\
+        "# bring in hyperstack's copy of react, comment this out "\
+        "if you bring it in from webpacker\n"
       )
     end
 
-    def install_webpacker
-      return if skip_webpack?
-      gem 'webpacker'
-      Bundler.with_clean_env do
-        run 'bundle install'
+    def add_component
+      # add_component AFTER webpack so component generator webpack check works
+      if skip_adding_component?
+        # normally this is handled by the hyper:component
+        # generator, but if we are skipping it we will check it
+        # now.
+        insure_hyperstack_loader_installed
+        check_javascript_link_directory
+      else
+        generate 'hyper:router App --add-route'
       end
-      run 'bundle exec rails webpacker:install'
     end
 
     def create_policies_directory
       return if skip_hyper_model?
-      policy_file = File.join('app', 'policies', 'application_policy.rb')
+      policy_file = Rails.root.join('app', 'policies', 'hyperstack', 'application_policy.rb')
       unless File.exist? policy_file
         create_file policy_file, <<-RUBY
   # #{policy_file}
@@ -121,38 +60,56 @@ Rails.application.config.assets.paths << Rails.root.join('public', 'packs', 'js'
   # The following policy will open up full access (but only in development)
   # The policy system is very flexible and powerful.  See the documentation
   # for complete details.
-  class Hyperstack::ApplicationPolicy
-    # Allow any session to connect:
-    always_allow_connection
-    # Send all attributes from all public models
-    regulate_all_broadcasts { |policy| policy.send_all }
-    # Allow all changes to models
-    allow_change(to: :all, on: [:create, :update, :destroy]) { true }
-    # allow remote access to all scopes - i.e. you can count or get a list of ids
-    # for any scope or relationship
-    ApplicationRecord.regulate_scope :all
-  end unless Rails.env.production?
+  module Hyperstack
+    class ApplicationPolicy
+      # Allow any session to connect:
+      always_allow_connection
+      # Send all attributes from all public models
+      regulate_all_broadcasts { |policy| policy.send_all }
+      # Allow all changes to models
+      allow_change(to: :all, on: [:create, :update, :destroy]) { true }
+    end unless Rails.env.production?
+  end
         RUBY
       end
     end
 
     def move_and_update_application_record
       return if skip_hyper_model?
-      rails_app_record_file = File.join('app', 'models', 'application_record.rb')
-      hyper_app_record_file = File.join('app', 'hyperstack', 'models', 'application_record.rb')
+      rails_app_record_file = Rails.root.join('app', 'models', 'application_record.rb')
+      hyper_app_record_file = Rails.root.join('app', 'hyperstack', 'models', 'application_record.rb')
       unless File.exist? hyper_app_record_file
-        empty_directory File.join('app', 'hyperstack', 'models')
+        empty_directory Rails.root.join('app', 'hyperstack', 'models')
         `mv #{rails_app_record_file} #{hyper_app_record_file}`
-        create_file rails_app_record_file, <<-RUBY
-# #{rails_app_record_file}
-# the presence of this file prevents rails migrations from recreating application_record.rb
-# see https://github.com/rails/rails/issues/29407
+        inject_into_file hyper_app_record_file, before: /^end/, verbose: false do
+          "  # allow remote access to all scopes - i.e. you can count or get a list of ids\n"\
+          "  # for any scope or relationship\n"\
+          "  ApplicationRecord.regulate_scope :all unless Hyperstack.env.production?\n"
+        end
 
-require 'models/application_record.rb'
-        RUBY
+#         create_file rails_app_record_file, <<-RUBY
+# # #{rails_app_record_file}
+# # the presence of this file prevents rails migrations from recreating application_record.rb
+# # see https://github.com/rails/rails/issues/29407
+#
+# require 'models/application_record.rb'
+#         RUBY
       end
     end
 
+    def turn_on_transport
+      inject_into_initializer <<-RUBY
+
+# transport controls how push (websocket) communications are
+# implemented.  The default is :none.
+# Other possibilities are :action_cable, :pusher (see www.pusher.com)
+# or :simple_poller which is sometimes handy during system debug.
+
+Hyperstack.transport = :action_cable # :pusher, :simple_poller or :none
+
+      RUBY
+    end
+
     def add_engine_route
       return if skip_hyper_model?
       route 'mount Hyperstack::Engine => \'/hyperstack\'  # this route should be first in the routes file so it always matches'
@@ -174,7 +131,7 @@ require 'models/application_record.rb'
         say '👩‍✈️ Basic development policy defined.  See app/policies/application_policy.rb 👨🏽‍✈️', :green
         say '💽 HyperModel installed. Move any Active Record models to the app/hyperstack/models to access them from the client 📀', :green
       end
-      if File.exist?(init = File.join('config', 'initializers', 'hyperstack.rb'))
+      if File.exist?(init = Rails.root.join('config', 'initializers', 'hyperstack.rb'))
         say "☑️  Check #{init} for other configuration options. ☑️", :green
       end
       unless skip_hotloader?
@@ -182,6 +139,8 @@ require 'models/application_record.rb'
       end
 
       say "\n\n"
+
+      warnings.each { |warning| say "#{warning}", :yellow }
     end
 
     private
@@ -205,7 +164,7 @@ require 'models/application_record.rb'
     def new_rails_app?
       # check to see if there are any routes set up and remember it, cause we might add a route in the process
       @new_rails_app ||= begin
-        route_file = File.join('config', 'routes.rb')
+        route_file = Rails.root.join('config', 'routes.rb')
         count = File.foreach(route_file).inject(0) do |c, line|
           line = line.strip
           next c if line.empty?
@@ -216,52 +175,5 @@ require 'models/application_record.rb'
         count <= 2
       end
     end
-
-    def inject_into_initializer(s)
-      file_name = File.join('config', 'initializers', 'hyperstack.rb')
-      if File.exist?(file_name)
-        prepend_to_file(file_name) { "#{s}\n" }
-      else
-        create_file file_name, <<-RUBY
-#{s}
-# set the component base class
-
-Hyperstack.component_base_class = 'HyperComponent' # i.e. 'ApplicationComponent'
-
-# prerendering is default :off, you should wait until your
-# application is relatively well debugged before turning on.
-
-Hyperstack.prerendering = :off # or :on
-
-# transport controls how push (websocket) communications are
-# implemented.  The default is :action_cable.
-# Other possibilities are :pusher (see www.pusher.com) or
-# :simple_poller which is sometimes handy during system debug.
-
-Hyperstack.transport = :action_cable # or :none, :pusher,  :simple_poller
-
-# add this line if you need jQuery AND ARE NOT USING WEBPACK
-# Hyperstack.import 'hyperstack/component/jquery', client_only: true
-
-# change definition of on_error to control how errors such as validation
-# exceptions are reported on the server
-module Hyperstack
-  def self.on_error(operation, err, params, formatted_error_message)
-    ::Rails.logger.debug(
-      "\#{formatted_error_message}\\n\\n" +
-      Pastel.new.red(
-        'To further investigate you may want to add a debugging '\\
-        'breakpoint to the on_error method in config/initializers/hyperstack.rb'
-      )
-    )
-  end
-end if Rails.env.development?
-        RUBY
-      end
-      # whenever we modify the initializer its best to empty the cache, BUT
-      # we only need to it once per generator execution
-      run 'rm -rf tmp/cache' unless @cache_emptied_already
-      @cache_emptied_already = true
-    end
   end
 end

data/lib/generators/hyperstack/install_generator_base.rb

@@ -6,9 +6,15 @@ module Rails
 
       protected
 
+      def warnings
+        @warnings ||= []
+      end
+
       def create_component_file(template)
         clear_cache
         insure_hyperstack_loader_installed
+        check_javascript_link_directory
+        added = webpack_check
         insure_base_component_class_exists
         @no_help = options.key?('no-help')
         self.components.each do |component|
@@ -17,46 +23,80 @@ module Rails
           @file_name = component_array.last
           @indent = 0
           template template,
-                   File.join('app', 'hyperstack', 'components',
+                   Rails.root.join('app', 'hyperstack', 'components',
                              *@modules.map(&:downcase),
                              "#{@file_name.underscore}.rb")
         end
         add_route
+        return unless added
+
+        say '📦 Webpack integrated with Hyperstack.  '\
+            'Add javascript assets to app/javascript/packs/client_only.js and /client_and_server.js 📦', :green
       end
 
 
       def clear_cache
-        run 'rm -rf tmp/cache' unless Dir.exist?(File.join('app', 'hyperstack'))
+        run 'rm -rf tmp/cache' unless Dir.exist?(Rails.root.join('app', 'hyperstack'))
       end
 
       def insure_hyperstack_loader_installed
-        application_js = File.join(
+        hyperstack_loader = %r{//=\s+require\s+hyperstack-loader\s+}
+        application_js = Rails.root.join(
           'app', 'assets', 'javascripts', 'application.js'
         )
-        require_tree = %r{//=\s+require_tree\s+}
-        hyperstack_loader = %r{//=\s+require\s+hyperstack-loader\s+}
-        unless File.foreach(application_js).any? { |l| l =~ hyperstack_loader }
-          if File.foreach(application_js).any? { |l| l =~ require_tree }
-            inject_into_file 'app/assets/javascripts/application.js', before: require_tree do
-              "//= require hyperstack-loader\n"
+        if File.exist? application_js
+          unless File.foreach(application_js).any? { |l| l =~ hyperstack_loader }
+            require_tree = %r{//=\s+require_tree\s+}
+            if File.foreach(application_js).any? { |l| l =~ require_tree }
+              inject_into_file 'app/assets/javascripts/application.js', verbose: false, before: require_tree do
+                "//= require hyperstack-loader\n"
+              end
+            else
+              warnings <<
+                " ***********************************************************\n"\
+                " * Could not add `//= require hyperstack-loader` directive *\n"\
+                " * to the app/assets/application.js file.                  *\n"\
+                " * Normally this directive is added just before the        *\n"\
+                " * `//= require_tree .` directive at the end of the file,  *\n"\
+                " * but no require_tree directive was found.  You need to   *\n"\
+                " * manually add `//= require hyperstack-loader` to the     *\n"\
+                " * app/assets/application.js file.                         *\n"\
+                " ***********************************************************\n"
+            end
+          end
+        else
+          create_file application_js, "//= require hyperstack-loader\n"
+          warnings <<
+            " ***********************************************************\n"\
+            " * Could not find the  app/assets/application.js file.     *\n"\
+            " * We created one for you, and added the                   *\n"\
+            " * `<%= javascript_include_tag 'application' %>` to your   *\n"\
+            " * `html.erb` files immediately after any                  *\n"\
+            " * `<%= javascript_pack 'application' %>` tags we found.   *\n"\
+            " ***********************************************************\n"
+          application_pack_tag =
+            /\s*\<\%\=\s+javascript_pack_tag\s+(\'|\")application(\'|\").*\%\>.*$/
+          Dir.glob(Rails.root.join('app', 'views', '**', '*.erb')) do |file|
+            if File.foreach(file).any? { |l| l =~ application_pack_tag }
+              inject_into_file file, verbose: false, after: application_pack_tag do
+                "\n    <%= javascript_include_tag 'application' %>"
+              end
             end
-          else
-            puts " ***********************************************************\n"\
-                 " * Could not add `//= require hyperstack-loader` directive *\n"\
-                 " * to the app/assets/application.js file.                  *\n"\
-                 " * Normally this directive is added just before the        *\n"\
-                 " * `//= require_tree .` directive at the end of the file,  *\n"\
-                 " * but no require_tree directive was found.  You need to   *\n"\
-                 " * manually add `//= require hyperstack-loader` to the     *\n"\
-                 " * app/assets/application.js file.                         *\n"\
-                 " ***********************************************************\n"
           end
         end
       end
 
+      def check_javascript_link_directory
+        manifest_js_file = Rails.root.join("app", "assets", "config", "manifest.js")
+        return unless File.exist? manifest_js_file
+        return unless File.readlines(manifest_js_file).grep(/javascripts \.js/).empty?
+
+        append_file manifest_js_file, "//= link_directory ../javascripts .js\n", verbose: false
+      end
+
       def insure_base_component_class_exists
         @component_base_class = options['base-class'] || Hyperstack.component_base_class
-        file_name = File.join(
+        file_name = Rails.root.join(
           'app', 'hyperstack', 'components', "#{@component_base_class.underscore}.rb"
         )
         template 'hyper_component_template.rb', file_name unless File.exist? file_name
@@ -64,19 +104,20 @@ module Rails
 
       def add_to_manifest(manifest, &block)
         if File.exist? "app/javascript/packs/#{manifest}"
-          append_file "app/javascript/packs/#{manifest}", &block
+          append_file "app/javascript/packs/#{manifest}", verbose: false, &block
         else
-          create_file "app/javascript/packs/#{manifest}", &block
+          create_file "app/javascript/packs/#{manifest}", verbose: false, &block
         end
       end
 
       def add_route
         return unless options['add-route']
         if self.components.count > 1
-          puts " ***********************************************************\n"\
-               " * The add-route option ignored because more than one      *\n"\
-               " * component is being generated.                           *\n"\
-               " ***********************************************************\n"
+          warnings <<
+            " ***********************************************************\n"\
+            " * The add-route option ignored because more than one      *\n"\
+            " * component is being generated.                           *\n"\
+            " ***********************************************************\n"
           return
         end
         action_name = (@modules+[@file_name.underscore]).join('__')
@@ -94,6 +135,154 @@ module Rails
         return if system("yarn add #{package}#{'@' + version if version}")
         raise Thor::Error.new("yarn failed to install #{package} with version #{version}")
       end
+
+      def install_webpack
+        insure_yarn_loaded
+        add_webpacker_manifests
+        add_webpacks
+        cancel_react_source_import
+        install_webpacker
+      end
+
+      def inject_into_initializer(s)
+        file_name = Rails.root.join('config', 'initializers', 'hyperstack.rb')
+        if File.exist?(file_name)
+          prepend_to_file(file_name, verbose: false) { "#{s}\n" }
+        else
+          create_file file_name, <<-RUBY
+#{s}
+
+# server_side_auto_require will patch the ActiveSupport Dependencies module
+# so that you can define classes and modules with files in both the
+# app/hyperstack/xxx and app/xxx directories.  For example you can split
+# a Todo model into server and client related definitions and place this
+# in `app/hyperstack/models/todo.rb`, and place any server only definitions in
+# `app/models/todo.rb`.
+
+require "hyperstack/server_side_auto_require.rb"
+
+# set the component base class
+
+Hyperstack.component_base_class = 'HyperComponent' # i.e. 'ApplicationComponent'
+
+# prerendering is default :off, you should wait until your
+# application is relatively well debugged before turning on.
+
+Hyperstack.prerendering = :off # or :on
+
+# add this line if you need jQuery AND ARE NOT USING WEBPACK
+# Hyperstack.import 'hyperstack/component/jquery', client_only: true
+
+# change definition of on_error to control how errors such as validation
+# exceptions are reported on the server
+module Hyperstack
+  def self.on_error(operation, err, params, formatted_error_message)
+    ::Rails.logger.debug(
+      "\#{formatted_error_message}\\n\\n" +
+      Pastel.new.red(
+        'To further investigate you may want to add a debugging '\\
+        'breakpoint to the on_error method in config/initializers/hyperstack.rb'
+      )
+    )
+  end
+end if Rails.env.development?
+          RUBY
+        end
+        # whenever we modify the initializer its best to empty the cache, BUT
+        # we only need to it once per generator execution
+        run 'rm -rf tmp/cache' unless @cache_emptied_already
+        @cache_emptied_already = true
+      end
+
+      private
+
+      def webpack_check
+        return unless defined? ::Webpacker
+
+        client_and_server = Rails.root.join("app", "javascript", "packs", "client_only.js")
+        return if File.exist? client_and_server
+
+        # Dir.chdir(Rails.root.join.to_s) { run 'bundle exec rails hyperstack:install:webpack' }
+
+        # say "warning: you are running webpacker, but the hyperstack webpack files have not been created.\n"\
+        #     "         Suggest you run bundle exec rails hyperstack:install:webpack soon.\n"\
+        #     "         Or to avoid this warning create an empty file named app/javascript/packs/client_only.js",
+        #     :red
+        install_webpack
+        true
+      end
+
+      def insure_yarn_loaded
+        begin
+          yarn_version = `yarn --version`
+          raise Errno::ENOENT if yarn_version.blank?
+        rescue Errno::ENOENT
+          raise Thor::Error.new("please insure nodejs is installed and the yarn command is available if using webpacker")
+        end
+      end
+
+      def add_webpacker_manifests
+        create_file 'app/javascript/packs/client_and_server.js', <<-JAVASCRIPT
+//app/javascript/packs/client_and_server.js
+// these packages will be loaded both during prerendering and on the client
+React = require('react');                         // react-js library
+createReactClass = require('create-react-class'); // backwards compatibility with ECMA5
+History = require('history');                     // react-router history library
+ReactRouter = require('react-router');            // react-router js library
+ReactRouterDOM = require('react-router-dom');     // react-router DOM interface
+ReactRailsUJS = require('react_ujs');             // interface to react-rails
+// to add additional NPM packages run `yarn add package-name@version`
+// then add the require here.
+        JAVASCRIPT
+        create_file 'app/javascript/packs/client_only.js', <<-JAVASCRIPT
+//app/javascript/packs/client_only.js
+// add any requires for packages that will run client side only
+ReactDOM = require('react-dom');               // react-js client side code
+jQuery = require('jquery');                    // remove if you don't need jQuery
+// to add additional NPM packages call run yarn add package-name@version
+// then add the require here.
+        JAVASCRIPT
+        append_file 'config/initializers/assets.rb', verbose: false do
+          <<-RUBY
+  Rails.application.config.assets.paths << Rails.root.join('public', 'packs', 'js').to_s
+          RUBY
+        end
+        inject_into_file 'config/environments/test.rb', verbose: false, before: /^end/ do
+          <<-RUBY
+
+  # added by hyperstack installer
+  config.assets.paths << Rails.root.join('public', 'packs-test', 'js').to_s
+          RUBY
+        end
+      end
+
+      def add_webpacks
+        yarn 'react', '16'
+        yarn 'react-dom', '16'
+        yarn 'react-router', '^5.0.0'
+        yarn 'react-router-dom', '^5.0.0'
+        yarn 'react_ujs', '^2.5.0'
+        yarn 'jquery', '^3.4.1'
+        yarn 'create-react-class'
+      end
+
+      def cancel_react_source_import
+        inject_into_initializer(
+          "# Hyperstack.import 'react/react-source-browser' "\
+          "# uncomment this line if you want hyperstack to use its copy of react"
+        )
+      end
+
+      def install_webpacker
+        return if defined?(::Webpacker)
+
+        gem "webpacker"
+        Bundler.with_unbundled_env do
+          run "bundle install"
+        end
+        `spring stop`
+        Dir.chdir(Rails.root.join.to_s) { run 'bundle exec rails webpacker:install' }
+      end
     end
   end
 end

data/lib/generators/install/hyperstack_generator.rb

@@ -214,7 +214,7 @@ hot-loader: bundle exec hyperstack-hotloader -p 25222 -d app/hyperstack
     end
 
     def install
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         run "bundle install"
       end
       run 'bundle exec rails webpacker:install'

data/lib/generators/install/hyperstack_generator_base.rb

@@ -6,39 +6,64 @@ module Rails
 
       protected
 
+      def warnings
+        @warnings ||= []
+      end
+
       def clear_cache
-        run 'rm -rf tmp/cache' unless Dir.exists?(File.join('app', 'hyperstack'))
+        run 'rm -rf tmp/cache' unless Dir.exists?(Rails.root.join('app', 'hyperstack'))
       end
 
       def insure_hyperstack_loader_installed
-        application_js = File.join(
+        hyperstack_loader = %r{//=\s+require\s+hyperstack-loader\s+}
+        application_js = Rails.root.join(
           'app', 'assets', 'javascripts', 'application.js'
         )
-        require_tree = %r{//=\s+require_tree\s+}
-        hyperstack_loader = %r{//=\s+require\s+hyperstack-loader\s+}
-        unless File.foreach(application_js).any? { |l| l =~ hyperstack_loader }
-          if File.foreach(application_js).any? { |l| l =~ require_tree }
-            inject_into_file 'app/assets/javascripts/application.js', before: require_tree do
-              "//= require hyperstack-loader\n"
+        if File.exist? application_js
+          unless File.foreach(application_js).any? { |l| l =~ hyperstack_loader }
+            require_tree = %r{//=\s+require_tree\s+}
+            if File.foreach(application_js).any? { |l| l =~ require_tree }
+              inject_into_file 'app/assets/javascripts/application.js', before: require_tree do
+                "//= require hyperstack-loader\n"
+              end
+            else
+              warnings <<
+                " ***********************************************************\n"\
+                " * Could not add `//= require hyperstack-loader` directive *\n"\
+                " * to the app/assets/application.js file.                  *\n"\
+                " * Normally this directive is added just before the        *\n"\
+                " * `//= require_tree .` directive at the end of the file,  *\n"\
+                " * but no require_tree directive was found.  You need to   *\n"\
+                " * manually add `//= require hyperstack-loader` to the     *\n"\
+                " * app/assets/application.js file.                         *\n"\
+                " ***********************************************************\n"
+            end
+          end
+        else
+          create_file application_js, "//= require hyperstack-loader\n"
+          warnings <<
+            " ***********************************************************\n"\
+            " * Could not find the  app/assets/application.js file.     *\n"\
+            " * We created one for you, and added the                   *\n"\
+            " * `<%= javascript_include_tag 'application' %>` to your   *\n"\
+            " * `html.erb` files immediately after any                  *\n"\
+            " * `<%= javascript_pack 'application' %>` tags we found.   *\n"\
+            " ***********************************************************\n"
+          application_pack_tag =
+            /\s*\<\%\=\s+javascript_pack_tag\s+(\'|\")application(\'|\").*\%\>.*$/
+          Dir.glob(Rails.root.join('app', 'views', '**', '*.erb')) do |file|
+            if File.foreach(file).any? { |l| l =~ application_pack_tag }
+              inject_into_file file, after: application_pack_tag do
+                "\n    <%= javascript_include_tag 'application' %>"
+              end
             end
-          else
-            puts " ***********************************************************\n"\
-                 " * Could not add `//= require hyperstack-loader` directive *\n"\
-                 " * to the app/assets/application.js file.                  *\n"\
-                 " * Normally this directive is added just before the        *\n"\
-                 " * `//= require_tree .` directive at the end of the file,  *\n"\
-                 " * but no require_tree directive was found.  You need to   *\n"\
-                 " * manually add `//= require hyperstack-loader` to the     *\n"\
-                 " * app/assets/application.js file.                         *\n"\
-                 " ***********************************************************\n"
           end
         end
       end
 
-
       def insure_base_component_class_exists
         @component_base_class = options['base-class']
-        file_name = File.join(
+        file_name = Rails.root.join(
           'app', 'hyperstack', 'components', "#{@component_base_class.underscore}.rb"
         )
         template 'hyper_component_template.rb', file_name unless File.exists? file_name
@@ -55,7 +80,8 @@ module Rails
       def add_route
         return unless options['add-route']
         if self.components.count > 1
-          puts " ***********************************************************\n"\
+          warnings <<
+               " ***********************************************************\n"\
                " * The add-route option ignored because more than one      *\n"\
                " * component is being generated.                           *\n"\
                " ***********************************************************\n"

data/lib/hyperstack/server_side_auto_require.rb

@@ -0,0 +1,39 @@
+Rails.configuration.autoloader = :classic
+
+module ActiveSupport
+  module Dependencies
+    HYPERSTACK_DIR = "hyperstack"
+    class << self
+      alias original_require_or_load require_or_load
+
+      # before requiring_or_loading a file, first check if
+      # we have the same file in the server side directory
+      # and add that as a dependency
+
+      def require_or_load(file_name, const_path = nil)
+        add_server_side_dependency(file_name)
+        original_require_or_load(file_name, const_path)
+      end
+
+      # search the filename path from the end towards the beginning
+      # for the HYPERSTACK_DIR directory.  If found, remove it from
+      # the filename, and if a ruby file exists at that location then
+      # add it as a dependency
+
+      def add_server_side_dependency(file_name)
+        path = File.expand_path(file_name.chomp(".rb"))
+                   .split(File::SEPARATOR).reverse
+        hs_index = path.find_index(HYPERSTACK_DIR)
+
+        return unless hs_index # no hyperstack directory here
+
+        new_path = (path[0..hs_index - 1] + path[hs_index + 1..-1]).reverse
+        load_path = new_path.join(File::SEPARATOR)
+
+        return unless File.exist? "#{load_path}.rb"
+
+        require_dependency load_path
+      end
+    end
+  end
+end

data/lib/hyperstack/version.rb

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

data/lib/rails-hyperstack.rb

@@ -1,6 +1,5 @@
 require 'hyperstack-config'
 require 'rails/generators'
-require 'hyper-state'
 
 # remove these once lap29 is released ...
 Hyperstack.js_import 'react/react-source-browser', client_only: true, defines: ['ReactDOM', 'React']
@@ -21,11 +20,11 @@ begin
   require 'opal-rails'
   require 'hyper-model'
   require 'hyper-router'
+  require 'mini_racer'
 rescue LoadError
 end
 require 'react-rails'
 require 'opal-browser'
-require 'mini_racer'
 require 'hyperstack/version'
 
 class RailsHyperstack < Rails::Railtie

data/rails-hyperstack.gemspec

@@ -57,43 +57,35 @@ You can control how much of the stack gets installed as well:
   spec.add_dependency 'hyper-model', Hyperstack::VERSION
   spec.add_dependency 'hyper-router', Hyperstack::ROUTERVERSION
   spec.add_dependency 'hyperstack-config', Hyperstack::VERSION
-  spec.add_dependency 'opal-rails', '~> 0.9.4'
+  spec.add_dependency 'opal-rails' #, '~> 2.0'
 
   spec.add_dependency 'opal-browser', '~> 0.2.0'
   spec.add_dependency 'react-rails', '>= 2.4.0', '< 2.5.0'
-  spec.add_dependency 'mini_racer', '~> 0.2.4'
-  spec.add_dependency 'libv8', '~> 6.7.0'
-  spec.add_dependency 'rails', '>= 4.0.0'
+  # spec.add_dependency 'mini_racer', '~> 0.2.6'
+  # spec.add_dependency 'libv8', '~> 7.3.492.27.1'
+  spec.add_dependency 'rails', ENV['RAILS_VERSION'] || '>= 5.0.0', '< 7.0'
 
-
-  # spec.add_development_dependency 'sqlite3', '~> 1.3.6' # see https://github.com/rails/rails/issues/35153
-  # #spec.add_development_dependency 'chromedriver-helper'
-  # spec.add_development_dependency 'geminabox', '>= 0.13.11'
-
-
-  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-spec', Hyperstack::VERSION
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'puma'
   spec.add_development_dependency 'bootsnap'
-  #spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec-rails'
   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 'sass-rails', '~> 5.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.4' # was 1.3.6 -- see https://github.com/rails/rails/issues/35153
+  spec.add_development_dependency 'sass-rails', '>= 5.0'
   # Use Uglifier as compressor for JavaScript assets
   spec.add_development_dependency 'uglifier', '>= 1.3.0'
   # See https://github.com/rails/execjs#readme for more supported runtimes
   # gem 'mini_racer', platforms: :ruby
 
   # Use CoffeeScript for .coffee assets and views
-  spec.add_development_dependency 'coffee-rails', '~> 4.2'
+  #spec.add_development_dependency 'coffee-rails', '~> 4.2'
   # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
   spec.add_development_dependency 'turbolinks', '~> 5'
   # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
   spec.add_development_dependency 'jbuilder', '~> 2.5'
   spec.add_development_dependency 'foreman'
   spec.add_development_dependency 'database_cleaner'
-
 end

data/spec/gems.rb

@@ -0,0 +1,10 @@
+gem 'rails-hyperstack',  path: '../..'
+gem 'hyperstack-config', path: '../../../hyperstack-config'
+gem 'hyper-state',       path: '../../../hyper-state'
+gem 'hyper-component',   path: '../../../hyper-component'
+gem 'hyper-operation',   path: '../../../hyper-operation'
+gem 'hyper-model',       path: '../../../hyper-model'
+gem 'hyper-router',      path: '../../../hyper-router'
+gem 'hyper-spec',        path: '../../../hyper-spec'
+
+gem 'pry'

data/spec/rails_hyperstack_spec.rb

@@ -1,24 +1,30 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'rails-hyperstack' do
-  it 'builds a working app', js: true do
-    visit '/'
-    expect(page).to have_content('App')
+describe "rails-hyperstack" do
+  it "builds a working app", js: true do
+    visit "/"
+    expect(page).to have_content("App")
   end
-  it 'installs hyper-model and friends', js: true do
-    visit '/'
-    expect_promise do
+
+  it "installs hyper-model and friends", js: true do
+    visit "/"
+    expect do
       Hyperstack::Model.load { Sample.count }
-    end.to eq(0)
-    evaluate_ruby do
-      Sample.create(name: 'sample1', description: 'the first sample')
+    end.on_client_to eq(0)
+    on_client do
+      Sample.create(name: "sample1", description: "the first sample")
     end
     wait_for_ajax
     expect(Sample.count).to eq(1)
-    expect(Sample.first.name).to eq('sample1')
-    expect(Sample.first.description).to eq('the first sample')
-    expect_evaluate_ruby do
-      Sample.count
-    end.to eq(1)
+    expect(Sample.first.name).to eq("sample1")
+    expect(Sample.first.description).to eq("the first sample")
+    expect { Sample.count }.on_client_to eq(1)
+  end
+
+  it "implements server_side_auto_require", js: true do
+    expect(Sample.super_secret_server_side_method).to be true
+    expect do
+      Sample.respond_to? :super_secret_server_side_method
+    end.on_client_to be_falsy
   end
 end

data/spec/server_side_sample.rb

@@ -0,0 +1,5 @@
+class Sample < ApplicationRecord
+  def self.super_secret_server_side_method
+    true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-hyperstack
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.5
+  version: 1.0.alpha1.6
 platform: ruby
 authors:
 - Loic Boutet
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-model
@@ -19,56 +19,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: hyper-router
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: hyperstack-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: opal-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -103,68 +103,40 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: mini_racer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-- !ruby/object:Gem::Dependency
-  name: libv8
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.7.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     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
@@ -185,14 +157,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.5
+        version: 1.0.alpha1.6
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +208,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -269,26 +241,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -305,20 +277,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -385,6 +343,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Rakefile
@@ -400,11 +359,14 @@ files:
 - lib/generators/hyperstack/install_mui_generator.rb
 - lib/generators/install/hyperstack_generator.rb
 - lib/generators/install/hyperstack_generator_base.rb
+- lib/hyperstack/server_side_auto_require.rb
 - lib/hyperstack/version.rb
 - lib/rails-hyperstack.rb
 - lib/tasks/hyperstack/install.rake
 - rails-hyperstack.gemspec
+- spec/gems.rb
 - spec/rails_hyperstack_spec.rb
+- spec/server_side_sample.rb
 - spec/spec_helper.rb
 homepage: http://hyperstack.org
 licenses:
@@ -459,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Hyperstack for Rails with generators