caboose-cms 0.4.65 → 0.4.66
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
OTU4MjVlNzQyYTQyM2RkY2NkZjY5YTljYWY0YjVjOTNiYTMzMjMwNw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
NzE3MmM0MjZhYTdkMzdiNzBiMmQwYmRmMzI2OGRkNGQ5MDJkNWE2OQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NzQwNmE0YTUzMzYwZmQzMGQ5Y2I5MmY3YjMxY2YxN2M5YTZhNjFmY2ZhNmY3
|
10
|
+
YWMwNzBjZmMzZDdlZWQ2NTVmNDUzMjRiYzc2ODIwZWQ2MDNkYWYxNTY4NWNj
|
11
|
+
YWQ2ZDkxYWJiY2I0N2M3ODFkMGI0MmNiNmI4YzgxY2ZmNTVjODI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
N2ZhMzJhNGE4N2JhNmRmZDM3NjE3NjkzNTVkOWUzMDk1M2ZmZGZiODhmOGU1
|
14
|
+
MzZkYmEyMDE0ZWZkZjc1OThiZmJiN2RiNmMzY2ZkYTNmYjUzYjQ0NjU4NDE0
|
15
|
+
Y2FkODY5MDNhM2QzNzMyNTY1MTVhODc2ZTRkOWQ0MWU2M2Y5Y2Y=
|
@@ -51,15 +51,14 @@ module Caboose
|
|
51
51
|
uri.chop! if uri.end_with?('/')
|
52
52
|
uri[0] = '' if uri.starts_with?('/')
|
53
53
|
|
54
|
-
page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
|
55
|
-
if
|
54
|
+
page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
|
55
|
+
if page.nil? || !page
|
56
56
|
|
57
57
|
# Check for a 301 redirect
|
58
58
|
site_id = Site.id_for_domain(request.host_with_port)
|
59
|
-
new_url = PermanentRedirect.match(site_id, request.fullpath)
|
60
|
-
if new_url
|
61
|
-
|
62
|
-
redirect_to new_url
|
59
|
+
new_url = PermanentRedirect.match(site_id, request.fullpath)
|
60
|
+
if new_url
|
61
|
+
redirect_to new_url, :status => 301
|
63
62
|
return
|
64
63
|
end
|
65
64
|
|
@@ -12,11 +12,11 @@ class Caboose::PermanentRedirect < ActiveRecord::Base
|
|
12
12
|
validates :old_url, :presence => { :message => 'The old URL is required.' }
|
13
13
|
validates :new_url, :presence => { :message => 'The new URL is required.' }
|
14
14
|
|
15
|
-
def self.match(site_id, uri)
|
16
|
-
Caboose::PermanentRedirect.where(:site_id => site_id).reorder(:priority).all.each do |pr|
|
15
|
+
def self.match(site_id, uri)
|
16
|
+
Caboose::PermanentRedirect.where(:site_id => site_id).reorder(:priority).all.each do |pr|
|
17
17
|
if pr.is_regex
|
18
18
|
return uri.gsub(/#{pr.old_url}/, pr.new_url) if uri =~ /#{pr.old_url}/
|
19
|
-
else
|
19
|
+
else
|
20
20
|
return pr.new_url if uri == pr.old_url
|
21
21
|
end
|
22
22
|
end
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: caboose-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.66
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- William Barry
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-08-
|
11
|
+
date: 2014-08-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|