trusty-multi-site-extension 1.0.4 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjc2ZDFmZDQzODlkOGM4YjI0NWI5YjAxZGFlMjgyZmNiMDRkZGY2Yw==
+    YTU4NmI1YTRkOTg2NTMzODdjMzc1ZWNlODk0ODE2ZjViNGFhYmVjOQ==
   data.tar.gz: !binary |-
-    ZmMwZTA2YzVhOGFiMWY3MTZiY2I4MWFmYzAzOThlNmMzZTBjNmZiMQ==
+    NjNhMmM3NmFjNDI0ODRiMTc4YjU2NTM1Mzg2MTU2N2M1MDk4MjcyNg==
 SHA512:
   metadata.gz: !binary |-
-    OGU2ZGI4MTRkMzI1NDQ1YjYwMDQ3ZWJkN2MzYzQ5MjMwYTBiNDE5NjllNjA4
-    ZmRjNmY5MTU3NWQ0ZjdhOGY4MTk1NDE1NzM1OWY1NmMzNGQ2NTIzN2E2OWY2
-    ODM1NDVlNDA2YTM5YWQ4MDI2ZTc2OWNmZWI0MTAxM2Y0YzRmNDE=
+    ZjEzN2QyYjQ3NTkzZDAxNTRmNTg1ZTk0ODMzNmQyNDlmMjcwOTQ2NTU1ZmQx
+    Y2ZhNTFmYzBiNmM1YzI4NDE5MGYzYzI0NGQ5YjBmZmRlMTBiNzMzYTlmMzhj
+    NmY0OTM0ZWNkNDIwYTMyMDY2MDY0YTE2OWYxMWRjZGM0YmJjYmI=
   data.tar.gz: !binary |-
-    YTljZjczN2E5MTdjMjFmMTVjODIxNjEyYWYxMjY3MDhkYTA1MTc5MDI4MzRi
-    ZDQ5ZTZhYjlkY2NlNjE1NTcxNmIxNWUzMGE5NzY1MjU5ODc3NjRkYWYwZWNj
-    ZDg2ZWQ3YTBkYzcxODFhZDExNzU2Y2RkMjljYTFkZGRmZjFhZTU=
+    NzAxN2IwYjg0ODdlMTVmNTUxN2JhOTU3NDUzNjg1ZTA5OTQ1YjdmN2QwYWMw
+    NzVmNDA5ZDQ1NGMxMjBhNWVlMDdjOTY0ODczYTgwNGMwMjYwZWFmNDU1ZDgy
+    Y2MwOTY5MDQ0MjY0M2ZlMDIyNTJlY2EzNjQ5MjIxYzg0YTI0OTc=

data/README.markdown

@@ -1,5 +1,7 @@
 # Multi Site #
 
+[![Gem Version](https://badge.fury.io/rb/trusty-multi-site-extension.svg)](http://badge.fury.io/rb/trusty-multi-site-extension)
+
 Created by Sean Cribbs, November 2007. Inspired by the original virtual_domain behavior.
 
 Multi Site allows you to host multiple websites on a single TrustyCMS installation.

data/app/views/admin/sites/_form.haml

@@ -31,7 +31,7 @@
     - if f.object.new_record?
       A new homepage will be created automatically if none is specified.
     - else
-      If you change the site homepage ID, be sure it is is to a page with no parents.
+      If you change the site homepage ID, be sure it is to a page with no parents.
   
   - render_region :form_bottom do |form_bottom|
     - form_bottom.edit_timestamp do

data/db/migrate/2015032011031415046078_add_site_id_to_pages.rb

@@ -0,0 +1,24 @@
+class AddSiteIdToPages < ActiveRecord::Migration
+  def self.up
+    add_column :pages, :site_id, :integer, required: true
+    add_index :pages, :site_id
+
+    Site.all.each do |site|
+      homepage = site.homepage
+      homepage.site_id = site.id
+      homepage.save
+      unless homepage.id == Page.root.id
+        homepage.descendants.each do |page|
+          page.site_id = site.id
+          page.save
+        end
+      end
+    end
+
+  end
+
+  def self.down
+    remove_index :pages, site_id
+    remove_column :pages, :site_id
+  end
+end

data/lib/multi_site/page_extensions.rb

@@ -5,10 +5,16 @@ module MultiSite::PageExtensions
     base.class_eval {
       alias_method_chain :url, :sites
       mattr_accessor :current_site
-      has_one :site, :foreign_key => "homepage_id", :dependent => :nullify
+      belongs_to :site
+      before_create :associate_with_site
     }
     base.extend ClassMethods
     class << base
+
+      def associate_with_site
+        self.site_id = Page.current_site.site_id if self.site_id.nil?
+      end
+
       def find_by_path(path, live=true)
         root = homepage
         raise Page::MissingRootPageError unless root
@@ -24,6 +30,11 @@ module MultiSite::PageExtensions
   end
   
   module ClassMethods
+
+    def find_by_slug_for_site(slug)
+      self.where(slug: slug, site_id: Page.current_site.id)
+    end
+
     def homepage
       if current_site.is_a?(Site)
         homepage = self.current_site.homepage

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 = "1.0.4"
+  s.version = "1.1.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eric Sipple"]
   s.date = %q{2014-10-07}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.4
 platform: ruby
 authors:
 - Eric Sipple
@@ -90,6 +90,7 @@ files:
 - db/migrate/006_remove_user_login_index.rb
 - db/migrate/20090810145840_site_abbreviation.rb
 - db/migrate/201411031415046078_recreate_non_unique_index_on_snippets_name.rb
+- db/migrate/2015032011031415046078_add_site_id_to_pages.rb
 - lib/multi_site/admin_ui.rb
 - lib/multi_site/application_controller_extensions.rb
 - lib/multi_site/application_controller_filter_extensions.rb