comfortable_mexican_sofa 2.0.1 → 2.0.2

data/config/locales/sk.yml

@@ -110,12 +110,6 @@ sk:
             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
@@ -145,8 +139,6 @@ sk:
             title: Nová stránka
           edit:
             title: Úprava stránky
-            revision:
-              <<: *revision
           form:
             select_target_page: Bez presmerovania
             preview: Náhľad
@@ -171,8 +163,6 @@ sk:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ sk:
             title: Nový fragment
           edit:
             title: Upraviť fragment
-            revision:
-              <<: *revision
           form:
             create: Vytvoriť fragment
             cancel: Zrušiť
@@ -222,6 +210,13 @@ sk:
             changes: Zmeny
             previous: Predchádzajúca
             current: Súčasná
+          sidebar:
+            revision:
+              zero: Žiadne revízie
+              one: '%{count} revízia'
+              few: '%{count} revízie'
+              many: '%{count} revízií'
+              other: '%{count} revízií'
 
         files:
           created: Súbory nahrané

data/config/locales/sv.yml

@@ -110,12 +110,6 @@ sv:
             title: Ny layout
           edit:
             title: Ändra layout
-            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
@@ -145,8 +139,6 @@ sv:
             title: Ny sida
           edit:
             title: Ändra sida
-            revision:
-              <<: *revision
           form:
             select_target_page: Ingen vidarebefodring
             preview: Förhandsgranska
@@ -171,8 +163,6 @@ sv:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ sv:
             title: Ny Snippet
           edit:
             title: Ändra Snippet
-            revision:
-              <<: *revision
           form:
             create: Skapa Snippet
             cancel: Avbryt
@@ -222,6 +210,13 @@ sv:
             changes: Changes
             previous: Previous
             current: Nuvarande
+          sidebar:
+            revision:
+              zero: No Revisions
+              one: '%{count} Revision'
+              few: '%{count} Revisions'
+              many: '%{count} Revisions'
+              other: '%{count} Revisions'
 
         files:
           created: Filer uppladdade

data/config/locales/tr.yml

@@ -110,12 +110,6 @@ tr:
             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ç
@@ -145,8 +139,6 @@ tr:
             title: Yeni Sayfa
           edit:
             title: Sayfa Düzenleniyor
-            revision:
-              <<: *revision
           form:
             select_target_page: Yönlendirme Yok
             preview: Önizle
@@ -171,8 +163,6 @@ tr:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ tr:
             title: Yeni Pasaj
           edit:
             title: Pasaj Düzenleniyor
-            revision:
-              <<: *revision
           form:
             create: Pasaj Oluştur
             cancel: İptal
@@ -222,6 +210,13 @@ tr:
             changes: Değişiklikler
             previous: Önceki
             current: Şimdiki
+          sidebar:
+            revision:
+              zero: Revize Yok
+              one: '%{count} Revizyon'
+              few: '%{count} Revizyon'
+              many: '%{count} Revizyon'
+              other: '%{count} Revizyon'
 
         files:
           created: Dosyalar yüklendi

data/config/locales/uk.yml

@@ -110,12 +110,6 @@ uk:
             title: Новий шаблон
           edit:
             title: Редагувати шаблон
-            revision: &revision
-              zero: Нeмa Ревізій
-              one: '%{count} Ревізія'
-              few: '%{count} Ревізій'
-              many: '%{count} Ревізій'
-              other: '%{count} Ревізій'
           form:
             select_parent_layout: Вибрати батьківский шаблон
             select_app_layout: Вибрати шаблон додатку
@@ -145,8 +139,6 @@ uk:
             title: Нова сторінка
           edit:
             title: Редагування сторінки
-            revision:
-              <<: *revision
           form:
             select_target_page: Без редіректу
             preview: Передперегляд
@@ -171,8 +163,6 @@ uk:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ uk:
             title: Новий сніппет
           edit:
             title: Редагувати сніппет
-            revision:
-              <<: *revision
           form:
             create: Створити сніппет
             cancel: Cкасувати
@@ -222,6 +210,13 @@ uk:
             changes: Зміни
             previous: Попередній
             current: Поточний
+          sidebar:
+            revision:
+              zero: Нeмa Ревізій
+              one: '%{count} Ревізія'
+              few: '%{count} Ревізій'
+              many: '%{count} Ревізій'
+              other: '%{count} Ревізій'
 
         files:
           created: Файли завантажені

data/config/locales/zh-CN.yml

@@ -110,12 +110,6 @@ zh-CN:
             title: 新布局
           edit:
             title: 编辑布局
-            revision: &revision
-              zero: '%{count} 修订版本'
-              one: '%{count} 修订版本'
-              few: '%{count} 修订版本'
-              many: '%{count} 修订版本'
-              other: '%{count} 修订版本'
           form:
             select_parent_layout: 选择上级布局
             select_app_layout: 选择应用布局
@@ -145,8 +139,6 @@ zh-CN:
             title: 新页面
           edit:
             title: 编辑页面
-            revision:
-              <<: *revision
           form:
             select_target_page: 没有跳转
             preview: 预览
@@ -171,8 +163,6 @@ zh-CN:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ zh-CN:
             title: 新片段
           edit:
             title: 编辑片段
-            revision:
-              <<: *revision
           form:
             create: 创建片段
             cancel: 取消
@@ -222,6 +210,13 @@ zh-CN:
             changes: Changes
             previous: Previous
             current: Current
+          sidebar:
+            revision:
+              zero: '%{count} 修订版本'
+              one: '%{count} 修订版本'
+              few: '%{count} 修订版本'
+              many: '%{count} 修订版本'
+              other: '%{count} 修订版本'
 
         files:
           created: 文件上传成功

data/config/locales/zh-TW.yml

@@ -110,12 +110,6 @@ zh-TW:
             title: 新佈局
           edit:
             title: 編輯佈局
-            revision: &revision
-              zero: '%{count} 修訂版本'
-              one: '%{count} 修訂版本'
-              few: '%{count} 修訂版本'
-              many: '%{count} 修訂版本'
-              other: '%{count} 修訂版本'
           form:
             select_parent_layout: 選擇上級佈局
             select_app_layout: 選擇應用佈局
@@ -145,8 +139,6 @@ zh-TW:
             title: 新頁面
           edit:
             title: 編輯頁面
-            revision:
-              <<: *revision
           form:
             select_target_page: 沒有跳轉
             preview: 預覽
@@ -171,8 +163,6 @@ zh-TW:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ zh-TW:
             title: 新片段
           edit:
             title: 編輯片段
-            revision:
-              <<: *revision
           form:
             create: 創建片段
             cancel: 取消
@@ -222,6 +210,13 @@ zh-TW:
             changes: 變更
             previous: 先前
             current: 現在
+          sidebar:
+            revision:
+              zero: '%{count} 修訂版本'
+              one: '%{count} 修訂版本'
+              few: '%{count} 修訂版本'
+              many: '%{count} 修訂版本'
+              other: '%{count} 修訂版本'
 
         files:
           created: 文件上傳成功

data/lib/comfortable_mexican_sofa/routes/cms_admin.rb

@@ -6,8 +6,8 @@ class ActionDispatch::Routing::Mapper
         namespace :cms, as: :admin_cms, path: path, except: :show do
           get "/", to: "base#jump"
 
-          concern :with_revisions do
-            resources :revisions, only: [:index, :show, :revert] do
+          concern :with_revisions do |options|
+            resources :revisions, options.merge(only: [:index, :show]) do
               patch :revert, on: :member
             end
           end
@@ -21,25 +21,30 @@ class ActionDispatch::Routing::Mapper
           end
 
           resources :sites do
-
-            concerns = [:with_revisions, :with_reorder, :with_form_fragments]
-            resources :pages, concerns: concerns do
+            resources :pages do
+              concerns :with_reorder
+              concerns :with_form_fragments
+              concerns :with_revisions, controller: "revisions/page"
 
               get :toggle_branch,  on: :member
 
-              resources :translations,
-                except:   [:index],
-                concerns: [:with_revisions, :with_form_fragments]
+              resources :translations, except: [:index] do
+                concerns :with_form_fragments
+                concerns :with_revisions, controller: "revisions/translation"
+              end
             end
 
-            resources :files,
-              concerns: [:with_reorder]
+            resources :files, concerns: [:with_reorder]
 
-            resources :layouts,
-              concerns: [:with_revisions, :with_reorder]
+            resources :layouts do
+              concerns :with_reorder
+              concerns :with_revisions, controller: "revisions/layout"
+            end
 
-            resources :snippets,
-              concerns: [:with_revisions, :with_reorder]
+            resources :snippets do
+              concerns :with_reorder
+              concerns :with_revisions, controller: "revisions/snippet"
+            end
 
             resources :categories
           end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/controllers/comfy/admin/cms/revisions/layout_controller_test.rb

@@ -0,0 +1,62 @@
+require_relative '../../../../../test_helper'
+
+class Comfy::Admin::Cms::Revisions::LayoutControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site     = comfy_cms_sites(:default)
+    @layout   = comfy_cms_layouts(:default)
+    @revision = comfy_cms_revisions(:layout)
+  end
+
+  def test_get_index
+    r :get, comfy_admin_cms_site_layout_revisions_path(@site, @layout)
+    assert_response :redirect
+    assert_redirected_to action: :show, id: @revision
+  end
+
+  def test_get_index_with_no_revisions
+    Comfy::Cms::Revision.delete_all
+    r :get, comfy_admin_cms_site_layout_revisions_path(@site, @layout)
+    assert_response :redirect
+    assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, @layout)
+  end
+
+  def test_get_show
+    r :get, comfy_admin_cms_site_layout_revision_path(@site, @layout, @revision)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Comfy::Cms::Layout)
+    assert_template :show
+  end
+
+  def test_get_show_for_invalid_record
+    r :get, comfy_admin_cms_site_layout_revision_path(@site, "invalid", @revision)
+    assert_response :redirect
+    assert_redirected_to comfy_admin_cms_site_layouts_path(@site)
+    assert_equal 'Record Not Found', flash[:danger]
+  end
+
+  def test_get_show_failure
+    r :get, comfy_admin_cms_site_layout_revision_path(@site, @layout, "invalid")
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:danger]
+  end
+
+
+  def test_revert
+    assert_difference -> {@layout.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_layout_revision_path(@site, @layout, @revision)
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_cms_site_layout_path(@site, @layout)
+      assert_equal 'Content Reverted', flash[:success]
+
+      @layout.reload
+      assert_equal 'revision {{cms:fragment content}}', @layout.content
+      assert_equal 'revision css', @layout.css
+      assert_equal 'revision js', @layout.js
+    end
+  end
+end

data/test/controllers/comfy/admin/cms/revisions/page_controller_test.rb

@@ -0,0 +1,87 @@
+require_relative '../../../../../test_helper'
+
+class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site     = comfy_cms_sites(:default)
+    @page     = comfy_cms_pages(:default)
+    @revision = comfy_cms_revisions(:page)
+  end
+
+  def test_get_index
+    r :get, comfy_admin_cms_site_page_revisions_path(@site, @page)
+    assert_response :redirect
+    assert_redirected_to action: :show, id: @revision
+  end
+
+  def test_get_index_with_no_revisions
+    Comfy::Cms::Revision.delete_all
+    r :get, comfy_admin_cms_site_page_revisions_path(@site, @page)
+    assert_response :redirect
+    assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, @page)
+  end
+
+  def test_get_show
+    r :get, comfy_admin_cms_site_page_revision_path(@site, @page, @revision)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Comfy::Cms::Page)
+    assert_template :show
+  end
+
+  def test_get_show_for_invalid_record
+    r :get, comfy_admin_cms_site_page_revision_path(@site, "invalid", @revision)
+    assert_response :redirect
+    assert_redirected_to comfy_admin_cms_site_pages_path(@site)
+    assert_equal 'Record Not Found', flash[:danger]
+  end
+
+
+  def test_get_show_failure
+    r :get, comfy_admin_cms_site_page_revision_path(@site, @page, "invalid")
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:danger]
+  end
+
+  def test_revert
+    assert_difference -> {@page.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_page_revision_path(@site, @page, @revision)
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, @page)
+      assert_equal 'Content Reverted', flash[:success]
+
+      @page.reload
+
+      assert_equal [
+        { identifier: "boolean",
+          tag:        "checkbox",
+          content:    nil,
+          datetime:   nil,
+          boolean:    true },
+        { identifier: "file",
+          tag:        "file",
+          content:    nil,
+          datetime:   nil,
+          boolean:    false },
+        { identifier: "datetime",
+          tag:        "datetime",
+          content:    nil,
+          datetime:   comfy_cms_fragments(:datetime).datetime,
+          boolean:    false },
+        { identifier: "content",
+          tag:        "text",
+          content:    "old content",
+          datetime:   nil,
+          boolean:    false },
+        { identifier: "title",
+          tag:        "text",
+          content:    "old title",
+          datetime:   nil,
+          boolean:    false }
+      ], @page.fragments_attributes
+    end
+  end
+end