comfortable_mexican_sofa 1.6.2 → 1.6.3

data/.travis.yml

@@ -6,8 +6,9 @@ rvm:
   - ree
   # - jruby
 gemfile:
-  - test/gemfiles/Gemfile.rails-3.0
-  - test/gemfiles/Gemfile.rails-3.1
+  - test/gemfiles/Gemfile.rails.3.0
+  - test/gemfiles/Gemfile.rails.3.1
+  - test/gemfiles/Gemfile.rails.3.2
 notifications:
   recipients:
     - oleg@twg.ca

data/VERSION

@@ -1 +1 @@
-1.6.2
+1.6.3

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

@@ -96,6 +96,15 @@ $.CMS = function(){
       
       elRTE.prototype.options.toolbars.sofa = $.CMS.config.elRTE.toolbar;
       
+      // BUG: Need to set content to an empty <p> for IE
+      if ($.browser.msie){
+        $('textarea.rich_text').each(function(){
+          if ($(this).val() == ''){
+            $(this).val('<p></p>');
+          }
+        })
+      }
+      
       $('textarea.rich_text').elrte({
         height:       300,
         toolbar:      'sofa',

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

@@ -39,8 +39,8 @@ this.value=q+"\t"+u;this.setSelectionRange(q.length+1,q.length+1)}}});a(this.doc
 c.selection.select(p);setTimeout(function(){if(t.parentNode){a(t).html(c.filter.proccess("paste",a(t).html()));p=t.lastChild;c.dom.unwrap(t);if(p){c.selection.select(p);c.selection.collapse(false)}}else{t.parentNode&&t.parentNode.removeChild(t);c.val(c.filter.proccess("paste",c.filter.wysiwyg2wysiwyg(a(c.doc.body).html())));c.selection.select(c.doc.body.firstChild);c.selection.collapse(true)}a(c.doc.body).mouseup()},15)}});if(a.browser.msie){this.$doc.bind("keyup",function(p){if(p.keyCode==86&&(p.metaKey||p.ctrlKey)){c.history.add(true);
 c.typing=true;c.lastKey=null;c.selection.saveIERange();c.val(c.filter.proccess("paste",c.filter.wysiwyg2wysiwyg(a(c.doc.body).html())));c.selection.restoreIERange();a(c.doc.body).mouseup();this.ui.update()}})}if(a.browser.safari){this.$doc.bind("click",function(p){a(c.doc.body).find(".elrte-webkit-hl").removeClass("elrte-webkit-hl");if(p.target.nodeName=="IMG"){a(p.target).addClass("elrte-webkit-hl")}}).bind("keyup",function(p){a(c.doc.body).find(".elrte-webkit-hl").removeClass("elrte-webkit-hl")
 })}this.window.focus();this.destroy=function(){this.updateSource();this.target.is("textarea")?this.target.val(a.trim(this.source.val())):this.target.html(a.trim(this.source.val()));this.editor.remove();this.target.show().parents("form").unbind("submit.elfinder")}};elRTE.prototype.i18n=function(b){return this._i18n.translate(b)};elRTE.prototype.open=function(){this.editor.show()};elRTE.prototype.close=function(){this.editor.hide()};elRTE.prototype.updateEditor=function(){this.val(this.source.val())
-};elRTE.prototype.updateSource=function(){this.source.val(this.filter.source(a(this.doc.body).html()))};elRTE.prototype.val=function(b){if(typeof(b)=="string"){b=""+b;if(this.source.is(":visible")){this.source.val(this.filter.source2source(b))}else{if(a.browser.msie){this.doc.body.innerHTML="<br />"+this.filter.wysiwyg(b);this.doc.body.removeChild(this.doc.body.firstChild)}else{this.doc.body.innerHTML=this.filter.wysiwyg(b)}}}else{if(this.source.is(":visible")){return this.filter.source2source(this.source.val()).trim()
-}else{return this.filter.source(a(this.doc.body).html()).trim()}}};elRTE.prototype.beforeSave=function(){this.source.val(a.trim(this.val())||"")};elRTE.prototype.save=function(){this.beforeSave();this.editor.parents("form").submit()};elRTE.prototype.log=function(b){if(window.console&&window.console.log){window.console.log(b)}};elRTE.prototype.i18Messages={};a.fn.elrte=function(g,b){var f=typeof(g)=="string"?g:"",c;this.each(function(){if(!this.elrte){this.elrte=new elRTE(this,typeof(g)=="object"?g:{})
+};elRTE.prototype.updateSource=function(){this.source.val(this.filter.source(a(this.doc.body).html()))};elRTE.prototype.val=function(b){if(typeof(b)=="string"){b=""+b;if(this.source.is(":visible")){this.source.val(this.filter.source2source(b))}else{if(a.browser.msie){this.doc.body.innerHTML="<br />"+this.filter.wysiwyg(b);this.doc.body.removeChild(this.doc.body.firstChild)}else{this.doc.body.innerHTML=this.filter.wysiwyg(b)}}}else{if(this.source.is(":visible")){return $.trim(this.filter.source2source(this.source.val()))
+}else{return $.trim(this.filter.source(a(this.doc.body).html()))}}};elRTE.prototype.beforeSave=function(){this.source.val(a.trim(this.val())||"")};elRTE.prototype.save=function(){this.beforeSave();this.editor.parents("form").submit()};elRTE.prototype.log=function(b){if(window.console&&window.console.log){window.console.log(b)}};elRTE.prototype.i18Messages={};a.fn.elrte=function(g,b){var f=typeof(g)=="string"?g:"",c;this.each(function(){if(!this.elrte){this.elrte=new elRTE(this,typeof(g)=="object"?g:{})
 }switch(f){case"open":case"show":this.elrte.open();break;case"close":case"hide":this.elrte.close();break;case"updateSource":this.elrte.updateSource();break;case"destroy":this.elrte.destroy()}});if(f=="val"){if(!this.length){return""}else{if(this.length==1){return b?this[0].elrte.val(b):this[0].elrte.val()}else{c={};this.each(function(){c[this.elrte.source.attr("name")]=this.elrte.val()});return c}}}return this}})(jQuery);(function(a){elRTE.prototype.dom=function(c){this.rte=c;var b=this;this.regExp={textNodes:/^(A|ABBR|ACRONYM|ADDRESS|B|BDO|BIG|BLOCKQUOTE|CAPTION|CENTER|CITE|CODE|DD|DEL|DFN|DIV|DT|EM|FIELDSET|FONT|H[1-6]|I|INS|KBD|LABEL|LEGEND|LI|MARQUEE|NOBR|NOEMBED|P|PRE|Q|SAMP|SMALL|SPAN|STRIKE|STRONG|SUB|SUP|TD|TH|TT|VAR)$/,textContainsNodes:/^(A|ABBR|ACRONYM|ADDRESS|B|BDO|BIG|BLOCKQUOTE|CAPTION|CENTER|CITE|CODE|DD|DEL|DFN|DIV|DL|DT|EM|FIELDSET|FONT|H[1-6]|I|INS|KBD|LABEL|LEGEND|LI|MARQUEE|NOBR|NOEMBED|OL|P|PRE|Q|SAMP|SMALL|SPAN|STRIKE|STRONG|SUB|SUP|TABLE|THEAD|TBODY|TFOOT|TD|TH|TR|TT|UL|VAR)$/,block:/^(APPLET|BLOCKQUOTE|BR|CAPTION|CENTER|COL|COLGROUP|DD|DIV|DL|DT|H[1-6]|EMBED|FIELDSET|LI|MARQUEE|NOBR|OBJECT|OL|P|PRE|TABLE|THEAD|TBODY|TFOOT|TD|TH|TR|UL)$/,selectionBlock:/^(APPLET|BLOCKQUOTE|BR|CAPTION|CENTER|COL|COLGROUP|DD|DIV|DL|DT|H[1-6]|EMBED|FIELDSET|LI|MARQUEE|NOBR|OBJECT|OL|P|PRE|TD|TH|TR|UL)$/,header:/^H[1-6]$/,formElement:/^(FORM|INPUT|HIDDEN|TEXTAREA|SELECT|BUTTON)$/};
 this.root=function(){return this.rte.body};this.create=function(f){return this.rte.doc.createElement(f)};this.createBookmark=function(){var f=this.rte.doc.createElement("span");f.id="elrte-bm-"+Math.random().toString().substr(2);a(f).addClass("elrtebm elrte-protected");return f};this.indexOf=function(g){var f=0;g=a(g);while((g=g.prev())&&g.length){f++}return f};this.attr=function(h,f){var g="";if(h.nodeType==1){g=a(h).attr(f);if(g&&f!="src"&&f!="href"&&f!="title"&&f!="alt"){g=g.toString().toLowerCase()
 }}return g||""};this.findCommonAncestor=function(j,h){if(!j||!h){return this.rte.log("dom.findCommonAncestor invalid arguments")}if(j==h){return j}else{if(j.nodeName=="BODY"||h.nodeName=="BODY"){return this.rte.doc.body}}var o=a(j).parents(),k=a(h).parents(),f=k.length-1,p=k[f];for(var g=o.length-1;g>=0;g--,f--){if(o[g]==k[f]){p=o[g]}else{break}}return p};this.isEmpty=function(f){if(f.nodeType==1){return this.regExp.textNodes.test(f.nodeName)?a.trim(a(f).text()).length==0:false}else{if(f.nodeType==3){return/^(TABLE|THEAD|TFOOT|TBODY|TR|UL|OL|DL)$/.test(f.parentNode.nodeName)||f.nodeValue==""||(a.trim(f.nodeValue).length==0&&!(f.nextSibling&&f.previousSibling&&f.nextSibling.nodeType==1&&f.previousSibling.nodeType==1&&!this.regExp.block.test(f.nextSibling.nodeName)&&!this.regExp.block.test(f.previousSibling.nodeName)))

data/app/models/cms/block.rb

@@ -2,7 +2,7 @@ class Cms::Block < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
   
-  set_table_name :cms_blocks
+  self.table_name = 'cms_blocks'
   
   # -- Relationships --------------------------------------------------------
   belongs_to :page

data/app/models/cms/categorization.rb

@@ -2,7 +2,7 @@ class Cms::Categorization < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
   
-  set_table_name :cms_categorizations
+  self.table_name = 'cms_categorizations'
   
   # -- Relationships --------------------------------------------------------
   belongs_to :category

data/app/models/cms/category.rb

@@ -2,7 +2,7 @@ class Cms::Category < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
   
-  set_table_name :cms_categories
+  self.table_name = 'cms_categories'
   
   # -- Relationships --------------------------------------------------------
   belongs_to :site

data/app/models/cms/file.rb

@@ -4,7 +4,7 @@ class Cms::File < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
     
-  set_table_name :cms_files
+  self.table_name = 'cms_files'
   
   cms_is_categorized
   

data/app/models/cms/layout.rb

@@ -2,7 +2,7 @@ class Cms::Layout < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
     
-  set_table_name :cms_layouts
+  self.table_name = 'cms_layouts'
   
   cms_acts_as_tree
   cms_is_mirrored

data/app/models/cms/page.rb

@@ -2,7 +2,7 @@ class Cms::Page < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
     
-  set_table_name :cms_pages
+  self.table_name = 'cms_pages'
   
   cms_acts_as_tree :counter_cache => :children_count
   cms_is_categorized

data/app/models/cms/revision.rb

@@ -2,7 +2,7 @@ class Cms::Revision < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
   
-  set_table_name :cms_revisions
+  self.table_name = 'cms_revisions'
   
   serialize :data
   

data/app/models/cms/site.rb

@@ -2,7 +2,7 @@ class Cms::Site < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
   
-  set_table_name :cms_sites
+  self.table_name = 'cms_sites'
   
   # -- Relationships --------------------------------------------------------
   has_many :layouts,    :dependent => :destroy

data/app/models/cms/snippet.rb

@@ -2,7 +2,7 @@ class Cms::Snippet < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
   
-  set_table_name :cms_snippets
+  self.table_name = 'cms_snippets'
   
   cms_is_categorized
   cms_is_mirrored

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.2"
+  s.version = "1.6.3"
 
   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 = "2011-12-20"
+  s.date = "2011-12-30"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -173,6 +173,7 @@ Gem::Specification.new do |s|
     "config/initializers/paperclip.rb",
     "config/locales/en.yml",
     "config/locales/es.yml",
+    "config/locales/pt-BR.yml",
     "config/routes.rb",
     "db/cms_fixtures/example.com/layouts/default/_default.yml",
     "db/cms_fixtures/example.com/layouts/default/content.html",
@@ -190,13 +191,13 @@ Gem::Specification.new do |s|
     "db/cms_fixtures/example.com/snippets/default/_default.yml",
     "db/cms_fixtures/example.com/snippets/default/content.html",
     "db/migrate/01_create_cms.rb",
-    "db/migrate/upgrades/02_upgrade_to_1_1_0.rb",
-    "db/migrate/upgrades/03_upgrade_to_1_2_0.rb",
-    "db/migrate/upgrades/04_upgrade_to_1_3_0.rb",
-    "db/migrate/upgrades/05_upgrade_to_1_4_0.rb",
-    "db/migrate/upgrades/06_upgrade_to_1_5_0.rb",
-    "db/migrate/upgrades/07_upgrade_to_1_6_0.rb",
     "db/seeds.rb",
+    "db/upgrade_migrations/02_upgrade_to_1_1_0.rb",
+    "db/upgrade_migrations/03_upgrade_to_1_2_0.rb",
+    "db/upgrade_migrations/04_upgrade_to_1_3_0.rb",
+    "db/upgrade_migrations/05_upgrade_to_1_4_0.rb",
+    "db/upgrade_migrations/06_upgrade_to_1_5_0.rb",
+    "db/upgrade_migrations/07_upgrade_to_1_6_0.rb",
     "doc/preview.png",
     "doc/sofa.png",
     "lib/comfortable_mexican_sofa.rb",
@@ -266,8 +267,9 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/sites_controller_test.rb",
     "test/functional/cms_admin/snippets_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
-    "test/gemfiles/Gemfile.rails-3.0",
-    "test/gemfiles/Gemfile.rails-3.1",
+    "test/gemfiles/Gemfile.rails.3.0",
+    "test/gemfiles/Gemfile.rails.3.1",
+    "test/gemfiles/Gemfile.rails.3.2",
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
     "test/integration/mirrors_test.rb",

data/config/locales/pt-BR.yml

@@ -0,0 +1,230 @@
+# encoding: utf-8
+pt-BR:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: Nome
+    parent_id: Pai
+    content: Conteúdo
+    slug: Identificador
+    identifier: Identificador
+  activerecord:
+    models:
+      cms/site: Site
+      cms/layout: Leiaute
+      cms/page: Página
+      cms/snippet: Fragmento
+    attributes:
+      cms/site:
+        hostname: Nome do Host
+        path: Caminho
+        locale: Idioma
+        is_mirrored: Espelhado
+      cms/layout:
+        label: Nome do Leiaute
+        app_layout: Leiaute da Aplicação
+        parent_id: Leiaute Pai
+        css: Stylesheet
+        js: Javascript
+      cms/page:
+        label: Título
+        layout_id: Leiaute
+        slug: Identificador
+        target_page_id: Redirecionar para a Página
+        is_published: Publicada
+      cms/file:
+        file: Arquivo
+        description: Descrição
+      cms/snippet:
+        identifier: Identificador
+        
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: Site não encontrado
+      fixtures_enabled: Os Fixtures do CMS estão ativados. Todas as mudanças feitas aqui serão descartadas.
+      
+    sites:
+      created: Site criado
+      creation_failure: Não foi possível criar site
+      updated: Site atualizado
+      update_failure: Não foi possível atualizar site
+      deleted: Site excluído
+      not_found: Site não encontrado
+      
+    layouts:
+      created: Leiaute criado
+      creation_failure: Não foi possível criar leiaute
+      updated: Leiaute atualizado
+      update_failure: Não foi possível atualizar leiaute
+      deleted: Leiaute excluído
+      not_found: Leiaute não encontrado
+      
+    pages:
+      created: Página criada
+      creation_failure: Não foi possível criar página
+      updated: Página atualizada
+      update_failure: Não foi possível atualizar página
+      deleted: Página excluída
+      not_found: Página não encontrada
+      layout_not_found: "Nenhum leiaute encontrado. Por favor, crie um."
+      
+    snippets:
+      created: Fragmento criado
+      creation_failure: Não foi possível criar fragmento
+      updated: Fragmento atualizado
+      update_failure: Não foi possível atualizar fragmento
+      deleted: Fragmento excluído
+      not_found: Fragmento não encontrado
+      
+    revisions:
+      reverted: Conteúdo Revertido
+      record_not_found: Registro Não Encontrado
+      not_found: Revisão Não Encontrada
+      
+    files:
+      created: Arquivo enviado
+      creation_failure: Não foi possível enviar arquivo
+      updated: Arquivo atualizado
+      update_failure: Não foi possível atualizar arquivo
+      deleted: Arquivo excluído
+      not_found: Arquivo não encontrado
+      
+    content:
+      site_not_found: Site Não Encontrado
+      layout_not_found: Leiaute Não Encontrado
+      page_not_found: Página Não Encontrada
+  
+  # -- Views ----------------------------------------------------------------
+  cms_admin:
+    base:
+      sites: Sites
+      layouts: Leiautes
+      pages: Páginas
+      snippets: Fragmentos
+      files: Arquivos
+      
+    sites:
+      index:
+        title: Sites
+        new_link: Criar Novo Site
+        select: Selecionar Site
+        edit: Editar
+        delete: Excluir
+        are_you_sure: Tem certeza que deseja excluir este site?
+      new:
+        title: Novo Site
+      edit:
+        title: Editando Site
+      form:
+        create: Criar Site
+        update: Atualizar Site
+        
+    layouts:
+      index:
+        title: Leiautes
+        new_link: Criar Novo Leiaute
+      index_branch:
+        add_child_layout: Adicionar Leiaute Filho
+        edit: Editar
+        delete: Excluir
+        are_you_sure: Tem certeza?
+      new:
+        title: Novo Leiaute
+      edit:
+        title: Editando Leiaute
+        revision: Revisão
+      form:
+        select_parent_layout: Selecione o Leiaute Pai
+        select_app_layout: Selecione o Leiaute da Aplicação
+        create: Criar Leiaute
+        update: Atualizar Leiaute
+      
+    pages:
+      index:
+        title: Páginas
+        new_link: Criar Nova Página
+      index_branch:
+        toggle: Alterar
+        add_child_page: Adicionar Página Filha
+        edit: Editar
+        delete: Excluir
+        are_you_sure: Tem certeza?
+      new:
+        title: Nova Página
+      edit:
+        title: Editando Página
+        revision: Revisão
+      form:
+        select_target_page: Sem Redirecionar
+        preview: Pré-visualização
+        create: Criar Página
+        update: Atualizar Página
+      form_blocks:
+        no_tags: |-
+          O leiaute não possui tags de conteúdo definidas.<br/>
+          Edite o conteúdo e inclua uma tag de página ou de campo. Por exemplo: <code>{{cms:page:content}}</code>
+      
+    snippets:
+      index:
+        title: Fragmentos
+        new_link: Criar Novo Fragmento
+        edit: Editar
+        delete: Excluir
+        are_you_sure: Tem certeza?
+      new:
+        title: Novo Fragmento
+      edit:
+        title: Editando Fragmento
+        revision: Revisão
+      form:
+        create: Criar Fragmento
+        update: Atualizar Fragmento
+          
+    revisions:
+      show:
+        title: Revisões de
+        revision: Revisão
+        full_path: Caminho completo
+        slug: Identificador
+        update: Atualizar para esta revisão
+      
+    files:
+      index:
+        title: Arquivos
+        new_link: Enviar Novo Arquivo
+        edit: Editar
+        delete: Excluir
+        are_you_sure: Tem certeza?
+        button: Enviar Arquivos
+      new:
+        title: Novo Arquivo
+      edit:
+        title: Editando Arquivo
+      form:
+        current_file: Arquivo Atual
+        create: Enviar Arquivo
+        update: Atualizar Arquivo
+      page_form:
+        are_you_sure: Tem certeza?
+      file:
+        are_you_sure: Tem certeza?
+        
+    categories:
+      index:
+        label: Categorias
+        edit: Editar
+        done: Pronto
+        all: Todas
+        add: Adicionar
+      show:
+        are_you_sure: Tem certeza?
+      edit:
+        save: Salvar
+      form:
+        label: Categorias
+        
+    dialogs:
+      image:
+        insert: Inserir Imagem
+      link:
+        create: Criar Link

data/db/cms_fixtures/example.com/pages/index/content.html

@@ -1,2 +1,2 @@
-Home Page Fixture Content
+Home Page Fixture Contént
 {{ cms:snippet:default }}

data/db/{migrate/upgrades → upgrade_migrations}/07_upgrade_to_1_6_0.rb

@@ -1,6 +1,6 @@
 class UpgradeTo160 < ActiveRecord::Migration
   def self.up
-    add_column :cms_sites, :identifier, :string, :null => false
+    add_column :cms_sites, :identifier, :string
     add_index :cms_sites, :identifier
     
     rename_column :cms_layouts, :slug, :identifier

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -62,7 +62,7 @@ class ComfortableMexicanSofa::Configuration
     @enable_fixtures      = false
     @fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
     @revisions_limit      = 25
-    @locales              = { :en => 'English', :es => 'Español' }
+    @locales              = { :en => 'English', :es => 'Español', 'pt-BR' => 'Brazilian Portuguese' }
     @admin_locale         = nil
     @database_config      = nil
   end

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -38,17 +38,17 @@ module ComfortableMexicanSofa::Fixtures
       # updating content
       if File.exists?(file_path = File.join(path, 'content.html'))
         if layout.new_record? || File.mtime(file_path) > layout.updated_at
-          layout.content = File.open(file_path, 'rb').read
+          layout.content = File.open(file_path).read
         end
       end
       if File.exists?(file_path = File.join(path, 'css.css'))
         if layout.new_record? || File.mtime(file_path) > layout.updated_at
-          layout.css = File.open(file_path, 'rb').read
+          layout.css = File.open(file_path).read
         end
       end
       if File.exists?(file_path = File.join(path, 'js.js'))
         if layout.new_record? || File.mtime(file_path) > layout.updated_at
-          layout.js = File.open(file_path, 'rb').read
+          layout.js = File.open(file_path).read
         end
       end
       
@@ -110,7 +110,7 @@ module ComfortableMexicanSofa::Fixtures
           identifier = file_path.split('/').last.split('.').first
           blocks_attributes << {
             :identifier => identifier,
-            :content    => File.open(file_path, 'rb').read
+            :content    => File.open(file_path).read
           }
         end
       end
@@ -162,7 +162,7 @@ module ComfortableMexicanSofa::Fixtures
       # updating content
       if File.exists?(file_path = File.join(path, 'content.html'))
         if snippet.new_record? || File.mtime(file_path) > snippet.updated_at
-          snippet.content = File.open(file_path, 'rb').read
+          snippet.content = File.open(file_path).read
         end
       end
       

data/lib/generators/cms_generator.rb

@@ -28,12 +28,17 @@ class CmsGenerator < Rails::Generators::Base
     directory 'app/assets/javascripts/comfortable_mexican_sofa',  'public/javascripts/comfortable_mexican_sofa'
     directory 'app/assets/images/comfortable_mexican_sofa',       'public/images/comfortable_mexican_sofa'
     
-    gsub_file 'public/stylesheets/comfortable_mexican_sofa/content.css',
-      '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
-    gsub_file 'public/stylesheets/comfortable_mexican_sofa/widgets.css',
-      '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
-    gsub_file 'public/stylesheets/comfortable_mexican_sofa/jquery_ui.css',
-      '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
+    files_to_be_changed = [
+      'public/stylesheets/comfortable_mexican_sofa/content.css', 
+      'public/stylesheets/comfortable_mexican_sofa/widgets.css',
+      'public/stylesheets/comfortable_mexican_sofa/jquery_ui.css',
+      'public/stylesheets/comfortable_mexican_sofa/elrte.css',
+      'public/stylesheets/comfortable_mexican_sofa/files.css'
+    ]
+    
+    files_to_be_changed.each do |file_path|
+      gsub_file file_path, '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
+    end
   end
   
   def generate_cms_seeds

data/test/gemfiles/Gemfile.rails.3.2

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',          '3.2.0.rc1'
+gem 'active_link_to', '~>1.0.0'
+gem 'paperclip',      '~>2.3.0'
+
+group :test do
+  gem 'sqlite3'
+  gem 'jeweler'
+end

data/test/integration/fixtures_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class FixturesTest < ActionDispatch::IntegrationTest
@@ -34,7 +36,7 @@ class FixturesTest < ActionDispatch::IntegrationTest
           assert_equal 'Default Fixture Layout', Cms::Layout.find_by_identifier('default').label
           assert_equal 'Default Fixture Snippet', Cms::Snippet.find_by_identifier('default').label
           
-          assert_equal "<html>\n  <body>\n    Home Page Fixture Content\nFixture Content for Default Snippet\n  </body>\n</html>", response.body
+          assert_equal "<html>\n  <body>\n    Home Page Fixture Contént\nFixture Content for Default Snippet\n  </body>\n</html>", response.body
         end
       end
     end

data/test/integration/routing_extensions_test.rb

@@ -4,21 +4,23 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
   
   def teardown
     reset_config
-    load(File.expand_path('config/routes.rb', Rails.root))
+    Rails.application.reload_routes!
   end
   
   def test_get_admin_with_admin_route_prefix
     ComfortableMexicanSofa.config.admin_route_prefix = 'custom-admin'
-    load(File.expand_path('config/routes.rb', Rails.root))
+    Rails.application.reload_routes!
     
-    assert_equal '/custom-admin/sites', cms_admin_sites_path
-    http_auth :get, cms_admin_sites_path
+    http_auth :get, '/cms-admin/sites'
+    assert_response 404
+    
+    http_auth :get, '/custom-admin/sites'
     assert_response :success
   end
   
   def test_get_admin_with_admin_route_redirect
     ComfortableMexicanSofa.config.admin_route_redirect = '/cms-admin/sites'
-    load(File.expand_path('config/routes.rb', Rails.root))
+    Rails.application.reload_routes!
     
     http_auth :get, '/cms-admin'
     assert_response :redirect
@@ -27,7 +29,7 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
   
   def test_get_admin_with_admin_route_prefix_disabled
     ComfortableMexicanSofa.config.admin_route_prefix = ''
-    load(File.expand_path('config/routes.rb', Rails.root))
+    Rails.application.reload_routes!
     
     http_auth :get, '/cms-admin'
     assert_response 404

data/test/unit/fixtures_test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class FixturesTest < ActiveSupport::TestCase
@@ -88,7 +90,7 @@ class FixturesTest < ActiveSupport::TestCase
       assert page = Cms::Page.find_by_full_path('/')
       assert_equal layout, page.layout
       assert_equal 'index', page.slug
-      assert_equal "<html>Home Page Fixture Content\ndefault_snippet_content</html>", page.content
+      assert_equal "<html>Home Page Fixture Contént\ndefault_snippet_content</html>", page.content
       assert page.is_published?
       
       assert child_page = Cms::Page.find_by_full_path('/child')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000Z
+date: 2011-12-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70266720140420 !ruby/object:Gem::Requirement
+  requirement: &70148499151060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266720140420
+  version_requirements: *70148499151060
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70266720139840 !ruby/object:Gem::Requirement
+  requirement: &70148499149820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266720139840
+  version_requirements: *70148499149820
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70266720139320 !ruby/object:Gem::Requirement
+  requirement: &70148499148020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266720139320
+  version_requirements: *70148499148020
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -209,6 +209,7 @@ files:
 - config/initializers/paperclip.rb
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/pt-BR.yml
 - config/routes.rb
 - db/cms_fixtures/example.com/layouts/default/_default.yml
 - db/cms_fixtures/example.com/layouts/default/content.html
@@ -226,13 +227,13 @@ files:
 - db/cms_fixtures/example.com/snippets/default/_default.yml
 - db/cms_fixtures/example.com/snippets/default/content.html
 - db/migrate/01_create_cms.rb
-- db/migrate/upgrades/02_upgrade_to_1_1_0.rb
-- db/migrate/upgrades/03_upgrade_to_1_2_0.rb
-- db/migrate/upgrades/04_upgrade_to_1_3_0.rb
-- db/migrate/upgrades/05_upgrade_to_1_4_0.rb
-- db/migrate/upgrades/06_upgrade_to_1_5_0.rb
-- db/migrate/upgrades/07_upgrade_to_1_6_0.rb
 - db/seeds.rb
+- db/upgrade_migrations/02_upgrade_to_1_1_0.rb
+- db/upgrade_migrations/03_upgrade_to_1_2_0.rb
+- db/upgrade_migrations/04_upgrade_to_1_3_0.rb
+- db/upgrade_migrations/05_upgrade_to_1_4_0.rb
+- db/upgrade_migrations/06_upgrade_to_1_5_0.rb
+- db/upgrade_migrations/07_upgrade_to_1_6_0.rb
 - doc/preview.png
 - doc/sofa.png
 - lib/comfortable_mexican_sofa.rb
@@ -302,8 +303,9 @@ files:
 - test/functional/cms_admin/sites_controller_test.rb
 - test/functional/cms_admin/snippets_controller_test.rb
 - test/functional/cms_content_controller_test.rb
-- test/gemfiles/Gemfile.rails-3.0
-- test/gemfiles/Gemfile.rails-3.1
+- test/gemfiles/Gemfile.rails.3.0
+- test/gemfiles/Gemfile.rails.3.1
+- test/gemfiles/Gemfile.rails.3.2
 - test/integration/authentication_test.rb
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb
@@ -358,7 +360,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3318486019662235143
+      hash: -1734611149156211223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: