comfortable_mexican_sofa 1.6.24 → 1.6.25

data/VERSION

@@ -1 +1 @@
-1.6.24
+1.6.25

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

@@ -34,7 +34,8 @@ $.CMS = function(){
     //   $.CMS.config.elRTE.toolbar = ['undoredo']
     config: {
       'elRTE': {
-        toolbar: ['undoredo', 'sofa_format', 'sofa_style', 'sofa_alignment', 'lists', 'sofa_copypaste', 'sofa_image', 'sofa_links']
+        toolbar: ['undoredo', 'sofa_format', 'sofa_style', 'sofa_alignment', 'lists', 'sofa_copypaste', 'sofa_image', 'sofa_links'],
+        cssfiles: []
       }
     },
 
@@ -95,7 +96,8 @@ $.CMS = function(){
       elRTE.prototype.options.panels.sofa_links     = ['sofa_link', 'unlink'];
 
       elRTE.prototype.options.toolbars.sofa = $.CMS.config.elRTE.toolbar;
-
+      elRTE.prototype.options.cssfiles      = $.CMS.config.elRTE.cssfiles;
+      
       // BUG: Need to set content to an empty <p> for IE
       if ($.browser.msie){
         $('textarea.rich_text').each(function(){

data/app/controllers/cms_admin/pages_controller.rb

@@ -8,6 +8,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
 
   def index
     return redirect_to :action => :new if @site.pages.count == 0
+    @pages_by_parent = @site.pages.includes(:categories).all.group_by(&:parent_id)
     if params[:category].present?
       @pages = @site.pages.includes(:categories).for_category(params[:category]).all(:order => 'label')
     else
@@ -55,6 +56,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   end
 
   def toggle_branch
+    @pages_by_parent = @site.pages.includes(:categories).all.group_by(&:parent_id)
     @page = @site.pages.find(params[:id])
     s   = (session[:cms_page_tree] ||= [])
     id  = @page.id.to_s

data/app/controllers/cms_admin/sites_controller.rb

@@ -9,7 +9,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
   def index
     return redirect_to :action => :new if Cms::Site.count == 0
     @site = Cms::Site.find_by_id(session[:site_id])
-    @sites = Cms::Site.all
+    @sites ||= Cms::Site.all
   end
 
   def new

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

@@ -5,6 +5,7 @@
     namespace[tag.namespace || 'default'] ||= []
     namespace[tag.namespace || 'default'] << tag
   end
+  has_namespaces = namespace.size > 1
 %>
 
 <div id='form_blocks'>
@@ -16,8 +17,8 @@
   
   <% else %>
     <%= fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
-      <div id='tag_namespaces'>
-        <% if namespace.size > 1 %>
+      <div id='<%= has_namespaces ? 'tag_namespaces' : 'no_tag_namespaces' %>'>
+        <% if has_namespaces %>
           <ul>
             <% namespace.each do |name, tags| %>
               <li><%= link_to name.humanize, "#ns-#{name}" %></li>

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

@@ -1,7 +1,9 @@
-<% 
-  page        ||= index_branch 
-  has_children  = page.children.present?
-  has_siblings  = page.siblings.present?
+<%
+  page        ||= index_branch
+  children      = @pages_by_parent[page.id]
+  siblings      = @pages_by_parent[page.parent_id]
+  has_children  = children.present?
+  has_siblings  = siblings.size > 1
   branch_open   = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
   category_view = params[:category].present?
 %>
@@ -9,7 +11,7 @@
 <li id='<%= dom_id(page) %>'>
   <div class='item'>
     <div class='toggle <%= 'open' if branch_open %>'>
-      <%= 
+      <%=
         if !category_view && has_children && !page.root?
           link_to span_tag(t('.toggle')), toggle_branch_cms_admin_site_page_path(@site, page), :remote => true
         end
@@ -35,7 +37,7 @@
   </div>
   <% if !category_view && has_children && branch_open %>
     <ul>
-      <%= render :partial => 'index_branch', :collection => page.children %>
+      <%= render :partial => 'index_branch', :collection => children %>
     </ul>
   <% end %>
 </li>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.24"
+  s.version = "1.6.25"
 
   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-08-09"
+  s.date = "2012-10-12"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -174,9 +174,11 @@ Gem::Specification.new do |s|
     "config/environments/test.rb",
     "config/initializers/comfortable_mexican_sofa.rb",
     "config/initializers/paperclip.rb",
+    "config/locales/de.yml",
     "config/locales/en.yml",
     "config/locales/es.yml",
     "config/locales/ja.yml",
+    "config/locales/pl.yml",
     "config/locales/pt-BR.yml",
     "config/locales/ru.yml",
     "config/locales/sv.yml",
@@ -265,6 +267,7 @@ Gem::Specification.new do |s|
     "test/fixtures/views/_nav_hook.html.erb",
     "test/fixtures/views/_nav_hook_2.html.erb",
     "test/fixtures/views/render_test/_test.html.erb",
+    "test/fixtures/views/render_test/new.html.erb",
     "test/fixtures/views/render_test/render_layout.html.erb",
     "test/functional/cms_admin/base_controller_test.rb",
     "test/functional/cms_admin/categories_controller_test.rb",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -108,4 +108,4 @@ ComfortableMexicanSofa::HttpAuth.password = 'password'
 # should be rendered into the following areas:
 #   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')
+#   ComfortableMexicanSofa::ViewHooks.add(:page_form, '/layouts/admin/page_form')

data/config/locales/de.yml

@@ -0,0 +1,234 @@
+# encoding: utf-8
+de:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: Bezeichnung
+    slug: Slug
+    parent_id: Parent
+    content: Inhalt
+    identifier: Identifikator
+  activerecord:
+    models:
+      cms/site: Web-Site
+      cms/layout: Layout
+      cms/page: Seite
+      cms/snippet: Schnipsel
+      cms/file: Datei
+    attributes:
+      cms/site:
+        identifier: Identifikator
+        hostname: Hostname
+        path: Pfad
+        locale: Sprache
+        is_mirrored: Gespiegelt
+      cms/layout:
+        identifier: Identifikator
+        label: Layout Name
+        app_layout: App Layout
+        parent_id: Parent Layout
+        css: Stylesheet
+        js: Javascript
+      cms/page:
+        label: Bezeichnung
+        layout_id: Layout
+        slug: Slug
+        target_page_id: Weiterleiten zu Seite
+        is_published: Veröffentlicht
+      cms/file:
+        file: Datei
+        description: Beschreibung
+      cms/snippet:
+        identifier: Identifikator
+
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: Web-Site nicht gefunden
+      fixtures_enabled: CMS Fixtures are aktiviert. Alle Änderungen hier gespeichert werden verworfen.
+
+    sites:
+      created: Web-Site erstellt
+      creation_failure: Fehler beim erstellen der Web-Site
+      updated: Web-Site aktualisiert
+      update_failure: Fehler beim speichern der Web-Site
+      deleted: Web-Site gelöscht
+      not_found: Web-Site nicht gefunden
+
+    layouts:
+      created: Layout erstellt
+      creation_failure: Fehler beim erstellen des Layouts
+      updated: Layout aktualisiert
+      update_failure: Fehler beim speichern des Layouts
+      deleted: Layout gelöscht
+      not_found: Layout nicht gefunden
+
+    pages:
+      created: Seite erstellt
+      creation_failure: Fehler beim erstellen der Seite
+      updated: Seite aktualisiert
+      update_failure: Fehler beim speichern der Seite
+      deleted: Seite gelöscht
+      not_found: Seite nicht gefunden
+      layout_not_found: Kein Layout gefunden. Bitte erstellen Sie eines.
+
+    snippets:
+      created: Schnipsel erstellt
+      creation_failure: Fehler beim erstellen des Schnipsels
+      updated: Schnipsel aktualisiert
+      update_failure: Fehler beim speichern des Schnipsel
+      deleted: Schnipsel gelöscht
+      not_found: Schnipsel nicht gefunden
+
+    revisions:
+      reverted: Inhalt wiederhergestellt
+      record_not_found: Eintrag nicht gefunden
+      not_found: Revision nicht gefunden
+
+    files:
+      created: Datei hochgeladet
+      creation_failure: Fehler beim hochladen der Datei
+      updated: Datei hochgeladet
+      update_failure: Fehler beim hochladen der Datei
+      deleted: Datei gelöscht
+      not_found: Datei nicht gefunden
+
+    content:
+      site_not_found: Web-Site nicht gefunden
+      layout_not_found: Layout nicht gefunden
+      page_not_found: Seite nicht gefunden
+
+  # -- Views ----------------------------------------------------------------
+  cms_admin:
+    base:
+      sites: Web-Sites
+      layouts: Layouts
+      pages: Seiten
+      snippets: Schnipsel
+      files: Datei
+
+    sites:
+      index:
+        title: Web-Sites
+        new_link: Erstelle neue Web-Site
+        select: Wähle Web-Site
+        edit: Bearbeiten
+        delete: Löschen
+        are_you_sure: Sind Sie sicher, dass Sie diese Web-Site löschen wollen?
+      new:
+        title: Neue Web-Site
+      edit:
+        title: Web-Site bearbeiten
+      form:
+        create: Erstelle Web-Site
+        update: Web-Site speichern
+
+    layouts:
+      index:
+        title: Layouts
+        new_link: Erstelle neue Layout
+      index_branch:
+        add_child_layout: Erstelle untergeordnetes Layout
+        edit: Bearbeiten
+        delete: Löschen
+        are_you_sure: Sind Sie sicher?
+      new:
+        title: Neues Layout
+      edit:
+        title: Layout bearbeiten
+        revision: Revision
+      form:
+        select_parent_layout: Select Parent Layout
+        select_app_layout: Select Application Layout
+        create: Erstelle Layout
+        update: Layout speichern
+
+    pages:
+      index:
+        title: Seiten
+        new_link: Erstelle neue Seite
+      index_branch:
+        toggle: Toggle
+        add_child_page: Erstelle untergeordnete Seite
+        edit: Bearbeiten
+        delete: Löschen
+        are_you_sure: Sind Sie sicher?
+      new:
+        title: Neue Seite
+      edit:
+        title: Seite bearbeiten
+        revision: Revision
+      form:
+        select_target_page: Keine Weiterleitung
+        preview: Vorschau
+        create: Erstelle Seite
+        update: Seite speichern
+      form_blocks:
+        no_tags: |-
+          Layout has hat keine Inhalt-Tags definiert.<br/>
+          Bearbeiten den Inhalt des Layout um ein Inhalt-Tag hinzuzufügen. Zum Beispiel: <code>{{cms:page:content}}</code>
+
+    snippets:
+      index:
+        title: Schnipsels
+        new_link: Erstelle neuen Schnipsel
+        edit: Bearbeiten
+        delete: Löschen
+        are_you_sure: Sind Sie sicher?
+      new:
+        title: Neuer Schnipsel
+      edit:
+        title: Schnipsel bearbeiten
+        revision: Revision
+      form:
+        create: Erstelle Schnipsel
+        update: Schnipsel speichern
+
+    revisions:
+      show:
+        title: Revisionen von
+        revision: Revision
+        full_path: Completer Pfad
+        slug: Slug
+        update: Zurücksetzen auf diese Revision
+        current: Aktuell
+
+    files:
+      index:
+        title: Datei
+        new_link: Neue Datei hochladen
+        edit: Bearbeiten
+        delete: Löschen
+        are_you_sure: Sind Sie sicher?
+        button: Datei hochladen
+      new:
+        title: Neue Datei
+      edit:
+        title: Datei bearbeiten
+      form:
+        current_file: Aktuelle Datei
+        create: Lade Datei hoch
+        update: Datei speichern
+      page_form:
+        are_you_sure: Sind Sie sicher?
+      file:
+        are_you_sure: Sind Sie sicher?
+
+    categories:
+      index:
+        label: Kategorien
+        edit: Bearbeiten
+        done: Erledigt
+        all: Alle
+        add: Hinzuzufügen
+      show:
+        are_you_sure: Sind Sie sicher?
+      edit:
+        save: Speichern
+      form:
+        label: Kategorien
+
+    dialogs:
+      image:
+        insert: Bild einfügen
+      link:
+        create: Link erstellen

data/config/locales/en.yml

@@ -232,4 +232,3 @@ en:
         insert: Insert Image
       link:
         create: Create Link
-      

data/config/locales/pl.yml

@@ -0,0 +1,234 @@
+# encoding: utf-8
+pl:
+  # -- Models ---------------------------------------------------------------
+  attributes:
+    label: Tytuł
+    slug: Ścieżka
+    parent_id: Rodzic
+    content: Zawartość
+    identifier: Identyfikator
+  activerecord:
+    models:
+      cms/site: Witryna
+      cms/layout: Szablin
+      cms/page: Strona
+      cms/snippet: Snippet
+      cms/file: Plik
+    attributes:
+      cms/site:
+        identifier: Identyfikator
+        hostname: Nazwa hosta
+        path: Ścieżka
+        locale: Język
+        is_mirrored: Mirror
+      cms/layout:
+        identifier: Identyfikator
+        label: Nazwa layout'u
+        app_layout: Nazwa aplikacji
+        parent_id: Rodzic
+        css: Style
+        js: Javascript
+      cms/page:
+        label: Tytuł
+        layout_id: Identyfikator szablonu
+        slug: Ścieżka
+        target_page_id: Przekieruj do strony
+        is_published: Opublikowana
+      cms/file:
+        file: Plik
+        description: Opis
+      cms/snippet:
+        identifier: Identyfikator
+        
+  # -- Controllers ----------------------------------------------------------
+  cms:
+    base:
+      site_not_found: Strona nie została znaleziona
+      fixtures_enabled: Fikstury CMS są włączone. Wszystkie zmiany zpisane tutaj nie będą uwzględnione.
+      
+    sites:
+      created: Witryna została utworzona
+      creation_failure: Błąd przy tworzeniu witryny
+      updated: Witryna została uaktulaniona
+      update_failure: Błąd przy uaktualnianiu witryny
+      deleted: Witryna została usunięta
+      not_found: Nie znaleziono witryny
+      
+    layouts:
+      created: Szablon został utworzony
+      creation_failure: Błąd przy tworzeniu layoutu
+      updated: Szanlon został uaktualniony
+      update_failure: Błąd przy uaktualnianiu layoutu
+      deleted: Szablon został usunięty
+      not_found: Nie znaleziono layoutu
+      
+    pages:
+      created: Strona została utworzona
+      creation_failure: Błąd przy tworzeniu strony
+      updated: Strona została uaktualniona
+      update_failure: Błąd przy uaktualnianiu strony
+      deleted: Strona została usunięta
+      not_found: Nie znaleziono strony
+      layout_not_found: Brakuje layoutu. Proszę utworzyć
+      
+    snippets:
+      created: Snippet został utworzony
+      creation_failure: Błąd przy tworzeniu snippeta
+      updated: Snippet został uaktualniony
+      update_failure: Błąd przy uaktualnianiu snippeta
+      deleted: Snippet został usunięty
+      not_found: Nie znaleziono snippeta
+      
+    revisions:
+      reverted: Zawartość zostala przywrócona
+      record_not_found: Wpis nie został znaleziony
+      not_found: Wersja nie została znaleziona
+      
+    files:
+      created: Plik wrzucony na serwer
+      creation_failure: Błąd przy wrzucaniu pliku
+      updated: Plik został uaktualniony
+      update_failure: Błąd przy uaktualnianiu pliku
+      deleted: Plik został usunięty
+      not_found: Plik nie został znaleziony
+      
+    content:
+      site_not_found: Witryna nie została znaleziona
+      layout_not_found: Szablon nie został znaleziony
+      page_not_found: Strona nie została znaleziona
+  
+  # -- Views ----------------------------------------------------------------
+  cms_admin:
+    base:
+      sites: Witryny
+      layouts: Szablony
+      pages: Pages
+      snippets: Snippets
+      files: Files
+      
+    sites:
+      index:
+        title: Witryny
+        new_link: Utwórz nowa witrynę
+        select: Wybierz witrynę
+        edit: Edytuj
+        delete: Usuń
+        are_you_sure: Jesteś pewien, że chce usunąć tą witrynę?
+      new:
+        title: Nowa witryna
+      edit:
+        title: Edytuj witrynę
+      form:
+        create: Utwórz witrynę
+        update: Uaktualnij witrynę
+        
+    layouts:
+      index:
+        title: Szablony
+        new_link: Utwórz nowy szablon
+      index_branch:
+        add_child_layout: Dodaj podszablon
+        edit: Edytuj
+        delete: Usuń
+        are_you_sure: Jesteś pewien?
+      new:
+        title: Nowy szablon
+      edit:
+        title: Edytuj szablon
+        revision: Wersje
+      form:
+        select_parent_layout: Wybierz szablon rodzic
+        select_app_layout: Wybierz szablon aplikacji
+        create: Stwórz szablon
+        update: Uaktualnij szablon
+      
+    pages:
+      index:
+        title: Strony
+        new_link: Utwórz nową stronę
+      index_branch:
+        toggle: Przełącz
+        add_child_page: Dodaj podstronę
+        edit: Edytuj
+        delete: Usuń
+        are_you_sure: Jesteś pewien?
+      new:
+        title: Nowa strona
+      edit:
+        title: Edytuj stronę
+        revision: Wersje
+      form:
+        select_target_page: Bez przekierowania
+        preview: Podgląd
+        create: Utwórz stronę
+        update: Uaktualnij stronę
+      form_blocks:
+        no_tags: |-
+          Szablon nie ma zdefiniowanych tagów<br/>
+          Wyedytuj treść aby dodać stronę lub pole np. <code>{{cms:page:content}}</code>
+      
+    snippets:
+      index:
+        title: Snippets
+        new_link: Utwórz nowy snippet
+        edit: Edytuj
+        delete: Usuń
+        are_you_sure: Jesteś pewien?
+      new:
+        title: Nowy snippet
+      edit:
+        title: Edytuj snippet
+        revision: Wersje
+      form:
+        create: Utwórz snippet
+        update: Uaktualnij snippet
+          
+    revisions:
+      show:
+        title: Wersje dla
+        revision: Wersja
+        full_path: Pełna ścieżka
+        slug: Ścieżka
+        update: Uaktualnij do tej wersji
+        current: Aktualna
+      
+    files:
+      index:
+        title: Pliki
+        new_link: Wrzuć nowy plik
+        edit: Edytuj
+        delete: Usuń
+        are_you_sure: Jesteś pewien?
+        button: Wrzuć plik
+      new:
+        title: Nowy plik
+      edit:
+        title: Edytuj plik
+      form:
+        current_file: Aktualny plik
+        create: Wrzuć plik
+        update: Uaktualnij plik
+      page_form:
+        are_you_sure: Jesteś pewien?
+      file:
+        are_you_sure: Jesteś pewien?
+        
+    categories:
+      index:
+        label: Kategorie
+        edit: Edytuj
+        done: Zrobione
+        all: Wszystko
+        add: Dodaj
+      show:
+        are_you_sure: Jesteś pewien?
+      edit:
+        save: Zapisz
+      form:
+        label: Tytuł
+        
+    dialogs:
+      image:
+        insert: Dodaj obrazek
+      link:
+        create: Utwórz link

data/config/locales/ru.yml

@@ -232,4 +232,3 @@ ru:
         insert: Вставить изображение
       link:
         create: Создать ссылку
-

data/config/locales/zh-CN.yml

@@ -231,4 +231,4 @@ zh-CN:
       image:
         insert: 插入图片
       link:
-        create: 创建链接
+        create: 创建链接

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -96,7 +96,9 @@ class ComfortableMexicanSofa::Configuration
       'zh-CN' => '简体中文',
       'ja'    => '日本語',
       'sv'    => 'Svenska',
-      'ru'    => 'Русский'
+      'ru'    => 'Русский',
+      'pl'    => 'Polski',
+      'de'    => 'Deutsch'
     }
     @admin_locale         = nil
     @database_config      = nil

data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb

@@ -80,7 +80,7 @@ module ComfortableMexicanSofa::ActsAsTree
     
     # Checks if this node is a root
     def root?
-      !self.parent
+      !self.parent_id
     end
     
     # Returns all siblings of the current node.
@@ -99,4 +99,4 @@ module ComfortableMexicanSofa::ActsAsTree
   end
 end
 
-ActiveRecord::Base.send :include, ComfortableMexicanSofa::ActsAsTree
+ActiveRecord::Base.send :include, ComfortableMexicanSofa::ActsAsTree

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -59,7 +59,7 @@ module ComfortableMexicanSofa::RenderMethods
         if @cms_layout = @cms_site && @cms_site.layouts.find_by_identifier(identifier)
           cms_app_layout = @cms_layout.try(:app_layout)
           cms_page = @cms_site.pages.build(:layout => @cms_layout)
-          cms_blocks = options.delete(:cms_blocks) || { :content => render_to_string(:layout => false)}
+          cms_blocks = options.delete(:cms_blocks) || { :content => render_to_string({ :layout => false }.merge(options)) }
           cms_blocks.each do |identifier, value|
             content = if value.is_a?(Hash)
               render_to_string(value.keys.first.to_sym => value[value.keys.first], :layout => false)
@@ -82,4 +82,4 @@ module ComfortableMexicanSofa::RenderMethods
   end
 end
 
-ActionController::Base.send :include, ComfortableMexicanSofa::RenderMethods
+ActionController::Base.send :include, ComfortableMexicanSofa::RenderMethods

data/lib/comfortable_mexican_sofa/tag.rb

@@ -93,7 +93,7 @@ module ComfortableMexicanSofa::Tag
     
     # Checks if this tag is using Cms::Block
     def is_cms_block?
-      %w(page field collection file).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
+      %w(page field collection).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
     end
     
     # Used in displaying form elements for Cms::Block

data/lib/comfortable_mexican_sofa/view_hooks.rb

@@ -9,7 +9,7 @@ module ComfortableMexicanSofa::ViewHooks
   def self.render(name, template, options = {})
     out = ''
     (self.hooks[name.to_sym] || []).each do |path|
-      out += template.render({:partial => path}.merge(options))
+      out += template.render({:partial => path.first}.merge(options))
     end
     return out.html_safe
   end
@@ -17,14 +17,16 @@ module ComfortableMexicanSofa::ViewHooks
   # Will declare a partial that will be rendered for this hook
   # Example:
   # ComfortableMexicanSofa::ViewHooks.add(:navigation, 'shared/navigation')
-  def self.add(name, partial_path)
+  def self.add(name, partial_path, position = 0)
     self.hooks[name.to_sym] ||= []
-    self.hooks[name.to_sym] << partial_path
+    self.hooks[name.to_sym] << [partial_path, position]
+    self.hooks[name.to_sym].sort_by! { |hook| hook.last }
   end
+
   
   # Removing previously declared hook
   def self.remove(name)
     self.hooks.delete(name)
   end
-  
-end
+
+end

data/test/fixtures/views/render_test/new.html.erb

@@ -0,0 +1 @@
+Can render CMS layout and specify action

data/test/integration/render_cms_test.rb

@@ -80,10 +80,15 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
         render :cms_layout => 'invalid'
       when 'layout_defaults_with_site'
         render :cms_layout => 'default', :cms_site => 'site-b'
+      when 'layout_with_action'
+        render :cms_layout => 'default', :action => :new
       else
         raise 'Invalid or no param[:type] provided'
       end
     end
+
+    def new
+    end
   end
   
   # -- Basic Render Tests ---------------------------------------------------
@@ -193,6 +198,16 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     assert assigns(:cms_layout)
     assert_equal cms_layouts(:default), assigns(:cms_layout)
   end
+
+  def test_cms_layout_with_action
+    cms_layouts(:default).update_column(:content, '{{cms:page:content}} {{cms:page:content_b}} {{cms:page:content_c}}')
+    get '/render-layout?type=layout_with_action'
+    assert_response :success
+    assert_equal "Can render CMS layout and specify action\n  ", response.body
+    assert assigns(:cms_site)
+    assert assigns(:cms_layout)
+    assert_equal cms_layouts(:default), assigns(:cms_layout)
+  end
   
   def test_cms_layout_failure
     assert_exception_raised ComfortableMexicanSofa::MissingLayout do
@@ -215,4 +230,4 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     end
   end
   
-end
+end

data/test/integration/view_hooks_test.rb

@@ -21,6 +21,16 @@ class ViewHooksTest < ActionDispatch::IntegrationTest
     assert_match /hook_content/, response.body
     assert_match /<hook_content_2>/, response.body
   end
+
+  def test_hooks_rendering_with_proper_order
+    CmsAdmin::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook_2', 0)
+    ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook', 1)
+    
+    http_auth :get, cms_admin_sites_path
+    assert_response :success
+    assert_match /<hook_content_2>hook_content/, response.body
+  end
   
   def test_hooks_rendering_with_no_hook
     ComfortableMexicanSofa::ViewHooks.remove(:navigation)
@@ -29,5 +39,5 @@ class ViewHooksTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_no_match /hook_content/, response.body
   end
-  
-end
+
+end

data/test/unit/tag_test.rb

@@ -212,6 +212,11 @@ class TagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:snippet:label }}'
     )
     assert !tag.is_cms_block?
+
+    tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
+      cms_pages(:default), '{{ cms:file:sample.jpg }}'
+    )
+    assert !tag.is_cms_block?
   end
   
   def test_content_with_irb_disabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.24
+  version: 1.6.25
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -225,9 +225,11 @@ files:
 - config/environments/test.rb
 - config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/paperclip.rb
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/ja.yml
+- config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sv.yml
@@ -316,6 +318,7 @@ files:
 - test/fixtures/views/_nav_hook.html.erb
 - test/fixtures/views/_nav_hook_2.html.erb
 - test/fixtures/views/render_test/_test.html.erb
+- test/fixtures/views/render_test/new.html.erb
 - test/fixtures/views/render_test/render_layout.html.erb
 - test/functional/cms_admin/base_controller_test.rb
 - test/functional/cms_admin/categories_controller_test.rb
@@ -386,7 +389,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2960063838234964061
+      hash: -4349925487218817830
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: