comfortable_mexican_sofa 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41489044868c7bb042cdbade3f93d9c3243a3616
-  data.tar.gz: 96b5f18e7166c5f45a546e216036854b584131d6
+  metadata.gz: 0a35ba0c1902bd02fd420650d31f0640f2c7c261
+  data.tar.gz: 6bdef6661eaf0b3b66cb8daa1df5181d52c72ee7
 SHA512:
-  metadata.gz: f5df44ea25b94cba839ce686bf513f9f02c50b27285c4b2b5a389e124d985fc7e74e9450b3cb1d0081aa6ebec29a1779227322e0aa7a6425978bf2654e3ffd9e
-  data.tar.gz: 83261b21be5c24846cd75568739ddda9d89955fc31b8fba4877f0a3a7e44816d51da1066030d03b9002a50184950483550d45f547bd85f16d37b2d673af1f3a7
+  metadata.gz: 3559118792688dc5c6605727f1d19b4e01b0b85530eaeb2f16d98aafd1a9915604f542fb4e9f66b6a90060a0dcaebd95e94c5696025242a5e741bcb1d04baa36
+  data.tar.gz: 53b453415bc65a90a0083bead5d6a30341e81b6cdcf1dec8a179b0d43c329915a8ab3af163761048935b0194492b0439c10bfb24a09e4ec7f9bc4c8f8e7acc42

data/.travis.yml

@@ -6,13 +6,10 @@ script:
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
+  - 2.1.0
 gemfile:
   - test/gemfiles/Gemfile.rails.4.0
   - test/gemfiles/Gemfile.rails.4.1
 branches:
   only:
     - master
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Oleg Khabarov, The Working Group Inc
+Copyright (c) 2010-2014 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -51,7 +51,7 @@ After finishing installation you should be able to navigate to http://yoursite/a
 
 Default username and password is 'username' and 'password'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable\_mexican\_sofa.rb](https://github.com/comfy/comfortable-mexican-sofa/blob/master/config/initializers/comfortable_mexican_sofa.rb)
 
-Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and it's language.
+Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and its language.
 
 After creating a Site, you need to make a Layout. Layout is the template of your pages; it defines some reusable content (like header and footer, for example) and places where the content goes. A very simple layout can look like this:
     
@@ -80,8 +80,4 @@ Twitter: [@GroceryBagHead](http://twitter.com/#!/GroceryBagHead)
 
 ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE) 
 
-Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/comfy/comfortable-mexican-sofa/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
+Copyright 2009-2014 Oleg Khabarov

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

@@ -100,7 +100,8 @@ window.CMS.page_blocks = ->
       complete: ->
         CMS.wysiwyg()
         CMS.timepicker()
-
+        CMS.codemirror()
+        CMS.reinitialize_page_blocks() if CMS.reinitialize_page_blocks?
 
 window.CMS.mirrors = ->
   $('#mirrors select').change ->

data/app/controllers/cms/content_controller.rb

@@ -1,6 +1,7 @@
 class Cms::ContentController < Cms::BaseController
 
-  respond_to :json, :html
+  # Respond with HTML by default so that requests with 'Accept: */*' get a web page (e.g. Facebook)
+  respond_to :html, :json
 
   # Authentication module must have #authenticate method
   include ComfortableMexicanSofa.config.public_auth.to_s.constantize

data/app/models/cms/file.rb

@@ -13,7 +13,7 @@ class Cms::File < ActiveRecord::Base
       if f.respond_to?(:instance) && f.instance.respond_to?(:dimensions)
         (f.instance.dimensions.blank?? { } : { :original => f.instance.dimensions }).merge(
           :cms_thumb => '80x60#'
-        )
+        ).merge(ComfortableMexicanSofa.config.upload_file_options[:styles] || {})
       end
     }
   )
@@ -27,6 +27,7 @@ class Cms::File < ActiveRecord::Base
   validates :site_id,
     :presence   => true
   validates_attachment_presence :file
+  validates_attachment_content_type :file, :content_type => /.*/
   validates :file_file_name,
     :uniqueness => {:scope => :site_id}
   

data/app/views/admin/cms/layouts/edit.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to pluralize(@layout.revisions.count, t('.revision')), admin_cms_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
+  = link_to t('.revision', :count => @layout.revisions.count), admin_cms_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
   %h2= t('.title')
 
 - content_for :right_column do

data/app/views/admin/cms/pages/_form_blocks.html.haml

@@ -24,5 +24,8 @@
           - namespace.each_with_index do |(name, tags), index|
             .tab-pane{:id => "ns-#{name}", :class => index == 0 ? 'active' : nil}
               - tags.each do |tag|
-                = cms_blocks.send(tag.class.to_s.demodulize.underscore, tag, block_index) rescue nil
+                - begin
+                  = cms_blocks.send(tag.class.to_s.demodulize.underscore, tag, block_index)
+                - rescue
+                  - Rails.env.production?? nil : raise
                 - block_index += 1

data/app/views/admin/cms/pages/edit.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to pluralize(@page.revisions.count, t('.revision')), admin_cms_site_page_revisions_path(@site, @page), :class => 'btn pull-right'
+  = link_to t('.revision', :count => @page.revisions.count), admin_cms_site_page_revisions_path(@site, @page), :class => 'btn pull-right'
   %h2= t('.title')
 
 - content_for :right_column do

data/app/views/admin/cms/pages/form_blocks.js.erb

@@ -1,2 +1 @@
 $('#form-blocks').replaceWith('<%= escape_javascript(render(:partial => "form_blocks")) %>');
-CMS.codemirror();

data/app/views/admin/cms/snippets/edit.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to pluralize(@snippet.revisions.count, t('.revision')), admin_cms_site_snippet_revisions_path(@site, @snippet), :class => 'btn pull-right'
+  = link_to t('.revision', :count => @snippet.revisions.count), admin_cms_site_snippet_revisions_path(@site, @snippet), :class => 'btn pull-right'
   %h2= t('.title')
 
 - content_for :right_column do

data/comfortable_mexican_sofa.gemspec

@@ -6,11 +6,11 @@ require 'comfortable_mexican_sofa/version'
 Gem::Specification.new do |s|
   s.name          = "comfortable_mexican_sofa"
   s.version       = ComfortableMexicanSofa::VERSION
-  s.authors       = ["Oleg Khabarov", "The Working Group Inc"]
+  s.authors       = ["Oleg Khabarov"]
   s.email         = ["oleg@khabarov.ca"]
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
   s.summary       = "CMS Engine for Rails 4 apps"
-  s.description   = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails applications"
+  s.description   = "ComfortableMexicanSofa is a powerful CMS Engine for Rails 4 applications"
   s.license       = 'MIT'
   
   s.files         = `git ls-files`.split("\n")
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   
   s.add_dependency 'rails',             '~> 4.0'
+  s.add_dependency 'rails-i18n',        '~> 4.0.0'
   s.add_dependency 'formatted_form',    '>= 2.1.0'
   s.add_dependency 'active_link_to',    '>= 1.0.0'
   s.add_dependency 'paperclip',         '>= 3.4.0'

data/config/locales/de.yml

@@ -137,7 +137,12 @@ de:
           title: Neues Layout
         edit:
           title: Layout bearbeiten
-          revision: Revision
+          revision: &revision
+            zero: No Revisions
+            one: '%{count} Revision'
+            few: '%{count} Revisions'
+            many: '%{count} Revisions'
+            other: '%{count} Revisions'
         form:
           select_parent_layout: Select Parent Layout
           select_app_layout: Select Application Layout
@@ -158,7 +163,8 @@ de:
           title: Neue Seite
         edit:
           title: Seite bearbeiten
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           select_target_page: Keine Weiterleitung
           preview: Vorschau
@@ -181,7 +187,8 @@ de:
           title: Neuer Schnipsel
         edit:
           title: Schnipsel bearbeiten
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           create: Erstelle Schnipsel
           update: Schnipsel speichern

data/config/locales/en.yml

@@ -137,7 +137,12 @@ en:
           title: New Layout
         edit:
           title: Editing Layout
-          revision: Revision
+          revision: &revision
+            zero: No Revisions
+            one: '%{count} Revision'
+            few: '%{count} Revisions'
+            many: '%{count} Revisions'
+            other: '%{count} Revisions'
         form:
           select_parent_layout: Select Parent Layout
           select_app_layout: Select Application Layout
@@ -158,7 +163,8 @@ en:
           title: New Page
         edit:
           title: Editing Page
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           select_target_page: No Redirect
           preview: Preview
@@ -181,7 +187,8 @@ en:
           title: New Snippet
         edit:
           title: Editing Snippet
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           create: Create Snippet
           update: Update Snippet

data/config/locales/es.yml

@@ -137,7 +137,12 @@ es:
           title: Nuevo Diseño
         edit:
           title: Editando Diseño
-          revision: Revisión
+          revision: &revision
+            zero: No Revisions
+            one: '%{count} Revision'
+            few: '%{count} Revisions'
+            many: '%{count} Revisions'
+            other: '%{count} Revisions'
         form:
           select_parent_layout: Seleccionar diseño padre
           select_app_layout: Seleccionar diseño (App)
@@ -158,7 +163,8 @@ es:
           title: Nueva Página
         edit:
           title: Editando Página
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           select_target_page: No Redirigir
           preview: Vista Previa
@@ -181,7 +187,8 @@ es:
           title: Nuevo Fragmento
         edit:
           title: Editando Fragmento
-          revision: Revisión
+          revision:
+            <<: *revision
         form:
           create: Crear Fragmento
           update: Actualizar Fragmento

data/config/locales/fr.yml

@@ -137,7 +137,12 @@ fr:
           title: Nouvelle mise en page
         edit:
           title: Modification de la mise en page
-          revision: révision
+          revision: &revision
+            zero: No Revisions
+            one: '%{count} Revision'
+            few: '%{count} Revisions'
+            many: '%{count} Revisions'
+            other: '%{count} Revisions'
         form:
           select_parent_layout: Sélectionner une mise en page parent
           select_app_layout: Sélectionner une mise en page de l'application
@@ -158,7 +163,8 @@ fr:
           title: Nouvelle page
         edit:
           title: Modification de la page
-          revision: révision
+          revision:
+            <<: *revision
         form:
           select_target_page: Pas de redirection
           preview: Prévisualiser
@@ -181,7 +187,8 @@ fr:
           title: Nouveau fragment
         edit:
           title: Modification du fragment
-          revision: révision
+          revision:
+            <<: *revision
         form:
           create: Créer le fragment
           update: Modifier le fragment

data/config/locales/it.yml

@@ -0,0 +1,244 @@
+# encoding: utf-8
+it:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: Etichetta
+    slug: Slug
+    parent_id: Padre
+    content: Contenuto
+    identifier: Identificatore
+  activerecord:
+    models:
+      cms/site: Sito
+      cms/layout: Layout
+      cms/page: Pagina
+      cms/snippet: Frammento
+      cms/file: File
+    attributes:
+      cms/site:
+        identifier: Identificatore
+        hostname: Indirizzo Host
+        path: Percorso
+        locale: Lingua
+        is_mirrored: Mirrored
+      cms/layout:
+        identifier: Identificatore
+        label: Nome Layout
+        app_layout: Layout Applicazione
+        parent_id: Layout Padres
+        css: Foglio di stile
+        js: Javascript
+      cms/page:
+        label: Etichetta
+        layout_id: Layout
+        slug: Slug
+        target_page_id: Reindirizza a Pagina
+        is_published: Pubblicato
+      cms/file:
+        file: File
+        description: Descrizione
+      cms/snippet:
+        identifier: Identificatore
+
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: Sito non trovato
+      fixtures_enabled: Le Fixtures CMS sono abilitate. Tutti i cambiamenti fatti qui saranno scartati.
+
+    sites:
+      created: Sito creato
+      creation_failure: Impossibile creare il sito
+      updated: Sito aggiornato
+      update_failure: Impossibile modificare il sito
+      deleted: Sito eliminato
+      not_found: Sito non trovato
+
+    layouts:
+      created: Layout creato
+      creation_failure: Impossibile creare il layout
+      updated: Layout modificato
+      update_failure: Impossibile modificare il layout
+      deleted: Layout eliminato
+      not_found: Layout non trovato
+
+    pages:
+      created: Pagina creata
+      creation_failure: Impossibile creare la pagina
+      updated: Pagina modificata
+      update_failure: Impossibile modificare la pagina
+      deleted: Pagina eliminata
+      not_found: Pagina non trovata
+      layout_not_found: Nessun layout trovato. Creane uno per favore.
+
+    snippets:
+      created: Frammento creato
+      creation_failure: Impossibile creare il frammento
+      updated: Frammento modificato
+      update_failure: Impossibile modificare il frammento
+      deleted: Frammento eliminato
+      not_found: Frammento non trovato
+
+    revisions:
+      reverted: Contenuto ripristinato
+      record_not_found: Record non trovato
+      not_found: Revisione non trovata
+
+    files:
+      created: Files caricati
+      creation_failure: Impossibile caricare i files
+      updated: File aggiornato
+      update_failure: Impossibile aggiornare il file
+      deleted: File eliminato
+      not_found: File non trovato
+
+    content:
+      site_not_found: Site non trovato
+      layout_not_found: Layout non trovato
+      page_not_found: Pagina non trovata
+
+  # -- Views ----------------------------------------------------------------
+  admin:
+    cms:
+      base:
+        sites: Siti
+        layouts: Layouts
+        pages: Pagine
+        snippets: Frammenti
+        files: Files
+
+      sites:
+        index:
+          title: Siti
+          new_link: Crea nuovo sito
+          select: Seleziona sito
+          edit: Modifica
+          delete: Elimina
+          are_you_sure: Sei sicuro di voler eliminare questo sito?
+        new:
+          title: Nuovo sito
+        edit:
+          title: Modifica sito
+        form:
+          create: Crea sito
+          update: Modifica sito
+          is_mirrored: Mirrored
+
+      layouts:
+        index:
+          title: Layouts
+          new_link: Crea nuovo layout
+        index_branch:
+          add_child_layout: Aggiungi Layout Figlio
+          edit: Modifica
+          delete: Elimina
+          are_you_sure: Sei sicuro?
+        new:
+          title: Nuovo Layout
+        edit:
+          title: Modifica Layout
+          revision: &revision
+            zero: '%{count} Revisione'
+            one: '%{count} Revisione'
+            few: '%{count} Revisione'
+            many: '%{count} Revisione'
+            other: '%{count} Revisione'
+        form:
+          select_parent_layout: Seleziona Layout Padre
+          select_app_layout: Seleziona Layout di applicazione
+          create: Crea Layout
+          update: Modifica Layout
+
+      pages:
+        index:
+          title: Pagine
+          new_link: Crea nuova pagina
+        index_branch:
+          toggle: Alterna
+          add_child_page: Aggiungi Pagina Figlio
+          edit: Modifica
+          delete: Elimina
+          are_you_sure: Sei sicuro?
+        new:
+          title: Nuova Pagina
+        edit:
+          title: Modifica Pagina
+          revision:
+            <<: *revision
+        form:
+          select_target_page: Nessuna reindirezione
+          preview: Anteprima
+          create: Crea Pagina
+          update: Modifica Pagina
+          is_published: Pubblicato
+        form_blocks:
+          no_tags: |-
+            Il Layout non ha tags di contenuto definiti.<br/>
+            Modifica il contenuto per includere una pagina o un campo. Per esempio: <code>{{cms:page:content}}</code>
+
+      snippets:
+        index:
+          title: Frammenti
+          new_link: Crea Nuovo Frammento
+          edit: Modifica
+          delete: Elimina
+          are_you_sure: Sei sicuro?
+        new:
+          title: Nuovo Frammento
+        edit:
+          title: Modifica Frammento
+          revision:
+            <<: *revision
+        form:
+          create: Crea Frammento
+          update: Modifica Frammento
+
+      revisions:
+        show:
+          title: Revisioni per
+          revision: Revisione
+          full_path: Percorso intero
+          slug: Slug
+          update: Aggiorna a questa Revisione
+          current: Attuale
+
+      files:
+        index:
+          title: Files
+          new_link: Carica nuovo file
+          edit: Modifica
+          delete: Elimina
+          are_you_sure: Sei sicuro?
+          button: Carica Files
+        new:
+          title: Nuovo File
+        edit:
+          title: Modifica File
+        form:
+          current_file: File Attuale
+          create: Carica File
+          update: Modifica File
+        page_form:
+          are_you_sure: Sei sicuro?
+        file:
+          are_you_sure: Sei sicuro?
+
+      categories:
+        index:
+          label: Categorie
+          edit: Modifica
+          done: Fatto
+          all: Tutte
+          add: Aggiungi
+        show:
+          are_you_sure: Sei sicuro?
+        edit:
+          save: Salva
+        form:
+          label: Categorie
+
+      dialogs:
+        image:
+          insert: Inserisci Immagine
+        link:
+          create: Modifica Link

data/config/locales/ja.yml

@@ -137,7 +137,12 @@ ja:
           title: 新規レイアウト
         edit:
           title: レイアウトを編集
-          revision: リビジョン
+          revision: &revision
+            zero: リビジョン
+            one: '%{count} リビジョン'
+            few: '%{count} リビジョン'
+            many: '%{count} リビジョン'
+            other: '%{count} リビジョン'
         form:
           select_parent_layout: 親レイアウトを選択
           select_app_layout: アプリケーションレイアウトを選択
@@ -158,7 +163,8 @@ ja:
           title: 新規ページ
         edit:
           title: ページを編集
-          revision: リビジョン
+          revision:
+            <<: *revision
         form:
           select_target_page: リダイレクトなし
           preview: プレビュー
@@ -181,7 +187,8 @@ ja:
           title: 新規スニペット
         edit:
           title: スニペットを編集
-          revision: リビジョン
+          revision:
+            <<: *revision
         form:
           create: スニペットを作成
           update: スニペットを更新

data/config/locales/nl.yml

@@ -137,7 +137,12 @@ nl:
           title: Nieuwe Lay-out
         edit:
           title: Lay-out Bewerken
-          revision: Revisie
+          revision: &revision
+            zero: '%{count} Revisie'
+            one: '%{count} Revisie'
+            few: '%{count} Revisie'
+            many: '%{count} Revisie'
+            other: '%{count} Revisie'
         form:
           select_parent_layout: Selecteer Ouder Lay-out
           select_app_layout: Selecteer Applicatie Lay-out
@@ -158,7 +163,8 @@ nl:
           title: Nieuwe Pagina
         edit:
           title: Pagina Bewerken
-          revision: Revisie
+          revision:
+            <<: *revision
         form:
           select_target_page: Geen Omleiding
           preview: Preview
@@ -181,7 +187,8 @@ nl:
           title: Nieuw Snippet
         edit:
           title: Snippet Bewerken
-          revision: Revisie
+          revision:
+            <<: *revision
         form:
           create: Snippet Aanmaken
           update: Snippet Bijwerken

data/config/locales/pl.yml

@@ -137,7 +137,12 @@ pl:
           title: Nowy szablon
         edit:
           title: Edytuj szablon
-          revision: Wersje
+          revision: &revision
+            zero: '%{count} Wersje'
+            one: '%{count} Wersje'
+            few: '%{count} Wersje'
+            many: '%{count} Wersje'
+            other: '%{count} Wersje'
         form:
           select_parent_layout: Wybierz szablon rodzic
           select_app_layout: Wybierz szablon aplikacji
@@ -158,7 +163,8 @@ pl:
           title: Nowa strona
         edit:
           title: Edytuj stronę
-          revision: Wersje
+          revision:
+            <<: *revision
         form:
           select_target_page: Bez przekierowania
           preview: Podgląd
@@ -181,7 +187,8 @@ pl:
           title: Nowy snippet
         edit:
           title: Edytuj snippet
-          revision: Wersje
+          revision:
+            <<: *revision
         form:
           create: Utwórz snippet
           update: Uaktualnij snippet

data/config/locales/pt-BR.yml

@@ -137,7 +137,12 @@ pt-BR:
           title: Novo Leiaute
         edit:
           title: Editando Leiaute
-          revision: Revisão
+          revision: &revision
+            zero: '%{count} Revisão'
+            one: '%{count} Revisão'
+            few: '%{count} Revisão'
+            many: '%{count} Revisão'
+            other: '%{count} Revisão'
         form:
           select_parent_layout: Selecione o Leiaute Pai
           select_app_layout: Selecione o Leiaute da Aplicação
@@ -158,7 +163,8 @@ pt-BR:
           title: Nova Página
         edit:
           title: Editando Página
-          revision: Revisão
+          revision:
+            <<: *revision
         form:
           select_target_page: Não Redirecionar
           preview: Pré-visualização
@@ -181,7 +187,8 @@ pt-BR:
           title: Novo Fragmento
         edit:
           title: Editando Fragmento
-          revision: Revisão
+          revision:
+            <<: *revision
         form:
           create: Criar Fragmento
           update: Atualizar Fragmento

data/config/locales/ru.yml

@@ -137,7 +137,12 @@ ru:
           title: Новый шаблон
         edit:
           title: Редактирование шаблона
-          revision: Ревизия
+          revision: &revision
+            zero: 'Нет Ревизий'
+            one: '%{count} Ревизия'
+            few: '%{count} Ревизии'
+            many: '%{count} Ревизий'
+            other: '%{count} Ревизии'
         form:
           select_parent_layout: Выбрать родительский шаблон
           select_app_layout: Выбрать шаблон приложения
@@ -158,7 +163,8 @@ ru:
           title: Новая страница
         edit:
           title: Редактирование страницы
-          revision: Ревизия
+          revision:
+            <<: *revision
         form:
           select_target_page: Без редиректа
           preview: Предпросмотр
@@ -181,7 +187,8 @@ ru:
           title: Новый сниппет
         edit:
           title: Редактирование сниппета
-          revision: Ревизия
+          revision:
+            <<: *revision
         form:
           create: Создать сниппет
           update: Обновить сниппет

data/config/locales/sv.yml

@@ -137,7 +137,12 @@ sv:
           title: Ny layout
         edit:
           title: Ändra layout
-          revision: Revision
+          revision: &revision
+            zero: No Revisions
+            one: '%{count} Revision'
+            few: '%{count} Revisions'
+            many: '%{count} Revisions'
+            other: '%{count} Revisions'
         form:
           select_parent_layout: Välj överordnad layout
           select_app_layout: Väl Applikationslayout
@@ -158,7 +163,8 @@ sv:
           title: Ny sida
         edit:
           title: Ändra sida
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           select_target_page: Ingen vidarebefodring
           preview: Förhandsgranska
@@ -181,7 +187,8 @@ sv:
           title: Ny Snippet
         edit:
           title: Ändra Snippet
-          revision: Revision
+          revision:
+            <<: *revision
         form:
           create: Skapa Snippet
           update: Uppdatera Snippet

data/config/locales/zh-CN.yml

@@ -137,7 +137,12 @@ zh-CN:
           title: 新布局
         edit:
           title: 编辑布局
-          revision: 修订版本
+          revision: &revision
+            zero: '%{count} 修订版本'
+            one: '%{count} 修订版本'
+            few: '%{count} 修订版本'
+            many: '%{count} 修订版本'
+            other: '%{count} 修订版本'
         form:
           select_parent_layout: 选择上级布局
           select_app_layout: 选择应用布局
@@ -158,7 +163,8 @@ zh-CN:
           title: 新页面
         edit:
           title: 编辑页面
-          revision: 修订版本
+          revision:
+            <<: *revision
         form:
           select_target_page: 没有跳转
           preview: 预览
@@ -181,7 +187,8 @@ zh-CN:
           title: 新片段
         edit:
           title: 编辑片段
-          revision: 修订版本
+          revision:
+            <<: *revision
         form:
           create: 创建片段
           update: 更新片段

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -99,7 +99,8 @@ class ComfortableMexicanSofa::Configuration
       'ru'    => 'Русский',
       'pl'    => 'Polski',
       'de'    => 'Deutsch',
-      'nl'    => 'Nederlands'
+      'nl'    => 'Nederlands',
+      'it'    => 'Italiano'
     }
     @admin_locale         = nil
     @database_config      = nil

data/lib/comfortable_mexican_sofa/engine.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'comfortable_mexican_sofa'
 require 'rails'
+require 'rails-i18n'
 require 'formatted_form'
 require 'active_link_to'
 require 'paperclip'

data/lib/comfortable_mexican_sofa/fixture/file.rb

@@ -59,7 +59,7 @@ module ComfortableMexicanSofa::Fixture::File
           file.file.path :
           file.file.url
           
-        open(::File.join(self.path, ::File.basename(file_path)), 'w') do |f|
+        open(::File.join(self.path, ::File.basename(file_path)), 'wb') do |f|
           open(data_path) { |src| f.write(src.read) }
         end
         
@@ -67,4 +67,4 @@ module ComfortableMexicanSofa::Fixture::File
       end
     end
   end
-end
+end

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -1,90 +1,97 @@
 class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
-  
+
   # -- Tag Field Fields -----------------------------------------------------
   def default_tag_field(tag, index, method = :text_field_tag, options = {})
-    
+
     label     = tag.page.class.human_attribute_name(tag.identifier.to_s)
     css_class = tag.class.to_s.demodulize.underscore
     content   = ''
-    
+
     case method
     when :file_field_tag
       input_params = {:id => nil}
       name = "page[blocks_attributes][#{index}][content]"
-      
+
       if options.delete(:multiple)
         input_params.merge!(:multiple => true)
         name << '[]'
       end
-      
+
       content << @template.send(method, name, input_params)
       content << @template.render(:partial => 'admin/cms/files/page_form', :object => tag.block)
     else
       content << @template.send(method, "page[blocks_attributes][#{index}][content]", tag.content, options)
     end
     content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
-    
+
     element(label, content.html_safe)
   end
-  
+
   def field_date_time(tag, index)
     default_tag_field(tag, index, :text_field_tag, :data => {'cms-datetime' => true})
   end
-  
+
   def field_integer(tag, index)
     default_tag_field(tag, index, :number_field_tag)
   end
-  
+
   def field_string(tag, index)
     default_tag_field(tag, index)
   end
-  
+
   def field_text(tag, index)
     default_tag_field(tag, index, :text_area_tag, :data => {'cms-cm-mode' => 'text/html'})
   end
-  
+
   def field_rich_text(tag, index)
     default_tag_field(tag, index, :text_area_tag, :data => {'cms-rich-text' => true})
   end
-  
+
+  def field_boolean(tag, index)
+    content = @template.hidden_field_tag("page[blocks_attributes][#{index}][content]", '', :id => nil)
+    content << @template.check_box_tag("page[blocks_attributes][#{index}][content]", '1', tag.content.present?, :id => nil)
+    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+    element(tag.identifier.titleize + "?", content)
+  end
+
   def page_date_time(tag, index)
     default_tag_field(tag, index, :text_field_tag, :data => {'cms-datetime' => true})
   end
-  
+
   def page_integer(tag, index)
     default_tag_field(tag, index, :number_field_tag)
   end
-  
+
   def page_string(tag, index)
     default_tag_field(tag, index)
   end
-  
+
   def page_text(tag, index)
     default_tag_field(tag, index, :text_area_tag, :data => {'cms-cm-mode' => 'text/html'})
   end
-  
+
   def page_rich_text(tag, index)
     default_tag_field(tag, index, :text_area_tag, :data => {'cms-rich-text' => true})
   end
-  
+
   def page_file(tag, index)
     default_tag_field(tag, index, :file_field_tag)
   end
-  
+
   def page_files(tag, index)
     default_tag_field(tag, index, :file_field_tag, :multiple => true)
   end
-  
+
   def page_markdown(tag, index)
     default_tag_field(tag, index, :text_area_tag, :data => {'cms-cm-mode' => 'text/x-markdown'})
   end
-  
+
   def collection(tag, index)
-    options = [["---- Select #{tag.collection_class.titleize} ----", nil]] + 
-      tag.collection_objects.collect do |m| 
+    options = [["---- Select #{tag.collection_class.titleize} ----", nil]] +
+      tag.collection_objects.collect do |m|
         [m.send(tag.collection_title), m.send(tag.collection_identifier)]
       end
-      
+
     content = @template.select_tag(
       "page[blocks_attributes][#{index}][content]",
       @template.options_for_select(options, :selected => tag.content),
@@ -93,5 +100,5 @@ class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
     content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
     element(tag.identifier.titleize, content, :class => tag.class.to_s.demodulize.underscore )
   end
-  
+
 end

data/lib/comfortable_mexican_sofa/tags/field_boolean.rb

@@ -0,0 +1,17 @@
+class ComfortableMexicanSofa::Tag::FieldBoolean
+  include ComfortableMexicanSofa::Tag
+
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= IDENTIFIER_REGEX
+    /\{\{\s*cms:field:(#{identifier}):boolean\s*\}\}/
+  end
+
+  def content
+    block.content
+  end
+
+  def render
+    ''
+  end
+
+end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.11.1"
+  VERSION = "1.11.2"
 end

data/test/controllers/admin/cms/files_controller_test.rb

@@ -172,7 +172,8 @@ class Admin::Cms::FilesControllerTest < ActionController::TestCase
     file = cms_files(:default)
     put :update, :site_id => file.site, :id => file, :file => {
       :label        => 'New File',
-      :description  => 'New Description'
+      :description  => 'New Description',
+      :file         => fixture_file_upload('files/image.jpg', 'image/jpeg')
     }
     assert_response :redirect
     assert_redirected_to :action => :edit, :site_id => file.site, :id => file

data/test/controllers/admin/cms/pages_controller_test.rb

@@ -176,6 +176,15 @@ class Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
+  def test_get_new_with_boolean_field
+    cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:boolean}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][content]'][value='']"
+    assert_select "input[type='checkbox'][name='page[blocks_attributes][0][content]'][value='1']"
+  end
+  
   def test_get_new_with_several_tag_fields
     cms_layouts(:default).update_columns(:content => '{{cms:page:label_a}}{{cms:page:label_b}}')
     get :new, :site_id => cms_sites(:default)
@@ -188,6 +197,11 @@ class Admin::Cms::PagesControllerTest < ActionController::TestCase
   
   def test_get_new_with_crashy_tag
     cms_layouts(:default).update_columns(:content => '{{cms:collection:label:invalid}}')
+    assert_exception_raised do 
+      get :new, :site_id => cms_sites(:default)
+    end
+    
+    Rails.stubs(:env => ActiveSupport::StringInquirer.new('production'))
     get :new, :site_id => cms_sites(:default)
     assert_response :success
   end

data/test/controllers/cms/content_controller_test.rb

@@ -21,6 +21,12 @@ class Cms::ContentControllerTest < ActionController::TestCase
     ), response.body
     assert_equal 'text/html', response.content_type
   end
+
+  def test_show_default_html
+    @request.headers["Accept"] = "*/*"
+    get :show, :cms_path => ''
+    assert_equal 'text/html', response.content_type
+  end
   
   def test_show_as_json
     get :show, :cms_path => '', :format => 'json'

data/test/lib/tags/field_boolean_test.rb

@@ -0,0 +1,49 @@
+require_relative '../../test_helper'
+
+class FieldBooleanTagTest < ActiveSupport::TestCase
+
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::FieldBoolean.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:boolean }}'
+    )
+    assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
+    assert tag = ComfortableMexicanSofa::Tag::FieldBoolean.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:boolean}}'
+    )
+    assert_equal 'content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldBoolean.initialize_tag(
+      cms_pages(:default), '{{cms:field:dash-content:boolean}}'
+    )
+    assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldBoolean.initialize_tag(
+      cms_pages(:default), '{{cms:field:namespace.content:boolean}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
+  end
+
+  def test_initialize_tag_failure
+    [
+      '{{cms:field:content:not_boolean}}',
+      '{{cms:field:content}}',
+      '{{cms:not_field:content}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::FieldBoolean.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::FieldBoolean.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:boolean}}'
+    )
+    assert tag.block.content.blank?
+    tag.block.content = 'TRUE'
+    assert_equal 'TRUE', tag.content
+    assert_equal '', tag.render
+  end
+
+end

data/test/models/file_test.rb

@@ -3,6 +3,11 @@ require_relative '../test_helper'
 class CmsFileTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
+    # stubbing out Paperclip 4.0 mimetype validation
+    if defined? Paperclip::Validators::MediaTypeSpoofDetectionValidator
+      Paperclip::Validators::MediaTypeSpoofDetectionValidator.any_instance.stubs(:validate_each).returns(true)
+    end
+    
     Cms::File.all.each do |file|
       assert file.valid?, file.errors.full_messages.to_s
     end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Oleg Khabarov
-- The Working Group Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: formatted_form
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +192,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.14.0
-description: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails applications
+description: ComfortableMexicanSofa is a powerful CMS Engine for Rails 4 applications
 email:
 - oleg@khabarov.ca
 executables: []
@@ -342,6 +355,7 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
@@ -404,6 +418,7 @@ files:
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/asset.rb
 - lib/comfortable_mexican_sofa/tags/collection.rb
+- lib/comfortable_mexican_sofa/tags/field_boolean.rb
 - lib/comfortable_mexican_sofa/tags/field_datetime.rb
 - lib/comfortable_mexican_sofa/tags/field_integer.rb
 - lib/comfortable_mexican_sofa/tags/field_rich_text.rb
@@ -504,6 +519,7 @@ files:
 - test/lib/tag_test.rb
 - test/lib/tags/asset_test.rb
 - test/lib/tags/collection_test.rb
+- test/lib/tags/field_boolean_test.rb
 - test/lib/tags/field_datetime_test.rb
 - test/lib/tags/field_integer_test.rb
 - test/lib/tags/field_rich_text_test.rb