refinerycms-core 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa69c80ba92533a1d3f40570315e835397c7635f
-  data.tar.gz: 43b2204819e877802ffedbd655ab90ebcbc0a070
+  metadata.gz: cdb057b3b306e31b50c5d499356dca454f58aafe
+  data.tar.gz: 00c968f4d7fa7461a910b7bfd981585f7867748a
 SHA512:
-  metadata.gz: dcbf6c99e35e1e908f9f8f266229f957132c1b3cba6a79e1362e93e1c7723ae80ec929bc3e1a590126702c378076d10c1c1562a87a57b41303ee68b3a7f8d0ab
-  data.tar.gz: 419e5eeb7e5a2288c47696fae277510fcb7d346717804ec006ad4d518c0a479861d7355db61043ee336214fc6ab2f3a5c7a9596d9366297dd0f4cdb271631e4c
+  metadata.gz: '0823576bc59743ae7178231da4f0044120d39097b5cf8b0d384fa5169efab0914e82fdfa66d78c9b58dc8ca9f16f061fa4c8d395b47b6228d1cd80842a7387c0'
+  data.tar.gz: beafadf6564b1c71e2b89e38aef370e5fddba961c34df7ad17fe2907a01b9fe1789fbb4af7e7d7ae5b690456b691c2150ec5eefebf2aa398661d28f0a4ae7176

data/app/views/refinery/_site_bar.html.erb

@@ -6,7 +6,7 @@
   <div id='site_bar'>
     <div id='site_bar_content' class='clearfix'>
 
-      <%= link_to 'http://refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
+      <%= link_to 'https://www.refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
         <%= image_tag 'refinery/refinery-cms-logo.svg', alt: 'Refinery CMS™' %>
       <% end %>
 

data/app/views/refinery/admin/_continue_editing.html.erb

@@ -1,3 +1,4 @@
 <%= f.submit t('.save_and_continue_editing'),
-             :id => "submit_continue_button",
-             :class => "wymupdate button" if f.object.persisted? %>
+             id: 'submit_continue_button',
+             class: 'wymupdate button',
+             data: { disable_with: false } if f.object.persisted? %>

data/app/views/refinery/admin/_form_actions.html.erb

@@ -1,8 +1,9 @@
 <%
   unless (hide_submit ||= false)
     submit_button_text  ||= t('.save')
-    submit_button_id    ||= "submit_button"
+    submit_button_id    ||= 'submit_button'
     submit_button_title ||= nil
+    submit_button_data  ||= { disable_with: false }
   end
 
   hide_cancel = from_dialog? unless defined?(hide_cancel).presence
@@ -12,8 +13,8 @@
     unless defined?(cancel_title)
       cancel_title = t('.cancel_lose_changes')
     end
-    cancel_button_id    ||= "cancel_button"
-    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? refinery.send(Refinery.route_for_model(f.object.class, :plural => true)) : back)
+    cancel_button_id    ||= 'cancel_button'
+    cancel_url          ||= (((back = url_for(:back)).include?('javascript') or action_name =~ /^(create|update)$/) ? refinery.send(Refinery.route_for_model(f.object.class, plural: true)) : back)
   end
 
   continue_editing = defined?(continue_editing) ? continue_editing : (f.object.present? and f.object.persisted?)
@@ -28,7 +29,7 @@
     delete_button_text  ||= t('.delete')
     delete_title        ||= nil
     delete_confirmation ||= nil
-    delete_button_id    ||= "delete_button"
+    delete_button_id    ||= 'delete_button'
     # we have to use eval rather than refinery.send because this url may not exist for HTTP GET
     delete_url          ||= eval("refinery.#{Refinery.route_for_model(f.object.class)}(#{f.object.id})")
   end
@@ -38,37 +39,42 @@
 <input type='hidden' name='dialog' value='true' />
 <% end %>
 
-<div class='form-actions<%= ' form-actions-dialog' if from_dialog? %>'>
-  <div class='form-actions-left'>
+<%= content_tag :div, class: "form-actions#{' form-actions-dialog' if from_dialog?}" do %>
+  <%= content_tag :div, class: 'form-actions-left' do %>
     <%= submit_tag submit_button_text,
-                   :id => submit_button_id,
-                   :name => nil,
-                   :class => "wymupdate button",
-                   :tooltip => submit_button_title unless hide_submit %>
+                   id: submit_button_id,
+                   name: nil,
+                   class: 'wymupdate button',
+                   data: submit_button_data,
+                   tooltip: submit_button_title unless hide_submit %>
 
-    <%= render '/refinery/admin/continue_editing', :f => f if continue_editing -%>
+    <%= render '/refinery/admin/continue_editing', f: f if continue_editing -%>
     <%= hidden_field_tag :continue_editing, false if continue_editing %>
 
     <%= local_assigns[:before_cancel_button] -%>
 
-    <%= link_to(cancel_button_text, cancel_url,
-                :title => cancel_title,
-                :id => cancel_button_id,
-                :class => "close_dialog button") unless hide_cancel %>
+    <%= link_to cancel_button_text, cancel_url,
+                title: cancel_title,
+                id: cancel_button_id,
+                class: 'close_dialog button' unless hide_cancel %>
 
     <%= local_assigns[:after_cancel_button] -%>
-    <i id='spinner' class='loading_icon hidden_icon'></i>
-  </div>
-  <div class='form-actions-right'>
+
+    <%= content_tag :i, nil, id: 'spinner', class: 'loading_icon hidden_icon' %>
+  <% end %>
+
+  <%= content_tag :div, class: 'form-actions-right' do %>
     <%= local_assigns[:before_delete_button] -%>
-    <%= link_to(delete_button_text, delete_url,
-                :title => delete_title,
-                :id => delete_button_id,
-                :method => :delete,
-                :data => {
-                  :confirm => delete_confirmation
+
+    <%= link_to delete_button_text, delete_url,
+                title: delete_title,
+                id: delete_button_id,
+                method: :delete,
+                data: {
+                  confirm: delete_confirmation
                 },
-                :class => "button confirm-delete") unless hide_delete %>
+                class: 'button confirm-delete' unless hide_delete %>
+
     <%= local_assigns[:after_delete_button] -%>
-  </div>
-</div>
+  <% end %>
+<% end %>

data/lib/generators/refinery/cms/cms_generator.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'mkmf'
 
 module Refinery
   class CmsGenerator < Rails::Generators::Base
@@ -76,15 +77,14 @@ end}  end
 
     def append_heroku_gems!
       production_gems = [
-        "gem 'dragonfly-s3_data_store'",
-        "gem 'rails_12factor'",
-        "gem 'puma'"
+        "gem 'dragonfly-s3_data_store'"
       ]
+      production_gems << "gem 'puma'" unless destination_gemfile_has_puma?
       production_gems << "gem 'pg'" unless destination_gemfile_has_postgres?
 
       append_file "Gemfile", %Q{
 # The Ruby version is specified here so that Heroku uses the right version.
-ruby #{ENV['RUBY_VERSION'].inspect}
+ruby #{current_ruby_version.inspect}
 
 # Gems that have been added for Heroku support
 group :production do
@@ -93,6 +93,10 @@ end
 }.sub("{{production_gems}}", production_gems.join("\n  "))
     end
 
+    def current_ruby_version
+      ENV['RUBY_VERSION'].presence || RUBY_VERSION
+    end
+
     def bundle!
       run 'bundle install'
     end
@@ -225,8 +229,16 @@ end
     end
 
     def destination_gemfile_has_postgres?
+      destination_gemfile_has_gem?('pg')
+    end
+
+    def destination_gemfile_has_puma?
+      destination_gemfile_has_gem?('puma')
+    end
+
+    def destination_gemfile_has_gem?(gem_name)
       destination_path.join('Gemfile').file? &&
-        destination_path.join('Gemfile').read =~ %r{gem ['"]pg['"]}
+        destination_path.join('Gemfile').read =~ %r{gem ['"]#{gem_name}['"]}
     end
 
     def heroku?
@@ -234,7 +246,7 @@ end
     end
 
     def heroku_toolbelt_missing?
-      !!system("heroku --version")
+      find_executable("heroku").nil?
     end
 
     def manage_roadblocks!
@@ -284,6 +296,7 @@ end
       generator_args << '--skip-migrations' if self.options[:skip_migrations]
       Refinery::CoreGenerator.start generator_args
       Refinery::Authentication::DeviseGenerator.start generator_args if defined?(Refinery::Authentication::DeviseGenerator)
+      Refinery::Dragonfly::DragonflyGenerator.start generator_args if defined?(Refinery::Dragonfly::DragonflyGenerator)
       Refinery::ResourcesGenerator.start generator_args if defined?(Refinery::ResourcesGenerator)
       Refinery::PagesGenerator.start generator_args if defined?(Refinery::PagesGenerator)
       Refinery::ImagesGenerator.start generator_args if defined?(Refinery::ImagesGenerator)

data/lib/generators/refinery/core/templates/config/initializers/refinery/core.rb.erb

@@ -6,21 +6,7 @@ Refinery::Core.configure do |config|
   # When true this will force SSL redirection in all Refinery backend controllers.
   # config.force_ssl = <%= Refinery::Core.force_ssl.inspect %>
 
-  # Set the S3 options using means other than securely by environment variables.
-  # If you have to.
-  # config.s3_bucket_name = ENV['S3_BUCKET']
-  # config.s3_region = ENV['S3_REGION']
-  # config.s3_access_key_id = ENV['S3_KEY']
-  # config.s3_secret_access_key = ENV['S3_SECRET']
-
-  # When true will use Amazon's Simple Storage Service instead of
-  # the default file system for storing resources and images
-  config.s3_backend = config.s3_access_key_id.present? || config.s3_secret_access_key.present?
-
-  # Use a custom Dragonfly storage backend instead of the default
-  # file system for storing resources and images
-  # config.dragonfly_custom_backend_class = <%= Refinery::Core.dragonfly_custom_backend_class.inspect %>
-  # config.dragonfly_custom_backend_opts = <%= Refinery::Core.dragonfly_custom_backend_opts.inspect %>
+  # Dragonfly and S3 configurations have moved to initializers/refinery/dragonfly.rb
 
   # Whenever Refinery caches anything and can set a cache key, it will add
   # a prefix to the cache key containing the string you set here.
@@ -37,10 +23,6 @@ Refinery::Core.configure do |config|
   # Enable/disable authenticity token on frontend
   # config.authenticity_token_on_frontend = <%= Refinery::Core.authenticity_token_on_frontend.inspect %>
 
-  # Should set this if concerned about DOS attacks. See
-  # http://markevans.github.com/dragonfly/file.Configuration.html#Configuration
-  # config.dragonfly_secret = <%= Refinery::Core.dragonfly_secret.inspect %>
-
   # Register extra javascript for backend
   # config.register_javascript "prototype-rails"
 

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

@@ -48,10 +48,11 @@
 
 <% end -%>
 <% end -%>
-  <%%= render '/refinery/admin/form_actions', :f => f,
-             :continue_editing => false,
-             :delete_title => t('delete', :scope => 'refinery.<%= plural_name %>.admin.<%= plural_name %>.<%= singular_name %>'),
-             :delete_confirmation => t('message', :scope => 'refinery.admin.delete'<% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>, :title => @<%= singular_name %>.<%= title.name %><% end %>) -%>
+  <%%= render '/refinery/admin/form_actions', f: f,
+             continue_editing: false,
+             delete_title: t('delete', scope: 'refinery.<%= plural_name %>.admin.<%= plural_name %>.<%= singular_name %>'),
+             delete_confirmation: t('message', scope: 'refinery.admin.delete'<% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>, title: @<%= singular_name %>.<%= title.name %><% end %>),
+             cancel_url: refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path -%>
 <%% end -%>
 <% if text_areas.any? -%>
 

data/lib/generators/refinery/engine/templates/spec/features/refinery/namespace/admin/plural_name_spec.rb.erb

@@ -9,8 +9,8 @@ describe Refinery do
 <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
         describe "<%= plural_name %> list" do
           before do
-            FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne")
-            FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleTwo")
+            FactoryBot.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne")
+            FactoryBot.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleTwo")
           end
 
           it "shows two items" do
@@ -45,7 +45,7 @@ describe Refinery do
           end
 
           context "duplicate" do
-            before { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitle") }
+            before { FactoryBot.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitle") }
 
             it "should fail" do
               visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
@@ -161,7 +161,7 @@ describe Refinery do
         end
 
         describe "edit" do
-          before { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "A <%= title.name %>") }
+          before { FactoryBot.create(:<%= singular_name %>, :<%= title.name %> => "A <%= title.name %>") }
 
           it "should succeed" do
             visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
@@ -179,7 +179,7 @@ describe Refinery do
         end
 
         describe "destroy" do
-          before { FactoryGirl.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne") }
+          before { FactoryBot.create(:<%= singular_name %>, :<%= title.name %> => "UniqueTitleOne") }
 
           it "should succeed" do
             visit refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path

data/lib/generators/refinery/engine/templates/spec/models/refinery/namespace/singular_name_spec.rb.erb

@@ -5,7 +5,7 @@ module Refinery
     describe <%= class_name %> do
       describe "validations", type: :model do
         subject do
-          FactoryGirl.create(:<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? -%>,
+          FactoryBot.create(:<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? -%>,
           :<%= title.name %> => "Refinery CMS"<% end %>)
         end
 

data/lib/generators/refinery/engine/templates/spec/support/factories/refinery/plural_name.rb.erb

@@ -1,5 +1,5 @@
 <% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>
-FactoryGirl.define do
+FactoryBot.define do
   factory :<%= singular_name %>, :class => Refinery::<%= namespacing %>::<%= class_name %> do
     sequence(:<%= title.name %>) { |n| "refinery#{n}" }
   end

data/lib/refinery/core/configuration.rb

@@ -2,33 +2,23 @@ module Refinery
   module Core
     include ActiveSupport::Configurable
 
-    config_accessor :rescue_not_found, :s3_backend, :base_cache_key, :site_name,
+    config_accessor :rescue_not_found, :base_cache_key, :site_name,
                     :google_analytics_page_code, :authenticity_token_on_frontend,
-                    :dragonfly_secret, :javascripts, :stylesheets, :mounted_path,
-                    :s3_bucket_name, :s3_region, :s3_access_key_id,
-                    :s3_secret_access_key, :force_ssl, :backend_route,
-                    :dragonfly_custom_backend_class, :dragonfly_custom_backend_opts,
+                    :javascripts, :stylesheets, :mounted_path,
+                    :force_ssl, :backend_route,
                     :visual_editor_javascripts, :visual_editor_stylesheets,
                     :plugin_priority, :refinery_logout_path
 
     self.rescue_not_found = false
-    self.s3_backend = false
     self.base_cache_key = :refinery
     self.site_name = "Company Name"
     self.google_analytics_page_code = "UA-xxxxxx-x"
     self.authenticity_token_on_frontend = false
-    self.dragonfly_secret = Array.new(24) { rand(256) }.pack('C*').unpack('H*').first
     self.javascripts = []
     self.stylesheets = []
-    self.s3_bucket_name = ENV['S3_BUCKET']
-    self.s3_region = ENV['S3_REGION']
-    self.s3_access_key_id = ENV['S3_KEY']
-    self.s3_secret_access_key = ENV['S3_SECRET']
     self.force_ssl = false
     self.backend_route = "refinery"
     self.mounted_path = "/"
-    self.dragonfly_custom_backend_class = ''
-    self.dragonfly_custom_backend_opts = {}
     self.visual_editor_javascripts = []
     self.visual_editor_stylesheets = []
     self.plugin_priority = []
@@ -68,12 +58,8 @@ module Refinery
         self.stylesheets = []
       end
 
-      def dragonfly_custom_backend?
-        config.dragonfly_custom_backend_class.present?
-      end
-
       def dragonfly_custom_backend_class
-        config.dragonfly_custom_backend_class.constantize if dragonfly_custom_backend?
+        raise "Refinery::Dragonfly now handles all dragonfly configuration. Consult 'config/initializers/refinery/dragonfly.rb'."
       end
 
       def site_name

data/lib/refinery/crud.rb

@@ -26,7 +26,7 @@ module Refinery
       {
         :conditions => '',
         :include => [],
-        :order => ('position ASC' if this_class.table_exists? && this_class.column_names.include?('position')),
+        :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)}",
@@ -67,7 +67,8 @@ module Refinery
           end
 
           def create
-            if (@#{singular_name} = #{class_name}.create(#{singular_name}_params)).valid?
+            @#{singular_name} = #{class_name}.new(#{singular_name}_params)
+            if @#{singular_name}.save
               flash.notice = t(
                 'refinery.crudify.created',
                 :what => "'\#{@#{singular_name}.#{options[:title_attribute]}}'"

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 4
     @minor = 0
-    @tiny  = 1
+    @tiny  = 2
     @build = nil
 
     class << self

data/refinerycms-core.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   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{http://refinerycms.com}
+  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}

data/spec/features/refinery/admin/xhr_paging_spec.rb

@@ -8,8 +8,8 @@ module Refinery
       # 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) { FactoryGirl.create :image }
-      let!(:image_2) { FactoryGirl.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)

data/spec/features/refinery/application_layout_spec.rb

@@ -5,7 +5,7 @@ module Refinery
     refinery_login
 
     let(:home_page) do
-      FactoryGirl.create :page, :title => 'Home', :link_url => '/'
+      FactoryBot.create :page, :title => 'Home', :link_url => '/'
     end
 
     describe 'body' do

data/spec/features/refinery/site_bar_spec.rb

@@ -47,7 +47,7 @@ module Refinery
 
     context "when in frontend" do
       # make a page in order to avoid 404
-      let!(:root_page) { FactoryGirl.create(:page, :link_url => "/") }
+      let!(:root_page) { FactoryBot.create(:page, :link_url => "/") }
       before { visit refinery.root_path }
 
       it "has a 'switch to your website editor' button" do

data/spec/helpers/refinery/translation_helper_spec.rb

@@ -11,7 +11,7 @@ module Refinery
     end
 
     describe "#translated_field" do
-      let(:page) { FactoryGirl.build(:page) }
+      let(:page) { FactoryBot.build(:page) }
 
       before do
         Globalize.with_locale(:en) do
@@ -40,4 +40,4 @@ module Refinery
     end
 
   end
-end
+end

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

@@ -1,18 +1,22 @@
 require 'spec_helper'
+require 'fileutils'
 require 'generator_spec/test_case'
 require 'generators/refinery/engine/engine_generator'
-require 'tmpdir'
 
 module Refinery
   describe EngineGenerator do
     include GeneratorSpec::TestCase
-    destination Dir.mktmpdir
+    destination File.expand_path("../../../../../../tmp", __FILE__)
 
     before do
       prepare_destination
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource }
     end
 
+    after do
+      FileUtils.rm_r destination_root
+    end
+
     context "when generating a resource without passing a namespace" do
       before do
         run_generator %w{ rspec_item_test title:string --extension rspec_product_tests --skip }

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fileutils'
 require 'generator_spec/test_case'
 require 'generators/refinery/engine/engine_generator'
 
@@ -12,6 +13,10 @@ module Refinery
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource }
     end
 
+    after do
+      FileUtils.rm_r destination_root
+    end
+
     it "uses reference columns for image and resource attributes" do
       File.open("#{destination_root}/vendor/extensions/rspec_product_tests/app/controllers/refinery/rspec_product_tests/admin/rspec_product_tests_controller.rb") do |file|
         content = file.read

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fileutils'
 require 'generator_spec/test_case'
 require 'generators/refinery/engine/engine_generator'
 
@@ -12,6 +13,10 @@ module Refinery
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource --authors Author1 Author2 }
     end
 
+    after do
+      FileUtils.rm_r destination_root
+    end
+
     it "uses reference columns for image and resource attributes" do
       File.open("#{destination_root}/vendor/extensions/rspec_product_tests/refinerycms-rspec_product_tests.gemspec") do |file|
         content = file.read

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fileutils'
 require 'generator_spec/test_case'
 require 'generators/refinery/engine/engine_generator'
 
@@ -12,6 +13,10 @@ module Refinery
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource --i18n title description }
     end
 
+    after do
+      FileUtils.rm_r destination_root
+    end
+
     specify do
       expect(destination_root).to have_structure {
         directory "vendor" do

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'fileutils'
 require 'generator_spec/test_case'
 require 'generators/refinery/engine/engine_generator'
 
@@ -12,6 +13,10 @@ module Refinery
       run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource --skip-frontend }
     end
 
+    after do
+      FileUtils.rm_r destination_root
+    end
+
     specify do
       expect(destination_root).to have_structure {
         directory "vendor" do

data/spec/lib/refinery/core/configuration_spec.rb

@@ -33,22 +33,6 @@ module Refinery
         end
       end
 
-      describe 'custom storage backend' do
-        it 'class should be nil by default' do
-          expect(Refinery::Core.dragonfly_custom_backend_class).to eq(nil)
-        end
-
-        context 'is set in core' do
-          before { class DummyBackend; end }
-          after { Refinery::Core.dragonfly_custom_backend_class = nil }
-          let(:backend) { DummyBackend.new }
-
-          it 'and is set to a class that exists' do
-            Refinery::Core.dragonfly_custom_backend_class = 'Refinery::Core::DummyBackend'
-            expect(Refinery::Core.dragonfly_custom_backend_class).to eq(backend.class)
-          end
-        end
-      end
     end
   end
 end

data/spec/presenters/refinery/translated_field_presenter_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 module Refinery
   describe TranslatedFieldPresenter do
-    let(:page) { FactoryGirl.build(:page) }
+    let(:page) { FactoryBot.build(:page) }
 
     before do
       Globalize.with_locale(:en) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Philip Arndt
@@ -32,7 +32,7 @@ cert_chain:
   jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
   5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
   -----END CERTIFICATE-----
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-i18n
@@ -670,7 +670,7 @@ files:
 - vendor/assets/javascripts/jquery/jquery.textTruncate.js
 - vendor/assets/javascripts/jquery/jquery.timers.js
 - vendor/assets/javascripts/modernizr-min.js
-homepage: http://refinerycms.com
+homepage: https://www.refinerycms.com
 licenses:
 - MIT
 metadata: {}