potassium 6.1.0 → 6.2.0

data/lib/potassium/recipes/schedule.rb

@@ -10,8 +10,8 @@ class Recipes::Schedule < Rails::AppBuilder
     if selected?(:schedule)
       gather_gem 'sidekiq-scheduler', '>= 3.0.1'
       add_readme_section :internal_dependencies, :sidekiq_scheduler
+      append_schedule_section_to_yml
     end
-    template '../assets/sidekiq_scheduler.yml', 'config/sidekiq.yml', force: true
   end
 
   def install
@@ -22,4 +22,19 @@ class Recipes::Schedule < Rails::AppBuilder
   def installed?
     gem_exists?(/sidekiq-scheduler/) && file_exist?('config/sidekiq.yml')
   end
+
+  private
+
+  def append_schedule_section_to_yml
+    append_to_file(
+      'config/sidekiq.yml',
+      <<-HERE.gsub(/^ {8}/, '')
+        # :schedule:
+          #  an_scheduled_task:
+          #    cron: '0 * * * * *'  # Runs once per minute
+          #    class: ExampleJob
+          #    args: ['a', 'b']
+      HERE
+    )
+  end
 end

data/lib/potassium/recipes/style.rb

@@ -13,10 +13,10 @@ class Recipes::Style < Rails::AppBuilder
 
   def add_linters
     gather_gems(:development, :test) do
-      gather_gem 'rubocop', '~> 0.82.0'
+      gather_gem 'rubocop', Potassium::RUBOCOP_VERSION
       gather_gem 'rubocop-performance'
       gather_gem 'rubocop-rails'
-      gather_gem 'rubocop-rspec'
+      gather_gem 'rubocop-rspec', Potassium::RUBOCOP_RSPEC_VERSION
     end
     run 'bin/yarn add --dev stylelint eslint eslint-plugin-import'
     run 'bin/yarn add --dev eslint-plugin-vue' if selected?(:front_end, :vue)

data/lib/potassium/templates/application.rb

@@ -20,6 +20,7 @@ run_action(:asking) do
   ask :database
   ask :devise
   ask :admin
+  ask :google_tag_manager
   ask :front_end
   ask :vue_admin
   ask :mailer
@@ -76,6 +77,7 @@ run_action(:recipe_loading) do
   create :github
   create :cleanup
   create :front_end
+  create :google_tag_manager
 end
 
 info "Gathered enough information. Applying the template. Wait a minute."

data/lib/potassium/version.rb

@@ -1,8 +1,9 @@
 module Potassium
-  VERSION = "6.1.0"
+  VERSION = "6.2.0"
   RUBY_VERSION = "2.7.0"
   RAILS_VERSION = "~> 6.0.2"
-  RUBOCOP_VERSION = "~> 0.65.0"
+  RUBOCOP_VERSION = "~> 1.9"
+  RUBOCOP_RSPEC_VERSION = "~> 2.2"
   POSTGRES_VERSION = "11.3"
   MYSQL_VERSION = "5.7"
   NODE_VERSION = "12"

data/potassium.gemspec

@@ -24,7 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.4.0"
   spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "rubocop", Potassium::RUBOCOP_VERSION
-  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rails"
+  spec.add_development_dependency "rubocop-rspec", Potassium::RUBOCOP_RSPEC_VERSION
   spec.add_runtime_dependency "gems", "~> 0.8"
   spec.add_runtime_dependency "gli", "~> 2.12.2"
   spec.add_runtime_dependency "inquirer", "~> 0.2"

data/spec/features/background_processor_spec.rb

@@ -2,11 +2,11 @@ require "spec_helper"
 require 'yaml'
 
 RSpec.describe "BackgroundProcessor" do
-  context "working with sidekiq" do
+  context "when working with sidekiq and no mailer" do
     before :all do
       drop_dummy_database
       remove_project_directory
-      create_dummy_project("background_processor" => "sidekiq", "heroku" => true)
+      create_dummy_project("background_processor" => true, "heroku" => true)
     end
 
     it "adds sidekiq gem to Gemfile" do
@@ -52,9 +52,11 @@ RSpec.describe "BackgroundProcessor" do
       expect(content).to include("require 'sidekiq'")
     end
 
-    it "adds sidekiq.yml file" do
-      content = IO.read("#{project_path}/config/sidekiq.yml")
-      expect(content).to include("concurrency: 5")
+    it "adds sidekiq.yml file with no mailer queue" do
+      yml_path = "#{project_path}/config/sidekiq.yml"
+      content = IO.read(yml_path)
+      expect(File.exist?(yml_path)).to be true
+      expect(content).not_to include("- mailers")
     end
 
     it "adds redis.yml file" do

data/spec/features/google_tag_manager_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+RSpec.describe "Google Tag Manager" do
+  before :all do
+    remove_project_directory
+    create_dummy_project('google_tag_manager' => true)
+  end
+
+  let(:gtm_head_file_path) do
+    "#{project_path}/app/views/shared/_gtm_head.html.erb"
+  end
+  let(:gtm_body_file_path) do
+    "#{project_path}/app/views/shared/_gtm_body.html.erb"
+  end
+  let(:content_security_policy_file_path) do
+    "#{project_path}/config/initializers/content_security_policy.rb"
+  end
+  let(:application_layout_file) do
+    IO.read("#{project_path}/app/views/layouts/application.html.erb")
+  end
+  let(:content_security_policy_file) do
+    IO.read(content_security_policy_file_path)
+  end
+
+  it 'adds google tag manager script' do
+    expect(File).to be_file(gtm_head_file_path)
+    expect(File).to be_file(gtm_body_file_path)
+    expect(application_layout_file).to include('shared/gtm_head')
+    expect(application_layout_file).to include('shared/gtm_body')
+  end
+
+  it 'add content security policy' do
+    expect(content_security_policy_file)
+      .to include(content_security_policy_code)
+  end
+
+  def content_security_policy_code
+    <<~HERE
+      Rails.application.config.content_security_policy do |policy|
+        if Rails.env.development?
+          policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035'
+          policy.script_src :self, :https, :unsafe_eval
+        else
+          policy.script_src :self, :https
+          # google tag manager requires to enable unsafe inline:
+          # https://developers.google.com/tag-manager/web/csp
+          policy.connect_src :self, :https, 'https://www.google-analytics.com'
+          policy.script_src :self,
+            :https,
+            :unsafe_inline,
+            'https://www.googletagmanager.com',
+            'https://www.google-analytics.com',
+            'https://ssl.google-analytics.com'
+          policy.img_src :self, :https, 'https://www.googletagmanager.com', 'https://www.google-analytics.com'
+        end
+      end
+    HERE
+  end
+end

data/spec/features/mailer_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe "Mailer" do
   let(:gemfile) { IO.read("#{project_path}/Gemfile") }
   let(:mailer_config) { IO.read("#{project_path}/config/mailer.rb") }
   let(:dev_config) { IO.read("#{project_path}/config/environments/development.rb") }
+  let(:sidekiq_config) { IO.read("#{project_path}/config/sidekiq.yml") }
 
   before(:all) { drop_dummy_database }
 
@@ -26,6 +27,8 @@ RSpec.describe "Mailer" do
       expect(dev_config).to include("sendgrid_dev_settings = {")
       expect(dev_config).to include("api_key: ENV['SENDGRID_API_KEY']")
     end
+
+    it { expect(sidekiq_config).to include("- mailers") }
   end
 
   context "when selecting aws_ses as mailer" do
@@ -38,5 +41,18 @@ RSpec.describe "Mailer" do
     it { expect(gemfile).to include("letter_opener") }
     it { expect(mailer_config).to include("delivery_method = :aws_sdk") }
     it { expect(dev_config).to include("delivery_method = :letter_opener") }
+    it { expect(sidekiq_config).to include("- mailers") }
+  end
+
+  context "when selecting a mailer and sidekiq" do
+    before :all do
+      drop_dummy_database
+      remove_project_directory
+      create_dummy_project(
+        "background_processor" => true, "email_service" => 'sendgrid'
+      )
+    end
+
+    it { expect(sidekiq_config).to include("- mailers") }
   end
 end

data/spec/features/schedule_spec.rb

@@ -1,10 +1,14 @@
 require "spec_helper"
 
 RSpec.describe "schedule" do
+  let(:sidekiq_config) { IO.read("#{project_path}/config/sidekiq.yml") }
+
   before :all do
     drop_dummy_database
     remove_project_directory
-    create_dummy_project("schedule" => true)
+    create_dummy_project(
+      "schedule" => true, "background_processor" => true, "email_service" => "sendgrid"
+    )
   end
 
   it "adds the sidekiq-scheduler gem to Gemfile" do
@@ -12,9 +16,12 @@ RSpec.describe "schedule" do
     expect(gemfile_content).to include("gem 'sidekiq-scheduler'")
   end
 
-  it "creates the config with schedule" do
-    initializer_content = IO.read("#{project_path}/config/sidekiq.yml")
-    expect(initializer_content).to include(":schedule:")
+  it "adds schedule section to sidekiq config" do
+    expect(sidekiq_config).to include(":schedule:")
+  end
+
+  it "doesn't remove mailers queue" do
+    expect(sidekiq_config).to include("- mailers")
   end
 
   it "adds scheduler ui to the sidekiq initializer" do

data/spec/support/potassium_test_helpers.rb

@@ -22,7 +22,6 @@ module PotassiumTestHelpers
         add_project_bin_to_path
         full_arguments = hash_to_arguments(create_arguments(true).merge(arguments))
         run_command("#{potassium_bin} create #{APP_NAME} #{full_arguments}")
-        on_project { run_command("hound rules update ruby --local") }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: potassium
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - juliogarciag
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,16 +86,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: gems
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +248,7 @@ files:
 - ".gitignore"
 - ".node-version"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -269,6 +298,8 @@ files:
 - lib/potassium/assets/app/mailers/application_mailer.rb
 - lib/potassium/assets/app/uploaders/base_uploader.rb
 - lib/potassium/assets/app/uploaders/image_uploader.rb
+- lib/potassium/assets/app/views/shared/_gtm_body.html.erb
+- lib/potassium/assets/app/views/shared/_gtm_head.html.erb
 - lib/potassium/assets/bin/cibuild.erb
 - lib/potassium/assets/bin/release
 - lib/potassium/assets/bin/setup.erb
@@ -295,7 +326,6 @@ files:
 - lib/potassium/assets/seeds/seeds.rb
 - lib/potassium/assets/sidekiq.rb.erb
 - lib/potassium/assets/sidekiq.yml
-- lib/potassium/assets/sidekiq_scheduler.yml
 - lib/potassium/assets/testing/.rspec
 - lib/potassium/assets/testing/platanus.png
 - lib/potassium/assets/testing/rails_helper.rb
@@ -337,6 +367,7 @@ files:
 - lib/potassium/recipes/file_storage.rb
 - lib/potassium/recipes/front_end.rb
 - lib/potassium/recipes/github.rb
+- lib/potassium/recipes/google_tag_manager.rb
 - lib/potassium/recipes/heroku.rb
 - lib/potassium/recipes/i18n.rb
 - lib/potassium/recipes/listen.rb
@@ -379,6 +410,7 @@ files:
 - spec/features/file_storage_spec.rb
 - spec/features/front_end_spec.rb
 - spec/features/github_spec.rb
+- spec/features/google_tag_manager_spec.rb
 - spec/features/graphql_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb
@@ -393,11 +425,12 @@ files:
 - spec/support/fake_heroku.rb
 - spec/support/fake_octokit.rb
 - spec/support/potassium_test_helpers.rb
+- tmp/.keep
 homepage: https://github.com/platanus/potassium
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -413,7 +446,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: An application generator from Platanus
 test_files:
@@ -430,6 +463,7 @@ test_files:
 - spec/features/file_storage_spec.rb
 - spec/features/front_end_spec.rb
 - spec/features/github_spec.rb
+- spec/features/google_tag_manager_spec.rb
 - spec/features/graphql_spec.rb
 - spec/features/heroku_spec.rb
 - spec/features/i18n_spec.rb

data/lib/potassium/assets/sidekiq_scheduler.yml

@@ -1,9 +0,0 @@
-production:
-  :concurrency: 5
-:queues:
-  - default
-# :schedule:
-  #  an_scheduled_task:
-  #    cron: '0 * * * * *'  # Runs once per minute
-  #    class: ExampleJob
-  #    args: ['a', 'b']