refinerycms-core 4.0.3 → 4.1.0

data/lib/generators/refinery/dummy/dummy_generator.rb

@@ -13,8 +13,22 @@ module Refinery
       paths.flatten
     end
 
+
     PASSTHROUGH_OPTIONS = [
-      :skip_active_record, :skip_javascript, :skip_action_cable, :skip_action_mailer, :database, :javascript, :quiet, :pretend, :force, :skip
+      :database,
+      :force,
+      :pretend,
+      :quiet,
+      :skip,
+      :skip_action_cable,
+      :skip_action_mailbox,
+      :skip_action_mailer,
+      :skip_action_text,
+      :skip_active_job,
+      :skip_active_record,
+      :skip_active_storage,
+      :skip_hotwire,
+      :skip_javascript
     ]
 
     def generate_test_dummy
@@ -23,7 +37,13 @@ module Refinery
       opts[:force] = true
       opts[:skip_bundle] = true
       opts[:skip_action_cable] = true
+      opts[:skip_action_mailbox] = true
       opts[:skip_action_mailer] = true
+      opts[:skip_action_text] = true
+      opts[:skip_active_job] = true
+      opts[:skip_active_storage] = true
+      opts[:skip_hotwire] = true
+      opts[:skip_javascript] = true
 
       invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
     end
@@ -31,14 +51,16 @@ module Refinery
     def test_dummy_config
       @database = options[:database]
 
-      template "rails/database.yml", "#{dummy_path}/config/database.yml", :force => true
-      template "rails/boot.rb.erb", "#{dummy_path}/config/boot.rb", :force => true
-      template "rails/application.rb.erb", "#{dummy_path}/config/application.rb", :force => true
-      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
-      template "rails/Rakefile", "#{dummy_path}/Rakefile", :force => true
-      template "rails/application.js", "#{dummy_path}/app/assets/javascripts/application.js", :force => true
-      template 'rails/blank.png', "#{dummy_path}/public/apple-touch-icon.png", :force => true
-      template 'rails/blank.png', "#{dummy_path}/public/apple-touch-icon-precomposed.png", :force => true
+      template "rails/database.yml", "#{dummy_path}/config/database.yml", force: true
+      template "rails/boot.rb.erb", "#{dummy_path}/config/boot.rb", force: true
+      template "rails/application.rb.erb", "#{dummy_path}/config/application.rb", force: true
+      template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
+      template "rails/storage.yml", "#{dummy_path}/config/storage.yml", force: true
+      template "rails/Rakefile", "#{dummy_path}/Rakefile", force: true
+      template "rails/application.js", "#{dummy_path}/app/assets/javascripts/application.js", force: true
+      template "rails/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
+      template 'rails/blank.png', "#{dummy_path}/public/apple-touch-icon.png", force: true
+      template 'rails/blank.png', "#{dummy_path}/public/apple-touch-icon-precomposed.png", force: true
     end
 
     def test_dummy_clean
@@ -80,7 +102,7 @@ module Refinery
     def application_definition
       @application_definition ||= begin
         dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
-        unless options[:pretend] || !File.exists?(dummy_application_path)
+        unless options[:pretend] || !File.exist?(dummy_application_path)
           contents = File.read(dummy_application_path)
           contents[(contents.index("module #{module_name}"))..-1]
         end

data/lib/generators/refinery/dummy/templates/rails/application.rb.erb

@@ -1,12 +1,32 @@
 require File.expand_path('../boot', __FILE__)
 
-require 'rails/all'
+begin
+  require 'rails/all'
+rescue NameError => e
+  raise unless e.message.include?("ActiveSupport::LoggerThreadSafeLevel::Logger")
 
-require 'bundler/setup'
+  require "logger"
+  retry
+end
+require 'refinerycms/core'
 
-# If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if in development
-# or test environments.
-Bundler.require *Rails.groups(:assets)
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
-<%= application_definition %>
+module Dummy
+  class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 6.1
+
+    # 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.
+
+    if config.respond_to?(:assets)
+      config.assets.paths << File.expand_path('app/assets/javascripts', __dir__)
+      config.assets.paths << File.expand_path('app/assets/stylesheets', __dir__)
+    end
+  end
+end

data/lib/generators/refinery/dummy/templates/rails/boot.rb.erb

@@ -2,5 +2,4 @@ require 'rubygems'
 gemfile = File.expand_path("<%= gemfile_path %>", __FILE__)
 
 ENV['BUNDLE_GEMFILE'] = gemfile
-require 'bundler'
-Bundler.setup
+require 'bundler/setup'

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

@@ -1,34 +1,75 @@
-login: &login
 <% if /mysql$/ === @database %>
+development:
   adapter: mysql<%= '2' unless /jdbc/ === @database %>
-  encoding: utf8
+  encoding: utf8mb4
   reconnect: false
   pool: 5
   username: root
-  password:
-  #socket: /tmp/mysql.sock
+  password: <%%= ENV['MYSQL_PASSWORD'] %>
+  database: dummy_dev
+
+test:
+  adapter: mysql<%= '2' unless /jdbc/ === @database %>
+  encoding: utf8mb4
+  reconnect: false
+  pool: 5
+  username: root
+  password: <%%= ENV['MYSQL_PASSWORD'] %>
+  database: dummy_test
+
+production:
+  adapter: mysql<%= '2' unless /jdbc/ === @database %>
+  encoding: utf8mb4
+  reconnect: false
+  pool: 5
+  username: root
+  password: <%%= ENV['MYSQL_PASSWORD'] %>
+  database: dummy_prod
+
 <% elsif /postgresql/ === @database %>
+development:
   adapter: postgresql
   encoding: unicode
-  database: refinery_database_development
   pool: 5
-  username: postgres
-  password: postgres
+  username: <%%= ENV.fetch('PGUSER', 'postgres') %>
+  password: <%%= ENV.fetch('PGPASSWORD', 'postgres') %>
   min_messages: warning
+  database: dummy_dev
+
+test:
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+  username: <%%= ENV.fetch('PGUSER', 'postgres') %>
+  password: <%%= ENV.fetch('PGPASSWORD', 'postgres') %>
+  min_messages: warning
+  database: dummy_test
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+  username: <%%= ENV.fetch('PGUSER', 'postgres') %>
+  password: <%%= ENV.fetch('PGPASSWORD', 'postgres') %>
+  min_messages: warning
+  database: dummy_prod
+
 <% else %>
+development:
   adapter: sqlite3
   pool: 5
   timeout: 5000
-<% end %>
-
-development:
-  <<: *login
   database: dummy_dev
 
 test:
-  <<: *login
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
   database: dummy_test
 
 production:
-  <<: *login
-  database: dummy_prod
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+  database: dummy_prod
+<% end %>

data/lib/generators/refinery/dummy/templates/rails/manifest.js

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

data/lib/generators/refinery/dummy/templates/rails/storage.yml

@@ -0,0 +1,7 @@
+test:
+  service: Disk
+  root: <%%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%%= Rails.root.join("storage") %>

data/lib/generators/refinery/engine/engine_generator.rb

@@ -43,5 +43,6 @@ module Refinery
     def in_frontend_directory?(file)
       file.to_s.include?('app') && file.to_s.scan(/admin|models|mailers/).empty?
     end
+
   end
 end

data/lib/generators/refinery/engine/templates/Gemfile

@@ -20,7 +20,7 @@ end
 
 platforms :ruby do
   gem 'sqlite3'
-  gem 'mysql2'
+  gem 'mysql2', '~> 0.4.10'
   gem 'pg'
 end
 
@@ -38,6 +38,5 @@ end
 # in production environments by default.
 group :assets do
   gem 'sass-rails'
-  gem 'coffee-rails'
   gem 'uglifier'
 end

data/lib/generators/refinery/engine/templates/Rakefile

@@ -8,11 +8,11 @@ end
 ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path "../spec/dummy/Rakefile", __FILE__
 
-if File.exists? APP_RAKEFILE
+if File.exist? APP_RAKEFILE
   load 'rails/tasks/engine.rake'
 end
 
-require "refinerycms-testing"
+require "refinery/testing"
 Refinery::Testing::Railtie.load_dummy_tasks ENGINE_PATH
 
 load File.expand_path('../tasks/testing.rake', __FILE__)

data/lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/admin/plural_name_controller.rb.erb

@@ -9,7 +9,7 @@ module Refinery
 
         private
 
-        # Only allow a trusted parameter "white list" through.
+        # Only allow a trusted parameter "permit list" through.
         def <%= "#{singular_table_name}_params" %>
           <%- if attributes_names.empty? -%>
           params[:<%= singular_table_name %>]

data/lib/generators/refinery/engine/templates/app/controllers/refinery/namespace/plural_name_controller.rb.erb

@@ -26,7 +26,7 @@ module Refinery
       end
 
       def find_page
-        @page = ::Refinery::Page.where(:link_url => "/<%= plural_name %>").first
+        @page = ::Refinery::Page.where(link_url: "<%= index_route %>").first
       end
 
     end

data/lib/generators/refinery/engine/templates/app/models/refinery/namespace/singular_name.rb.erb

@@ -6,6 +6,7 @@ module Refinery
 <% end %>
 <% if localized? -%>
 
+      extend Mobility
       translates <%= localized_attributes.map { |a| ":#{a.name}" }.join(', ') %>
 <% end -%>
 <% if string_attributes.any? -%>

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_form.html.erb

@@ -9,7 +9,7 @@
 
 <% if localized? -%>
   <%%= render '/refinery/admin/locale_picker',
-              :current_locale => Globalize.locale %>
+              :current_locale => Mobility.locale %>
 <% end -%>
 <% attributes.each_with_index do |attribute, index| -%>
 <% if attribute.refinery_type == :image -%>

data/lib/generators/refinery/engine/templates/db/migrate/1_create_namespace_plural_name.rb.erb

@@ -2,18 +2,30 @@ class Create<%= namespacing %><%= class_name.pluralize %> < ActiveRecord::Migrat
 
   def up
     create_table :refinery_<%= "#{namespacing.underscore}_" if table_name != namespacing.underscore.pluralize -%><%= table_name %> do |t|
-<% attributes.each do |attribute| -%>
+<% (attributes - localized_attributes).each do |attribute| -%>
       t.<%= attribute.type %> :<%= attribute.column_name %>
 <% end -%>
       t.integer :position
 
       t.timestamps
     end
+
 <% if localized? %>
-    Refinery::<%= namespacing %>::<%= class_name %>.create_translation_table! <%= attributes_for_translation_table %>
+    create_table :<%= localized_table_name %> do |t|
+<% localized_attributes.each do |attribute| -%>
+      t.<%= attribute.type %> :<%= attribute.column_name %>
+<% end -%>
+      t.string  :locale, null: false
+      t.integer :refinery_<%= singular_table_name %>_id, null: false
+      t.timestamps
+    end
+
+    add_index :<%= localized_table_name %>, :locale, name: :index_<%= localized_table_name %>_on_locale
+    add_index :<%= localized_table_name %>, [:refinery_<%= singular_table_name %>_id, :locale], name: :index_<%= Digest::SHA1.hexdigest(localized_table_name) %>, unique: true
 <% end %>
   end
 
+
   def down
     if defined?(::Refinery::UserPlugin)
       ::Refinery::UserPlugin.destroy_all({:name => "refinerycms-<%= namespacing.underscore %>"})
@@ -25,8 +37,7 @@ class Create<%= namespacing %><%= class_name.pluralize %> < ActiveRecord::Migrat
 <% end %>
     drop_table :refinery_<%= "#{namespacing.underscore}_" if table_name != namespacing.underscore.pluralize -%><%= table_name %>
 <% if localized? %>
-    Refinery::<%= namespacing %>::<%= class_name %>.drop_translation_table!
+    drop_table :<%= localized_table_name %>
 <% end %>
   end
-
 end

data/lib/generators/refinery/engine/templates/lib/generators/refinery/extension_plural_name_generator.rb.erb

@@ -6,7 +6,7 @@ module Refinery
     end
 
     def append_load_seed_data
-      create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
+      create_file 'db/seeds.rb' unless File.exist?(File.join(destination_root, 'db', 'seeds.rb'))
       append_file 'db/seeds.rb', :verbose => true do
         <<-EOH
 

data/lib/generators/refinery/engine/templates/lib/refinery/plural_name.rb.erb

@@ -1,4 +1,4 @@
-require 'refinerycms-core'
+require 'refinery/core'
 
 module Refinery
   autoload :<%= extension_plural_class_name %>Generator, 'generators/refinery/<%= extension_plural_name %>_generator'

data/lib/refinery/admin/base_controller.rb

@@ -40,11 +40,11 @@ module Refinery
         authorisation_manager.authenticate!
       end
 
-      def group_by_date(records)
+      def group_by_date(records, date_field = :created_at)
         new_records = []
 
         records.each do |record|
-          key = record.created_at.strftime("%Y-%m-%d")
+          key = record.send(date_field).strftime("%Y-%m-%d")
           record_group = new_records.map{ |r| r.last if r.first == key }.flatten.compact << record
           (new_records.delete_if { |i| i.first == key}) << [key, record_group]
         end

data/lib/refinery/application_controller.rb

@@ -31,8 +31,7 @@ module Refinery
       # 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, :formats => [:html]
+      render file: file, format: :html, layout: false, status: 404
       return false
     end
 

data/lib/refinery/cli.rb

@@ -1,7 +1,7 @@
 require 'thor'
 
 module Refinery
-  class CLI < Thor
+  class Cli < Thor
     include Thor::Actions
 
     no_tasks do

data/lib/refinery/core/configuration.rb

@@ -3,7 +3,8 @@ module Refinery
     include ActiveSupport::Configurable
 
     config_accessor :rescue_not_found, :base_cache_key, :site_name,
-                    :google_analytics_page_code, :authenticity_token_on_frontend,
+                    :google_analytics_page_code, :matomo_analytics_server,
+                    :matomo_analytics_site_id, :authenticity_token_on_frontend,
                     :javascripts, :stylesheets, :mounted_path,
                     :force_ssl, :backend_route,
                     :visual_editor_javascripts, :visual_editor_stylesheets,
@@ -13,6 +14,8 @@ module Refinery
     self.base_cache_key = :refinery
     self.site_name = "Company Name"
     self.google_analytics_page_code = "UA-xxxxxx-x"
+    self.matomo_analytics_server = "analytics.example.org"
+    self.matomo_analytics_site_id = "123"
     self.authenticity_token_on_frontend = false
     self.javascripts = []
     self.stylesheets = []

data/lib/refinery/core/engine.rb

@@ -44,6 +44,26 @@ module Refinery
         WillPaginate.per_page = 20
       end
 
+      initializer "refinery.mobility" do
+        Mobility.configure do
+          plugins do
+            backend :table
+            reader                             # Explicitly declare readers,
+            writer                             # writers, and
+            backend_reader                     # backend reader (post.title_backend, etc).
+            active_record                      # You must now also explicitly ask for ActiveRecord (or Sequel)
+            query                              # i18n is the default scope
+            cache                              # previously implicit
+            fallbacks
+            presence                           # previously implicit
+            default
+            attribute_methods                  # uncomment this to get methods like `translated_attributes`
+            dirty
+          end
+          # accessor_method not available in v1.0
+        end
+      end
+
       before_inclusion do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root

data/lib/refinery/core.rb

@@ -24,4 +24,3 @@ require 'decorators'
 require 'jquery-rails'
 require 'jquery-ui-rails'
 require 'sass-rails'
-require 'coffee-rails'

data/lib/refinery/crud.rb

