comfortable_mexican_sofa 1.12.9 → 1.12.10

data/app/controllers/comfy/admin/cms/layouts_controller.rb

@@ -45,7 +45,7 @@ class Comfy::Admin::Cms::LayoutsController < Comfy::Admin::Cms::BaseController
     (params[:comfy_cms_layout] || []).each_with_index do |id, index|
       ::Comfy::Cms::Layout.where(:id => id).update_all(:position => index)
     end
-    render :nothing => true
+    head :ok
   end
 
 protected

data/app/controllers/comfy/admin/cms/pages_controller.rb

@@ -70,7 +70,7 @@ class Comfy::Admin::Cms::PagesController < Comfy::Admin::Cms::BaseController
     (params[:comfy_cms_page] || []).each_with_index do |id, index|
       ::Comfy::Cms::Page.where(:id => id).update_all(:position => index)
     end
-    render :nothing => true
+    head :ok
   end
 
 protected

data/app/controllers/comfy/admin/cms/snippets_controller.rb

@@ -45,7 +45,7 @@ class Comfy::Admin::Cms::SnippetsController < Comfy::Admin::Cms::BaseController
     (params[:comfy_cms_snippet] || []).each_with_index do |id, index|
       ::Comfy::Cms::Snippet.where(:id => id).update_all(:position => index)
     end
-    render :nothing => true
+    head :ok
   end
 
 protected

data/app/controllers/comfy/cms/assets_controller.rb

@@ -8,11 +8,11 @@ class Comfy::Cms::AssetsController < Comfy::Cms::BaseController
   after_action :set_cache_control_header
   
   def render_css
-    render :text => @cms_layout.css, :content_type => 'text/css'
+    render :body => @cms_layout.css, :content_type => 'text/css'
   end
 
   def render_js
-    render :text => @cms_layout.js, :content_type => 'application/javascript'
+    render :body => @cms_layout.js, :content_type => 'application/javascript'
   end
 
 protected
@@ -20,7 +20,7 @@ protected
   def load_cms_layout
     @cms_layout = @cms_site.layouts.find_by_identifier!(params[:identifier])
   rescue ActiveRecord::RecordNotFound
-    render :nothing => true, :status => 404
+    render :body => nil, :status => 404
   end
   
   # null_session avoids cookies and flash updates

data/app/controllers/comfy/cms/content_controller.rb

@@ -39,7 +39,7 @@ protected
               :status       => status,
               :content_type => mime_type
     else
-      render :text => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
+      render :plain => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
     end
   end
 

data/app/models/comfy/cms/layout.rb

@@ -45,10 +45,12 @@ class Comfy::Cms::Layout < ActiveRecord::Base
   end
   
   # List of available application layouts
-  def self.app_layouts_for_select
-    Dir.glob(File.expand_path('app/views/layouts/**/*.html.*', Rails.root)).collect do |filename|
-      filename.gsub!("#{File.expand_path('app/views/layouts', Rails.root)}/", '')
-      filename.split('/').last[0...1] == '_' ? nil : filename.split('.').first
+  def self.app_layouts_for_select(view_paths)
+    view_paths.map(&:to_s).select { |path| path.start_with?(Rails.root.to_s) }.flat_map do |full_path|
+      Dir.glob("#{full_path}/layouts/**/*.html.*").collect do |filename|
+        filename.gsub!("#{full_path}/layouts/", '')
+        filename.split('/').last[0...1] == '_' ? nil : filename.split('.').first
+      end.compact.sort
     end.compact.sort
   end
   

data/app/models/comfy/cms/page.rb

@@ -118,8 +118,7 @@ protected
   def sync_child_full_paths!
     return unless full_path_changed?
     children.each do |p|
-      p.update_column(:full_path, p.send(:assign_full_path))
-      p.send(:sync_child_full_paths!)
+      p.update_attribute(:full_path, p.send(:assign_full_path))
     end
   end
 

data/app/models/comfy/cms/site.rb

@@ -96,9 +96,12 @@ protected
     return unless is_mirrored_changed? && is_mirrored?
 
     [self, Comfy::Cms::Site.mirrored.where("id != #{id}").first].compact.each do |site|
-      (site.layouts(:reload).roots + site.layouts.roots.map(&:descendants)).flatten.map(&:sync_mirror)
-      (site.pages(:reload).roots + site.pages.roots.map(&:descendants)).flatten.map(&:sync_mirror)
-      site.snippets(:reload).map(&:sync_mirror)
+      site.layouts.reload
+      site.pages.reload
+      site.snippets.reload
+      (site.layouts.roots + site.layouts.roots.map(&:descendants)).flatten.map(&:sync_mirror)
+      (site.pages.roots + site.pages.roots.map(&:descendants)).flatten.map(&:sync_mirror)
+      site.snippets.map(&:sync_mirror)
     end
   end
 

data/app/views/comfy/admin/cms/files/index.html.haml

@@ -24,7 +24,7 @@
 :javascript
   $(function(){
     window.CMS.uploader($("#cms-uploader"), {
-      url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload)}',
+      url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload, :category => params[:category])}',
       multipart_params: {
         '#{request_forgery_protection_token}': '#{form_authenticity_token}',
         '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'

data/app/views/comfy/admin/cms/layouts/_form.html.haml

@@ -5,7 +5,7 @@
 - if (options = Comfy::Cms::Layout.options_for_select(@site, @layout)).present?
   = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options
 
-- if (options = Comfy::Cms::Layout.app_layouts_for_select).present?
+- if (options = Comfy::Cms::Layout.app_layouts_for_select(lookup_context.view_paths)).present?
   = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options
 
 = form.text_area :content, :data => {'cms-cm-mode' => 'text/html'}

data/app/views/comfy/admin/cms/sites/_mirrors.html.haml

@@ -10,7 +10,7 @@
   - when ::Comfy::Cms::Snippet
     - object.mirrors.collect{|m| [m.site.label, edit_comfy_admin_cms_site_snippet_path(m.site, m)]}
   - else
-    - (::Comfy::Cms::Site.mirrored - [@site]).collect{|s| [s.label, url_for(params.merge(:site_id => s))]}
+    - (::Comfy::Cms::Site.mirrored - [@site]).collect{|s| [s.label, url_for(params.permit!.merge(:site_id => s))]}
 
 - options = [[@site.label, request.fullpath]] + options
 

data/comfortable_mexican_sofa.gemspec

@@ -9,17 +9,17 @@ Gem::Specification.new do |s|
   s.authors       = ["Oleg Khabarov"]
   s.email         = ["oleg@khabarov.ca"]
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
-  s.summary       = "Rails 4 CMS Engine"
-  s.description   = "ComfortableMexicanSofa is a powerful Rails 4 CMS Engine"
+  s.summary       = "Rails 4/5 CMS Engine"
+  s.description   = "ComfortableMexicanSofa is a powerful Rails 4/5 CMS Engine"
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_dependency 'rails',             '>= 4.0.0', '< 5'
+  s.add_dependency 'rails',             '>= 4.0.0', '< 5.1'
   s.add_dependency 'rails-i18n',        '>= 4.0.0'
   s.add_dependency 'bootstrap_form',    '>= 2.2.0'
   s.add_dependency 'active_link_to',    '>= 1.0.0'

data/config/environments/test.rb

@@ -13,8 +13,13 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  if config.respond_to?(:public_file_server)
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+  else
+    config.serve_static_files = true
+    config.static_cache_control = "public, max-age=3600"
+  end
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -36,7 +41,7 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
 
   config.active_support.test_order = :random
 
-  if Rails.version >= '4.2'
+  if Rails.version >= '4.2' && Rails.version < '5'
     config.active_record.raise_in_transactional_callbacks = true
   end
 

data/config/locales/sk.yml

@@ -0,0 +1,243 @@
+# encoding: utf-8
+sk:
+  activerecord:
+    models:
+      comfy/cms/site: Web
+      comfy/cms/layout: Rozloženie
+      comfy/cms/page: Stránka
+      comfy/cms/snippet: Fragment
+      comfy/cms/file: Súbor
+
+    attributes:
+      comfy/cms/site:
+        identifier: Identifikátor
+        label: Popis
+        hostname: Doména
+        path: Cesta
+        locale: Jazyk
+        is_mirrored: Zrkadlené
+      comfy/cms/layout:
+        identifier: Identifikátor
+        label: Názov rozloženia
+        app_layout: Rozloženie aplikácie
+        parent_id: Nadradené rozloženie
+        content: Obsah
+        css: Štýl
+        js: Javascript
+      comfy/cms/page:
+        label: Popis
+        layout_id: Rozloženie
+        slug: Strojový názov
+        full_path: Plná cesta
+        parent_id: Nadradené
+        target_page_id: Presmerovať na stránku
+        content: Obsah
+        is_published: Zverejnené
+      comfy/cms/file:
+        label: Popis
+        file: Súbor
+        description: Popis
+      comfy/cms/snippet:
+        identifier: Identifikátor
+        label: Popis
+        content: Obsah
+
+  comfy:
+    cms:
+      content:
+        site_not_found: Web nenájdený
+        layout_not_found: Rozloženie nenájdené
+        page_not_found: Stránka nenájdená
+
+    admin:
+      cms:
+        base:
+          site_not_found: Web nenájdený
+          fixtures_enabled: Sú povolené CMS Fixtures. Všetky tu vykonané zmeny budú stratené.
+
+          sites: Weby
+          layouts: Rozloženia
+          pages: Stránky
+          snippets: Fragmenty
+          files: Súbory
+
+        sites:
+          created: Web vytvorený
+          creation_failure: Nepodarilo sa vytvoriť web
+          updated: Web upravený
+          update_failure: Nepodarilo sa upraviť web
+          deleted: Web odstránený
+          not_found: Web nenájdený
+
+          index:
+            title: Weby
+            new_link: Vytvoriť web
+            select: Zvoľte web
+            edit: Upraviť
+            delete: Zmazať
+            are_you_sure: Ste si istí, že chcete odstrániť tento web?
+          new:
+            title: Nový web
+          edit:
+            title: Úprava webu
+          form:
+            create: Vytvoriť web
+            cancel: Zrušiť
+            update: Upraviť web
+            is_mirrored: Zrkadlené
+
+        layouts:
+          created: Rozloženie vytvorené
+          creation_failure: Nepodarilo sa vytvoriť rozloženie
+          updated: Rozloženie upravené
+          update_failure: Nepodarilo sa upraviť rozloženie
+          deleted: Rozloženie odstránené
+          not_found: Rozloženie nenájdené
+
+          index:
+            title: Rozloženia
+            new_link: Vytvoriť nové rozloženie
+          index_branch:
+            add_child_layout: Pridať podriadené rozloženie
+            edit: Upraviť
+            delete: Zmazať
+            are_you_sure: Ste si istí?
+          new:
+            title: Nové rozloženie
+          edit:
+            title: Úprava rozloženia
+            revision: &revision
+              zero: Žiadne revízie
+              one: '%{count} revízia'
+              few: '%{count} revízie'
+              many: '%{count} revízií'
+              other: '%{count} revízií'
+          form:
+            select_parent_layout: Zvoľte nadradené rozloženie
+            select_app_layout: Zvoľte rozloženie aplikácie
+            create: Vytvoriť rozloženie
+            cancel: Zrušiť
+            update: Upraviť rozloženie
+
+        pages:
+          created: Stránka vytvorená
+          creation_failure: Nepodarilo sa vytvoriť stránku
+          updated: Stránka upravená
+          update_failure: Nepodarilo sa upraviť stránku
+          deleted: Stránka odstránená
+          not_found: Stránka nenájdená
+          layout_not_found: "Neboli nájdené žiadne rozloženia, vytvorte prosím nejaké."
+
+          index:
+            title: Stránky
+            new_link: Vytvoriť novú stránku
+          index_branch:
+            toggle: Prepnúť
+            add_child_page: Pridať podstránku
+            edit: Upraviť
+            delete: Zmazať
+            are_you_sure: Ste si istí?
+          new:
+            title: Nová stránka
+          edit:
+            title: Úprava stránky
+            revision:
+              <<: *revision
+          form:
+            select_target_page: Bez presmerovania
+            preview: Náhľad
+            create: Vytvoriť stránku
+            cancel: Zrušiť
+            update: Upraviť stránku
+            is_published: Zverejnené
+            choose_link: Zvoľte stránku...
+          form_blocks:
+            no_tags: |-
+              Rozloženie nemá definované žiadne značky obsahu.<br/>
+              Upravte obsah tak, aby obsahoval značky stránok alebo polí. Napríklad: <code>{{cms:page:content}}</code>
+
+        snippets:
+          created: Fragment vytvorený
+          creation_failure: Nepodarilo sa vytvoriť fragment
+          updated: Fragment upravený
+          update_failure: Nepodarilo sa upraviť fragment
+          deleted: Fragment odstránený
+          not_found: Fragment nenájdený
+
+          index:
+            title: Fragmenty
+            new_link: Vytvoriť fragment
+            edit: Upraviť
+            delete: Zmazať
+            are_you_sure: Ste si istí?
+          new:
+            title: Nový fragment
+          edit:
+            title: Upraviť fragment
+            revision:
+              <<: *revision
+          form:
+            create: Vytvoriť fragment
+            cancel: Zrušiť
+            update: Upraviť fragment
+
+        revisions:
+          reverted: Obsah bol obnovený
+          record_not_found: Záznam nenájdený
+          not_found: Revízia nenájdená
+
+          show:
+            title: Revízia pre
+            revision: Revízia
+            full_path: Celá cesta
+            slug: Strojový názov
+            update: Použiť túto revíziu
+            content: Obsah
+            changes: Zmeny
+            previous: Predchádzajúca
+            current: Súčasná
+
+        files:
+          created: Súbory nahrané
+          creation_failure: Nepodarilo sa nahrať súbory
+          updated: Súbor upravený
+          update_failure: Nepodarilo sa upraviť súbor
+          deleted: Súbor odstránený
+          not_found: Súbor nenájdený
+
+          index:
+            title: Súbory
+            new_link: Nahrať nový súbor
+            button: Nahrať súbory
+          new:
+            title: Nový súbor
+          edit:
+            title: Upraviť súbor
+          form:
+            current_file: Aktuálny súbor
+            create: Nahrať súbor
+            cancel: Zrušiť
+            update: Upraviť súbor
+            delete: Zmazať
+            are_you_sure: Ste si istí?
+          page_form:
+            are_you_sure: Ste si istí?
+          file:
+            edit: Upraviť
+            delete: Zmazať
+            are_you_sure: Ste si istí?
+
+        categories:
+          index:
+            label: Kategórie
+            edit: Upraviť
+            done: Hotovo
+            all: Všetky
+            add: Pridať
+            add_placeholder: Pridať kategóriu
+          show:
+            are_you_sure: Ste si istí?
+          edit:
+            save: Uložiť
+          form:
+            label: Kategórie

data/config/locales/tr.yml

@@ -0,0 +1,243 @@
+# encoding: utf-8
+tr:
+  activerecord:
+    models:
+      comfy/cms/site: Site
+      comfy/cms/layout: Şablon
+      comfy/cms/page: Sayfa
+      comfy/cms/snippet: Pasaj
+      comfy/cms/file: Dosya
+
+    attributes:
+      comfy/cms/site:
+        identifier: Tanımlayıcı
+        label: Etiket
+        hostname: Sunucu Adı
+        path: Yol
+        locale: Dil
+        is_mirrored: Mirrored
+      comfy/cms/layout:
+        identifier: Tanımlayıcı
+        label: Şablon Adı
+        app_layout: Uygulama Şablonu
+        parent_id: Üst Şablon
+        content: İçerik
+        css: Stylesheet
+        js: Javascript
+      comfy/cms/page:
+        label: Etiket
+        layout_id: Şablon
+        slug: Slug
+        full_path: Tam Yol
+        parent_id: Üst
+        target_page_id: Sayfaya Yönlendir
+        content: İçerik
+        is_published: Yayında mı?
+      comfy/cms/file:
+        label: Etiket
+        file: Dosya
+        description: Açıklama
+      comfy/cms/snippet:
+        label: Etiket
+        identifier: Tanımlayıcı
+        content: İçerik
+
+  comfy:
+    cms:
+      content:
+        site_not_found: Site Bulunamadı
+        layout_not_found: Şablon Bulunamadı
+        page_not_found: Sayfa Bulunamadı
+
+    admin:
+      cms:
+        base:
+          site_not_found: Site Bulunamadı
+          fixtures_enabled: CMS Fixtures are enabled. All changes done here will be discarded.
+
+          sites: Siteler
+          layouts: Şablonlar
+          pages: Sayfalar
+          snippets: Pasajlar
+          files: Dosyalar
+
+        sites:
+          created: Site oluşturuldu
+          creation_failure: Site oluşturulamadı
+          updated: Site güncellendi
+          update_failure: Site güncellenemedi
+          deleted: Site silindi
+          not_found: Site bulunamadı
+
+          index:
+            title: Siteler
+            new_link: Yeni Site Oluştur
+            select: Site Seç
+            edit: Düzenle
+            delete: Sil
+            are_you_sure: Bu siteyi silmek istediğinizden emin misiniz?
+          new:
+            title: Yeni Site
+          edit:
+            title: Siteyi Düzenle
+          form:
+            create: Siteyi Oluştur
+            cancel: İptal
+            update: Siteyi Güncelle
+            is_mirrored: Mirrored
+
+        layouts:
+          created: Şablon oluşturuldu
+          creation_failure: Şablon oluşturulamadı
+          updated: Şablon güncellendi
+          update_failure: Şablon güncellenemedi
+          deleted: Şablon silindi
+          not_found: Şablon bulunamadı
+
+          index:
+            title: Şablonlar
+            new_link: Yeni Şablon Oluştur
+          index_branch:
+            add_child_layout: Alt Şablon Oluştur
+            edit: Düzenle
+            delete: Sil
+            are_you_sure: Emin misin?
+          new:
+            title: Yeni Şablon
+          edit:
+            title: Şablon Düzenleniyor
+            revision: &revision
+              zero: Revize Yok
+              one: '%{count} Revizyon'
+              few: '%{count} Revizyon'
+              many: '%{count} Revizyon'
+              other: '%{count} Revizyon'
+          form:
+            select_parent_layout: Üst Şablon Seç
+            select_app_layout: Uygulama Şablonu Seç
+            create: Şablon Oluştur
+            cancel: İptal
+            update: Şablonu Güncelle
+
+        pages:
+          created: Sayfa oluşturuldu
+          creation_failure: Sayfa oluşturulamadı
+          updated: Sayfa güncellendi
+          update_failure: Sayfa güncellenemedi
+          deleted: Sayfa silindi
+          not_found: Sayfa bulunamadı
+          layout_not_found: Şablon bulunamadı. Lütfen oluşturun.
+
+          index:
+            title: Sayfalar
+            new_link: Yeni Sayfa Oluştur
+          index_branch:
+            toggle: Toggle
+            add_child_page: Alt Sayfa Oluştur
+            edit: Düzenle
+            delete: Sil
+            are_you_sure: Emin misin?
+          new:
+            title: Yeni Sayfa
+          edit:
+            title: Sayfa Düzenleniyor
+            revision:
+              <<: *revision
+          form:
+            select_target_page: Yönlendirme Yok
+            preview: Önizle
+            create: Sayfa Oluştur
+            cancel: İptal
+            update: Sayfayı Güncelle
+            is_published: Yayınlandı
+            choose_link: Sayfa Seç...
+          form_blocks:
+            no_tags: |-
+              Şablon etiket içermiyor.<br/>
+              Lütfen bir etiket ekleyin. Örnek: <code>{{cms:page:content}}</code>
+
+        snippets:
+          created: Pasaj oluşturuldu
+          creation_failure: Pasaj oluşturulamadı
+          updated: Pasaj güncellendi
+          update_failure: Pasaj güncellenemedi
+          deleted: Pasaj silindi
+          not_found: Pasaj bulunamadı
+
+          index:
+            title: Pasajlar
+            new_link: Yeni Pasaj Oluştur
+            edit: Düzenle
+            delete: Sil
+            are_you_sure: Emin misin?
+          new:
+            title: Yeni Pasaj
+          edit:
+            title: Pasaj Düzenleniyor
+            revision:
+              <<: *revision
+          form:
+            create: Pasaj Oluştur
+            cancel: İptal
+            update: Pasajı Güncelle
+
+        revisions:
+          reverted: İçerik Geri Alındı
+          record_not_found: Kayıt bulunamadı
+          not_found: Revizyon bulunamadı
+
+          show:
+            title: Revizeler
+            revision: Revizyon
+            full_path: Tam Yol
+            slug: Slug
+            update: Bu revizyona Güncelle
+            content: İçerik
+            changes: Değişiklikler
+            previous: Önceki
+            current: Şimdiki
+
+        files:
+          created: Dosyalar yüklendi
+          creation_failure: Dosyalar yüklenemedi
+          updated: Dosya güncellendi
+          update_failure: Dosya güncellenemedi
+          deleted: Dosya silindi
+          not_found: Dosya bulunamadı
+
+          index:
+            title: Dosyalar
+            new_link: Yeni Dosya Yükle
+            button: Dosyaları Yükle
+          new:
+            title: Yeni Dosya
+          edit:
+            title: Dosyayı Düzenle
+          form:
+            current_file: Şimdiki Dosya
+            create: Dosya Yükle
+            cancel: İptal
+            update: Dosyayı Güncelle
+            delete: Dosyayı Sil
+            are_you_sure: Emin misin?
+          page_form:
+            are_you_sure: Emin misin?
+          file:
+            edit: Düzenle
+            delete: Sil
+            are_you_sure: Emin misin?
+
+        categories:
+          index:
+            label: Kategoriler
+            edit: Düzenle
+            done: Tamam
+            all: Hepsi
+            add: Ekle
+            add_placeholder: Kategori Ekle
+          show:
+            are_you_sure: Emin misin?
+          edit:
+            save: Kaydet
+          form:
+            label: Kategoriler