turbo-rails 0.5.9 → 0.7.14

data/lib/tasks/turbo_tasks.rake

@@ -1,24 +1,47 @@
-def run_turbo_install_template(path) system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/#{path}.rb",  __dir__)}" end
+def run_turbo_install_template(path)
+  system "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{File.expand_path("../install/#{path}.rb",  __dir__)}"
+end
+
+def redis_installed?
+  system('which redis-server')
+end
+
+def switch_on_redis_if_available
+  if redis_installed?
+    Rake::Task["turbo:install:redis"].invoke
+  else
+    puts "Run turbo:install:redis to switch on Redis and use it in development for turbo streams"
+  end
+end
 
 namespace :turbo do
   desc "Install Turbo into the app"
   task :install do
-    if defined?(Webpacker::Engine)
-      Rake::Task["turbo:install:webpacker"].invoke
+    if Rails.root.join("config/importmap.rb").exist?
+      Rake::Task["turbo:install:importmap"].invoke
+    elsif Rails.root.join("package.json").exist?
+      Rake::Task["turbo:install:node"].invoke
     else
-      Rake::Task["turbo:install:asset_pipeline"].invoke
+      puts "You must either be running with node (package.json) or importmap-rails (config/importmap.rb) to use this gem."
     end
   end
 
   namespace :install do
     desc "Install Turbo into the app with asset pipeline"
-    task :asset_pipeline do
-      run_turbo_install_template "turbo_with_asset_pipeline"
+    task :importmap do
+      run_turbo_install_template "turbo_with_importmap"
+      switch_on_redis_if_available
     end
 
     desc "Install Turbo into the app with webpacker"
-    task :webpacker do
-      run_turbo_install_template "turbo_with_webpacker"
+    task :node do
+      run_turbo_install_template "turbo_with_node"
+      switch_on_redis_if_available
+    end
+
+    desc "Switch on Redis and use it in development"
+    task :redis do
+      run_turbo_install_template "turbo_needs_redis"
     end
   end
 end

data/lib/turbo/engine.rb

@@ -16,13 +16,17 @@ module Turbo
       #{root}/app/jobs
     )
 
+    initializer "turbo.no_action_cable" do
+      Rails.autoloaders.once.do_not_eager_load(Dir["#{root}/app/channels/turbo/*_channel.rb"]) unless defined?(ActionCable)
+    end
+
     initializer "turbo.assets" do
       if Rails.application.config.respond_to?(:assets)
-        Rails.application.config.assets.precompile += %w( turbo )
+        Rails.application.config.assets.precompile += %w( turbo.js )
       end
     end
 
-    initializer "turbo.helpers" do
+    initializer "turbo.helpers", before: :load_config_initializers do
       ActiveSupport.on_load(:action_controller_base) do
         include Turbo::Streams::TurboStreamsTagBuilder, Turbo::Frames::FrameRequest, Turbo::Native::Navigation
         helper Turbo::Engine.helpers

data/lib/turbo/test_assertions.rb

@@ -7,14 +7,13 @@ module Turbo
       delegate :dom_id, :dom_class, to: ActionView::RecordIdentifier
     end
 
-    def assert_turbo_stream(action:, target: nil, &block)
-      assert_response :ok
+    def assert_turbo_stream(action:, target: nil, status: :ok, &block)
+      assert_response status
       assert_equal Mime[:turbo_stream], response.media_type
       assert_select %(turbo-stream[action="#{action}"][target="#{target.respond_to?(:to_key) ? dom_id(target) : target}"]), count: 1, &block
     end
 
     def assert_no_turbo_stream(action:, target: nil)
-      assert_response :ok
       assert_equal Mime[:turbo_stream], response.media_type
       assert_select %(turbo-stream[action="#{action}"][target="#{target.respond_to?(:to_key) ? dom_id(target) : target}"]), count: 0
     end

data/lib/turbo/version.rb

@@ -1,3 +1,3 @@
 module Turbo
-  VERSION = "0.5.9"
+  VERSION = "0.7.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.7.14
 platform: ruby
 authors:
 - Sam Stephenson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,8 +56,9 @@ files:
 - app/models/concerns/turbo/broadcastable.rb
 - app/models/turbo/streams/tag_builder.rb
 - config/routes.rb
