trusty-multi-site-extension 2.0.7 → 2.0.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cbd421050fbfed411b830b354e526fa4100b7108
4
- data.tar.gz: b01afa801a4f5853d0876834d716105356b9adab
3
+ metadata.gz: 5bd73fa89eb6f058a4cadedce1b233e0a36b24a2
4
+ data.tar.gz: 265e4f19de7c4c4362dbdf8e1838a10e93671b17
5
5
  SHA512:
6
- metadata.gz: ed7737f122b223547b2e97ae18a02ad3f3ade52bd77c3eafc81795aa945591d92aff2eef27a20da6b7ba0d5c3194d5738b756466870c0d724d30ae45359cefe9
7
- data.tar.gz: 2ad905c588a12005d7bb3c2d7f901cbbf04ccf1b55524a5e4e3843e339f7bdb64ba1ebe96d5e84e5d245cf87fe72f5c349b4fac40fffb3b695d69371d3696ae0
6
+ metadata.gz: 6766a66579866721b2e5f695608067759f86919c78481048ec37c86d438743be625356eafb891e6db89fd3d9be0c9280ca4531d38339ad543a638188a7e5608a
7
+ data.tar.gz: 93664440177990fcaa9cd56d9faa4e945a6136c12c8db117f19afc5357d3accb3147a176cb28489b5fb4fcf0cea914d28439ace56c7b91840e78b3be136d938f
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-multi-site-extension (2.0.7)
4
+ trusty-multi-site-extension (2.0.9)
5
5
  acts_as_list (= 0.4.0)
6
6
  trusty-cms (~> 2.0.0)
7
7
  trusty-snippets-extension (~> 2.0.0)
@@ -154,7 +154,7 @@ GEM
154
154
  byebug (~> 5.0)
155
155
  pry (~> 0.10)
156
156
  rack (1.6.4)
157
- rack-cache (1.5.1)
157
+ rack-cache (1.6.1)
158
158
  rack (>= 0.4)
159
159
  rack-test (0.6.3)
160
160
  rack (>= 1.0)
@@ -208,7 +208,7 @@ GEM
208
208
  rspec-mocks (~> 3.0.0)
209
209
  rspec-support (~> 3.0.0)
210
210
  rspec-support (3.0.4)
211
- ruby_parser (3.7.3)
211
+ ruby_parser (3.8.1)
212
212
  sexp_processor (~> 4.1)
213
213
  sass (3.4.16)
214
214
  sass-rails (5.0.1)
@@ -217,7 +217,7 @@ GEM
217
217
  sprockets (>= 2.8, < 4.0)
218
218
  sprockets-rails (>= 2.0, < 4.0)
219
219
  tilt (~> 1.1)
220
- sexp_processor (4.6.1)
220
+ sexp_processor (4.7.0)
221
221
  slop (3.6.0)
222
222
  sprockets (2.12.4)
223
223
  hike (~> 1.2)
@@ -239,7 +239,7 @@ GEM
239
239
  thor (0.19.1)
240
240
  thread_safe (0.3.5)
241
241
  tilt (1.4.1)
242
- trusty-cms (2.0.13)
242
+ trusty-cms (2.0.16)
243
243
  RedCloth (~> 4.2)
244
244
  acts_as_tree (~> 2.1)
245
245
  bundler (~> 1.7)
@@ -11,13 +11,17 @@ module MultiSite::SiteControllerExtensions
11
11
  def process_page_with_home_path(page)
12
12
  homepage = Page.current_site.homepage
13
13
  if page.is_a?(FileNotFoundPage) && !params[:url].include?(homepage.slug)
14
- false if redirect_to "/#{homepage.slug}/#{params[:url]}"
14
+ if homepage.slug != "/"
15
+ false if redirect_to "/#{homepage.slug}/#{params[:url]}"
16
+ else
17
+ process_page_without_home_path(page)
18
+ end
15
19
  else
16
20
  process_page_without_home_path(page)
17
21
  end
18
22
 
19
23
  end
20
-
24
+
21
25
  def set_site
22
26
  Page.current_site = Site.find_for_host(request.host)
23
27
  true
@@ -1,7 +1,7 @@
1
1
  require_dependency 'application_controller'
2
2
 
3
3
  class MultiSiteExtension < TrustyCms::Extension
4
- version "2.0.7"
4
+ version "2.0.9"
5
5
  description %{ Enables virtual sites to be created with associated domain names.
6
6
  Also scopes the sitemap view to any given page (or the root of an
7
7
  individual site) and allows model classes to be scoped by site. }
@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "trusty-multi-site-extension"
7
- s.version = "2.0.7"
7
+ s.version = "2.0.9"
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
10
10
  s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-multi-site-extension
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.7
4
+ version: 2.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2016-02-22 00:00:00.000000000 Z
13
+ date: 2016-02-29 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: acts_as_list
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
145
145
  version: '0'
146
146
  requirements: []
147
147
  rubyforge_project:
148
- rubygems_version: 2.4.6
148
+ rubygems_version: 2.4.8
149
149
  signing_key:
150
150
  specification_version: 4
151
151
  summary: Extends Trusty CMS Layouts to support multiple sites, defined by domain
@@ -161,4 +161,3 @@ test_files:
161
161
  - spec/models/site_spec.rb
162
162
  - spec/spec.opts
163
163
  - spec/spec_helper.rb
164
- has_rdoc: