trusty-multi-site-extension 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 051525d2e6fb79b13a021a819ccd192bb9d1b975
-  data.tar.gz: 5a1ad1f30229359ebdd7272001dc4c1816806377
+  metadata.gz: 8cc418f29b7ebc97289a7e27876e6128e567a9c4
+  data.tar.gz: 54329c1b4e9d59134c227fae36d075c93c4ccce5
 SHA512:
-  metadata.gz: b79f839db9c3f701da91744368d5910337f065a2892f4b24dffa4e0fb5edb03785fdbd42addb329a0ec5bc9c5478acbdeba25de4e6f8bccdf32340ec8e416f46
-  data.tar.gz: e9c6645e09223dbddc1955c549806b66264c131f83710e52abba90f966bfb029887fbea0ccd29329446aa1f81ed2331d081b1598306d9c5a8877b50ecc604b81
+  metadata.gz: 21ac25398cdefa494ecccf8ef6536c3a4ec32a5b824e457af2cf97ad9f6e7e210e910970a090c64a0dd519b7b56eb78cd6395aafb66ff7af0e73d3d84d6597ba
+  data.tar.gz: e5853a79398180f3d805e94e51e86da8877a9dc456276d10ad4434d5da1d021e4d7401bc654f34d528b813e09e792da86e52a005479caf36c897bf6d6b5de8e2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-multi-site-extension (2.0.3)
+    trusty-multi-site-extension (2.0.6)
       acts_as_list (= 0.4.0)
       trusty-cms (~> 2.0.0)
       trusty-snippets-extension (~> 2.0.0)
@@ -47,7 +47,7 @@ GEM
       tzinfo (~> 1.1)
     acts_as_list (0.4.0)
       activerecord (>= 3.0)
-    acts_as_tree (2.2.0)
+    acts_as_tree (2.4.0)
       activerecord (>= 3.0.0)
     addressable (2.3.8)
     arel (6.0.3)
@@ -94,7 +94,7 @@ GEM
     diff-lcs (1.2.5)
     erubis (2.7.0)
     eventmachine (1.0.8)
-    execjs (2.5.2)
+    execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
@@ -111,7 +111,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.3)
+    highline (1.7.8)
     hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -119,13 +119,13 @@ GEM
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
     i18n (0.7.0)
-    jquery-rails (3.1.3)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.11)
+    libv8 (3.16.14.13)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -135,7 +135,7 @@ GEM
     mini_portile (0.6.2)
     minitest (5.8.0)
     multi_json (1.11.2)
-    mysql (2.9.1)
+    mysql2 (0.4.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
@@ -154,7 +154,7 @@ GEM
       byebug (~> 5.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rack-cache (1.2)
+    rack-cache (1.6.0)
       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.1)
+    ruby_parser (3.7.3)
       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.0)
+    sexp_processor (4.6.1)
     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.11)
+    trusty-cms (2.0.13)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -251,7 +251,7 @@ GEM
       haml-rails (~> 0.5)
       highline (~> 1.6)
       jquery-rails (~> 3.1)
-      mysql (~> 2.9)
+      mysql2 (~> 0.4.2)
       protected_attributes (~> 1.0.9)
       rack (~> 1.4)
       rack-cache (~> 1.2)
@@ -263,19 +263,19 @@ GEM
       tzinfo (~> 1.2)
       uglifier (~> 2.6)
       will_paginate (~> 3.0)
-    trusty-snippets-extension (2.0.3)
-      trusty-cms (~> 2.0.0.pre.beta)
+    trusty-snippets-extension (2.0.5)
+      trusty-cms (~> 2.0.0)
     trustygems (0.2.1)
       rake
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.1)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     websocket-driver (0.6.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -298,3 +298,6 @@ DEPENDENCIES
   thin (~> 1.6.2)
   trusty-multi-site-extension!
   trustygems (~> 0.2.0)
+
+BUNDLED WITH
+   1.10.6

data/lib/multi_site/page_extensions.rb

@@ -16,7 +16,16 @@ module MultiSite::PageExtensions
         root = homepage
         raise Page::MissingRootPageError unless root
         path = root.path if clean_path(path) == "/"
-        root.find_by_path(path, live)
+        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 result.is_a?(FileNotFoundPage) && result.site_id != homepage.site_id
+          get_site_specific_file_not_found(result)
+        else
+          result
+        end
+
       end
       def current_site
         @current_site ||= Site.default
@@ -27,6 +36,14 @@ module MultiSite::PageExtensions
       def clean_path(path)
         "/#{ path.to_s.strip }/".gsub(%r{//+}, '/')
       end
+
+      # if the result is a FileNotFoundPage, try to find the one for this site.
+      # if you can't, return the initial result
+      def get_site_specific_file_not_found(result)
+        site_file_not_founds = FileNotFoundPage.where(site_id: homepage.site_id)
+        site_file_not_founds.any? ? site_file_not_founds.first : result
+      end
+
     end
   end
 

data/multi_site_extension.rb

@@ -1,7 +1,7 @@
 require_dependency 'application_controller'
 
 class MultiSiteExtension < TrustyCms::Extension
-  version "1.0.0"
+  version "2.0.6"
   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. }
@@ -12,7 +12,7 @@ class MultiSiteExtension < TrustyCms::Extension
     # ActionController::Routing modules are required rather than sent as includes
     # because the routing persists between dev. requests and is not compatible
     # with multiple alias_method_chain calls.
-    
+
     # likewise for ScopedValidation, which is a pre-emptive hack that shouldn't run more than once.
 
 
@@ -49,7 +49,7 @@ class MultiSiteExtension < TrustyCms::Extension
       TrustyCms::AdminUI.send :include, MultiSite::AdminUI
       admin.site = TrustyCms::AdminUI.load_default_site_regions
     end
-    
+
     if respond_to?(:tab)
       tab("Settings") do
         add_item "Sites", "/admin/sites", :after => "Extensions", :visibility => [:admin]

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.5"
+  s.version = "2.0.6"
   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.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list