-- lib/install/turbo_with_asset_pipeline.rb
-- lib/install/turbo_with_webpacker.rb
+- lib/install/turbo_needs_redis.rb
+- lib/install/turbo_with_importmap.rb
+- lib/install/turbo_with_node.rb
 - lib/tasks/turbo_tasks.rake
 - lib/turbo-rails.rb
 - lib/turbo/engine.rb
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: The speed of a single-page web application without having to write any JavaScript.

data/lib/install/turbo_with_asset_pipeline.rb

@@ -1,36 +0,0 @@
-APPLICATION_LAYOUT_PATH = Rails.root.join("app/views/layouts/application.html.erb")
-IMPORTMAP_PATH = Rails.root.join("app/assets/javascripts/importmap.json.erb")
-
-if APPLICATION_LAYOUT_PATH.exist?
-  say "Yield head in application layout for cache helper"
-  insert_into_file APPLICATION_LAYOUT_PATH.to_s, "\n    <%= yield :head %>", before: /\s*<\/head>/
-
-  if APPLICATION_LAYOUT_PATH.read =~ /stimulus/
-    say "Add Turbo include tags in application layout"
-    insert_into_file APPLICATION_LAYOUT_PATH.to_s, %(\n    <%= javascript_include_tag "turbo", type: "module-shim" %>), after: /<%= stimulus_include_tags %>/
-
-    if IMPORTMAP_PATH.exist?
-      say "Add Turbo to importmap"
-      insert_into_file IMPORTMAP_PATH, %(    "turbo": "<%= asset_path "turbo" %>",\n), after: /  "imports": {\s*\n/
-    end
-  else
-    say "Add Turbo include tags in application layout"
-    insert_into_file APPLICATION_LAYOUT_PATH.to_s, %(\n    <%= javascript_include_tag "turbo", type: "module" %>), before: /\s*<\/head>/
-  end
-else
-  say "Default application.html.erb is missing!", :red
-
-  if APPLICATION_LAYOUT_PATH.read =~ /stimulus/
-    say %(        Add <%= javascript_include_tag("turbo", type: "module-shim") %> and <%= yield :head %> within the <head> tag after Stimulus includes in your custom layout.)
-  else
-    say %(        Add <%= javascript_include_tag("turbo", type: "module") %> and <%= yield :head %> within the <head> tag in your custom layout.)
-  end
-end
-
-say "Enable redis in bundle"
-uncomment_lines "Gemfile", %(gem 'redis')
-
-say "Switch development cable to use redis"
-gsub_file "config/cable.yml", /development:\n\s+adapter: async/, "development:\n  adapter: redis\n  url: redis://localhost:6379/1"
-
-say "Turbo successfully installed ⚡️", :green

data/lib/install/turbo_with_webpacker.rb

@@ -1,23 +0,0 @@
-# Some Rails versions use commonJS(require) others use ESM(import).
-TURBOLINKS_REGEX = /(import .* from "turbolinks".*\n|require\("turbolinks"\).*\n)/.freeze
-
-abort "❌ Webpacker not found. Exiting." unless defined?(Webpacker::Engine)
-
-say "Install Turbo"
-run "yarn add @hotwired/turbo-rails"
-insert_into_file "#{Webpacker.config.source_entry_path}/application.js", "import \"@hotwired/turbo-rails\"\n", before: /import.*ActiveStorage/
-
-say "Remove Turbolinks"
-gsub_file 'Gemfile', /gem 'turbolinks'.*/, ''
-run "bin/bundle", capture: true
-run "bin/yarn remove turbolinks"
-gsub_file "#{Webpacker.config.source_entry_path}/application.js", TURBOLINKS_REGEX, ''
-gsub_file "#{Webpacker.config.source_entry_path}/application.js", /Turbolinks.start.*\n/, ''
-
-say "Enable redis in bundle"
-uncomment_lines "Gemfile", %(gem 'redis')
-
-say "Switch development cable to use redis"
-gsub_file "config/cable.yml", /development:\n\s+adapter: async/, "development:\n  adapter: redis\n  url: redis://localhost:6379/1"
-
-say "Turbo successfully installed ⚡️", :green