From b9435260d78b4d2688c3d4476ed43b9f22607dd2 Mon Sep 17 00:00:00 2001 From: scott-knight Date: Thu, 30 Sep 2021 09:31:14 -0500 Subject: [PATCH 1/5] Update version and lock file --- Gemfile.lock | 4 ++-- lib/tailwindcss/version.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dc79a0a..3f2579d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - tailwindcss-rails-webpacker (0.2.0) + tailwindcss-rails-webpacker (0.2.1) rails (>= 6.0.0) GEM @@ -143,4 +143,4 @@ DEPENDENCIES tailwindcss-rails-webpacker! BUNDLED WITH - 2.1.4 + 2.2.28 diff --git a/lib/tailwindcss/version.rb b/lib/tailwindcss/version.rb index aa52f77..633b3c7 100644 --- a/lib/tailwindcss/version.rb +++ b/lib/tailwindcss/version.rb @@ -1,3 +1,3 @@ module Tailwindcss - VERSION = "0.2.0" + VERSION = "0.2.1" end From dba5b94542f9b7dc936655dcc8e795e60027217a Mon Sep 17 00:00:00 2001 From: scott-knight Date: Thu, 30 Sep 2021 09:31:38 -0500 Subject: [PATCH 2/5] Create the controller generator --- .../controller/controller_generator.rb | 16 ++++++++++++++++ .../controller/templates/view.html.erb.tt | 8 ++++++++ 2 files changed, 24 insertions(+) create mode 100644 lib/generators/tailwindcss/controller/controller_generator.rb create mode 100644 lib/generators/tailwindcss/controller/templates/view.html.erb.tt diff --git a/lib/generators/tailwindcss/controller/controller_generator.rb b/lib/generators/tailwindcss/controller/controller_generator.rb new file mode 100644 index 0000000..b18aaae --- /dev/null +++ b/lib/generators/tailwindcss/controller/controller_generator.rb @@ -0,0 +1,16 @@ +require 'rails/generators/erb/controller/controller_generator' + +module Tailwindcss + module Generators + class ControllerGenerator < Erb::Generators::ControllerGenerator + source_root File.expand_path("../templates", __FILE__) + + protected + + def handler + :erb + end + + end + end +end \ No newline at end of file diff --git a/lib/generators/tailwindcss/controller/templates/view.html.erb.tt b/lib/generators/tailwindcss/controller/templates/view.html.erb.tt new file mode 100644 index 0000000..c6b75aa --- /dev/null +++ b/lib/generators/tailwindcss/controller/templates/view.html.erb.tt @@ -0,0 +1,8 @@ +
+

+ <%= class_name %>#<%= @action %> +

+

+ Find me in <%= @path %> +

