refinerycms-multisite 0.0.5 → 0.0.6

data/app/models/site.rb

@@ -1,15 +1,3 @@
 class Site < ActiveRecord::Base
-  belongs_to :page
-  attr_accessible :name, :page_id, :stylesheet, :hostnames,
-                  :hostnames_attributes
-
-  has_many :hostnames,
-           :dependent => :destroy
-
-  accepts_nested_attributes_for :hostnames, :allow_destroy => true
-
-  def self.find_by_hostname(hostname)
-    Site.joins(:hostnames).where(:hostnames=>{:hostname=>hostname}).first ||
-            Site.joins(:hostnames).where(:hostnames=>{:hostname=>'*'}).first
-  end
-end
+  include Refinery::SiteModel
+end

data/app/views/shared/_header.html.erb

@@ -1,15 +1,10 @@
 <h1 id='logo'>
   <%= link_to RefinerySetting.find_or_set(:site_name, "Company Name"), root_path %>
 </h1>
-<%=
-  ::Fiber.new {
-    ::Fiber.yield(
-      render(:partial => "/shared/menu", :locals => {
+<%=  render(:partial => "/shared/menu", :locals => {
                :dom_id => 'menu',
                :css => 'menu',
                :roots => @menu_pages.where(:parent_id => @site.try(:page_id)),
                :collection => @menu_pages.where(@menu_pages.arel_table[:parent_id].not_eq(nil)),
                :selected_item => (@page if defined?(::Page))
-             })
-    )
-  }.resume %>
+             }) %>

data/lib/refinerycms-multisite/version.rb

@@ -1,5 +1,5 @@
 module Refinerycms
   module Multisite
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/refinerycms-multisite.rb

@@ -19,6 +19,35 @@ module Refinery
       end
     end
   end
+
+  module SiteModel
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :page
+      attr_accessible :name, :page_id, :stylesheet, :hostnames,
+          :hostnames_attributes
+
+      has_many :hostnames, :dependent => :destroy
+
+      accepts_nested_attributes_for :hostnames, :allow_destroy => true
+    end
+
+    module ClassMethods
+      def find_by_hostname(hostname)
+        Site.joins(:hostnames).where(:hostnames=>{:hostname=>hostname}).first ||
+          Site.joins(:hostnames).where(:hostnames=>{:hostname=>'*'}).first
+      end
+    end
+
+    module InstanceMethods
+    end
+  end
+  
+  module SiteModelClassMethods
+    #include ActiveRecord
+
+  end
 end
 
 module PagesControllerSite
@@ -44,4 +73,4 @@ class ActionController::Base
       alias_method_chain :home, :site
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-multisite
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - "Andreas K\xC3\xB6nig"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 +02:00
+date: 2011-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency