imagine_cms 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a7593edf968b6e0d372fc908c82db4c7e604fb
-  data.tar.gz: c18d992a9ec86684edcf29f5ac8b63299d4b035b
+  metadata.gz: d5f39688f4ce0db4088dcb9a9fd335d8559cc8b2
+  data.tar.gz: f17c64bc6b869b8bb6ebd43f0ccb8f4a40ea8569
 SHA512:
-  metadata.gz: 2ddd8575abab07976f71573ae4fbd943657c3684bcd9ee3e13e7ffc0568f9855f03bb9ebbe430414e366d46b21dafcb55d721868f5713bb4f0edc542e5351e50
-  data.tar.gz: 48adb3ff7855eb1600bd22f3ba702b0effab15fc915e1e8ac3a9c1645fbfdfa25e643839a22b1104a1a16770a33b440436184652fe03cd15a620dea725aa8895
+  metadata.gz: 1c346d09b43132531d39927c97f3747099980b5fb662900897ea0252975e2380192818aef42705f24be8579ec5dfb85d87c4c18249ce477f726143a6151bf990
+  data.tar.gz: 3b5953c978eb5b1de34ef12e8ab469689791571d38ecfd89c246b610762f883c5f6ae4ee677ec0ae24c5a0f86b7f1083a995a51a0c96ddf229b1bca2053adf3e

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.2.4

data/app/assets/javascripts/imagine_cms/core.js

@@ -296,8 +296,8 @@ function changeGalleryImage(galleryName, index) {
         $(galleryName + '_caption').style.display = 'none';
     }
 
-    prevIndex = index == 0 ? gallerySize[galleryName] - 1 : index-1;
-    nextIndex = index == gallerySize[galleryName] - 1 ? 0 : index+1;
+    var prevIndex = index == 0 ? gallerySize[galleryName] - 1 : index-1;
+    var nextIndex = index == gallerySize[galleryName] - 1 ? 0 : index+1;
     $(galleryName + '_prev_button').onclick = function () { changeGalleryImage(galleryName, prevIndex) };
     $(galleryName + '_next_button').onclick = function () { changeGalleryImage(galleryName, nextIndex) };
 }

data/app/controllers/cms/content_controller.rb

@@ -93,7 +93,7 @@ module Cms # :nodoc:
             else
               flash[:notice] = "Please log in now in order to switch to Preview Mode on the page you were just viewing."
               session[:saved_user_uri] = '/' + db_path.join('/')
-              redirect_to :controller => '/management/user', :action => 'login' and return true
+              redirect_to controller: '/management/user', action: 'login' and return true
             end
           end
         end
@@ -151,7 +151,7 @@ module Cms # :nodoc:
         
         if @pg = CmsPage.includes(:template).find_by_path(db_path.join('/'))
           if edit_mode
-            redirect_to :controller => '/management/cms', :action => 'edit_page_content', :id => @pg and return true
+            redirect_to controller: '/management/cms', action: 'edit_page_content', id: @pg and return true
           else
             # return if page is offline and viewer is not an admin
             if @pg.published_version < 0
@@ -191,11 +191,11 @@ module Cms # :nodoc:
             if @page_list_segment
               name = params[:page_list_name]
               key = "obj-page_list-#{name.gsub(/[^\w]/, '_')}"
-              render :inline => render_page_list_segment(name, @page_list_pages[key]) and return true
+              render inline: render_page_list_segment(name, @page_list_pages[key]) and return true
             end
             # end of page list segment code
             
-            render :inline => template_content
+            render inline: template_content
             
             if UseCmsPageCaching && @allow_caching && perform_caching && request.format == Mime::HTML
               cache_page
@@ -250,27 +250,30 @@ module Cms # :nodoc:
       end
       @pages = @pages.first(100)
       
+      logger.debug "Search returned #{@pages.size} matching pages for terms #{@terms}"
+      
       @pg = CmsPage.new
       @pg.template = CmsTemplate.find_by_name('Search') || CmsTemplate.new
       @page_title = 'Search Results'
       
       load_page_objects or return
-      @page_objects['obj-text-search_results'] = render_to_string(:partial => 'search')
       
-      render :inline => render_cms_page_to_string(@pg)
+      @page_objects['obj-text-search_results'] = render_to_string(partial: 'search')
+      
+      render inline: render_cms_page_to_string(@pg)
     end
     
     def rss_feed
       min_time = Time.rfc2822(request.env["HTTP_IF_MODIFIED_SINCE"]) rescue nil
       if min_time && (Time.now - min_time) < 5.minutes
-        render :text => '', :status => '304 Not Modified' and return
+        render text: '', status: '304 Not Modified' and return
       end
       
       @@cms_page_table_exists ||= CmsPage.table_exists?
       return not_found unless @@cms_page_table_exists
       
       @pg = CmsPage.find_by_id(params[:page_id])
-      render :nothing => true and return unless @pg && params[:page_list_name]
+      render nothing: true and return unless @pg && params[:page_list_name]
       key = "obj-page_list-#{params[:page_list_name].gsub(/[^\w]/, '_')}"
       
       load_page_objects or return false
@@ -287,7 +290,7 @@ module Cms # :nodoc:
         
         if min_time && @most_recent_pub_date.published_date && @most_recent_pub_date.published_date <= min_time
           # use cached version
-          render :text => '', :status => '304 Not Modified' and return
+          render text: '', status: '304 Not Modified' and return
         end
         
         @pages.each_with_index do |page, index|

data/app/controllers/management/cms_controller.rb

@@ -1463,8 +1463,9 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       end
       
       # set a few defaults
-      ret[:slide_duration] ||= 0
-      ret[:show_thumbs] ||= true
+      ret['slide_duration'] ||= 0
+      ret['autoplay'] ||= true
+      ret['show_thumbs'] ||= true
       
       return HashObject.new(ret)
     end

data/app/helpers/cms_application_helper.rb

@@ -384,10 +384,6 @@ module CmsApplicationHelper
       pages.reject! { |page| page.tags.reject { |t| t.name != tag } == [] }
     end
     
-    if pg && (options[:exclude_current] === true || @page_objects["#{key}-exclude-current"] == 'true')
-      pages.reject! { |page| page == pg }
-    end
-    
     # set some reasonable defaults in case the sort keys are nil
     pages.each { |pg| pg.article_date ||= Time.now; pg.position ||= 0; pg.title ||= '' }
     pri_sort_key = first_non_empty(@page_objects["#{key}-sort-first-field"], options[:primary_sort_key], 'article_date')
@@ -426,12 +422,18 @@ module CmsApplicationHelper
     offset = first_non_empty(@page_objects["#{key}-item-offset"], options[:item_offset], 0).to_i
     @page_objects["#{key}-item-offset"] = offset
     
+    # exclude current page if box is checked (even for single_pages)
+    if pg && (options[:exclude_current] === true || @page_objects["#{key}-exclude-current"] == 'true')
+      pages.reject! { |page| page == pg }
+      single_pages.reject! { |page| page == pg }
+    end
+    
     logger.debug "Page List Offset: #{offset} / #{pages.size} #{pages.map(&:id)}"
     pages = pages[offset, pages.size] || []
     
     # since the user selected these pages individually, they expect them to be included (and prioritized!), no matter what
     # (but make sure they are unique)
-    pages = (single_pages + pages).uniq
+    pages = (single_pages + pages).uniq unless single_pages.empty?
     
     # randomize if requested
     randomize = first_non_empty(@page_objects["#{key}-use-randomization"], options[:use_randomization], 'false').to_s == 'true'

data/app/views/management/cms/_image_details.html.erb

@@ -1,7 +1,7 @@
-<%- img = "content/#{@pg.path}/#{params[:gallery_id]}/#{params[:image]}" -%>
+<%- img = "assets/content/#{@pg.path}/#{params[:gallery_id]}/#{params[:image]}" -%>
 <table>
   <tr valign="top">
-    <td><%= image_tag "#{img}?#{File.mtime(File.join(Rails.root, 'public', 'assets', img)).to_i}" %></td>
+    <td><%= image_tag "/#{img}?#{File.mtime(File.join(Rails.root, 'public', img)).to_i}" %></td>
     <td style="padding-left: 10px;">
       <div id="caption_container" style="margin-bottom: 20px;">
         <strong>Caption</strong><br/>

data/app/views/management/cms/gallery_management.html.erb

@@ -57,15 +57,15 @@
       <tr>
         <td width="100">Slideshow Autoplay?</td>
         <td>
-          <%= radio_button :gallery, :autoplay, true, :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_autoplay_true">Yes</label><br/>
-          <%= radio_button :gallery, :autoplay, false, :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_autoplay_false">No</label>
+          <%= radio_button :gallery, :autoplay, 'true', :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_autoplay_true">Yes</label><br/>
+          <%= radio_button :gallery, :autoplay, 'false', :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_autoplay_false">No</label>
         </td>
       </tr>
       <tr>
         <td>Show Thumbnails?</td>
-        <td>
-          <%= radio_button :gallery, :show_thumbs, true, :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_show_thumbs_true">Yes</label><br/>
-          <%= radio_button :gallery, :show_thumbs, false, :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_show_thumbs_false">No</label>
+        <td><%= @gallery.show_thumbs %>
+          <%= radio_button :gallery, :show_thumbs, 'true', :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_show_thumbs_true">Yes</label><br/>
+          <%= radio_button :gallery, :show_thumbs, 'false', :onclick => "$('btn_save_settings').disabled = false;" %> <label for="gallery_show_thumbs_false">No</label>
         </td>
       </tr>
       <tr>

data/lib/imagine_cms/engine.rb

@@ -1,3 +1,35 @@
+require 'safe_yaml'
+
+require 'rails-observers'
+require 'actionpack/action_caching'
+require 'actionpack/page_caching'
+
+require 'prototype-rails'
+require 'prototype_legacy_helper/lib/prototype_legacy_helper'
+
+require 'non-stupid-digest-assets'
+
+require 'upload_progress/lib/multipart_progress'
+require 'upload_progress/lib/progress'
+require 'upload_progress/lib/upload_progress'
+require 'upload_progress/lib/upload_progress_helper'
+
+require 'acts_as_versioned/lib/acts_as_versioned'
+require 'aws-sdk'
+require 'zip'
+require 'rails_rinku'
+require 'acts_as_tree'
+require 'net/dns'
+require 'codemirror-rails'
+require 'RMagick'
+require 'mini_magick'
+
+require 'auto_link_email_addresses'
+require 'extensions/array_extensions'
+require 'hash_object'
+require 'hash_wrapper'
+
+
 module ImagineCms
   
   class Engine < Rails::Engine
@@ -6,12 +38,20 @@ module ImagineCms
     config.app_root = root
     middleware.use ::ActionDispatch::Static, "#{root}/public"
     
-    initializer "imagine_cms.assets.precompile" do |config|
-      Rails.application.config.assets.precompile += %w( dojo/** management.css imagine_controls.css reset.css )
-      Rails.application.config.assets.precompile += ["codemirror*", "codemirror/**/*"]
+    initializer "imagine_cms.assets.precompile" do |app|
+      app.config.assets.precompile += %w( dojo/** management.css imagine_controls.css reset.css cropper/* interface/* management/* )
+      app.config.assets.precompile += ["codemirror*", "codemirror/**/*"]
       # Rails.application.config.load_paths << File.dirname(__FILE__) + "/../app/helpers"
     end
     
+    initializer 'imagine_cms.legacy_support' do |app|
+      ActionController::Base.send :include, PrototypeHelper
+      ActionController::Base.send :helper, PrototypeHelper
+      
+      ActionController::Base.send(:include, UploadProgress)
+      ActionView::Base.send(:include, UploadProgress::UploadProgressHelper)
+    end
+    
     initializer 'imagine_cms.load_helpers' do |app|
       ActionController::Base.send :include, CmsApplicationHelper
     end
@@ -32,69 +72,17 @@ module ImagineCms
       ActionController::Base.send :before_filter, :expire_session_data
     end
     
-    initializer 'imagine_cms.prototype_legacy_helper' do |app|
-      require 'prototype_legacy_helper/lib/prototype_legacy_helper'
-      ActionController::Base.send :include, PrototypeHelper
-      ActionController::Base.send :helper, PrototypeHelper
-    end
-    
-    initializer 'imagine_cms.acts_as_versioned' do |app|
-      require 'acts_as_versioned/lib/acts_as_versioned'
-    end
-    
-    initializer 'imagine_cms.upload_progress' do |app|
-      require 'upload_progress/lib/multipart_progress'
-      require 'upload_progress/lib/progress'
-      require 'upload_progress/lib/upload_progress'
-      require 'upload_progress/lib/upload_progress_helper'
-      ActionController::Base.send(:include, UploadProgress)
-      ActionView::Base.send(:include, UploadProgress::UploadProgressHelper)
-    end
-    
-    initializer 'imagine_cms.auto_link_email_addresses' do |app|
-      require 'auto_link_email_addresses'
-    end
-    
-    initializer 'imagine_cms.array_extensions' do |app|
-      require 'extensions/array_extensions'
-    end
-    
-    initializer 'imagine_cms.hash_classes' do |app|
-      require 'hash_object'
-      require 'hash_wrapper'
-    end
-    
     
     def self.activate
       Dir.glob(File.join(Rails.root, "app/overrides/*.rb")) do |c|
-        Rails.application.config.cache_classes ? require(c) : load(c)
+        require_dependency(c)
       end
       Dir.glob(File.join(Rails.root, "app/**/*_decorator*.rb")) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
+        require_dependency(c)
       end
     end
     
     config.to_prepare &method(:activate).to_proc
-    
-    #
-    # activate gems as needed
-    #
-    require 'rails-observers'
-    require 'actionpack/action_caching'
-    require 'actionpack/page_caching'
-    require 'aws-sdk'
-    require 'zip'
-    require 'rails_rinku'
-    require 'safe_yaml'
-    require 'acts_as_tree'
-    require 'net/dns'
-    require 'codemirror-rails'
-    
-    # on the way out, but still needed for now
-    require 'prototype-rails'
-    require 'RMagick'
-    require 'mini_magick'
-    require 'non-stupid-digest-assets'
   end
   
 end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "4.2.3"
+  VERSION = "4.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -591,7 +591,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: imagine_cms
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Imagine Content Management System for Rails