Merge branch 'master' into duplicate

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [parndt, bricesanchez]

.github/workflows/main.yml

@@ -0,0 +1,53 @@
+name: CI
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        database: [ mysql, postgresql ]
+        extension: [ core, dragonfly, images, pages, resources ]
+        ruby: [ "2.7.x", "2.6.x" ]
+      fail-fast: false
+      max-parallel: 10
+    runs-on: ubuntu-latest
+
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_PATH: vendor/bundle
+      CI: true
+      DB: ${{ matrix.database }}
+      MYSQL_PASSWORD: root
+      PGHOST: localhost
+      PGUSER: postgres
+      RAILS_ENV: test
+
+    name: ${{ matrix.extension }} ${{ matrix.ruby }} ${{ matrix.database }}
+    steps:
+      - uses: actions/setup-ruby@v1.0.0
+        with:
+          version: ${{ matrix.ruby }}
+      - uses: actions/checkout@v2
+      - run: sudo apt-get update && sudo apt-get install libpq-dev libmysqlclient-dev libsqlite3-dev -y
+      - run: sudo systemctl start mysql.service
+      - id: cache-bundler
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ matrix.ruby }}-gem-${{ matrix.database }}-${{ hashFiles('Gemfile') }}
+      - run: bundle install --without development --path vendor/bundle
+      - run: bin/rake refinery:testing:dummy_app
+        env:
+          PGPORT: ${{ job.services.postgres.ports[5432] }}
+
+      - run: bin/rspec ${{ matrix.extension }}/spec
+        env:
+          PGPORT: ${{ job.services.postgres.ports[5432] }}
+          RETRY_COUNT: 3
+
+    services:
+      postgres:
+        image: postgres:11.5
+        ports: ["5432:5432"]
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

Gemfile

@@ -9,37 +9,38 @@ path "./" do
   gem "refinerycms-resources"
 end
 
-gem 'bootsnap', require: false
-gem 'listen'
-
-gem 'activejob'
-
 # Add support for refinerycms-acts-as-indexed
 gem 'refinerycms-acts-as-indexed', ['~> 3.0', '>= 3.0.0']
 
 # Add the default visual editor, for now.
 gem 'refinerycms-wymeditor', ['~> 2.2', '>= 2.2.0']
 
 # Database Configuration
-unless ENV['TRAVIS']
+unless ENV['CI']
   gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc1', platform: :jruby
   gem 'sqlite3', platform: :ruby
 end
 
-if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+if !ENV['CI'] || ENV['DB'] == 'mysql'
   group :mysql do
     gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0.rc1', platform: :jruby
     gem 'mysql2', '~> 0.4', :platform => :ruby
   end
 end
 
-if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+if !ENV['CI'] || ENV['DB'] == 'postgresql'
   group :postgres, :postgresql do
     gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0.rc1', platform: :jruby
     gem 'pg', '~> 0.21', platform: :ruby
   end
 end
 
+group :development, :test do
+  gem 'activejob'
+  gem 'bootsnap', require: false
+  gem 'listen', '~> 3.0'
+end
+
 group :test do
   gem 'refinerycms-testing', path: './testing'
   gem 'generator_spec', '~> 0.9.3'

certs/parndt.pem

@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
-2Oqsxsw30MIZnh2Cw/xLRkc1I50luA==
+aW8wDQYJKoZIhvcNAQELBQADggGBALu2HM50B8xqlAXkCwavJDvWWtV9pG1igFUg
+friZRWprUQ5nTaNmAd8p8qbJQwaIK2gt+DfYWfB9LtKnQTfbhLRBbmJ7zYw8LjKY
+PwCs4RWjDAiuyCO3ppfsz+1bsMUXPLgWlaUkXsUy3nr2NruEFTO9zu3wGYQQ93Tt
+vYSHOnP35UB4QjsjNrOO7FBaQfy6O909PP+GnVcJ62s9c26voJz63RSolwY7Jydw
+XUlG68jjJKSoDHRzVTmNB7sX8rs8P2kvYkpIUXPHyls3mWBWjBWbdEYWESZrxI2x
+dS7jY3AnfqhvsWra2pSREb2IDqPnJrHVOejnEI/zuuufUxLwDx3AC6SMdsyWkZ7V
+9OmLt2rg75Sct6h2220lO5ySqYtqAXuOMBDGv5L0zLalx1g8LACA7uILTKVWh8B8
+Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
+/HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
 -----END CERTIFICATE-----

core/config/locales/sk.yml

@@ -52,6 +52,11 @@ sk:
         button_text: Hľadať 
         results_for_html: "Výsledky hľadania pre &#8216;<em>%{query}</em>&#8217;"
         no_results: Žiadne záznamy sa nenašli
+        cancel_search: 'Zrušiť vyhľadávanie'
+        search_input_notice: ''
+        input:
+          placeholder: "Hľadať &#8230;"
+          help: 'Napíšte slovo alebo frázu, ktorú chcete vyhľadať'
       delete:
         message: Naozaj chcete zmazať '%{title}'?
       error_messages:
@@ -66,6 +71,8 @@ sk:
       close_this_message: Zavrieť správu
     draft_page_message:
       not_live: Táto stránka NIE JE viditeľná pre bežných návštevníkov webu.
+    skip_to_first_child_page_message:
+      skip_to_first_child: "Táto stránka má nastavenie \"Presmeruj na prvú substránku\" a nikdy nebude zobrazená návštevníkom"
     footer:
       copyright: Copyright © %{year} %{site_name}
     no_script:

core/lib/generators/refinery/dummy/templates/rails/database.yml

@@ -5,7 +5,7 @@ login: &login
   reconnect: false
   pool: 5
   username: root
-  password:
+  password: <%%= ENV['MYSQL_PASSWORD'] %>
   #socket: /tmp/mysql.sock
 <% elsif /postgresql/ === @database %>
   adapter: postgresql
@@ -31,4 +31,4 @@ test:
 
 production:
   <<: *login
-  database: dummy_prod
+  database: dummy_prod

core/lib/refinery/application_controller.rb

@@ -31,8 +31,7 @@ def error_404(exception = nil)
       # fallback to the default 404.html page.
       file = Rails.root.join 'public', '404.html'
       file = Refinery.roots('refinery/core').join('public', '404.html') unless file.exist?
-      render file: file.cleanpath.to_s.gsub(%r{#{file.extname}$}, ''),
-             layout: false, status: 404, format: :html
+      render file: file, format: :html, layout: false, status: 404
       return false
     end
 

core/refinerycms-core.gemspec

@@ -1,43 +1,43 @@
-# Encoding: UTF-8
-require File.expand_path('../../core/lib/refinery/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../core/lib/refinery/version', __dir__)
 
 version = Refinery::Version.to_s
 rails_version = ['>= 6.0.0', '< 7']
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
-  s.name              = %q{refinerycms-core}
+  s.name              = 'refinerycms-core'
   s.version           = version
-  s.summary           = %q{Core extension for Refinery CMS}
-  s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most extensions}
-  s.email             = %q{refinerycms@p.arndt.io}
-  s.homepage          = %q{https://www.refinerycms.com}
-  s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
-  s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
+  s.summary           = 'Core extension for Refinery CMS'
+  s.description       = 'The core of Refinery CMS. This handles the common functionality and is required by most extensions'
+  s.email             = 'gems@p.arndt.io'
+  s.homepage          = 'https://www.refinerycms.com'
+  s.authors           = ['Philip Arndt', 'David Jones', 'Uģis Ozols', 'Brice Sanchez']
+  s.license           = 'MIT'
+  s.require_paths     = %w[lib]
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
 
-  s.add_dependency 'refinerycms-i18n',            ['~> 5.0', '>= 5.0.1']
-  s.add_dependency 'railties',                    rails_version
-  s.add_dependency 'activerecord',                rails_version
   s.add_dependency 'actionpack',                  rails_version
-  s.add_dependency 'truncate_html',               '~> 0.9'
-  s.add_dependency 'will_paginate',               '~> 3.1', '>= 3.1.0'
-  s.add_dependency 'sass-rails',                  '>= 4.0', '< 7'
-  s.add_dependency 'font-awesome-sass',           '>= 4.3.0', '< 5.0'
+  s.add_dependency 'activerecord',                rails_version
   s.add_dependency 'coffee-rails',                ['~> 4.0', '>= 4.0.0']
+  s.add_dependency 'decorators',                  '~> 2.0', '>= 2.0.0'
+  s.add_dependency 'font-awesome-sass',           '>= 4.3.0', '< 5.0'
   s.add_dependency 'jquery-rails',                '~> 4.3', '>= 4.3.1'
   s.add_dependency 'jquery-ui-rails',             '~> 6.0', '>= 6.0.0'
-  s.add_dependency 'decorators',                  '~> 2.0', '>= 2.0.0'
+  s.add_dependency 'railties',                    rails_version
+  s.add_dependency 'refinerycms-i18n',            ['~> 5.0', '>= 5.0.1']
+  s.add_dependency 'sass-rails',                  '>= 4.0', '< 7'
+  s.add_dependency 'truncate_html',               '~> 0.9'
+  s.add_dependency 'will_paginate',               '~> 3.1', '>= 3.1.0'
   s.add_dependency 'zilch-authorisation',         '~> 0', '>= 0.0.1'
 
-  s.cert_chain  = [File.expand_path("../../certs/parndt.pem", __FILE__)]
-  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  s.cert_chain = [File.expand_path('../certs/parndt.pem', __dir__)]
+  if $PROGRAM_NAME =~ /gem\z/ && ARGV.include?('build') && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
   end
 end

core/spec/lib/generators/refinery/cms/cms_generator_spec.rb

@@ -57,9 +57,9 @@ module Refinery
           end
         end
         directory "config" do
-          file "database.yml.mysql"
-          file "database.yml.postgresql"
-          file "database.yml.sqlite3"
+          file "database.mysql.yml"
+          file "database.postgresql.yml"
+          file "database.sqlite3.yml"
         end
       }
     end

doc/guides/6 - Updating Refinery/1 - Upgrading to the Latest Stable Version.md

@@ -15,7 +15,7 @@ Take a look at <https://rubygems.org/gems/refinerycms> to find the latest versio
 Edit your `Gemfile` to reference the latest version of Refinery (a later version than the one shown [may exist](https://rubygems.org/gems/refinerycms/versions)).
 
 ```ruby
-gem 'refinerycms', '~> 3.0.0'
+gem 'refinerycms', '~> 4.0.0'
 ```
 
 Now install the new gems using bundler's update functionality:
@@ -39,4 +39,4 @@ Database migrations and new gem dependencies may have been added, so finish your
 ```shell
 $ bin/rake db:migrate
 $ bundle install
-```
+```