refinerycms-multisite 0.0.2 → 0.0.3

data/app/models/site.rb

@@ -12,23 +12,4 @@ class Site < ActiveRecord::Base
     Site.joins(:hostnames).where(:hostnames=>{:hostname=>hostname}).first ||
             Site.joins(:hostnames).where(:hostnames=>{:hostname=>'*'}).first
   end
-
-  # Monkey-Patch the Page-Controller for loading the right root-Page
-  PagesController.class_eval do
-    def home
-      if (@site)
-        error_404 unless (@page = Page.find(@site.page_id)).present?
-      else
-        error_404 unless (@page = Page.where(:link_url => '/').first).present?
-      end
-    end
-  end
-  # Monkey-Patch the Application-Controller for loading the current site
-  ApplicationController.class_eval do
-    prepend_before_filter :load_site
-    protected
-    def load_site
-      @site = Site.find_by_hostname(request.host)
-    end
-  end
-end
+end

data/lib/refinerycms-multisite.rb

@@ -19,4 +19,25 @@ module Refinery
       end
     end
   end
+end
+
+class ActionController::Base
+  # Loading the Current Site
+  before_filter :load_site
+  protected
+  def load_site
+    @site = Site.find_by_hostname(request.host)
+    # Monkey-Patch the Page-Controller for loading the right root-Page
+    return if ::PagesController.new.respond_to? :home_with_site
+    ::PagesController.class_eval do
+      def home_with_site
+        if (@site)
+          error_404 unless (@page = Page.find(@site.page_id)).present?
+        else
+          home_without_site
+        end
+      end
+      alias_method_chain  :home, :site
+    end
+  end
 end

data/lib/refinerycms-multisite/version.rb

@@ -1,5 +1,5 @@
 module Refinerycms
   module Multisite
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-multisite
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Andreas K\xC3\xB6nig"
@@ -75,7 +75,6 @@ files:
 - Gemfile
 - Rakefile
 - app/controllers/admin/sites_controller.rb
-- app/controllers/application_controller.rb
 - app/helpers/admin/sites_helper.rb
 - app/helpers/application_helper.rb
 - app/models/hostname.rb

data/app/controllers/application_controller.rb

@@ -1,8 +0,0 @@
-class ApplicationController < ActionController::Base
-  before_filter :load_site
-  protect_from_forgery
-  protected
-  def load_site
-    @site = Site.find_by_hostname(request.host)
-  end
-end