trusty-multi-site-extension 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cc418f29b7ebc97289a7e27876e6128e567a9c4
-  data.tar.gz: 54329c1b4e9d59134c227fae36d075c93c4ccce5
+  metadata.gz: cbd421050fbfed411b830b354e526fa4100b7108
+  data.tar.gz: b01afa801a4f5853d0876834d716105356b9adab
 SHA512:
-  metadata.gz: 21ac25398cdefa494ecccf8ef6536c3a4ec32a5b824e457af2cf97ad9f6e7e210e910970a090c64a0dd519b7b56eb78cd6395aafb66ff7af0e73d3d84d6597ba
-  data.tar.gz: e5853a79398180f3d805e94e51e86da8877a9dc456276d10ad4434d5da1d021e4d7401bc654f34d528b813e09e792da86e52a005479caf36c897bf6d6b5de8e2
+  metadata.gz: ed7737f122b223547b2e97ae18a02ad3f3ade52bd77c3eafc81795aa945591d92aff2eef27a20da6b7ba0d5c3194d5738b756466870c0d724d30ae45359cefe9
+  data.tar.gz: 2ad905c588a12005d7bb3c2d7f901cbbf04ccf1b55524a5e4e3843e339f7bdb64ba1ebe96d5e84e5d245cf87fe72f5c349b4fac40fffb3b695d69371d3696ae0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-multi-site-extension (2.0.6)
+    trusty-multi-site-extension (2.0.7)
       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.6.0)
+    rack-cache (1.5.1)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -300,4 +300,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/lib/multi_site/page_extensions.rb

@@ -18,15 +18,17 @@ module MultiSite::PageExtensions
         path = root.path if clean_path(path) == "/"
         result = root.find_by_path(path, live)
 
-        # If the result is a FileNotFoundPage that doesn't match the current
-        # site, try to find one that does.
+        # If the result is a FileNotFoundPage and it
+        # doesn't match the current site, try to find one that does.
         if result.is_a?(FileNotFoundPage) && result.site_id != homepage.site_id
           get_site_specific_file_not_found(result)
+
+        # Otherwise, just go with it.
         else
           result
         end
-
       end
+
       def current_site
         @current_site ||= Site.default
       end

data/lib/multi_site/site_controller_extensions.rb

@@ -2,8 +2,21 @@ module MultiSite::SiteControllerExtensions
   def self.included(base)
     base.class_eval do
       before_filter :set_site
+      alias_method_chain :process_page, :home_path
     end
   end
+
+  # If it's a file not found page and the path doesn't include
+  # the site's homepage path, try redirecting to include it.
+  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]}"
+    else
+      process_page_without_home_path(page)
+    end
+
+  end
   
   def set_site
     Page.current_site = Site.find_for_host(request.host)

data/multi_site_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class MultiSiteExtension < TrustyCms::Extension
-  version "2.0.6"
+  version "2.0.7"
   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.6"
+  s.version = "2.0.7"
   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.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-22 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.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Extends Trusty CMS Layouts to support multiple sites, defined by domain
@@ -161,3 +161,4 @@ test_files:
 - spec/models/site_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: