caboose-cms 0.4.65 → 0.4.66

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2RmZGE5OTAwODg2Yzc5MjA1NzU0ZDY0MTQxOWE4Yjk4NDY2M2QyMg==
+    OTU4MjVlNzQyYTQyM2RkY2NkZjY5YTljYWY0YjVjOTNiYTMzMjMwNw==
   data.tar.gz: !binary |-
-    Zjc1YjVjYzJkNGM2MTAzNGMzYzQ0ZjM2OTJjZDE1YWVkNWM3YzUyOQ==
+    NzE3MmM0MjZhYTdkMzdiNzBiMmQwYmRmMzI2OGRkNGQ5MDJkNWE2OQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDMyYWY4NTY4NzU2NWMyYTU5NzM5MDBhOWRlZDViODA4NWFkNmRlMzQ1OTU3
-    ZTVmNmZiY2NkNjRjNWQxNWRkYTdhNDUwNTBkNjlkMjY3NTFmNDkxMDQ2NzNl
-    NzM4NWEwYWQ2MjdiNTFjYzc3ZGFlNTBjN2M4YjY5NDliN2Y5OWQ=
+    NzQwNmE0YTUzMzYwZmQzMGQ5Y2I5MmY3YjMxY2YxN2M5YTZhNjFmY2ZhNmY3
+    YWMwNzBjZmMzZDdlZWQ2NTVmNDUzMjRiYzc2ODIwZWQ2MDNkYWYxNTY4NWNj
+    YWQ2ZDkxYWJiY2I0N2M3ODFkMGI0MmNiNmI4YzgxY2ZmNTVjODI=
   data.tar.gz: !binary |-
-    NTUxYmUzZjY2N2VlZGEzNjViZDYwODIyZWM0ODZkYzA4YjM2MzM0MWUyMWI0
-    MjFjZDRkMzYwMmI3YzU5OGEzNTYzNjE0YjkzMzFhY2JlNDZlNzA2YTY1OTZj
-    YzkyYTBjNGYxZGU4YmEzMTI2MTFjOGZjMzg2YTE2MWE5NzdmZjA=
+    N2ZhMzJhNGE4N2JhNmRmZDM3NjE3NjkzNTVkOWUzMDk1M2ZmZGZiODhmOGU1
+    MzZkYmEyMDE0ZWZkZjc1OThiZmJiN2RiNmMzY2ZkYTNmYjUzYjQ0NjU4NDE0
+    Y2FkODY5MDNhM2QzNzMyNTY1MTVhODc2ZTRkOWQ0MWU2M2Y5Y2Y=

data/app/controllers/caboose/pages_controller.rb

@@ -51,15 +51,14 @@ module Caboose
       uri.chop! if uri.end_with?('/')
       uri[0] = '' if uri.starts_with?('/')
 
-      page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
-      if (page.nil? || !page)
+      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
+        new_url = PermanentRedirect.match(site_id, request.fullpath)        
+        if new_url          
+          redirect_to new_url, :status => 301
           return
         end
         

data/app/models/caboose/permanent_redirect.rb

@@ -12,11 +12,11 @@ class Caboose::PermanentRedirect < ActiveRecord::Base
   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|
+  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
+      else                
         return pr.new_url if uri == pr.old_url
       end
     end

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.65
+  version: 0.4.66
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails