comfortable_mexican_sofa 1.6.25 → 1.6.26

data/README.md

@@ -1,5 +1,5 @@
 # ComfortableMexicanSofa (Rails 3 CMS Engine) 
-[![Build Status](https://secure.travis-ci.org/comfy/comfortable-mexican-sofa.png)](http://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa)
+[![Build Status](https://travis-ci.org/comfy/comfortable-mexican-sofa.png?branch=master)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa)
 
 ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
 

data/VERSION

@@ -1 +1 @@
-1.6.25
+1.6.26

data/app/assets/javascripts/comfortable_mexican_sofa/application.js

@@ -59,8 +59,8 @@ $.CMS = function(){
       function slugify(str, delimiter){
         var opposite_delimiter = (delimiter == '-') ? '_' : '-';
         str = str.replace(/^\s+|\s+$/g, '');
-        var from = "ÀÁÄÂÈÉËÊÌÍÏÎÒÓÖÔÙÚÜÛàáäâèéëêìíïîòóöôùúüûÑñÇç";
-        var to   = "aaaaeeeeiiiioooouuuuaaaaeeeeiiiioooouuuunncc";
+        var from = "ÀÁÄÂÃÈÉËÊÌÍÏÎÒÓÖÔÕÙÚÜÛàáäâãèéëêìíïîòóöôõùúüûÑñÇç";
+        var to   = "aaaaaeeeeiiiiooooouuuuaaaaaeeeeiiiiooooouuuunncc";
         for (var i=0, l=from.length ; i<l ; i++) {
           str = str.replace(new RegExp(from[i], "g"), to[i]);
         }

data/app/assets/stylesheets/comfortable_mexican_sofa/form.css

@@ -24,6 +24,8 @@
 #cms_body .form_element .value input[type='password'],
 #cms_body .form_element .value input[type='datetime'],
 #cms_body .form_element .value input[type='number'],
+#cms_body .form_element .value input[type='email'],
+#cms_body .form_element .value input[type='url'],
 #cms_body .form_element .value select,
 #cms_body .form_element .value textarea {
   border: 0px;

data/app/controllers/cms_admin/base_controller.rb

@@ -44,7 +44,7 @@ protected
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
     if %w(cms_admin/layouts cms_admin/pages cms_admin/snippets).member?(params[:controller])
-      ComfortableMexicanSofa::Fixtures.import_all(@site.hostname)
+      ComfortableMexicanSofa::Fixtures.import_all(@site.identifier)
       flash.now[:error] = I18n.t('cms.base.fixtures_enabled')
     end
   end

data/app/controllers/cms_content_controller.rb

@@ -36,14 +36,14 @@ protected
 
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
+    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.identifier)
   end
   
   def load_cms_site
     @cms_site ||= if params[:site_id]
       Cms::Site.find_by_id(params[:site_id])
     else
-      Cms::Site.find_site(request.host.downcase, request.fullpath)
+      Cms::Site.find_site(request.host_with_port.downcase, request.fullpath)
     end
     
     if @cms_site

data/app/models/cms/site.rb

@@ -12,14 +12,17 @@ class Cms::Site < ActiveRecord::Base
                   :is_mirrored
   
   # -- Relationships --------------------------------------------------------
-  has_many :layouts,    :dependent => :delete_all
-  has_many :pages,      :dependent => :delete_all
-  has_many :snippets,   :dependent => :delete_all
-  has_many :files,      :dependent => :destroy
-  has_many :categories, :dependent => :delete_all
+  with_options :dependent => :destroy do |site|
+    site.has_many :layouts
+    site.has_many :pages
+    site.has_many :snippets
+    site.has_many :files
+    site.has_many :categories
+  end
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_identifier,
+                    :assign_hostname,
                     :assign_label
   before_save :clean_path
   after_save  :sync_mirrors
@@ -34,7 +37,7 @@ class Cms::Site < ActiveRecord::Base
   validates :hostname,
     :presence   => true,
     :uniqueness => { :scope => :path },
-    :format     => { :with => /^[\w\.\-]+$/ }
+    :format     => { :with => /^[\w\.\-]+(?:\:\d+)?$/ }
     
   # -- Scopes ---------------------------------------------------------------
   scope :mirrored, where(:is_mirrored => true)
@@ -54,6 +57,14 @@ class Cms::Site < ActiveRecord::Base
     end
     return cms_site
   end
+  
+  # -- Instance Methods -----------------------------------------------------
+  # When removing entire site, let's not destroy content from other sites
+  # Since before_destroy doesn't really work, this does the trick
+  def destroy
+    self.class.update_all({:is_mirrored => false}, :id => self.id) if self.is_mirrored?
+    super
+  end
 
 protected
   
@@ -70,6 +81,10 @@ protected
     self.identifier = self.identifier.blank?? self.hostname.try(:idify) : self.identifier
   end
   
+  def assign_hostname
+    self.hostname ||= self.identifier
+  end
+  
   def assign_label
     self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
   end

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

@@ -36,7 +36,7 @@
     </div>
   </div>
   <% if !category_view && has_children && branch_open %>
-    <ul>
+    <ul class="children">
       <%= render :partial => 'index_branch', :collection => children %>
     </ul>
   <% end %>

data/app/views/cms_admin/pages/toggle_branch.js.erb

@@ -2,10 +2,10 @@ var li = $('li#cms_page_<%=@page.id%>');
 li.find('.item .toggle').first().toggleClass('open');
 
 <% if session[:cms_page_tree].member?(@page.id.to_s) %>
-  if(!li.find('ul')[0]) {
-    li.append('<ul><%= escape_javascript(render :partial => "index_branch", :collection => @page.children) %></ul>');
+  if(!li.find('ul.children')[0]) {
+    li.append('<ul class="children"><%= escape_javascript(render :partial => "index_branch", :collection => @page.children) %></ul>');
     $.CMS.enable_sortable_list();
   }
 <% else %>
-  li.find('ul').remove();
+  li.find('ul.children').remove();
 <% end %>

data/app/views/layouts/cms_admin/_body.html.erb

@@ -1,4 +1,6 @@
 <body id='cms_body' class='c_<%= params[:controller].idify %> a_<%= params[:action].idify %>'>
+  <%= cms_hook :header %>
+
   <div class='body_wrapper'>
     <div class='left_column'>
       <div class='left_column_content'>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.25"
+  s.version = "1.6.26"
 
   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 = "2012-10-12"
+  s.date = "2013-01-24"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -177,6 +177,7 @@ Gem::Specification.new do |s|
     "config/locales/de.yml",
     "config/locales/en.yml",
     "config/locales/es.yml",
+    "config/locales/fr.yml",
     "config/locales/ja.yml",
     "config/locales/pl.yml",
     "config/locales/pt-BR.yml",
@@ -184,21 +185,21 @@ Gem::Specification.new do |s|
     "config/locales/sv.yml",
     "config/locales/zh-CN.yml",
     "config/routes.rb",
-    "db/cms_fixtures/example.com/layouts/default/_default.yml",
-    "db/cms_fixtures/example.com/layouts/default/content.html",
-    "db/cms_fixtures/example.com/layouts/default/css.css",
-    "db/cms_fixtures/example.com/layouts/default/js.js",
-    "db/cms_fixtures/example.com/layouts/default/nested/_nested.yml",
-    "db/cms_fixtures/example.com/layouts/default/nested/content.html",
-    "db/cms_fixtures/example.com/layouts/default/nested/css.css",
-    "db/cms_fixtures/example.com/layouts/default/nested/js.js",
-    "db/cms_fixtures/example.com/pages/index/_index.yml",
-    "db/cms_fixtures/example.com/pages/index/child/_child.yml",
-    "db/cms_fixtures/example.com/pages/index/child/left.html",
-    "db/cms_fixtures/example.com/pages/index/child/right.html",
-    "db/cms_fixtures/example.com/pages/index/content.html",
-    "db/cms_fixtures/example.com/snippets/default/_default.yml",
-    "db/cms_fixtures/example.com/snippets/default/content.html",
+    "db/cms_fixtures/sample-site/layouts/default/_default.yml",
+    "db/cms_fixtures/sample-site/layouts/default/content.html",
+    "db/cms_fixtures/sample-site/layouts/default/css.css",
+    "db/cms_fixtures/sample-site/layouts/default/js.js",
+    "db/cms_fixtures/sample-site/layouts/default/nested/_nested.yml",
+    "db/cms_fixtures/sample-site/layouts/default/nested/content.html",
+    "db/cms_fixtures/sample-site/layouts/default/nested/css.css",
+    "db/cms_fixtures/sample-site/layouts/default/nested/js.js",
+    "db/cms_fixtures/sample-site/pages/index/_index.yml",
+    "db/cms_fixtures/sample-site/pages/index/child/_child.yml",
+    "db/cms_fixtures/sample-site/pages/index/child/left.html",
+    "db/cms_fixtures/sample-site/pages/index/child/right.html",
+    "db/cms_fixtures/sample-site/pages/index/content.html",
+    "db/cms_fixtures/sample-site/snippets/default/_default.yml",
+    "db/cms_fixtures/sample-site/snippets/default/content.html",
     "db/migrate/01_create_cms.rb",
     "db/seeds.rb",
     "db/upgrade_migrations/02_upgrade_to_1_1_0.rb",
@@ -249,7 +250,6 @@ Gem::Specification.new do |s|
     "lib/generators/comfy/cms/README",
     "lib/generators/comfy/cms/cms_generator.rb",
     "lib/tasks/comfortable_mexican_sofa.rake",
-    "rvmrc.example",
     "script/rails",
     "test/fixtures/cms/blocks.yml",
     "test/fixtures/cms/categories.yml",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -106,6 +106,7 @@ ComfortableMexicanSofa::HttpAuth.password = 'password'
 
 # If you need to inject some html in cms admin views you can define what partial
 # should be rendered into the following areas:
+#   ComfortableMexicanSofa::ViewHooks.add(:header, '/layouts/admin/header')
 #   ComfortableMexicanSofa::ViewHooks.add(:navigation, '/layouts/admin/navigation')
 #   ComfortableMexicanSofa::ViewHooks.add(:html_head, '/layouts/admin/html_head')
 #   ComfortableMexicanSofa::ViewHooks.add(:page_form, '/layouts/admin/page_form')

data/config/locales/fr.yml

@@ -0,0 +1,234 @@
+# encoding: utf-8
+fr:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: Label
+    slug: Slug
+    parent_id: Parent
+    content: Contenu
+    identifier: Identifiant
+  activerecord:
+    models:
+      cms/site: Site
+      cms/layout: Mise en page
+      cms/page: Page
+      cms/snippet: Snippet
+      cms/file: Fichier
+    attributes:
+      cms/site:
+        identifier: Identifiant
+        hostname: Hostname
+        path: Chemin d'accès
+        locale: Langage
+        is_mirrored: En miroir
+      cms/layout:
+        identifier: Identifiant
+        label: Nom de la Mise en page
+        app_layout: Mise en page Application
+        parent_id: Mise en page Parent
+        css: Feuille de Style CSS
+        js: Javascript
+      cms/page:
+        label: Label
+        layout_id: Mise en page
+        slug: Slug
+        target_page_id: Rediriger vers Page
+        is_published: Publié
+      cms/file:
+        file: File
+        description: Description
+      cms/snippet:
+        identifier: Identifiant
+        
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: Site non trouvé
+      fixtures_enabled: Jeu de données Test activé. Toutes les modifications seront supprimées.
+
+    sites:
+      created: Site créé
+      creation_failure: Echec de la création du site
+      updated: Site modifié
+      update_failure: Echec de la modification du site
+      deleted: Site supprimé
+      not_found: Site non trouvé
+      
+    layouts:
+      created: Mise en page créée
+      creation_failure: Echec de la création de la Mise en page
+      updated: Mise en page modifiée
+      update_failure: Echec de la modification de la mise en page
+      deleted: Mise en page supprimée
+      not_found: Mise en page non trouvée
+      
+    pages:
+      created: Page créée
+      creation_failure: Echec de la création de la page
+      updated: Page modifiée
+      update_failure: Echec de la modification de la page
+      deleted: Page supprimée
+      not_found: Page non trouvée
+      layout_not_found: Aucune Mise ne page disponible. SVP créez en une.
+      
+    snippets:
+      created: Snippet créé
+      creation_failure: Echec de la création du snippet
+      updated: Snippet modifié
+      update_failure: Echec de la modification du snippet
+      deleted: Snippet supprimé
+      not_found: Snippet non trouvé
+      
+    revisions:
+      reverted: Contenu Reverted
+      record_not_found: Enregistrement non trouvé
+      not_found: Revision non trouvée
+      
+    files:
+      created: Fichier téléchargé
+      creation_failure: Echec deu téléchargement de fichier
+      updated: Fichier modifié
+      update_failure: Echec de la modification du fichier
+      deleted: Fichier supprimé
+      not_found: Fichier non trouvé
+      
+    content:
+      site_not_found: Site non trouvé
+      layout_not_found: Mise en page non trouvée
+      page_not_found: Page non trouvée
+  
+  # -- Views ----------------------------------------------------------------
+  cms_admin:
+    base:
+      sites: Sites
+      layouts: Mises en page
+      pages: Pages
+      snippets: Snippets
+      files: Fichiers
+      
+    sites:
+      index:
+        title: Sites
+        new_link: Créer Nouveau Site
+        select: Sélectionner Site
+        edit: Modifier
+        delete: Supprimer
+        are_you_sure: Confirmez-vous la suppression de ce site?
+      new:
+        title: Nouveau Site
+      edit:
+        title: Modification Site
+      form:
+        create: Créer Site
+        update: Modifier Site
+        
+    layouts:
+      index:
+        title: Layouts
+        new_link: Créer Nouveau Layout
+      index_branch:
+        add_child_layout: Ajouter Mise en page Enfant
+        edit: Modifier
+        delete: Supprimer
+        are_you_sure: Confirmez-vous la suppression?
+      new:
+        title: Nouvelle Mise en page
+      edit:
+        title: Modification Mise en page
+        revision: Révision
+      form:
+        select_parent_layout: Sélection Mise en page Parent
+        select_app_layout: Sélection Mise en page Application
+        create: Créer Mise en page
+        update: Modifier Mise en page
+      
+    pages:
+      index:
+        title: Pages
+        new_link: Créer Nouvelle Page
+      index_branch:
+        toggle: Basculer
+        add_child_page: Ajouter Page Enfant
+        edit: Modifier
+        delete: Supprimer
+        are_you_sure: Confirmez-vous la suppression?
+      new:
+        title: Nouvelle Page
+      edit:
+        title: Modification Page
+        revision: Révision
+      form:
+        select_target_page: Sans Redirection
+        preview: Prévisualiser
+        create: Créer Page
+        update: Modifier Page
+      form_blocks:
+        no_tags: |-
+          Mise en page sans aucun tag de contenu.<br/>
+          Modifiez le contenu pour y ajouter un tag de page ou de champs. Par exemple: <code>{{cms:page:content}}</code>
+      
+    snippets:
+      index:
+        title: Snippets
+        new_link: Créer Nouveau Snippet
+        edit: Modifier
+        delete: Supprimer
+        are_you_sure: Confirmez-vous la suppression?
+      new:
+        title: Nouveau Snippet
+      edit:
+        title: Modification Snippet
+        revision: Révision
+      form:
+        create: Créer Snippet
+        update: Modifier Snippet
+          
+    revisions:
+      show:
+        title: Révisions pour
+        revision: Révision
+        full_path: Chemin d'accès complet
+        slug: Nom unique
+        update: Update to this Révision
+        current: Actuel
+      
+    files:
+      index:
+        title: Fichiers
+        new_link: Télécharger Nouveau Fichier
+        edit: Modifier
+        delete: Supprimer
+        are_you_sure: Confirmez-vous la suppression?
+        button: Télécharger Fichiers
+      new:
+        title: Nouveau Fichier
+      edit:
+        title: Modification Fichier
+      form:
+        current_file: Fichier actuel
+        create: Télécharger Fichier
+        update: Modifier Fichier
+      page_form:
+        are_you_sure: Confirmez-vous la suppression?
+      file:
+        are_you_sure: Confirmez-vous la suppression?
+        
+    categories:
+      index:
+        label: Catégories
+        edit: Modifier
+        done: Effectué
+        all: Tout
+        add: Ajouter
+      show:
+        are_you_sure: Confirmez-vous la suppression?
+      edit:
+        save: Enregistrer
+      form:
+        label: Catégories
+        
+    dialogs:
+      image:
+        insert: Insérer Image
+      link:
+        create: Créer Lien

data/config/locales/pt-BR.yml

@@ -13,7 +13,7 @@ pt-BR:
       cms/layout: Leiaute
       cms/page: Página
       cms/snippet: Fragmento
-      cms/file: File
+      cms/file: Arquivo
     attributes:
       cms/site:
         identifier: Identificador

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -91,6 +91,7 @@ class ComfortableMexicanSofa::Configuration
     @revisions_limit      = 25
     @locales              = {
       'en'    => 'English',
+      'fr'    => 'Français',
       'es'    => 'Español',
       'pt-BR' => 'Português Brasileiro',
       'zh-CN' => '简体中文',

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -1,20 +1,20 @@
 module ComfortableMexicanSofa::Fixtures
   
-  def self.import_all(to_hostname, from_hostname = nil)
-    import_layouts  to_hostname, from_hostname
-    import_pages    to_hostname, from_hostname
-    import_snippets to_hostname, from_hostname
+  def self.import_all(to_site, from_folder = nil)
+    import_layouts  to_site, from_folder
+    import_pages    to_site, from_folder
+    import_snippets to_site, from_folder
   end
   
-  def self.export_all(from_hostname, to_hostname = nil)
-    export_layouts  from_hostname, to_hostname
-    export_pages    from_hostname, to_hostname
-    export_snippets from_hostname, to_hostname
+  def self.export_all(from_site, to_folder = nil)
+    export_layouts  from_site, to_folder
+    export_pages    from_site, to_folder
+    export_snippets from_site, to_folder
   end
   
-  def self.import_layouts(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, layout_ids = [])
-    site = Cms::Site.find_or_create_by_hostname(to_hostname)
-    unless path ||= find_fixtures_path((from_hostname || to_hostname), 'layouts')
+  def self.import_layouts(to_site, from_folder = nil, path = nil, root = true, parent = nil, layout_ids = [])
+    site = Cms::Site.find_or_create_by_identifier(to_site)
+    unless path ||= find_fixtures_path((from_folder || to_site), 'layouts')
       ComfortableMexicanSofa.logger.warn('Cannot find Layout fixtures')
       return []
     end
@@ -66,7 +66,7 @@ module ComfortableMexicanSofa::Fixtures
       layout_ids << layout.id
       
       # checking for nested fixtures
-      layout_ids += import_layouts(to_hostname, from_hostname, path, false, layout, layout_ids)
+      layout_ids += import_layouts(to_site, from_folder, path, false, layout, layout_ids)
     end
     
     # removing all db entries that are not in fixtures
@@ -79,9 +79,9 @@ module ComfortableMexicanSofa::Fixtures
     layout_ids.uniq
   end
   
-  def self.import_pages(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, page_ids = [])
-    site = Cms::Site.find_or_create_by_hostname(to_hostname)
-    unless path ||= find_fixtures_path((from_hostname || to_hostname), 'pages')
+  def self.import_pages(to_site, from_folder = nil, path = nil, root = true, parent = nil, page_ids = [])
+    site = Cms::Site.find_or_create_by_identifier(to_site)
+    unless path ||= find_fixtures_path((from_folder || to_site), 'pages')
       ComfortableMexicanSofa.logger.warn('Cannot find Page fixtures')
       return []
     end
@@ -113,7 +113,7 @@ module ComfortableMexicanSofa::Fixtures
       blocks_to_clear = page.blocks.collect(&:identifier)
       blocks_attributes = [ ]
       Dir.glob("#{path}/*.html").each do |file_path|
-        identifier = file_path.split('/').last.split('.').first
+        identifier = file_path.split('/').last.gsub(/\.html$/, '')
         blocks_to_clear.delete(identifier)
         if page.new_record? || File.mtime(file_path) > page.updated_at
           blocks_attributes << {
@@ -144,7 +144,7 @@ module ComfortableMexicanSofa::Fixtures
       page_ids << page.id
       
       # checking for nested fixtures
-      page_ids += import_pages(to_hostname, from_hostname, path, false, page, page_ids)
+      page_ids += import_pages(to_site, from_folder, path, false, page, page_ids)
     end
     
     # removing all db entries that are not in fixtures
@@ -157,9 +157,9 @@ module ComfortableMexicanSofa::Fixtures
     page_ids.uniq
   end
   
-  def self.import_snippets(to_hostname, from_hostname = nil)
-    site = Cms::Site.find_or_create_by_hostname(to_hostname)
-    unless path = find_fixtures_path((from_hostname || to_hostname), 'snippets')
+  def self.import_snippets(to_site, from_folder = nil)
+    site = Cms::Site.find_or_create_by_identifier(to_site)
+    unless path = find_fixtures_path((from_folder || to_site), 'snippets')
       ComfortableMexicanSofa.logger.warn('Cannot find Snippet fixtures')
       return []
     end
@@ -203,9 +203,9 @@ module ComfortableMexicanSofa::Fixtures
     ComfortableMexicanSofa.logger.warn('Imported Snippets!')
   end
   
-  def self.export_layouts(from_hostname, to_hostname = nil)
-    return unless site = Cms::Site.find_by_hostname(from_hostname)
-    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_hostname || site.hostname), 'layouts')
+  def self.export_layouts(from_site, to_folder = nil)
+    return unless site = Cms::Site.find_by_identifier(from_site)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_folder || site.identifier), 'layouts')
     FileUtils.rm_rf(path)
     FileUtils.mkdir_p(path)
     
@@ -233,9 +233,9 @@ module ComfortableMexicanSofa::Fixtures
     end
   end
   
-  def self.export_pages(from_hostname, to_hostname = nil)
-    return unless site = Cms::Site.find_by_hostname(from_hostname)
-    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_hostname || site.hostname), 'pages')
+  def self.export_pages(from_site, to_folder = nil)
+    return unless site = Cms::Site.find_by_identifier(from_site)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_folder || site.identifier), 'pages')
     FileUtils.rm_rf(path)
     FileUtils.mkdir_p(path)
     
@@ -262,9 +262,9 @@ module ComfortableMexicanSofa::Fixtures
     end
   end
   
-  def self.export_snippets(from_hostname, to_hostname = nil)
-    return unless site = Cms::Site.find_by_hostname(from_hostname)
-    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_hostname || site.hostname), 'snippets')
+  def self.export_snippets(from_site, to_folder = nil)
+    return unless site = Cms::Site.find_by_identifier(from_site)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, (to_folder || site.identifier), 'snippets')
     FileUtils.rm_rf(path)
     FileUtils.mkdir_p(path)
     
@@ -281,8 +281,8 @@ module ComfortableMexicanSofa::Fixtures
   
 protected
   
-  def self.find_fixtures_path(hostname, dir)
-    path = File.join(ComfortableMexicanSofa.config.fixtures_path, hostname, dir)
+  def self.find_fixtures_path(identifier, dir)
+    path = File.join(ComfortableMexicanSofa.config.fixtures_path, identifier, dir)
     File.exists?(path) ? path : nil
   end
   

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -6,7 +6,7 @@ end
 namespace :comfortable_mexican_sofa do
   namespace :fixtures do
     
-    desc 'Import Fixture data into database (options: FROM=example.local TO=example.com)'
+    desc 'Import Fixture data into database (options: FROM=folder_name TO=site_identifier)'
 
     task :import => :environment do
       to    = ENV['TO'] || ENV['FROM']
@@ -23,7 +23,7 @@ namespace :comfortable_mexican_sofa do
       ComfortableMexicanSofa.logger = logger_org
     end
     
-    desc 'Export database data into Fixtures (options: FROM=example.com TO=example.local)'
+    desc 'Export database data into Fixtures (options: FROM=site_identifier.com TO=folder_name)'
     task :export => :environment do
       to    = ENV['TO'] || ENV['FROM']
       from  = ENV['FROM']

data/test/integration/fixtures_test.rb

@@ -5,8 +5,7 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class FixturesTest < ActionDispatch::IntegrationTest
   
   def setup
-    host! 'example.com'
-    cms_sites(:default).update_column(:hostname, 'example.com')
+    cms_sites(:default).update_column(:identifier, 'sample-site')
   end
   
   def test_fixtures_disabled

data/test/integration/sites_test.rb

@@ -60,6 +60,22 @@ class SitesTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_get_public_page_with_host_with_port
+    Cms::Site.delete_all
+    site_a = Cms::Site.create!(:identifier => 'site-a', :hostname => 'test.host:3000')
+    site_b = Cms::Site.create!(:identifier => 'site-b', :hostname => 'test.host')
+    
+    [site_a, site_b].each do |site|
+      layout  = site.layouts.create!(:identifier => 'test')
+      site.pages.create!(:label => 'index', :layout => layout)
+      site.pages.create!(:label => '404', :slug => '404', :layout => layout)
+    end
+    
+    get '/'
+    assert assigns(:cms_site)
+    assert_equal site_b, assigns(:cms_site)
+  end
+  
   def test_get_public_with_locale
     get '/'
     assert_response :success
@@ -99,7 +115,6 @@ class SitesTest < ActionDispatch::IntegrationTest
     assert_equal :en, I18n.locale
 
     I18n.default_locale = :en
-
   end
   
 end

data/test/unit/fixtures_test.rb

@@ -8,7 +8,7 @@ class FixturesTest < ActiveSupport::TestCase
     Cms::Layout.delete_all
     
     assert_difference 'Cms::Layout.count', 2 do
-      ComfortableMexicanSofa::Fixtures.import_layouts('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_layouts('default-site', 'sample-site')
       
       assert layout = Cms::Layout.find_by_identifier('default')
       assert_equal 'Default Fixture Layout', layout.label
@@ -34,7 +34,7 @@ class FixturesTest < ActiveSupport::TestCase
     child_layout.update_column(:updated_at, 10.years.ago)
     
     assert_difference 'Cms::Layout.count', -1 do
-      ComfortableMexicanSofa::Fixtures.import_layouts('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_layouts('default-site', 'sample-site')
       
       layout.reload
       assert_equal 'Default Fixture Layout', layout.label
@@ -57,7 +57,7 @@ class FixturesTest < ActiveSupport::TestCase
   
   def test_import_layouts_ignoring
     layout = cms_layouts(:default)
-    layout_path       = File.join(ComfortableMexicanSofa.config.fixtures_path, 'example.com', 'layouts', 'default')
+    layout_path       = File.join(ComfortableMexicanSofa.config.fixtures_path, 'sample-site', 'layouts', 'default')
     attr_file_path    = File.join(layout_path, '_default.yml')
     content_file_path = File.join(layout_path, 'content.html')
     css_file_path     = File.join(layout_path, 'css.css')
@@ -68,7 +68,7 @@ class FixturesTest < ActiveSupport::TestCase
     assert layout.updated_at >= File.mtime(css_file_path)
     assert layout.updated_at >= File.mtime(js_file_path)
     
-    ComfortableMexicanSofa::Fixtures.import_layouts('test.host', 'example.com')
+    ComfortableMexicanSofa::Fixtures.import_layouts('default-site', 'sample-site')
     layout.reload
     assert_equal 'default', layout.identifier
     assert_equal 'Default Layout', layout.label
@@ -87,7 +87,7 @@ class FixturesTest < ActiveSupport::TestCase
     nested.update_column(:content, '<html>{{cms:page:left}}<br/>{{cms:page:right}}</html>')
     
     assert_difference 'Cms::Page.count', 2 do
-      ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_pages('default-site', 'sample-site')
       
       assert page = Cms::Page.find_by_full_path('/')
       assert_equal layout, page.layout
@@ -114,7 +114,7 @@ class FixturesTest < ActiveSupport::TestCase
     child.update_column(:slug, 'old')
     
     assert_no_difference 'Cms::Page.count' do
-      ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_pages('default-site', 'sample-site')
       
       page.reload
       assert_equal 'Home Fixture Page', page.label
@@ -132,14 +132,14 @@ class FixturesTest < ActiveSupport::TestCase
       :blocks_attributes => [ { :identifier => 'content', :content => 'test content' } ]
     )
     
-    page_path         = File.join(ComfortableMexicanSofa.config.fixtures_path, 'example.com', 'pages', 'index')
+    page_path         = File.join(ComfortableMexicanSofa.config.fixtures_path, 'sample-site', 'pages', 'index')
     attr_file_path    = File.join(page_path, '_index.yml')
     content_file_path = File.join(page_path, 'content.html')
     
     assert page.updated_at >= File.mtime(attr_file_path)
     assert page.updated_at >= File.mtime(content_file_path)
     
-    ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
+    ComfortableMexicanSofa::Fixtures.import_pages('default-site', 'sample-site')
     page.reload
     
     assert_equal nil, page.slug
@@ -158,7 +158,7 @@ class FixturesTest < ActiveSupport::TestCase
     )
     page.update_column(:updated_at, 10.years.ago)
     
-    ComfortableMexicanSofa::Fixtures.import_pages('test.host', 'example.com')
+    ComfortableMexicanSofa::Fixtures.import_pages('default-site', 'sample-site')
     page.reload
     
     block = page.blocks.where(:identifier => 'content').first
@@ -172,7 +172,7 @@ class FixturesTest < ActiveSupport::TestCase
     Cms::Snippet.delete_all
     
     assert_difference 'Cms::Snippet.count' do
-      ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_snippets('default-site', 'sample-site')
       assert snippet = Cms::Snippet.last
       assert_equal 'default', snippet.identifier
       assert_equal 'Default Fixture Snippet', snippet.label
@@ -188,7 +188,7 @@ class FixturesTest < ActiveSupport::TestCase
     assert_equal 'default_snippet_content', snippet.content
     
     assert_no_difference 'Cms::Snippet.count' do
-      ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_snippets('default-site', 'sample-site')
       snippet.reload
       assert_equal 'default', snippet.identifier
       assert_equal 'Default Fixture Snippet', snippet.label
@@ -201,7 +201,7 @@ class FixturesTest < ActiveSupport::TestCase
     snippet.update_column(:identifier, 'old')
     
     assert_no_difference 'Cms::Snippet.count' do
-      ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
+      ComfortableMexicanSofa::Fixtures.import_snippets('default-site', 'sample-site')
       assert snippet = Cms::Snippet.last
       assert_equal 'default', snippet.identifier
       assert_equal 'Default Fixture Snippet', snippet.label
@@ -213,14 +213,14 @@ class FixturesTest < ActiveSupport::TestCase
   
   def test_import_snippets_ignoring
     snippet = cms_snippets(:default)
-    snippet_path      = File.join(ComfortableMexicanSofa.config.fixtures_path, 'example.com', 'snippets', 'default')
+    snippet_path      = File.join(ComfortableMexicanSofa.config.fixtures_path, 'sample-site', 'snippets', 'default')
     attr_file_path    = File.join(snippet_path, '_default.yml')
     content_file_path = File.join(snippet_path, 'content.html')
     
     assert snippet.updated_at >= File.mtime(attr_file_path)
     assert snippet.updated_at >= File.mtime(content_file_path)
     
-    ComfortableMexicanSofa::Fixtures.import_snippets('test.host', 'example.com')
+    ComfortableMexicanSofa::Fixtures.import_snippets('default-site', 'sample-site')
     snippet.reload
     assert_equal 'default', snippet.identifier
     assert_equal 'Default Snippet', snippet.label
@@ -235,7 +235,7 @@ class FixturesTest < ActiveSupport::TestCase
     assert_difference 'Cms::Layout.count', 2 do
       assert_difference 'Cms::Page.count', 2 do
         assert_difference 'Cms::Snippet.count', 1 do
-          ComfortableMexicanSofa::Fixtures.import_all('test.host', 'example.com')
+          ComfortableMexicanSofa::Fixtures.import_all('default-site', 'sample-site')
         end
       end
     end
@@ -248,7 +248,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert_difference 'Cms::Layout.count', 2 do
         assert_difference 'Cms::Page.count', 2 do
           assert_difference 'Cms::Snippet.count', 1 do
-            ComfortableMexicanSofa::Fixtures.import_all('test.host', 'example.com')
+            ComfortableMexicanSofa::Fixtures.import_all('default-site', 'sample-site')
           end
         end
       end
@@ -256,7 +256,7 @@ class FixturesTest < ActiveSupport::TestCase
   end
   
   def test_export_layouts
-    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test.test')
+    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
     layout_1_attr_path    = File.join(host_path, 'layouts/nested/_nested.yml')
     layout_1_content_path = File.join(host_path, 'layouts/nested/content.html')
     layout_1_css_path     = File.join(host_path, 'layouts/nested/css.css')
@@ -266,7 +266,7 @@ class FixturesTest < ActiveSupport::TestCase
     layout_2_css_path     = File.join(host_path, 'layouts/nested/child/css.css')
     layout_2_js_path      = File.join(host_path, 'layouts/nested/child/js.js')
     
-    ComfortableMexicanSofa::Fixtures.export_layouts('test.host', 'test.test')
+    ComfortableMexicanSofa::Fixtures.export_layouts('default-site', 'test-site')
     
     assert File.exists?(layout_1_attr_path)
     assert File.exists?(layout_1_content_path)
@@ -302,13 +302,13 @@ class FixturesTest < ActiveSupport::TestCase
   end
   
   def test_export_pages
-    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test.test')
+    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
     page_1_attr_path    = File.join(host_path, 'pages/index/_index.yml')
     page_1_block_a_path = File.join(host_path, 'pages/index/default_field_text.html')
     page_1_block_b_path = File.join(host_path, 'pages/index/default_page_text.html')
     page_2_attr_path    = File.join(host_path, 'pages/index/child-page/_child-page.yml')
     
-    ComfortableMexicanSofa::Fixtures.export_pages('test.host', 'test.test')
+    ComfortableMexicanSofa::Fixtures.export_pages('default-site', 'test-site')
     
     assert_equal ({
       'label'         => 'Default Page',
@@ -334,11 +334,11 @@ class FixturesTest < ActiveSupport::TestCase
   end
   
   def test_export_snippets
-    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test.test')
+    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
     attr_path     = File.join(host_path, 'snippets/default/_default.yml')
     content_path  = File.join(host_path, 'snippets/default/content.html')
     
-    ComfortableMexicanSofa::Fixtures.export_snippets('test.host', 'test.test')
+    ComfortableMexicanSofa::Fixtures.export_snippets('default-site', 'test-site')
     
     assert File.exists?(attr_path)
     assert File.exists?(content_path)
@@ -349,8 +349,8 @@ class FixturesTest < ActiveSupport::TestCase
   end
   
   def test_export_all
-    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test.test')
-    ComfortableMexicanSofa::Fixtures.export_all('test.host', 'test.test')
+    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
+    ComfortableMexicanSofa::Fixtures.export_all('default-site', 'test-site')
     FileUtils.rm_rf(host_path)
   end
   

data/test/unit/mirrors_test.rb

@@ -225,9 +225,9 @@ class MirrorsTest < ActiveSupport::TestCase
       :is_mirrored  => true
     )
     mirror.reload
-    
     assert_no_difference ['site.layouts.count', 'site.pages.count', 'site.snippets.count'] do
       mirror.destroy
+      site.reload
     end
   end
   

data/test/unit/models/page_test.rb

@@ -184,7 +184,9 @@ class CmsPageTest < ActiveSupport::TestCase
   
   def test_cascading_destroy
     assert_difference 'Cms::Page.count', -2 do
-      cms_pages(:default).destroy
+      assert_difference 'Cms::Block.count', -2 do
+        cms_pages(:default).destroy
+      end
     end
   end
   

data/test/unit/models/site_test.rb

@@ -4,7 +4,7 @@ class CmsSiteTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
     Cms::Site.all.each do |site|
-      assert site.valid?, site.errors.full_messages.to_s
+      assert site.valid?, site.errors.inspect
     end
   end
   
@@ -22,7 +22,10 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_has_errors_on site, :identifier
     
     site = Cms::Site.new(:identifier => 'test', :hostname => 'site.host')
-    assert site.valid?, site.errors.to_yaml
+    assert site.valid?, site.errors.inspect
+    
+    site = Cms::Site.new(:identifier => 'test', :hostname => 'localhost:3000')
+    assert site.valid?, site.errors.inspect
   end
   
   def test_validation_path_uniqueness
@@ -49,6 +52,12 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal 'my_site_host', site.identifier
   end
   
+  def test_hostname_assignment
+    site = Cms::Site.new(:identifier => 'test-site')
+    assert site.valid?
+    assert_equal 'test-site', site.hostname
+  end
+  
   def test_label_assignment
     site = Cms::Site.new(:identifier => 'test', :hostname => 'my-site.host')
     assert site.valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.25
+  version: 1.6.26
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,6 +228,7 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/ja.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -235,21 +236,21 @@ files:
 - config/locales/sv.yml
 - config/locales/zh-CN.yml
 - config/routes.rb
-- db/cms_fixtures/example.com/layouts/default/_default.yml
-- db/cms_fixtures/example.com/layouts/default/content.html
-- db/cms_fixtures/example.com/layouts/default/css.css
-- db/cms_fixtures/example.com/layouts/default/js.js
-- db/cms_fixtures/example.com/layouts/default/nested/_nested.yml
-- db/cms_fixtures/example.com/layouts/default/nested/content.html
-- db/cms_fixtures/example.com/layouts/default/nested/css.css
-- db/cms_fixtures/example.com/layouts/default/nested/js.js
-- db/cms_fixtures/example.com/pages/index/_index.yml
-- db/cms_fixtures/example.com/pages/index/child/_child.yml
-- db/cms_fixtures/example.com/pages/index/child/left.html
-- db/cms_fixtures/example.com/pages/index/child/right.html
-- db/cms_fixtures/example.com/pages/index/content.html
-- db/cms_fixtures/example.com/snippets/default/_default.yml
-- db/cms_fixtures/example.com/snippets/default/content.html
+- db/cms_fixtures/sample-site/layouts/default/_default.yml
+- db/cms_fixtures/sample-site/layouts/default/content.html
+- db/cms_fixtures/sample-site/layouts/default/css.css
+- db/cms_fixtures/sample-site/layouts/default/js.js
+- db/cms_fixtures/sample-site/layouts/default/nested/_nested.yml
+- db/cms_fixtures/sample-site/layouts/default/nested/content.html
+- db/cms_fixtures/sample-site/layouts/default/nested/css.css
+- db/cms_fixtures/sample-site/layouts/default/nested/js.js
+- db/cms_fixtures/sample-site/pages/index/_index.yml
+- db/cms_fixtures/sample-site/pages/index/child/_child.yml
+- db/cms_fixtures/sample-site/pages/index/child/left.html
+- db/cms_fixtures/sample-site/pages/index/child/right.html
+- db/cms_fixtures/sample-site/pages/index/content.html
+- db/cms_fixtures/sample-site/snippets/default/_default.yml
+- db/cms_fixtures/sample-site/snippets/default/content.html
 - db/migrate/01_create_cms.rb
 - db/seeds.rb
 - db/upgrade_migrations/02_upgrade_to_1_1_0.rb
@@ -300,7 +301,6 @@ files:
 - lib/generators/comfy/cms/README
 - lib/generators/comfy/cms/cms_generator.rb
 - lib/tasks/comfortable_mexican_sofa.rake
-- rvmrc.example
 - script/rails
 - test/fixtures/cms/blocks.yml
 - test/fixtures/cms/categories.yml
@@ -389,7 +389,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4349925487218817830
+      hash: 1707127231452077452
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/rvmrc.example

@@ -1 +0,0 @@
-rvm use 1.9.2@comfortable-mexican-sofa --create