trusty-multi-site-extension 2.0.7 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbd421050fbfed411b830b354e526fa4100b7108
-  data.tar.gz: b01afa801a4f5853d0876834d716105356b9adab
+  metadata.gz: 5bd73fa89eb6f058a4cadedce1b233e0a36b24a2
+  data.tar.gz: 265e4f19de7c4c4362dbdf8e1838a10e93671b17
 SHA512:
-  metadata.gz: ed7737f122b223547b2e97ae18a02ad3f3ade52bd77c3eafc81795aa945591d92aff2eef27a20da6b7ba0d5c3194d5738b756466870c0d724d30ae45359cefe9
-  data.tar.gz: 2ad905c588a12005d7bb3c2d7f901cbbf04ccf1b55524a5e4e3843e339f7bdb64ba1ebe96d5e84e5d245cf87fe72f5c349b4fac40fffb3b695d69371d3696ae0
+  metadata.gz: 6766a66579866721b2e5f695608067759f86919c78481048ec37c86d438743be625356eafb891e6db89fd3d9be0c9280ca4531d38339ad543a638188a7e5608a
+  data.tar.gz: 93664440177990fcaa9cd56d9faa4e945a6136c12c8db117f19afc5357d3accb3147a176cb28489b5fb4fcf0cea914d28439ace56c7b91840e78b3be136d938f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-multi-site-extension (2.0.7)
+    trusty-multi-site-extension (2.0.9)
       acts_as_list (= 0.4.0)
       trusty-cms (~> 2.0.0)
       trusty-snippets-extension (~> 2.0.0)
@@ -154,7 +154,7 @@ GEM
       byebug (~> 5.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rack-cache (1.5.1)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -208,7 +208,7 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.7.3)
+    ruby_parser (3.8.1)
       sexp_processor (~> 4.1)
     sass (3.4.16)
     sass-rails (5.0.1)
@@ -217,7 +217,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
-    sexp_processor (4.6.1)
+    sexp_processor (4.7.0)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
@@ -239,7 +239,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.13)
+    trusty-cms (2.0.16)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)

data/lib/multi_site/site_controller_extensions.rb

@@ -11,13 +11,17 @@ module MultiSite::SiteControllerExtensions
   def process_page_with_home_path(page)
     homepage = Page.current_site.homepage
     if page.is_a?(FileNotFoundPage) && !params[:url].include?(homepage.slug)
-      false if redirect_to "/#{homepage.slug}/#{params[:url]}"
+      if homepage.slug != "/"
+        false if redirect_to "/#{homepage.slug}/#{params[:url]}"
+      else
+        process_page_without_home_path(page)
+      end
     else
       process_page_without_home_path(page)
     end
 
   end
-  
+
   def set_site
     Page.current_site = Site.find_for_host(request.host)
     true

data/multi_site_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class MultiSiteExtension < TrustyCms::Extension
-  version "2.0.7"
+  version "2.0.9"
   description %{ Enables virtual sites to be created with associated domain names.
                  Also scopes the sitemap view to any given page (or the root of an
                  individual site) and allows model classes to be scoped by site. }

data/trusty-multi-site-extension.gemspec

@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
 
 Gem::Specification.new do |s|
   s.name        = "trusty-multi-site-extension"
-  s.version = "2.0.7"
+  s.version = "2.0.9"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
   s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.9
 platform: ruby
 authors:
 - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Extends Trusty CMS Layouts to support multiple sites, defined by domain
@@ -161,4 +161,3 @@ test_files:
 - spec/models/site_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: