refinerycms-core 4.0.3 → 4.1.0

data/lib/refinery/extension_generation.rb

@@ -3,13 +3,43 @@ module Refinery
 
     def self.included(base)
       base.class_eval do
-        argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-        class_option :namespace, :type => :string, :default => nil, :banner => 'NAMESPACE', :required => false
-        class_option :authors, :type => :array, :default => [], :banner => 'author author', :required => false, :desc => 'Indicates authors of this extension'
-        class_option :extension, :type => :string, :default => nil, :banner => 'ENGINE', :required => false
-        class_option :i18n, :type => :array, :default => [], :required => false, :banner => "field field", :desc => 'Indicates generated fields'
-        class_option :install, :type => :boolean, :default => false, :required => false, :banner => nil, :desc => 'Bundles and runs the generated generator, rake db:migrate, rake db:seed for you'
+        argument :attributes,
+                 type: :array,
+                 default: [],
+                 banner: 'field:type field:type'
+
+        class_option :namespace,
+                     type: :string,
+                     default: '',
+                     banner: 'NAMESPACE',
+                     required: false
+
+        class_option :authors,
+                     type: :array,
+                     default: [],
+                     banner: 'author author',
+                     required: false,
+                     desc: 'Indicates authors of this extension'
+
+        class_option :extension,
+                     type: :string,
+                     default: '',
+                     banner: 'ENGINE',
+                     required: false
+
+        class_option :i18n,
+                     type: :array,
+                     default: [],
+                     required: false,
+                     banner: 'field field',
+                     desc: 'Indicates generated fields'
+
+        class_option :install,
+                     type: :boolean,
+                     default: false,
+                     required: false,
+                     banner: nil,
+                     desc: 'Bundles and runs the generated generator, rake db:migrate, rake db:seed for you'
 
         remove_class_option :skip_namespace
       end
@@ -68,6 +98,13 @@ module Refinery
       @localized_attributes ||= attributes.select{ |a| options[:i18n].include?(a.name)}
     end
 
+    def localized_table_name
+      localized_table_name = [ 'refinery']
+      localized_table_name << namespacing.underscore if table_name != namespacing.underscore.pluralize
+      localized_table_name << [ singular_table_name, 'translations']
+      localized_table_name.join('_')
+    end
+
     def attributes_for_translation_table
       localized_attributes.inject([]) { |memo, attr| memo << ":#{attr.name} => :#{attr.type}"}.join(', ')
     end
@@ -333,6 +370,14 @@ module Refinery
                              gsub('namespace', namespacing.underscore)
     end
 
+    def index_route
+      if namespacing.underscore == plural_name
+        '/' + plural_name
+      else
+        '/' + namespacing.underscore + '/' + plural_name
+      end
+    end
+
     def viable_templates
       @viable_templates ||= begin
         all_templates.reject(&method(:reject_template?)).inject({}) do |hash, path|
@@ -393,8 +438,10 @@ module Refinery
         end
       end
 
+      # merge_rb is only used for merging routes.rb
+      # Put destination lines first, so that extension namespaced routes precede the default extension route
       def merge_rb
-        (source_lines[0..-2] + destination_lines[1..-2] + [source_lines.last]).join "\n"
+        (destination_lines[0..-2] + source_lines[1..-2] + [destination_lines.last]).join "\n"
       end
 
       def merge_yaml

data/lib/refinery/generators/generated_attribute.rb

@@ -3,9 +3,22 @@ require 'rails/generators/generated_attribute'
 module Refinery
   module Generators
     class GeneratedAttribute < Rails::Generators::GeneratedAttribute
+      REFINERY_TYPES = %w(image resource radio select checkbox)
+
       attr_accessor :refinery_type
 
       class << self
+        def parse(column_definition)
+          name, type, index_type = column_definition.split(":")
+
+          # Handle Refinery's custom types before Rails validates them
+          if type && REFINERY_TYPES.include?(type)
+            new(name, type.to_sym, index_type)
+          else
+            super
+          end
+        end
+
         def reference?(type)
           [:references, :belongs_to, :image, :resource].include? type
         end

data/lib/refinery/plugins.rb

@@ -49,7 +49,7 @@ module Refinery
     def update_positions(plugin_list)
       plugins = plugin_list.map {|p| find_by_name(p) }.reject(&:blank?)
       plugins.each_with_index do |plugin, index|
-        plugin.update_attributes(position: index)
+        plugin.update(position: index)
       end
     end
 

data/lib/refinery/version.rb

@@ -1,8 +1,8 @@
 module Refinery
   class Version
     @major = 4
-    @minor = 0
-    @tiny  = 3
+    @minor = 1
+    @tiny  = 0
     @build = nil
 
     class << self
@@ -13,8 +13,8 @@ module Refinery
       end
 
       def required_ruby_version
-        '>= 2.2.2'
+        '>= 3.1'
       end
     end
   end
-end
+end

data/lib/refinery.rb

@@ -1,4 +1,11 @@
-require 'rails' # from railties
+begin
+  require 'rails' # from railties
+rescue NameError => e
+  raise unless e.message.include?("ActiveSupport::LoggerThreadSafeLevel::Logger")
+
+  require "logger"
+  retry
+end
 require 'active_record'
 require 'action_controller'
 require 'rbconfig'
@@ -141,7 +148,7 @@ module Refinery
 
       klass = klass.constantize if klass.respond_to?(:constantize)
       active_name = ::ActiveModel::Name.new(
-        klass, (Refinery if klass.parents.include?(Refinery))
+        klass, (Refinery if klass.module_parents.include?(Refinery))
       )
 
       if options[:admin]

data/lib/refinerycms/core.rb

@@ -0,0 +1 @@
+require_relative '../refinery/core'

data/lib/tasks/refinery.rake

@@ -1,18 +1,18 @@
 namespace :refinery do
   desc "Override files for use in an application"
   task :override => :environment do
-    Refinery::CLI.new.override(ENV)
+    Refinery::Cli.new.override(ENV)
   end
 
   desc "Override files for use in an application"
   namespace :override do
     task :list => :environment do
-      Refinery::CLI.new.override_list(ENV)
+      Refinery::Cli.new.override_list(ENV)
     end
   end
 
   desc "Un-crudify a method on a controller that uses crudify"
   task :uncrudify => :environment do
-    Refinery::CLI.new.uncrudify(ENV['controller'], ENV['action'])
+    Refinery::Cli.new.uncrudify(ENV['controller'], ENV['action'])
   end
 end

data/refinerycms-core.gemspec

@@ -1,44 +1,38 @@
-# 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 = ['>= 5.1.0', '< 5.2']
+rails_version = ['>= 6.1.0', '< 9']
 
 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://github.com/refinery/refinerycms'
+  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',            ['~> 4.0', '>= 4.0.0']
-  s.add_dependency 'awesome_nested_set',          ['~> 3.0', '>= 3.0.0']
-  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', '< 5.1'
+  s.add_dependency 'activerecord',                rails_version
+
+  s.add_dependency 'decorators',                  '~> 2.0', '>= 2.0.0'
   s.add_dependency 'font-awesome-sass',           '>= 4.3.0', '< 5.0'
-  s.add_dependency 'coffee-rails',                ['~> 4.0', '>= 4.0.0']
   s.add_dependency 'jquery-rails',                '~> 4.3', '>= 4.3.1'
-  s.add_dependency 'jquery-ui-rails',             '~> 5.0', '>= 5.0.0'
-  s.add_dependency 'decorators',                  '~> 2.0', '>= 2.0.0'
+  s.add_dependency 'jquery-ui-rails',             '~> 7.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")
-  end
 end

data/spec/controllers/refinery/sitemap_controller_spec.rb

@@ -9,7 +9,7 @@ module Refinery
     it "shows a valid xml response" do
       get :index
 
-      expect(response).to be_success
+      expect(response).to be_successful
     end
   end
 end

data/spec/helpers/refinery/tag_helper_spec.rb

@@ -15,7 +15,7 @@ module Refinery
       end
 
       it "wraps image_tag with some options preset" do
-        expect(helper.refinery_icon_tag("ugis.ozols.jpg")).to xml_eq(%Q{<img alt="Ugis.ozols" height="16" src="/images/refinery/icons/ugis.ozols.jpg" width="16" />})
+        expect(helper.refinery_icon_tag("ugis.ozols.jpg", { alt: "Ugis.ozols"})).to xml_eq(%Q{<img alt="Ugis.ozols" height="16" src="/images/refinery/icons/ugis.ozols.jpg" width="16" />})
       end
     end
 

data/spec/helpers/refinery/translation_helper_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module Refinery
-  describe TranslationHelper, :type => :helper do
+  describe TranslationHelper, type: :helper do
 
     describe "#t" do
       it "overrides Rails' translation method" do
@@ -14,30 +14,66 @@ module Refinery
       let(:page) { FactoryBot.build(:page) }
 
       before do
-        Globalize.with_locale(:en) do
-          page.title = "draft"
-          page.save!
+        Mobility.with_locale(:en) do
+          page.update!({title: 'draft'})
         end
 
-        Globalize.with_locale(:lv) do
+        Mobility.with_locale(:lv) do
           page.title = "melnraksts"
           page.save!
         end
       end
 
-      context "when title is present" do
-        it "returns it" do
+      context "when field for current locale is present" do
+        it "it's value is returned" do
           expect(helper.translated_field(page, :title)).to eq("draft")
         end
       end
 
-      context "when title for current locale isn't available" do
-        it "returns existing title from translations" do
-          Page.translation_class.where(locale: :en).first.destroy
+      context "when field for current locale isn't present" do
+
+        it "returns existing field value from other translations" do
+          Page::Translation.where(locale: :en).first.destroy
           expect(helper.translated_field(page, :title)).to eq("melnraksts")
         end
       end
     end
 
+    describe '#locales_with_translated_field' do
+      let(:page) { FactoryBot.build(:page) }
+
+      before do
+        allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :lv, :it])
+        Mobility.with_locale(:en) do
+          page.update!({title: 'draft'})
+        end
+
+        Mobility.with_locale(:lv) do
+          page.title = "melnraksts"
+          page.save!
+        end
+      end
+
+      it 'returns an array of locales which have the named field translated' do
+        expect(helper.locales_with_translated_field(page, :title)).to eq([:en, :lv])
+      end
+
+      context 'The field has no translations' do
+        before do
+          Refinery::I18n.frontend_locales.each do |locale|
+            Mobility.with_locale(locale) do
+              page.title = "A title"
+              page.menu_title = ""
+              page.save!
+            end
+          end
+        end
+
+        it 'returns an empty array' do
+          expect(helper.locales_with_translated_field(page, :menu_title)).to eq([])
+        end
+      end
+    end
+
   end
 end

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

@@ -57,9 +57,9 @@ end
           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
@@ -97,12 +97,12 @@ end
     end
 
     def copy_routes
-      routes = File.join(Gem.loaded_specs['railties'].full_gem_path, 'lib', 'rails', 'generators', 'rails', 'app', 'templates', 'config', 'routes.rb')
+      routes = File.join(Gem.loaded_specs['railties'].
+        full_gem_path, 'lib', 'rails', 'generators', 'rails', 'app', 'templates', 'config', 'routes.rb.tt')
       destination = File.join(destination_root, "config")
 
       FileUtils.mkdir_p(destination)
-      FileUtils.cp routes, destination
+      FileUtils.cp routes, File.join(destination, "routes.rb")
     end
-
   end
 end

data/spec/lib/generators/refinery/engine/engine_generator_multiple_resources_spec.rb

@@ -7,6 +7,7 @@ module Refinery
   describe EngineGenerator do
     include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
+    let(:extension_root){"#{destination_root}/vendor/extensions/rspec_product_tests"}
 
     before do
       prepare_destination
@@ -41,6 +42,13 @@ module Refinery
           end
         }
       end
+
+      it "does not namespace the link_url in the extension controller" do
+        File.read("#{extension_root}/app/controllers/refinery/rspec_product_tests/rspec_product_tests_controller.rb") do |file|
+          expect(file.grep(%r{/:link_url => "/rspec_product_tests"\)\.first/})).to be_truthy
+        end
+      end
+
     end
 
     context "when generating a resource inside existing extensions dir" do
@@ -66,16 +74,29 @@ module Refinery
       end
 
       it "appends existing seeds file" do
-        File.open("#{destination_root}/vendor/extensions/rspec_product_tests/db/seeds.rb") do |file|
+        File.open("#{extension_root}/db/seeds.rb") do |file|
           expect(file.grep(%r{/rspec_product_tests|/rspec_item_tests}).count).to eq(2)
         end
       end
 
       it "appends routes to the routes file" do
-        File.open("#{destination_root}/vendor/extensions/rspec_product_tests/config/routes.rb") do |file|
+        File.open("#{extension_root}/config/routes.rb") do |file|
           expect(file.grep(%r{rspec_item_tests}).count).to eq(2)
         end
       end
+
+      it "places second and subsequent routes before the primary extension routes" do
+        content = File.read("#{extension_root}/config/routes.rb")
+        item_front_end_route = content.index("resources :rspec_item_tests, :only => [:index, :show]")
+        product_front_end_route =  content.index("resources :rspec_product_tests, :path => '', :only => [:index, :show]")
+        expect(item_front_end_route).to be < product_front_end_route
+      end
+
+      it "uses the namespaced url in the extension controller" do
+        content = File.read("#{extension_root}/app/controllers/refinery/rspec_product_tests/rspec_item_tests_controller.rb") do |file|
+          expect(file.grep(%r{/:link_url => "/rspec_product_tests/rspec_item_tests"\)\.first/})).to be_truthy
+        end
+      end
     end
   end
 end

data/spec/lib/refinery/cli_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 require 'refinery/cli'
 require "rake"
 
-describe "CLI" do
+describe "Cli" do
   let(:rake) { Rake::Application.new }
 
   before do
@@ -98,7 +98,7 @@ describe "CLI" do
         Array(spec_success_message).each do |message_fragment|
           expect(msg).to include(message_fragment)
         end
-        expect(File.exists?(Rails.root.join(copied_file_location))).to be_truthy
+        expect(File.exist?(Rails.root.join(copied_file_location))).to be_truthy
       end
     end
   end

data/spec/lib/refinery/{users_manager_spec.rb → core/users_manager_spec.rb}

@@ -1,5 +1,5 @@
 require 'spec_helper_no_rails'
-require 'refinery/users_manager'
+require 'refinery/core/users_manager'
 
 module Refinery
   module Core

data/spec/lib/refinery/crud_spec.rb

@@ -15,7 +15,8 @@ module Refinery
   end
 
   class CrudDummyController < ::ApplicationController
-    crudify :'refinery/crud_dummy'
+    skip_before_action :find_or_set_locale, raise: false
+    crudify :'refinery/crud_dummy', find_actions: [:update, :destroy, :edit]
   end
 end
 

data/spec/presenters/refinery/translated_field_presenter_spec.rb

@@ -5,14 +5,12 @@ module Refinery
     let(:page) { FactoryBot.build(:page) }
 
     before do
-      Globalize.with_locale(:en) do
-        page.title = "draft"
-        page.save!
+      Mobility.with_locale(:en) do
+        page.update!({ title: "draft" })
       end
 
-      Globalize.with_locale(:lv) do
-        page.title = "melnraksts"
-        page.save!
+      Mobility.with_locale(:lv) do
+        page.update!(title: "melnraksts")
       end
     end
 
@@ -25,7 +23,7 @@ module Refinery
 
       context "when title for current locale isn't available" do
         it "returns existing title from translations" do
-          Page.translation_class.where(locale: :en).first.destroy
+          Page::Translation.where(locale: :en).first.destroy
           expect(TranslatedFieldPresenter.new(page).call(:title)).to eq("melnraksts")
         end
       end

data/spec/support/refinery.rb

@@ -1,9 +1,9 @@
-require 'refinerycms-testing'
+require 'refinery/testing'
 
 RSpec.configure do |config|
   config.extend Refinery::Testing::ControllerMacros::Authentication, :type => :controller
   config.include Refinery::Testing::ControllerMacros::Routes, :type => :controller
-  config.extend Refinery::Testing::FeatureMacros::Authentication, :type => :feature
+  config.extend Refinery::Testing::FeatureMacros::Authentication, :type => :system
 
   # set some config values so that image and resource factories don't fail to create
   config.before do

data/spec/{features → system}/refinery/admin/custom_assets_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module Refinery
-  describe "custom", type: :feature do
+  describe "custom", type: :system do
     refinery_login
 
     let(:custom_js){ Refinery.roots('refinery/core').join('spec/support/fixtures/custom_js.js') }

data/spec/system/refinery/admin/dialogs_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+module Refinery
+  describe "dialog", type: :system do
+    refinery_login
+
+    context "links" do
+      it "have iframe src" do
+        visit refinery.admin_dialog_path("Link")
+        expect(page).to have_selector("iframe[src$='/refinery/pages_dialogs/link_to']")
+      end
+    end
+
+    context "images" do
+      it "have iframe src" do
+        visit refinery.admin_dialog_path("Image")
+        expect(page).to have_selector("iframe[src$='/refinery/images/insert?modal=true']")
+      end
+    end
+
+    context "a" do
+      it "404s" do
+        expect_any_instance_of(Admin::DialogsController).to receive(:error_404).once
+
+        visit refinery.admin_dialog_path("a")
+      end
+    end
+  end
+end

data/spec/{features → system}/refinery/admin/xhr_paging_spec.rb

@@ -1,18 +1,22 @@
 require "spec_helper"
 
 module Refinery
-  describe "Crudify", type: :feature do
+  describe "Crudify", type: :system do
+    before do
+      driven_by(:selenium_chrome_headless)
+    end
     refinery_login
 
     describe "xhr_paging", :js do
       # Refinery::Admin::ImagesController specifies :order => 'created_at DESC' in crudify
       let(:first_image) { Image.order('created_at DESC').first }
       let(:last_image) { Image.order('created_at DESC').last }
-      let!(:image_1) { FactoryBot.create :image }
-      let!(:image_2) { FactoryBot.create :image }
+      let!(:image_1) { FactoryBot.create(:image) }
+      let!(:image_2) { FactoryBot.create(:image) }
 
       before do
         allow(Image).to receive(:per_page).and_return(1)
+        allow(Refinery::Images).to receive(:preferred_image_view).and_return(:grid)
       end
 
       it 'performs ajax paging of index' do
@@ -22,9 +26,9 @@ module Refinery
         expect(page).to have_css(%Q{img[alt="#{first_image.title}"]})
 
         # placeholder which would disappear in a full page refresh.
-        page.evaluate_script("node = document.createElement('i');")
-        page.evaluate_script("node.id = 'has_not_refreshed_entire_page';")
-        page.evaluate_script("document.body.appendChild(node);")
+        page.execute_script("node = document.createElement('i');")
+        page.execute_script("node.id = 'has_not_refreshed_entire_page';")
+        page.execute_script("document.body.appendChild(node);")
 
         within '.pagination' do
           click_link '2'
@@ -37,5 +41,4 @@ module Refinery
       end
     end
   end
-
 end

data/spec/{features → system}/refinery/application_layout_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Refinery
-  describe 'layout', :type => :feature do
+  describe 'layout', :type => :system do
     refinery_login
 
     let(:home_page) do
@@ -9,10 +9,9 @@ module Refinery
     end
 
     describe 'body' do
-      it "id is the page's canonical id" do
+      it "has an id that includes the page's canonical name" do
         visit home_page.url
-
-        expect(page).to have_css 'body#home-page'
+        expect(page.find("body")[:id]).to eq "home-page"
       end
     end
   end

data/spec/{features → system}/refinery/core_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Refinery
   module Core
-    describe Engine, :type => :feature do
+    describe Engine, :type => :system do
       describe "#refinery_inclusion!" do
         it "should be idempotent" do
           expect { visit(refinery.root_path) }.not_to raise_error