@@ -24,19 +24,21 @@ module Refinery
       plural_name = singular_name.pluralize
 
       {
-        :conditions => '',
-        :include => [],
-        :order => ('position ASC' if this_class.connected? && this_class.table_exists? && this_class.column_names.include?('position')),
-        :paging => true,
-        :per_page => false,
-        :redirect_to_url => "refinery.#{Refinery.route_for_model(class_name.constantize, :plural => true)}",
-        :searchable => true,
-        :search_conditions => '',
-        :sortable => true,
-        :title_attribute => "title",
-        :class_name => class_name,
-        :singular_name => singular_name,
-        :plural_name => plural_name
+        conditions: '',
+        include: [],
+        order: ('position ASC' if this_class.connected? && this_class.table_exists? && this_class.column_names.include?('position')),
+        paging: true,
+        per_page: false,
+        redirect_to_url: "refinery.#{Refinery.route_for_model(class_name.constantize, :plural => true)}",
+        searchable: true,
+        search_conditions: '',
+        sortable: true,
+        title_attribute: "title",
+        class_name: class_name,
+        singular_name: singular_name,
+        plural_name: plural_name,
+        find_actions: [:update, :destroy, :edit, :show],
+        exclude_from_find: []
       }
     end
 
@@ -52,14 +54,14 @@ module Refinery
         class_name = options[:class_name]
         singular_name = options[:singular_name]
         plural_name = options[:plural_name]
+        actions = [*options[:find_actions]] - [*options[:exclude_from_find]]
 
-        module_eval %(
+        module_eval <<-RUBY, __FILE__, __LINE__ + 1
           def self.crudify_options
             #{options.inspect}
           end
 
-          prepend_before_action :find_#{singular_name},
-                                :only => [:update, :destroy, :edit, :show]
+          prepend_before_action :find_#{singular_name}, only: #{actions}
           prepend_before_action :merge_position_into_params!, :only => :create
 
           def new
@@ -85,7 +87,7 @@ module Refinery
           end
 
           def update
-            if @#{singular_name}.update_attributes(#{singular_name}_params)
+            if @#{singular_name}.update(#{singular_name}_params)
               flash.notice = t(
                 'refinery.crudify.updated',
                 :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'"
@@ -181,7 +183,7 @@ module Refinery
                 if request.xhr?
                   render :partial => '/refinery/message'
                 else
-                  redirect_to :back
+                  redirect_back(fallback_location: { action: 'edit' })
                 end
               else
                 redirect_back_or_default redirect_url
@@ -227,21 +229,21 @@ module Refinery
                     :create_or_update_successful,
                     :create_or_update_unsuccessful,
                     :merge_position_into_params!
-        ), __FILE__, __LINE__
+        RUBY
 
         # Methods that are only included when this controller is searchable.
         if options[:searchable]
           if options[:paging]
-            module_eval %(
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
               def index
                 search_all_#{plural_name} if searching?
                 paginate_all_#{plural_name}
 
                 render_partial_response?
               end
-            ), __FILE__, __LINE__
+            RUBY
           else
-            module_eval %(
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
               def index
                 if searching?
                   search_all_#{plural_name}
@@ -251,31 +253,31 @@ module Refinery
 
                 render_partial_response?
               end
-            ), __FILE__, __LINE__
+            RUBY
           end
 
         else
           if options[:paging]
-            module_eval %(
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
               def index
                 paginate_all_#{plural_name}
 
                 render_partial_response?
               end
-            ), __FILE__, __LINE__
+            RUBY
           else
-            module_eval %(
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
               def index
                 find_all_#{plural_name}
                 render_partial_response?
               end
-            ), __FILE__, __LINE__
+            RUBY
           end
 
         end
 
         if options[:sortable]
-          module_eval %(
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def reorder
               find_all_#{plural_name}
             end
@@ -333,10 +335,10 @@ module Refinery
             end
 
             protected :after_update_positions
-          ), __FILE__, __LINE__
+          RUBY
         end
 
-        module_eval %(
+        module_eval <<-RUBY, __FILE__, __LINE__ + 1
           class << self
             def pageable?
               #{options[:paging]}
@@ -351,8 +353,7 @@ module Refinery
               #{options[:searchable]}
             end
           end
-        ), __FILE__, __LINE__
-
+        RUBY
       end
 
     end