+
\ No newline at end of file From 57f1dd13eab21ad5b99153b42c259f3b5ee4ca2a Mon Sep 17 00:00:00 2001 From: scott-knight Date: Thu, 30 Sep 2021 09:32:59 -0500 Subject: [PATCH 3/5] Add the controller test --- .../tailwindcss/controller_generator_test.rb | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 test/lib/generators/tailwindcss/controller_generator_test.rb diff --git a/test/lib/generators/tailwindcss/controller_generator_test.rb b/test/lib/generators/tailwindcss/controller_generator_test.rb new file mode 100644 index 0000000..5c4f7ea --- /dev/null +++ b/test/lib/generators/tailwindcss/controller_generator_test.rb @@ -0,0 +1,32 @@ +require "./test/test_helper" +require "generators/tailwindcss/controller/controller_generator" + +class Tailwindcss::Generators::ControllerGeneratorTest < Rails::Generators::TestCase + GENERATION_PATH = File.expand_path("../tmp", File.dirname(__FILE__)) + + tests Tailwindcss::Generators::ControllerGenerator + destination GENERATION_PATH + + setup :prepare_destination + + arguments %w[Account foo bar] + + Minitest.after_run do + FileUtils.rm_rf GENERATION_PATH + end + + test "should invoke template engine" do + run_generator + assert_file "app/views/account/foo.html.erb" + assert_file "app/views/account/bar.html.erb" + end + + test "should revoke template engine" do + run_generator + run_generator ["account"], behavior: :revoke + + assert_no_file "app/views/account" + assert_no_file "app/views/account/foo.html.erb" + assert_no_file "app/views/account/bar.html.erb" + end +end \ No newline at end of file From 494072e8a54c2ef781b4166de203a4009f25343f Mon Sep 17 00:00:00 2001 From: scott-knight Date: Thu, 30 Sep 2021 09:33:22 -0500 Subject: [PATCH 4/5] Fix missing test_helper error for other tests --- test/lib/generators/tailwindcss/scaffold_generator_test.rb | 2 +- test/tailwindcss/rails/webpacker_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/generators/tailwindcss/scaffold_generator_test.rb b/test/lib/generators/tailwindcss/scaffold_generator_test.rb index fd28851..5cfa657 100644 --- a/test/lib/generators/tailwindcss/scaffold_generator_test.rb +++ b/test/lib/generators/tailwindcss/scaffold_generator_test.rb @@ -1,4 +1,4 @@ -require "test_helper" +require "./test/test_helper" require "generators/tailwindcss/scaffold/scaffold_generator" class Tailwindcss::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCase diff --git a/test/tailwindcss/rails/webpacker_test.rb b/test/tailwindcss/rails/webpacker_test.rb index 689d5b4..6241009 100644 --- a/test/tailwindcss/rails/webpacker_test.rb +++ b/test/tailwindcss/rails/webpacker_test.rb @@ -1,4 +1,4 @@ -require "test_helper" +require "./test/test_helper" class TailwindcssTest < ActiveSupport::TestCase test "it has a version number" do From dc03a22fb293967ae25775b3e13a75a60daff02a Mon Sep 17 00:00:00 2001 From: scott-knight Date: Thu, 30 Sep 2021 09:36:33 -0500 Subject: [PATCH 5/5] Add new lines to the end of files --- lib/generators/tailwindcss/controller/controller_generator.rb | 2 +- .../tailwindcss/controller/templates/view.html.erb.tt | 2 +- test/lib/generators/tailwindcss/controller_generator_test.rb | 2 +- test/lib/generators/tailwindcss/scaffold_generator_test.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/generators/tailwindcss/controller/controller_generator.rb b/lib/generators/tailwindcss/controller/controller_generator.rb index b18aaae..7f71147 100644 --- a/lib/generators/tailwindcss/controller/controller_generator.rb +++ b/lib/generators/tailwindcss/controller/controller_generator.rb @@ -13,4 +13,4 @@ def handler end end -end \ No newline at end of file +end diff --git a/lib/generators/tailwindcss/controller/templates/view.html.erb.tt b/lib/generators/tailwindcss/controller/templates/view.html.erb.tt index c6b75aa..140df0d 100644 --- a/lib/generators/tailwindcss/controller/templates/view.html.erb.tt +++ b/lib/generators/tailwindcss/controller/templates/view.html.erb.tt @@ -5,4 +5,4 @@

Find me in <%= @path %>

- \ No newline at end of file + diff --git a/test/lib/generators/tailwindcss/controller_generator_test.rb b/test/lib/generators/tailwindcss/controller_generator_test.rb index 5c4f7ea..c2d7826 100644 --- a/test/lib/generators/tailwindcss/controller_generator_test.rb +++ b/test/lib/generators/tailwindcss/controller_generator_test.rb @@ -29,4 +29,4 @@ class Tailwindcss::Generators::ControllerGeneratorTest < Rails::Generators::Test assert_no_file "app/views/account/foo.html.erb" assert_no_file "app/views/account/bar.html.erb" end -end \ No newline at end of file +end diff --git a/test/lib/generators/tailwindcss/scaffold_generator_test.rb b/test/lib/generators/tailwindcss/scaffold_generator_test.rb index 5cfa657..839915a 100644 --- a/test/lib/generators/tailwindcss/scaffold_generator_test.rb +++ b/test/lib/generators/tailwindcss/scaffold_generator_test.rb @@ -18,4 +18,4 @@ class Tailwindcss::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCa %w(index edit new show _form _message).each { |view| assert_file "app/views/messages/#{view}.html.erb" } end -end \ No newline at end of file +end