refinerycms-core 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54905bf441f5cec6679998d3159184707e4c0717
-  data.tar.gz: 206ca811bae7f8a983a61221ef7b8a05cb1997ec
+  metadata.gz: b66220b4f74303327aea521ea84d4f55d04f2ed0
+  data.tar.gz: e8973e66118a66affbd539d3c977d5f8fde7dd06
 SHA512:
-  metadata.gz: aa6b2fc6616687a2fdb4f2b38f532ed4977cc320c8f49886389e75f01e7faf65d473f4f17d7cbe5c8761bc141b86d9d57fe7a23293c755d1b1b5f806929607cf
-  data.tar.gz: ec0266f41d3096bc88da963561891dfa8060854b4804ff4080dacf71b31e55cdc19e903d972118a9222aefa67e7b525819338f6d2a8dbf4c6c5e1510cbbb0644
+  metadata.gz: 4dad9797f9c4657a32d88d53f24d7e8a572725052de48f74696040fb1025e1b563b880d0388fba44412f5527729d106a00416a6d253db59c5e887b88e6961c26
+  data.tar.gz: b67575d0d484ecdf99edba59dca4f87be0fda8e94dd198b409b8772c6d4f7a2a54753dcd35ae0bae3de255f4aa53c5210b61cb82c37e59681824273e4fafe048

data/app/assets/config/refinery_core_manifest.js

@@ -0,0 +1,14 @@
+//= link_tree ../images
+
+//= link refinery/refinery.js
+//= link refinery/sortable_list.js
+//= link refinery/nestedsortables.js
+//= link refinery/serializelist.js
+//= link refinery/tree.js
+//= link admin.js
+//= link modernizr-min.js
+
+//= link refinery/refinery.css
+//= link refinery/formatting.css
+//= link refinery/site_bar.css
+//= link refinery/theme.css

data/app/assets/javascripts/refinery/admin.js.erb

@@ -167,7 +167,9 @@ trigger_reordering_content_section = function(e, enable) {
 };
 
 submit_and_continue = function(e, redirect_to) {
-  visual_editor_update();
+  if( typeof(visual_editor_update) == "function" ) {
+    visual_editor_update();
+  }
 
   $('#continue_editing').val(true);
   $('#flash').hide();
@@ -631,7 +633,10 @@ var page_options = {
 
               page_options.tabs.tabs("option", "active", -1);
 
-              visual_editor_init();
+              if( typeof(visual_editor_init) == "function" ) {
+                visual_editor_init();
+              }
+              
 
               // Wipe the title and increment the index counter by one.
               $('#new_page_part_index').val(parseInt($('#new_page_part_index').val(), 10) + 1);

data/app/assets/stylesheets/refinery/components/_dialog.scss

@@ -101,7 +101,7 @@ body.dialog #content .search_form {
   color: #000;
   border: 4px solid #22A7F2;
   width: auto;
-  z-index: 1;
+  z-index: 3;
   #dialog_loading {
     position: fixed;
     top: 50%;

data/app/assets/stylesheets/refinery/sections/_layout.scss

@@ -1037,30 +1037,38 @@ a img {
   border: 0px none;
 }
 
+
 /* page parts */
+
+ul#page_parts, 
+ul#page_parts_controls {
+  margin: 0;
+  padding: 0;
+}
+
 ul#page_parts {
   float: left;
   width: 92%;
+  z-index: 1;
 }
-ul#page_parts, ul#page_parts_controls {
-  margin: 0;
-  padding: 0;
-}
+
 ul#page_parts_controls {
   float: right;
   margin: 20px 3px 0 0;
+  z-index: 2;
+
+  li {
+    list-style: none;
+    float: right;
+    margin: 0 3px;
+
+    a {
+      border: 0px none;
+    }
+  }
 }
-ul#page_parts_controls li {
-  list-style: none;
-  float: right;
-  margin: 0 3px;
-}
-ul#page_parts_controls li a {
-  border: 0px none;
-}
-ul#page_parts_controls img {
-  vertical-align: middle;
-}
+
+
 #page-tabs.ui-sortable.reordering {
   li {
     cursor: move;

data/app/controllers/refinery/admin/dialogs_controller.rb

@@ -36,7 +36,7 @@ module ::Refinery
       end
 
       def url_params
-        params.reject { |key, value| /(action)|(controller)/ === key}.
+        params.to_unsafe_h.reject { |key, value| /(action)|(controller)/ === key}.
                merge :id => nil
       end
 

data/app/helpers/refinery/tag_helper.rb

@@ -13,7 +13,8 @@ module Refinery
     # They are all 16x16 so this is the default but is able to be overriden with supplied options.
     def refinery_icon_tag(filename, options = {})
       filename = "#{filename}.png" unless filename.split('.').many?
-      image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge(options)
+      path = image_path "refinery/icons/#{filename}", skip_pipeline: true
+      image_tag path, {:width => 16, :height => 16}.merge(options)
     end
 
     def action_icon(action, url, title, options={})

data/app/views/layouts/application.html.erb

@@ -8,13 +8,13 @@
   <body id="<%= canonical_id @page %>" class="<%= view_template_class @page %>">
     <%= site_bar -%>
     <div id="page_container">
-      <header id="header">
+      <header id="header" role="banner">
         <%= render "/refinery/header" -%>
       </header>
-      <section id="page">
+      <main id="page" role="main">
         <%= yield %>
-      </section>
-      <footer>
+      </main>
+      <footer role="contentinfo">
         <%= render "/refinery/footer" -%>
       </footer>
     </div>

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

@@ -1,4 +1,13 @@
-<h1 id='logo'>
-  <%= link_to Refinery::Core.site_name, refinery.root_path %>
-</h1>
-<%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %>
+<%= content_tag :div, id: "logo", itemscope: "",  itemtype: "http://schema.org/Organization" do %>
+  <%= link_to refinery.root_path, itemprop: "url" do %>
+    <%= Refinery::Core.site_name %>
+  <% end %>
+<% end %>
+
+<% cache [I18n.locale, 'main_menu', @page, Refinery::Page.fast_menu.map(&:updated_at).max] do %>
+  <%=
+    main_menu = Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self)
+    main_menu.menu_role = 'navigation'
+    main_menu.to_html
+  %>
+<% end %>

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

@@ -6,10 +6,10 @@
   <%= csrf_meta_tags %>
   <%= stylesheet_link_tag 'refinery/refinery' %>
   <% visual_editor_stylesheets.each do |css| %>
-    <%= stylesheet_link_tag css.path, css.options %>
+    <%= stylesheet_link_tag css.path, { skip_pipeline: true }.merge(css.options) %>
   <% end %>
   <% custom_stylesheets.each do |css| %>
-    <%= stylesheet_link_tag css.path, css.options %>
+    <%= stylesheet_link_tag css.path, { skip_pipeline: true }.merge(css.options) %>
   <% end %>
   <%= yield :stylesheets %>
   <%= render 'refinery/admin/javascripts' %>

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

@@ -10,6 +10,6 @@
 <% end %>
 <%= yield :after_javascript_libraries -%>
 <% custom_javascripts.each do |js| %>
-  <%= javascript_include_tag js %>
+  <%= javascript_include_tag js, skip_pipeline: true %>
 <% end %>
 <%= yield :javascripts %>

data/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile << 'refinery_core_manifest.js'

data/config/locales/en.yml

@@ -16,6 +16,7 @@ en:
       created: '%{what} was successfully added.'
       updated: '%{what} was successfully updated.'
       destroyed: '%{what} was successfully removed.'
+      not_destroyed: '%{what} was not removed.'
     site_bar:
       log_out: Log out
       switch_to_your_website: Switch to your website

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

@@ -14,7 +14,7 @@ module Refinery
     end
 
     PASSTHROUGH_OPTIONS = [
-      :skip_active_record, :skip_javascript, :database, :javascript, :quiet, :pretend, :force, :skip
+      :skip_active_record, :skip_javascript, :skip_action_cable, :skip_action_mailer, :database, :javascript, :quiet, :pretend, :force, :skip
     ]
 
     def generate_test_dummy
@@ -22,6 +22,8 @@ module Refinery
       opts[:database] = 'sqlite3' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
+      opts[:skip_action_cable] = true
+      opts[:skip_action_mailer] = true
 
       invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
     end

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

@@ -36,10 +36,12 @@ module Refinery
       'rails generate refinery:engine'
     end
 
-    def reject_file_with_skip_frontend?(file)
-      (skip_frontend? && (file.to_s.include?('app') && file.to_s.scan(/admin|models|mailers/).empty?)) ||
-        reject_file_without_skip_frontend?(file)
+    def reject_file?(file)
+      (skip_frontend? && in_frontend_directory?(file)) || super
+    end
+
+    def in_frontend_directory?(file)
+      file.to_s.include?('app') && file.to_s.scan(/admin|models|mailers/).empty?
     end
-    alias_method_chain :reject_file?, :skip_frontend
   end
 end

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

@@ -1,4 +1,4 @@
-class Create<%= namespacing %><%= class_name.pluralize %> < ActiveRecord::Migration
+class Create<%= namespacing %><%= class_name.pluralize %> < ActiveRecord::Migration[<%= "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}" %>]
 
   def up
     create_table :refinery_<%= "#{namespacing.underscore}_" if table_name != namespacing.underscore.pluralize -%><%= table_name %> do |t|

data/lib/refinery.rb

@@ -3,6 +3,7 @@ require 'active_record'
 require 'action_controller'
 require 'rbconfig'
 require 'font-awesome-sass'
+require 'jquery-rails'
 
 module Refinery
   require 'refinery/errors'

data/lib/refinery/core/engine.rb

@@ -63,7 +63,7 @@ module Refinery
         end
       end
 
-      initializer "refinery.routes", :after => :set_routes_reloader_hook do |app|
+      initializer "refinery.routes" do |app|
         Refinery::Core::Engine.routes.append do
           get "#{Refinery::Core.backend_route}/*path" => 'admin#error_404'
         end
@@ -77,41 +77,6 @@ module Refinery
         ].flatten
       end
 
-      # set assets to be precompiled
-      config.to_prepare do
-
-        # scripts
-        Rails.application.config.assets.precompile += %w(
-          refinery/*.js
-          refinery/icons/*
-          modernizr-min.js
-          admin.js
-        )
-
-        # stylesheets
-        Rails.application.config.assets.precompile += %w(
-          refinery/refinery.css
-          refinery/formatting.css
-          refinery/site_bar.css
-          refinery/theme.css
-        )
-
-        # images
-        Rails.application.config.assets.precompile += %w(
-          refinery/images/*
-          refinery/refinery-cms-logo.svg
-        )
-
-        # fonts
-        Rails.application.config.assets.precompile += %w(
-          font-awesome/fontawesome-webfont.eot
-          font-awesome/fontawesome-webfont.woff2
-          font-awesome/fontawesome-webfont.woff
-          font-awesome/fontawesome-webfont.ttf
-          font-awesome/fontawesome-webfont.svg
-        )
-      end
-
       # active model fields which may contain sensitive data to filter
       initializer "refinery.params.filter" do |app|
         app.config.filter_parameters += [:password, :password_confirmation]

data/lib/refinery/crud.rb

@@ -49,7 +49,6 @@ module Refinery
 
       def crudify(model_name, options = {})
         options = ::Refinery::Crud.default_options(model_name).merge(options)
-        Refinery.deprecate :xhr_paging, when: '3.1' if options[:xhr_paging]
         class_name = options[:class_name]
         singular_name = options[:singular_name]
         plural_name = options[:plural_name]
@@ -166,8 +165,8 @@ module Refinery
           # then render only the collection of items.
           def render_partial_response?
             if request.xhr?
-              render :text => render_to_string(:partial => '#{plural_name}', :layout => false).html_safe,
-                     :layout => 'refinery/flash' and return false
+              render plain: render_to_string(partial: '#{plural_name}', layout: false).html_safe,
+                     layout: 'refinery/flash' and return false
             end
           end
 
@@ -283,7 +282,7 @@ module Refinery
             # Based upon https://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
             def update_positions
               previous = nil
-              params[:ul].each do |_, list|
+              params.to_unsafe_h[:ul].each do |_, list|
                 list.each do |index, hash|
                   moved_item_id = hash['id'][/\\d+\\z/]
                   @current_#{singular_name} = #{class_name}.find_by_id(moved_item_id)
@@ -329,7 +328,7 @@ module Refinery
             end
 
             def after_update_positions
-              render :nothing => true
+              head :ok
             end
 
             protected :after_update_positions

data/lib/refinery/plugin.rb

@@ -29,15 +29,6 @@ module Refinery
       ::I18n.translate(['refinery', 'plugins', name, 'description'].join('.'))
     end
 
-    # Stores information that can be used to retrieve the latest activities of this plugin
-    def activity=(_)
-      Refinery.deprecate('Refinery::Plugin#activity=', when: '3.1')
-    end
-
-    def dashboard=(_)
-      Refinery.deprecate('Refinery::Plugin#dashboard=', when: '3.1')
-    end
-
     # Used to highlight the current tab in the admin interface
     def highlighted?(params)
       !!(params[:controller].try(:gsub, "admin/", "") =~ menu_match)

data/lib/refinery/version.rb

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

data/refinerycms-core.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../../core/lib/refinery/version', __FILE__)
 
 version = Refinery::Version.to_s
-rails_version = ['>= 4.2.3', '< 5.0']
+rails_version = ['>= 5.1.0', '< 5.2']
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
@@ -22,20 +22,20 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
 
-  s.add_dependency 'refinerycms-i18n',            '~> 3.0.0'
-  s.add_dependency 'awesome_nested_set',          '~> 3.0.0'
+  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.0.2'
+  s.add_dependency 'will_paginate',               '~> 3.1', '>= 3.1.0'
   s.add_dependency 'sass-rails',                  '>= 4.0', '< 5.1'
   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',                '>= 2.3.0'
-  s.add_dependency 'jquery-ui-rails',             '~> 5.0.0'
-  s.add_dependency 'decorators',                  '~> 2.0.0'
-  s.add_dependency 'zilch-authorisation'
+  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 '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__)

data/spec/controllers/refinery/admin/dummy_controller_spec.rb

@@ -4,7 +4,7 @@ module Refinery
   module Admin
     class DummyController < Refinery::AdminController
       def index
-        render :nothing => true
+        head :ok
       end
     end
   end

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

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 module Refinery
-  describe "dialog", :type => :feature do
+  describe "dialog", type: :feature do
     refinery_login
 
     context "links" do

data/spec/lib/refinery/application_controller_spec.rb

@@ -17,7 +17,7 @@ module Refinery
       include ::Refinery::ApplicationController
 
       def index
-        render :nothing => true
+        head :ok
       end
     end
 

data/spec/lib/refinery/crud_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 ActiveRecord::Schema.define do
-  create_table :refinery_crud_dummies, :force => true do |t|
+  create_table :refinery_crud_dummies, force: true do |t|
     t.integer :parent_id
     t.integer :lft
     t.integer :rgt
@@ -20,7 +20,7 @@ module Refinery
 end
 
 module Refinery
-  describe CrudDummyController, :type => :controller do
+  describe CrudDummyController, type: :controller do
     before do
       @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
         r.draw do
@@ -40,12 +40,12 @@ module Refinery
         let!(:crud_dummy_three) { Refinery::CrudDummy.create! }
 
         it "orders dummies" do
-          post :update_positions, {
-            "ul" => {
-              "0" => {
-                "0" => {"id" => "crud_dummy_#{crud_dummy_three.id}"},
-                "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
-                "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+          post :update_positions, params: {
+            "ul": {
+              "0": {
+                "0": {"id": "crud_dummy_#{crud_dummy_three.id}"},
+                "1": {"id": "crud_dummy_#{crud_dummy_two.id}"},
+                "2": {"id": "crud_dummy_#{crud_dummy_one.id}"}
               }
             }
           }
@@ -64,23 +64,23 @@ module Refinery
         end
 
         it "orders nested dummies" do
-          nested_crud_dummy_one = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
-          nested_crud_dummy_two = Refinery::CrudDummy.create! :parent_id => crud_dummy_one.id
-
-          post :update_positions, {
-            "ul" => {
-              "0" => {
-                "0" => {
-                  "id" => "crud_dummy_#{crud_dummy_three.id}",
-                  "children" => {
-                    "0" => {
-                      "0" => {"id" => "crud_dummy_#{nested_crud_dummy_one.id}"},
-                      "1" => {"id" => "crud_dummy_#{nested_crud_dummy_two.id}"}
+          nested_crud_dummy_one = Refinery::CrudDummy.create! parent_id: crud_dummy_one.id
+          nested_crud_dummy_two = Refinery::CrudDummy.create! parent_id: crud_dummy_one.id
+
+          post :update_positions, params: {
+            "ul": {
+              "0": {
+                "0": {
+                  "id": "crud_dummy_#{crud_dummy_three.id}",
+                  "children": {
+                    "0": {
+                      "0": {"id": "crud_dummy_#{nested_crud_dummy_one.id}"},
+                      "1": {"id": "crud_dummy_#{nested_crud_dummy_two.id}"}
                     }
                   }
                 },
-                "1" => {"id" => "crud_dummy_#{crud_dummy_two.id}"},
-                "2" => {"id" => "crud_dummy_#{crud_dummy_one.id}"}
+                "1": {"id": "crud_dummy_#{crud_dummy_two.id}"},
+                "2": {"id": "crud_dummy_#{crud_dummy_one.id}"}
               }
             }
           }
@@ -117,12 +117,12 @@ module Refinery
         # sorted above #2 if we are sorting by strings.
         11.times do |n|
           dummy << Refinery::CrudDummy.create!
-          dummy_params[n.to_s] = {"id" => "crud_dummy_#{dummy[n].id}"}
+          dummy_params[n.to_s] = {"id": "crud_dummy_#{dummy[n].id}"}
         end
 
-        post :update_positions, { "ul" => { "0" => dummy_params } }
+        post :update_positions, params: { "ul": { "0": dummy_params } }
 
-        expect(dummy.last.reload.lft).to eq(21)
+        expect(dummy.last.reload.lft).to eq(5)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -32,7 +32,7 @@ cert_chain:
   jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
   5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
   -----END CERTIFICATE-----
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-i18n
@@ -40,19 +40,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
@@ -60,6 +69,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -68,60 +80,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +154,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -214,21 +232,30 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
@@ -236,6 +263,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
@@ -243,6 +273,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
@@ -250,22 +283,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: zilch-authorisation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 description: The core of Refinery CMS. This handles the common functionality and is
   required by most extensions
 email: refinerycms@p.arndt.io
@@ -273,6 +315,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/config/refinery_core_manifest.js
 - app/assets/images/favicon.ico
 - app/assets/images/refinery/add.png
 - app/assets/images/refinery/admin_bg.png
@@ -400,7 +443,6 @@ files:
 - app/helpers/refinery/custom_assets_helper.rb
 - app/helpers/refinery/html_truncation_helper.rb
 - app/helpers/refinery/image_helper.rb
-- app/helpers/refinery/menu_helper.rb
 - app/helpers/refinery/meta_helper.rb
 - app/helpers/refinery/pagination_helper.rb
 - app/helpers/refinery/site_bar_helper.rb
@@ -446,6 +488,7 @@ files:
 - app/views/refinery/admin/dialog_success.html.erb
 - app/views/refinery/admin/dialogs/show.html.erb
 - app/views/refinery/sitemap/index.xml.builder
+- config/initializers/assets.rb
 - config/initializers/will_paginate_monkeypatch.rb
 - config/locales/ar.yml
 - config/locales/bg.yml
@@ -637,7 +680,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/helpers/refinery/menu_helper.rb

@@ -1,17 +0,0 @@
-module Refinery
-  module MenuHelper
-
-    # Adds conditional caching
-    def cache_if(condition, name = {}, &block)
-      if condition
-        cache(name, &block)
-      else
-        yield
-      end
-
-      # for <%= style helpers vs <% style
-      nil
-    end
-
-  end
-end