comfortable_mexican_sofa 1.4.9 → 1.4.10

data/VERSION

@@ -1 +1 @@
-1.4.9
+1.4.10

data/app/views/cms_admin/pages/_form.html.erb

@@ -25,12 +25,11 @@
     <%= form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options %>
   <% end %>
   <%= cms_hook :page_form, :object => form %>
+  <%= render :partial => 'cms_admin/categories/form', :object => form %>
 </div>
 
 <%= render :partial => 'form_blocks' %>
 
-<%= render :partial => 'cms_admin/categories/form', :object => form %>
-
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= form.check_box :is_published, :disable_builder => true %>
   <%= form.label_for :is_published %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.9"
+  s.version = "1.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-09-06}
+  s.date = %q{2011-09-09}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/db/migrate/01_create_cms.rb

@@ -1,9 +1,6 @@
 class CreateCms < ActiveRecord::Migration
   
   def self.up
-    
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
-    
     # -- Sites --------------------------------------------------------------
     create_table :cms_sites do |t|
       t.string :label
@@ -107,13 +104,9 @@ class CreateCms < ActiveRecord::Migration
     end
     add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
-      
   end
   
   def self.down
-    
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
-    
     drop_table :cms_sites
     drop_table :cms_layouts
     drop_table :cms_pages
@@ -123,6 +116,5 @@ class CreateCms < ActiveRecord::Migration
     drop_table :cms_revisions
     drop_table :cms_categories
     drop_table :cms_categorizations
-    
   end
 end

data/db/migrate/upgrades/02_upgrade_to_1_1_0.rb

@@ -1,6 +1,5 @@
 class UpgradeTo110 < ActiveRecord::Migration
   def self.up
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     rename_column :cms_layouts,   :cms_site_id,   :site_id
     rename_column :cms_pages,     :cms_site_id,   :site_id
     rename_column :cms_pages,     :cms_layout_id, :layout_id
@@ -10,7 +9,6 @@ class UpgradeTo110 < ActiveRecord::Migration
   end
 
   def self.down
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     rename_column :cms_uploads,   :site_id,   :cms_site_id
     rename_column :cms_snippets,  :site_id,   :cms_site_id
     rename_column :cms_blocks,    :page_id,   :cms_page_id

data/db/migrate/upgrades/03_upgrade_to_1_2_0.rb

@@ -1,6 +1,5 @@
 class UpgradeTo120 < ActiveRecord::Migration
   def self.up
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     create_table :cms_revisions, :force => true do |t|
       t.string    :record_type
       t.integer   :record_id
@@ -11,7 +10,6 @@ class UpgradeTo120 < ActiveRecord::Migration
   end
 
   def self.down
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     drop_table :cms_revisions
   end
 end

data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb

@@ -1,6 +1,5 @@
 class UpgradeTo130 < ActiveRecord::Migration
   def self.up
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     add_column :cms_sites, :is_mirrored, :boolean, :null => false, :default => false
     add_column :cms_sites, :path, :string
     add_column :cms_sites, :locale, :string, :null => false, :default => 'en'
@@ -12,7 +11,6 @@ class UpgradeTo130 < ActiveRecord::Migration
   end
 
   def self.down
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     remove_index :cms_sites, :is_mirrored
     remove_column :cms_sites, :path
     remove_column :cms_sites, :is_mirrored

data/db/migrate/upgrades/05_upgrade_to_1_4_0.rb

@@ -1,6 +1,5 @@
 class UpgradeTo140 < ActiveRecord::Migration
   def self.up
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     rename_table :cms_uploads, :cms_files
     add_column :cms_files, :label, :string
     add_column :cms_files, :description, :string, :limit => 2048
@@ -23,7 +22,6 @@ class UpgradeTo140 < ActiveRecord::Migration
   end
   
   def self.down
-    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     remove_index :cms_files, [:site_id, :label]
     remove_column :cms_files, :description
     remove_column :cms_files, :label

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -20,7 +20,7 @@ module ComfortableMexicanSofa::ControllerMethods
     # by the cms page and/or layout)
     def render(options = {}, locals = {}, &block)
       if options.is_a?(Hash) && path = options.delete(:cms_page)
-        site = Cms::Site.find_by_hostname(request.host.downcase)
+        site = Cms::Site.find_site(request.host.downcase, request.fullpath)
         page = site && site.pages.find_by_full_path(path)
         if page
           cms_app_layout = page.layout.try(:app_layout)

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -65,7 +65,7 @@ module ComfortableMexicanSofa::Fixtures
     site.layouts.where('id NOT IN (?)', layout_ids.uniq).each{ |l| l.destroy } if root
     
     # returning ids of layouts in fixtures
-    layout_ids
+    layout_ids.uniq
   end
   
   def self.import_pages(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, page_ids = [])
@@ -122,7 +122,7 @@ module ComfortableMexicanSofa::Fixtures
     site.pages.where('id NOT IN (?)', page_ids.uniq).each{ |p| p.destroy } if root
     
     # returning ids of layouts in fixtures
-    page_ids
+    page_ids.uniq
   end
   
   def self.import_snippets(to_hostname, from_hostname = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000 -04:00
+date: 2011-09-09 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70300779511500 !ruby/object:Gem::Requirement
+  requirement: &70241019987880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300779511500
+  version_requirements: *70241019987880
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70300779510480 !ruby/object:Gem::Requirement
+  requirement: &70241019987160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70300779510480
+  version_requirements: *70241019987160
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70300779509540 !ruby/object:Gem::Requirement
+  requirement: &70241019986320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70300779509540
+  version_requirements: *70241019986320
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 99875934053295203
+      hash: -1886242251632818290
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: