caboose-cms 0.6.1 → 0.6.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NlNDg1ZjM4NTJkYTdiZmFmYmVjM2M3MWU2ZmQyZTE5NjQyMGNhMQ==
+    ZmU5NjQ5ZTQ3ZTVmZmY4MjAwMDMxMjlkYjljM2RkNmE2YzFhYTMxMQ==
   data.tar.gz: !binary |-
-    ZDZhZjFmZWUwZDE2Mjc0NGU4ZDk3OTMzMDdhY2JjNTczYTg0ZDcyMw==
+    M2E0NmFiYTlmZGZjOTdlZTA4NDA0Nzk2MzVmNjQ5NzA4MmRiOGFmNg==
 SHA512:
   metadata.gz: !binary |-
-    Nzk1MDVhOGU2NTI5YmZlNDI1NWI3MjY5ZTdjMjgxMTcwZWFmOWRlNjcyNTdh
-    NmFiMTVlYzhjMDcyNWYzNzc5NWFkZGExM2I0MzUwYmUzZWY5YjQyMjdmNDMw
-    ODNlMDgyYmNlYjk4NzJiNjI0MmNiZTA1ZjcwZmExZmE1ZWFiMTE=
+    ZDEwYTM2YmQ2NzJkYjc1OGE1NGUxMjFmNzhhNzQxNTlhMjE4YTk3MGQyNDI3
+    MWFlZjNiYjhjNWRiNWQ1Nzk5MjIxODJkYzY2MzUwZmNhMmZjNDliZWFhMzk4
+    OWNiYmQzM2JlZTYxOGE5YWFjZGE3NmRlNzdlNmFiZTU3ZDE1ZjE=
   data.tar.gz: !binary |-
-    NDBiMTQwNmY3NzQ5OTU0NWI1YjlkMWFhY2FhYTE0MDVjNjE5M2YyMzg2YjIz
-    ZWRmYzNmOTE3MWY2YTFhNDVlYTU5MWUzZTY2YzQ1ZDVhNDQwZjI2NDFhODI4
-    ZDQxYTA2YjYzNmY5YTQwOTZhZWM4YmFmZmIwMmU0NmUxOTcwNzQ=
+    ZjBlYzBhNzFhMGMyZmRhMzZiMmM2ZWRjZTZjM2FiNzYzMTlhYzkzNGQ5YjU3
+    NWI5MmM5N2M0MGMyMzE3ZTkzYjQxNWEyZjI1OWFiMDYyMzUzODZkZWI4ZDNl
+    YTJkYTcxMzNmMDM5MWU4ZjZkYTQ0ZTZhZWM5YjJmMGIyMmY3YmI=

data/app/controllers/caboose/logout_controller.rb

@@ -7,7 +7,7 @@ module Caboose
       logout_user
       elo = User.find(User::LOGGED_OUT_USER_ID)        
       login_user(elo)      
-      redirect_to "/"    
+      redirect_to params[:return_url] ? params[:return_url] : "/"    
     end
   end
 end

data/app/controllers/caboose/users_controller.rb

@@ -248,14 +248,42 @@ module Caboose
     def admin_su
       return if !user_is_allowed('users', 'sudo')
       user = User.find(params[:id])
+                                  
+      # See if we're on the default domain               
+      d = Caboose::Domain.where(:domain => request.host_with_port).first      
+            
+      if d.primary == true
+        logout_user
+        login_user(user, false) # Login the new user      
+        redirect_to "/"
+      end
+               
+      # Set a random token for the user
+      user.token = (0...20).map { ('a'..'z').to_a[rand(26)] }.join
+      user.save
+      redirect_to "http://#{d.site.primary_domain.domain}/admin/users/#{params[:id]}/su/#{user.token}"                    
+    end
+    
+    # GET /admin/users/:id/su/:token
+    def admin_su_token
+      return if params[:token].nil?
+      user = User.find(params[:id])
       
-      # Log out the current user
-      cookies.delete(:caboose_user_id)
-      reset_session
-      
-      # Login the new user
-      login_user(user, false)      
-      redirect_to "/"      
+      token = params[:token]      
+      if user.token == params[:token]
+        if logged_in? || logged_in_user.id == User::LOGGED_OUT_USER_ID
+          Caboose.log(logged_in_user.id)          
+          redirect_to "/logout?return_url=/admin/users/#{params[:id]}/su/#{user.token}"
+          return
+        end
+        
+        user.token = nil
+        user.save                                
+        login_user(user)
+        redirect_to '/'
+      else
+        render :json => false     
+      end                    
     end
     
   end

data/app/helpers/caboose/application_helper.rb

