caboose-cms 0.4.64 → 0.4.65

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y0MDJjZDc3ZTM5NTk2ZWUxNDE4MzE3ZGNkNDA2ZmQxNGFlNWY1MQ==
+    Y2RmZGE5OTAwODg2Yzc5MjA1NzU0ZDY0MTQxOWE4Yjk4NDY2M2QyMg==
   data.tar.gz: !binary |-
-    MDA1ZWQ2YTc0YjE1YjlhZGM0Y2MyNWNmMTY0ODA4ZGIwZDA3YTgyZg==
+    Zjc1YjVjYzJkNGM2MTAzNGMzYzQ0ZjM2OTJjZDE1YWVkNWM3YzUyOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmUzNDY2YjVjMmU2YzU5OGYwM2I5MWE0MjdiNjFkNGIzYzcxYjk4ZWQ3M2Fh
-    OTA0NTVkYTk4N2Y1ZTZlMDBlZGNiNTRhOGIyNzU4NzkxNGNmOThjMDgxNTli
-    YWRlYjc3MWU0OTlkZDFjMjNiNTNjMDY3OWQ5ZTViYjZhMWQ3YWQ=
+    NDMyYWY4NTY4NzU2NWMyYTU5NzM5MDBhOWRlZDViODA4NWFkNmRlMzQ1OTU3
+    ZTVmNmZiY2NkNjRjNWQxNWRkYTdhNDUwNTBkNjlkMjY3NTFmNDkxMDQ2NzNl
+    NzM4NWEwYWQ2MjdiNTFjYzc3ZGFlNTBjN2M4YjY5NDliN2Y5OWQ=
   data.tar.gz: !binary |-
-    OWNkNzZkNDBjNWEyYjZjNDZjZWM4Njg0ZjQ0OGZjODYyNzQ4Y2VjNmVkMDBi
-    NWZlOGI5YTdhMDk5NjZjZDkxYmM4YzVjMzg2Y2FmMjQxNjU5ZTE1MTZjNGUy
-    YzRmNDlhYmZkY2FhMTdlN2QwYjNiMmQ4YzAzMDUwZjU4ODA0OTE=
+    NTUxYmUzZjY2N2VlZGEzNjViZDYwODIyZWM0ODZkYzA4YjM2MzM0MWUyMWI0
+    MjFjZDRkMzYwMmI3YzU5OGEzNTYzNjE0YjkzMzFhY2JlNDZlNzA2YTY1OTZj
+    YzkyYTBjNGYxZGU4YmEzMTI2MTFjOGZjMzg2YTE2MWE5NzdmZjA=

data/app/assets/stylesheets/caboose/admin.css

@@ -257,12 +257,14 @@ select.fake option {
   color: #757575;
 }
 
-#content input[type='checkbox'] {
+#content .mb_container input[type='checkbox'] {
   position: absolute;
   top: 4px;
   left: 0;
-  z-index: 19;
-  
+  z-index: 19;  
+}
+
+#content input[type='checkbox'] {
   margin: 0;
   padding: 0;
   width: 20px;

data/app/controllers/caboose/pages_controller.rb

@@ -53,6 +53,16 @@ module Caboose
 
       page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
       if (page.nil? || !page)
+        
+        # Check for a 301 redirect
+        site_id = Site.id_for_domain(request.host_with_port)        
+        new_url = PermanentRedirect.match(site_id, request.fullpath)
+        if new_url
+          Caboose.log("Found a redirect: #{new_url}")
+          redirect_to new_url
+          return
+        end
+        
         respond_to do |format|          
           format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }
         end         

data/app/controllers/caboose/redirects_controller.rb

@@ -0,0 +1,108 @@
+
+module Caboose
+  class RedirectsController < ApplicationController
+    
+    helper :application
+    
+    def before_action
+      @page = Page.page_with_uri(request.host_with_port, '/admin')
+    end    
+    
+    #===========================================================================
+    # Admin actions
+    #===========================================================================
+    
+    # GET /admin/redirects
+    def admin_index
+      return if !user_is_allowed('redirects', 'view')            
+      @domain = Domain.where(:domain => request.host_with_port).first      
+      @redirects = @domain ? PermanentRedirect.where(:site_id => @domain.site_id).reorder(:priority).all : []            
+      render :layout => 'caboose/admin'      
+    end
+
+    # GET /admin/redirects/new
+    def admin_new
+      return unless user_is_allowed('redirects', 'add')            
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/redirects/:id
+    def admin_edit
+      return unless user_is_allowed('redirects', 'edit')
+      @permanent_redirect = PermanentRedirect.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+                
+    # PUT /admin/redirects/priority
+    def admin_update_priority
+      return unless user_is_allowed('redirects', 'edit')      
+      @page = Page.find(params[:id])
+      ids = params[:ids]
+      i = 0
+      ids.each do |prid|
+        pr = PermanentRedirect.find(prid)
+        pr.priority = i
+        pr.save
+        i = i + 1
+      end
+      render :json => true
+    end
+    
+    # POST /admin/redirects
+    def admin_add
+      return unless user_is_allowed('redirects', 'add')
+
+      resp = Caboose::StdClass.new
+
+      pr = PermanentRedirect.new
+      pr.site_id = Site.id_for_domain(request.host_with_port)
+      pr.is_regex = false
+      pr.old_url  = params[:old_url]
+      pr.new_url  = params[:new_url]
+      pr.priority = 0
+
+      if !pr.valid?        
+        resp.error = pr.errors.first[1]
+      else
+        pr.save
+        resp.redirect = "/admin/redirects/#{pr.id}"
+      end
+
+      render :json => resp
+    end
+    
+    # PUT /admin/redirects/:id
+    def admin_update
+      return unless user_is_allowed('redirects', 'edit')
+      
+      resp = StdClass.new
+      pr = PermanentRedirect.find(params[:id])
+      
+      save = true      
+      params.each do |name, value|
+        case name
+          when 'is_regex'  then pr.is_regex = value
+          when 'old_url'   then pr.old_url  = value
+          when 'new_url'   then pr.new_url  = value
+          when 'priority'  then pr.priority = value        
+        end
+      end
+    
+      resp.success = save && pr.save
+      render :json => resp
+    end
+    
+    # DELETE /admin/redirects/:id
+    def admin_delete
+      return unless user_is_allowed('redirects', 'delete')
+      pr = PermanentRedirect.find(params[:id])
+      pr.destroy
+      
+      resp = StdClass.new({
+        'redirect' => '/admin/redirects'
+      })
+      render :json => resp
+    end
+		
+  end
+end

data/app/models/caboose/permanent_redirect.rb

@@ -2,8 +2,25 @@
 class Caboose::PermanentRedirect < ActiveRecord::Base
   self.table_name = "permanent_redirects"
   
-  attr_accessible
+  attr_accessible :id,
+    :site_id,
+    :priority,
+    :is_regex,
+    :old_url,
+    :new_url
   
+  validates :old_url, :presence => { :message => 'The old URL is required.' }
+  validates :new_url, :presence => { :message => 'The new URL is required.' }
+  
+  def self.match(site_id, uri)
+    Caboose::PermanentRedirect.where(:site_id => site_id).reorder(:priority).all.each do |pr|
+      if pr.is_regex
+        return uri.gsub(/#{pr.old_url}/, pr.new_url) if uri =~ /#{pr.old_url}/ 
+      else
+        return pr.new_url if uri == pr.old_url
+      end
+    end
+    return false
+  end                      
   
-
 end

data/app/models/caboose/schema.rb

@@ -173,6 +173,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :page_id , :integer  ],
         [ :action  , :string   ]
       ],
+      Caboose::PermanentRedirect => [
+        [ :site_id  , :integer ],
+        [ :priority , :integer , { :default => 0 }],
+        [ :is_regex , :boolean , { :default => false }],
+        [ :old_url  , :string  ],
+        [ :new_url  , :string  ]
+      ],
       Caboose::Permission => [
         [ :resource , :string ],
         [ :action   , :string ]

data/app/models/caboose/site.rb

@@ -10,4 +10,10 @@ class Caboose::Site < ActiveRecord::Base
     c = Caboose::SmtpConfig.where(:site_id => self.id).first
   end
   
+  def self.id_for_domain(domain)
+    d = Caboose::Domain.where(:domain => domain).first
+    return nil if d.nil?
+    return d.site_id
+  end
+  
 end

data/app/views/caboose/redirects/admin_edit.html.erb

@@ -0,0 +1,59 @@
+<%
+pr = @permanent_redirect
+%>
+<h1>Edit Permanent Redirect</h1>
+
+<p><div id='permanentredirect_<%= pr.id %>_priority' ></div></p>
+<p><div id='permanentredirect_<%= pr.id %>_is_regex' ></div></p>
+<p><div id='permanentredirect_<%= pr.id %>_old_url'  ></div></p>
+<p><div id='permanentredirect_<%= pr.id %>_new_url'  ></div></p>
+
+<div id='message'></div>
+<div id='controls'>
+<input type='button' value='Back'            onclick="window.location='/admin/redirects';" />
+<input type='button' value='Delete Redirect' onclick="delete_redirect(<%= pr.id %>);" />
+</div>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag "caboose/model/all" %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+  new ModelBinder({
+    name: 'PermanentRedirect',
+    id: <%= pr.id %>,
+    update_url: '/admin/redirects/<%= pr.id %>',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'priority'    , nice_name: 'Priority'    , type: 'text'     , value: <%= raw Caboose.json(pr.priority) %>, width: 400 },
+      { name: 'is_regex'    , nice_name: 'Regex'       , type: 'checkbox' , value: <%= pr.is_regex ? 1 : 0           %>, width: 400 },
+      { name: 'old_url'     , nice_name: 'Old URL'     , type: 'text'     , value: <%= raw Caboose.json(pr.old_url)  %>, width: 400 },
+      { name: 'new_url'     , nice_name: 'New URL'     , type: 'text'     , value: <%= raw Caboose.json(pr.new_url)  %>, width: 400 }
+    ]    
+  });  
+});
+
+function delete_redirect(pr_id, confirm)
+{        
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the redirect? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_redirect(pr_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));
+    $('#message').empty().append(p);
+    return;
+  }
+  $('#message').html("<p class='loading'>Deleting redirect...</p>");
+  $.ajax({
+    url: '/admin/redirects/' + pr_id,
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;
+    }
+  });
+}
+
+</script>
+<% end %>

data/app/views/caboose/redirects/admin_index.html.erb

@@ -0,0 +1,24 @@
+<h1>Permanent Redirects</h1>
+
+<p><a href='/admin/redirects/new'>New Redirect</a></p>
+
+<% if @redirects && @redirects.count > 0 %>
+  <table class='data'>
+    <tr>
+      <th>Priority</th>
+      <th>Is Regex</th>      
+      <th>Old URL</th>
+      <th>New URL</th>            
+    </tr>
+  <% @redirects.each do |pr| %>
+    <tr onclick="window.location='/admin/redirects/<%= pr.id %>';">
+      <td align='right'><%= pr.priority %></td>
+      <td><%= pr.is_regex ? 'Yes' : 'No' %></td>
+      <td><%= raw pr.old_url %></td>
+      <td><%= raw pr.new_url %></td>
+    </tr>
+  <% end %>
+  </table>  
+<% else %>
+  <p>There are no redirects right now.</p>
+<% end %>

data/app/views/caboose/redirects/admin_new.html.erb

@@ -0,0 +1,38 @@
+
+<h1>New Permanent Redirect</h1>
+
+<form action='/admin/redirects' method='post' id='new_redirect_form'>
+<input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' /> 
+<p>Regular expression? <input type='checkbox' name='is_regex' value='1' /></p>
+<p><input type='text' name='old_url' id='old_url' placeholder='Old URL' value='' style='width: 400px;' /></p>
+<p><input type='text' name='new_url' id='new_url' placeholder='New URL' value='' style='width: 400px;' /></p>
+<div id='message'></div>
+<p>
+  <input type='button' value='< Back' onclick="window.location='/admin/redirects';" />
+  <input type='submit' value='Add Redirect' />
+</p>
+</form>
+
+<% content_for :caboose_js do %>
+<script type='text/javascript'>
+            
+$(document).ready(function() {
+  $('#new_redirect_form').submit(function() { add_redirect(); return false; });
+});
+
+function add_redirect()
+{
+  $('#message').html("<p class='loading'>Adding redirect...</p>");
+  $.ajax({
+    url: '/admin/redirects',
+    type: 'post',
+    data: $('#new_redirect_form').serialize(),
+    success: function(resp) {
+      if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) window.location = resp.redirect;    
+    }
+  });
+}
+
+</script>
+<% end %>

data/config/routes.rb

@@ -27,14 +27,21 @@ Caboose::Engine.routes.draw do
   post    "admin/sites/:id/domains"                        => "sites#admin_add_domain"
   put     "admin/sites/:id/domains/:domain_id/set-primary" => "sites#admin_set_primary_domain"
   delete  "admin/sites/:id/domains/:domain_id"             => "sites#admin_remove_domain"
-  
+                                                                                                                                     
   get     "admin/sites/options"              => "sites#options"
   get     "admin/sites"                      => "sites#admin_index"    
   get     "admin/sites/new"                  => "sites#admin_new"  
   get     "admin/sites/:id"                  => "sites#admin_edit"  
   put     "admin/sites/:id"                  => "sites#admin_update"  
   post    "admin/sites"                      => "sites#admin_add"  
-  delete  "admin/sites/:id"                  => "sites#admin_delete"    
+  delete  "admin/sites/:id"                  => "sites#admin_delete"
+    
+  get     "admin/redirects"      => "redirects#admin_index"    
+  get     "admin/redirects/new"  => "redirects#admin_new"  
+  get     "admin/redirects/:id"  => "redirects#admin_edit"  
+  put     "admin/redirects/:id"  => "redirects#admin_update"  
+  post    "admin/redirects"      => "redirects#admin_add"  
+  delete  "admin/redirects/:id"  => "redirects#admin_delete"
   
   get     "admin/users"                     => "users#index"  
   get     "admin/users/options"             => "users#options"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.64'
+  VERSION = '0.4.65'
 end

data/lib/tasks/caboose.rake

@@ -1,7 +1,7 @@
 require "caboose/version"
 
 namespace :caboose do  
-  
+    
   desc "Creates/verifies that all database tables and fields are correctly added."
   task :db => :environment do
     Caboose::Schema.create_schema

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.64
+  version: 0.4.65
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,7 @@ files:
 - app/controllers/caboose/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
 - app/controllers/caboose/posts_controller.rb
+- app/controllers/caboose/redirects_controller.rb
 - app/controllers/caboose/register_controller.rb
 - app/controllers/caboose/roles_controller.rb
 - app/controllers/caboose/settings_controller.rb
@@ -414,6 +415,9 @@ files:
 - app/views/caboose/posts/admin_new.html.erb
 - app/views/caboose/posts/detail.html.erb
 - app/views/caboose/posts/index.html.erb
+- app/views/caboose/redirects/admin_edit.html.erb
+- app/views/caboose/redirects/admin_index.html.erb
+- app/views/caboose/redirects/admin_new.html.erb
 - app/views/caboose/register/index.html.erb
 - app/views/caboose/roles/edit.html.erb
 - app/views/caboose/roles/index.html.erb