buoys 1.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 36271005ba0ba04593d62e6d6f0d2c0cc0156c91
-  data.tar.gz: 62c723569c8a8ffb962b1204914209291efc0dca
+SHA256:
+  metadata.gz: 7206430f425484e8e75b8cd16a49b6a737dafdc54486dfc7d803d1cd06a05b91
+  data.tar.gz: 170521a71be7ff33dd3d1a29a377f3e8dc2f2993debae6273e0ef3dc01249cd4
 SHA512:
-  metadata.gz: df714e7c87349f56c64a60a99b7f5d8c94c34e9f572ce28bc60d3f5bbedf696b248eb4f7ded73d0c4cc4aeb7135df4f029cadd9774811c7ae1b23b88957d13af
-  data.tar.gz: 4b1d8c37a805d8f23e4246caaebc788ff7e962cc71e74084023ef89c04467c607656ace7f5c29f9bf05ae90d13ce92a054e0b9b7227ba7e30d69e75ae5b3ba09
+  metadata.gz: 126f9ac46f9f98f28e24cdb3566c9ebc3d997c8e55f793ebc3e2545b1821e74944123748d02b6b36396b35d93f91b90bdb8afab2891f8d2502564aba60a09fbb
+  data.tar.gz: 153b7a25618e75baa83a554cacee3d97ef68adf320591c1bb1d20838655b0c067fb34a8a727b1def1f6b6958535d8c8e95a79046e9e7661af34755bde03276b3

data/README.md

@@ -60,7 +60,7 @@ buoy :story do |story|
   # same as `link I18n.t('story', scope: 'buoys.breadcrumbs', default: 'story'), story_path(story)`
 end
 
-# You can alse override Buoys configuration
+# You can also override Buoys configuration
 # ex)
 buoy :story_tasks do |story|
   link :story_tasks, story_tasks_path

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError

data/lib/buoys/buoy.rb

@@ -3,6 +3,7 @@
 module Buoys
   class Buoy
     attr_reader :previous, :context
+
     # buoy :account do
     #   link 'Account', account_path
     # end
@@ -40,8 +41,8 @@ module Buoys
     end
     alias parent pre_buoy
 
-    def method_missing(method, *args, &block)
-      context.send(method, *args, &block)
+    def method_missing(method, *args, **kwargs, &block)
+      context.send(method, *args, **kwargs, &block)
     end
   end
 end

data/lib/buoys/config.rb

@@ -3,9 +3,7 @@
 module Buoys
   class Config
     class << self
-      attr_accessor :current_class
-
-      attr_accessor :link_current
+      attr_accessor :current_class, :link_current
     end
   end
 end

data/lib/buoys/loader.rb

@@ -32,7 +32,7 @@ module Buoys
         loaded_times.clear
 
         buoy_files.each do |file|
-          instance_eval File.open(file).read, file
+          instance_eval File.read(file), file
           loaded_times << File.mtime(file)
         end
       end

data/lib/buoys/railtie.rb

@@ -4,7 +4,7 @@ module Buoys
   class Railtie < ::Rails::Railtie
     initializer 'buoys' do
       ActiveSupport.on_load(:action_view) do
-        ActionView::Base.send :include, Buoys::Helper
+        ActionView::Base.include Buoys::Helper
       end
     end
   end

data/lib/buoys/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Buoys
-  VERSION = '1.1.0'.freeze
+  VERSION = '2.1.0'
 end

data/lib/generators/buoys/templates/_buoys.html.erb

@@ -7,7 +7,7 @@
           <span itemprop='name'><%= link.text %></span>
           <meta itemprop='position' content='<%= i %>' />
         <% else %>
-          <%= link_to link.text, link.url, link.options.merge(itemprop: :item) do %>
+          <%= link_to link.url, link.options.merge(itemprop: :item) do %>
             <span itemprop='name'><%= link.text %></span>
           <% end %>
           <meta itemprop='position' content='<%= i %>' />

data/lib/generators/buoys/templates/breadcrumbs.rb

@@ -23,7 +23,7 @@ end
 #   # same as `link I18n.t(:story, scope: 'buoys.breadcrumbs', default: story), story_path(story)`
 # end
 
-# You can alse override Buoys configuration
+# You can also override Buoys configuration
 #
 # ex)
 # buoy :story_tasks do |story|

data/test/buoys_buoy_test.rb

@@ -4,7 +4,11 @@ require 'test_helper'
 
 class BuoysBuoyTest < ActiveSupport::TestCase
   setup do
-    @view_context = ActionView::Base.new
+    @view_context = if ActionView::Base.respond_to?(:empty)
+                      ActionView::Base.empty
+                    else
+                      ActionView::Base.new # Rails 5.2 or lower
+                    end
     Buoys::Loader.load_buoys_files
   end
 
@@ -29,4 +33,16 @@ class BuoysBuoyTest < ActiveSupport::TestCase
     assert_equal links[0].text, 'Account'
     assert_equal links[0].url,  'http://example.com/account'
   end
+
+  test 'delegate unknown methods to view context' do
+    def @view_context.hello(arg, kwarg:, &block)
+      [arg, kwarg, block]
+    end
+
+    arg, kwarg, block = Buoys::Buoy.new(@view_context, :account).hello('hello', kwarg: ',') { 'world' }
+
+    assert_equal arg,        'hello'
+    assert_equal kwarg,      ','
+    assert_equal block.call, 'world'
+  end
 end

data/test/buoys_generator_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/RegexpLiteral, Metrics/LineLength
+# rubocop:disable Style/RegexpLiteral, Layout/LineLength
 require 'test_helper'
 require 'generators/buoys/install_generator'
 
@@ -51,4 +51,4 @@ class BuoysGeneratorTest < Rails::Generators::TestCase
     assert_file File.expand_path('./config/locales/buoys.en.yml', dest_root)
   end
 end
-# rubocop:enable Style/RegexpLiteral, Metrics/LineLength
+# rubocop:enable Style/RegexpLiteral, Layout/LineLength

data/test/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
 Rails.application.load_tasks

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/test/dummy/app/assets/javascripts/application.js

@@ -5,9 +5,11 @@
 // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require rails-ujs
+//= require activestorage
 //= require_tree .

data/test/dummy/app/assets/javascripts/cable.js

@@ -0,0 +1,13 @@
+// Action Cable provides the framework to deal with WebSockets in Rails.
+// You can generate new channels where WebSocket features live using the `rails generate channel` command.
+//
+//= require action_cable
+//= require_self
+//= require_tree ./channels
+
+(function() {
+  this.App || (this.App = {});
+
+  App.cable = ActionCable.createConsumer();
+
+}).call(this);

data/test/dummy/app/assets/stylesheets/application.css

@@ -6,9 +6,9 @@
  * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
  *
  *= require_tree .
  *= require_self

data/test/dummy/app/channels/application_cable/channel.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Channel < ActionCable::Channel::Base
+  end
+end

data/test/dummy/app/channels/application_cable/connection.rb

@@ -0,0 +1,4 @@
+module ApplicationCable
+  class Connection < ActionCable::Connection::Base
+  end
+end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,7 +1,2 @@
-# frozen_string_literal: true
-
 class ApplicationController < ActionController::Base
-  # Prevent CSRF attacks by raising an exception.
-  # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
 end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
 module ApplicationHelper
 end

data/test/dummy/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/test/dummy/app/mailers/application_mailer.rb

@@ -0,0 +1,4 @@
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end

data/test/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/test/dummy/app/models/item.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class Item < ActiveRecord::Base
+class Item < ApplicationRecord
 end

data/test/dummy/app/models/user.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-class User < ActiveRecord::Base
+class User < ApplicationRecord
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
+  <head>
+    <title>Dummy</title>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
 
-<%= yield %>
+    <%= stylesheet_link_tag    'application', media: 'all' %>
+    <%= javascript_include_tag 'application' %>
+  </head>
 
-</body>
+  <body>
+    <%= yield %>
+  </body>
 </html>

data/test/dummy/app/views/layouts/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+
+  <body>
+    <%= yield %>
+  </body>
+</html>

data/test/dummy/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>

data/test/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application', __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/setup

@@ -1,29 +1,36 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require 'fileutils'
+include FileUtils
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 
-Dir.chdir APP_ROOT do
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
   # This script is a starting point to setup your application.
-  # Add necessary setup steps to this file:
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   system "cp config/database.yml.sample config/database.yml"
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system! 'bin/rails db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system! 'bin/rails log:clear tmp:clear'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system! 'bin/rails restart'
 end

data/test/dummy/bin/update

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/test/dummy/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
+  begin
+    exec "yarnpkg", *ARGV
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/test/dummy/config/application.rb

@@ -1,31 +1,19 @@
-# frozen_string_literal: true
-
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require 'buoys'
+require "buoys"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    config.i18n.default_locale = :en
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    if Gem::Version.new(Rails.version) >= Gem::Version.new('4.2.0') &&
-       Gem::Version.new(Rails.version) <= Gem::Version.new('5.0.0')
-      config.active_record.raise_in_transactional_callbacks = true
-    end
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration can go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded after loading
+    # the framework and any gems in your application.
   end
 end
+

data/test/dummy/config/boot.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)

data/test/dummy/config/cable.yml

@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: async
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: dummy_production

data/test/dummy/config/database.yml

@@ -6,7 +6,7 @@
 #
 default: &default
   adapter: sqlite3
-  pool: 5
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
 
 development:

data/test/dummy/config/environment.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
 
 # Initialize the Rails application.
 Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -11,33 +9,53 @@ Rails.application.configure do
   # Do not eager load code on boot.
   config.eager_load = false
 
-  # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  # Show full error reports.
+  config.consider_all_requests_local = true
+
+  # Enable/disable caching. By default caching is disabled.
+  # Run rails dev:cache to toggle caching.
+  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+    config.action_controller.perform_caching = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options)
+  config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
+  config.action_mailer.perform_caching = false
+
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
+  # Highlight code that triggered database queries in logs.
+  config.active_record.verbose_query_logs = true
+
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
 
-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  # Suppress logger output for asset requests.
+  config.assets.quiet = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Use an evented file watcher to asynchronously detect changes in source code,
+  # routes, locales, etc. This feature depends on the listen gem.
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end