@@ -26,6 +26,20 @@ tinyMCE.init({
     def parent_categories
       Caboose::Category.find(1).children.where(:status => 'Active')
     end
+          
+    def gzip_javascript_include_tag(asset)
+      tag = javascript_include_tag asset    
+      tag = tag.gsub(/\.js/i, ".js.gz") if Rails.env.production? && request.accept_encoding =~ /gzip/i
+      #tag = tag.gsub(/\.js/i, ".js.gz") if request.accept_encoding =~ /gzip/i
+      tag.html_safe
+    end
+    
+    def gzip_stylesheet_link_tag(asset)      
+      tag = stylesheet_link_tag asset          
+      tag = tag.gsub(/\.css/i, ".css.gz") if Rails.env.production? && request.accept_encoding =~ /gzip/i
+      #tag = tag.gsub(/\.css/i, ".css.gz") if request.accept_encoding =~ /gzip/i
+      tag.html_safe
+    end
     
   end
 end

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

@@ -1,19 +1,19 @@
 <% if @page && @page.title != 'Access Denied' %>
 <% content_for :js do %>
-<%= javascript_include_tag "caboose/application" %>
-<%= javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
+<%= gzip_javascript_include_tag "caboose/application" %>
+<%= gzip_javascript_include_tag @site.name == 'application' ? 'application' : "#{@site.name}/js/application" %>
 <script>window.loggedIn = <%= logged_in?.to_json %></script>
 <% Caboose::javascripts.each do |js| %><%= javascript_include_tag(js) %><% end %>
-<% @page.linked_resources_map[:js].each do |r| %><%= javascript_include_tag r %><% end %>
+<% @page.linked_resources_map[:js].each do |r| %><%= gzip_javascript_include_tag r %><% end %>
 <% if @site.date_js_updated %><script type='text/javascript' src="<%= raw @site.custom_js_url %>"></script><% end %>
 <% if @page.custom_js && @page.custom_js.strip.length > 0 %><script type='text/javascript'><%= raw @page.custom_js %></script><% end %>
 <%= yield :caboose_js %>
 <% end %>
 <% content_for :css do %>
-<%= stylesheet_link_tag 'caboose/application' %>
-<%= stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
-<% Caboose::stylesheets.each do |css| %><%= stylesheet_link_tag(css) %><% end %>
-<% @page.linked_resources_map[:css].each do |r| %><%= stylesheet_link_tag r %><% end %>
+<%= gzip_stylesheet_link_tag 'caboose/application' %>
+<%= gzip_stylesheet_link_tag @site.name == 'application' ? 'application' : "#{@site.name}/css/application" %>
+<% Caboose::stylesheets.each do |css| %><%= gzip_stylesheet_link_tag(css) %><% end %>
+<% @page.linked_resources_map[:css].each do |r| %><%= gzip_stylesheet_link_tag r %><% end %>
 <% if @site.date_css_updated %><link rel='stylesheet' type='text/css' url="<%= raw @site.custom_css_url %>" /><% end %>
 <% if @page.custom_css && @page.custom_css.strip.length > 0 %><style><%= raw @page.custom_css %></style><% end %>
 <%= yield :caboose_css %>

data/config/routes.rb

@@ -168,6 +168,7 @@ Caboose::Engine.routes.draw do
   get     "/admin/users/new"                 => "users#new"
   get     "/admin/users/import"              => "users#import_form"
   post    "/admin/users/import"              => "users#import"  
+  get     "/admin/users/:id/su/:token"       => "users#admin_su_token"
   get     "/admin/users/:id/su"              => "users#admin_su"
   get     "/admin/users/:id/edit-password"   => "users#edit_password"
   get     "/admin/users/:id"                 => "users#edit"  

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/tasks/caboose.rake

@@ -9,18 +9,16 @@ namespace :caboose do
     end
   end
   
-  desc "Migrate block images to media"
-  task :migrate_block_images_to_media => :environment do
+  desc "Migrate block images and files to media"
+  task :migrate_block_assets_to_media => :environment do
     Caboose::Block.where("image_file_name is not null and media_id is null").reorder(:id).all.each do |b|                
       b.delay.migrate_media
-    end
-  end
-  
-  desc "Migrate block files to media"
-  task :migrate_block_files_to_media => :environment do
+    end  
     Caboose::Block.where("file_file_name is not null and media_id is null").reorder(:id).all.each do |b|
       b.delay.migrate_media
     end
+    Caboose::BlockType.where(:id => 19).update_all('name' => 'image2')    
+    Caboose::Block.where(:block_type_id => 19).update_all('name' => 'image2')
   end
         
   desc "Update expired caches and cache pages that aren't cached"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg