comfortable_mexican_sofa 2.0.1 → 2.0.2

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

@@ -0,0 +1,59 @@
+require_relative '../../../../../test_helper'
+
+class Comfy::Admin::Cms::Revisions::SnippetControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site     = comfy_cms_sites(:default)
+    @snippet  = comfy_cms_snippets(:default)
+    @revision = comfy_cms_revisions(:snippet)
+  end
+
+  def test_get_index
+    r :get, comfy_admin_cms_site_snippet_revisions_path(@site, @snippet)
+    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_snippet_revisions_path(@site, @snippet)
+    assert_response :redirect
+    assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, @snippet)
+  end
+
+  def test_get_show
+    r :get, comfy_admin_cms_site_snippet_revision_path(@site, @snippet, @revision)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Comfy::Cms::Snippet)
+    assert_template :show
+  end
+
+  def test_get_show_for_invalid_record
+    r :get, comfy_admin_cms_site_snippet_revision_path(@site, "invalid", @revision)
+    assert_response :redirect
+    assert_redirected_to comfy_admin_cms_site_snippets_path(@site)
+    assert_equal 'Record Not Found', flash[:danger]
+  end
+
+  def test_get_show_failure
+    r :get, comfy_admin_cms_site_snippet_revision_path(@site, @snippet, 'invalid')
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:danger]
+  end
+
+   def test_revert
+    assert_difference -> {@snippet.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_snippet_revision_path(@site, @snippet, @revision)
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, @snippet)
+      assert_equal 'Content Reverted', flash[:success]
+
+      @snippet.reload
+      assert_equal 'revision content', @snippet.content
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+require_relative '../../../../../test_helper'
+
+class Comfy::Admin::Cms::Revisions::TranslationControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site         = comfy_cms_sites(:default)
+    @page         = comfy_cms_pages(:default)
+    @translation  = comfy_cms_translations(:default)
+    @revision     = comfy_cms_revisions(:translation)
+  end
+
+  def test_get_index
+    r :get, comfy_admin_cms_site_page_translation_revisions_path(@site, @page, @translation)
+    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_translation_revisions_path(@site, @page, @translation)
+    assert_response :redirect
+    assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+  end
+
+  def test_get_show
+    r :get, comfy_admin_cms_site_page_translation_revision_path(@site, @page, @translation, @revision)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Comfy::Cms::Translation)
+    assert_template :show
+  end
+
+  def test_get_show_for_invalid_record
+    r :get, comfy_admin_cms_site_page_translation_revision_path(@site, @page, "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_translation_revision_path(@site, @page, @translation, 'invalid')
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:danger]
+  end
+
+  def test_revert
+    assert_difference -> {@translation.revisions.count} do
+      r :patch, revert_comfy_admin_cms_site_page_translation_revision_path(@site, @page, @translation, @revision)
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+      assert_equal 'Content Reverted', flash[:success]
+
+      @translation.reload
+
+      assert_equal [{
+        identifier: "content",
+        tag:        "text",
+        content:    "old content",
+        datetime:   nil,
+        boolean:    false
+      }], @translation.fragments_attributes
+    end
+  end
+
+end

data/test/gemfiles/Gemfile.rails.5.2

@@ -1,29 +1,9 @@
 source 'http://rubygems.org'
 
-gem "rails", ">= 5.2.0.beta1"
-
-gem "bootstrap_form",
-  github: "bootstrap-ruby/rails-bootstrap-forms",
-  branch: "bootstrap-v4"
+gemspec path: "../../"
 
 gem 'kaminari', '>= 0.14.0'
 
-gem "bootstrap",           ">= 4.0.0.beta2.1"
-gem "mini_magick",         ">= 4.8.0"
-gem "mimemagic",           ">= 0.3.2"
-gem "jquery-rails",        ">= 4.3.1"
-gem "jquery-ui-rails",     ">= 6.0.1"
-gem "codemirror-rails",    ">= 5.16.0"
-gem "font-awesome-rails",  ">= 4.7.0"
-gem "rails-i18n",          ">= 5.0.0"
-gem "active_link_to",      ">= 1.0.0"
-gem "haml-rails",          ">= 1.0.0"
-
-gem 'kramdown',          '>= 1.0.0'
-gem 'sass-rails',        '>= 4.0.3'
-gem 'coffee-rails',      '>= 3.1.0'
-gem 'plupload-rails',    '>= 1.2.1'
-
 group :test do
   gem 'sqlite3'
   gem 'coveralls',  require: false

data/test/integration/access_control_test.rb

@@ -25,15 +25,15 @@ class AccessControlTest < ActionDispatch::IntegrationTest
 
     # faking ComfortableMexicanSofa.config.admin_authorization = 'AccessControlTest::TestAuthorization'
     # faking ComfortableMexicanSofa.config.public_authorization = 'AccessControlTest::TestAuthorization'
-    class SitesController         < Comfy::Admin::Cms::SitesController;         include Authorize; end
-    class LayoutsController       < Comfy::Admin::Cms::LayoutsController;       include Authorize; end
-    class PagesController         < Comfy::Admin::Cms::PagesController;         include Authorize; end
-    class SnippetsController      < Comfy::Admin::Cms::SnippetsController;      include Authorize; end
-    class FilesController         < Comfy::Admin::Cms::FilesController;         include Authorize; end
-    class CategoriesController    < Comfy::Admin::Cms::CategoriesController;    include Authorize; end
-    class RevisionsController     < Comfy::Admin::Cms::RevisionsController;     include Authorize; end
-    class TranslationsController  < Comfy::Admin::Cms::TranslationsController;  include Authorize; end
-    class ContentController       < Comfy::Cms::ContentController;              include Authorize; end
+    class SitesController         < Comfy::Admin::Cms::SitesController;             include Authorize; end
+    class LayoutsController       < Comfy::Admin::Cms::LayoutsController;           include Authorize; end
+    class PagesController         < Comfy::Admin::Cms::PagesController;             include Authorize; end
+    class SnippetsController      < Comfy::Admin::Cms::SnippetsController;          include Authorize; end
+    class FilesController         < Comfy::Admin::Cms::FilesController;             include Authorize; end
+    class CategoriesController    < Comfy::Admin::Cms::CategoriesController;        include Authorize; end
+    class RevisionsController     < Comfy::Admin::Cms::Revisions::LayoutController; include Authorize; end
+    class TranslationsController  < Comfy::Admin::Cms::TranslationsController;      include Authorize; end
+    class ContentController       < Comfy::Cms::ContentController;                  include Authorize; end
   end
 
   # -- Tests -------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -382,7 +382,11 @@ files:
 - app/controllers/comfy/admin/cms/files_controller.rb
 - app/controllers/comfy/admin/cms/layouts_controller.rb
 - app/controllers/comfy/admin/cms/pages_controller.rb
-- app/controllers/comfy/admin/cms/revisions_controller.rb
+- app/controllers/comfy/admin/cms/revisions/base_controller.rb
+- app/controllers/comfy/admin/cms/revisions/layout_controller.rb
+- app/controllers/comfy/admin/cms/revisions/page_controller.rb
+- app/controllers/comfy/admin/cms/revisions/snippet_controller.rb
+- app/controllers/comfy/admin/cms/revisions/translation_controller.rb
 - app/controllers/comfy/admin/cms/sites_controller.rb
 - app/controllers/comfy/admin/cms/snippets_controller.rb
 - app/controllers/comfy/admin/cms/translations_controller.rb
@@ -435,6 +439,7 @@ files:
 - app/views/comfy/admin/cms/pages/index.html.haml
 - app/views/comfy/admin/cms/pages/new.html.haml
 - app/views/comfy/admin/cms/pages/toggle_branch.js.erb
+- app/views/comfy/admin/cms/revisions/_sidebar.html.haml
 - app/views/comfy/admin/cms/revisions/show.html.haml
 - app/views/comfy/admin/cms/sites/_form.html.haml
 - app/views/comfy/admin/cms/sites/edit.html.haml
@@ -581,7 +586,10 @@ files:
 - test/controllers/comfy/admin/cms/files_controller_test.rb
 - test/controllers/comfy/admin/cms/layouts_controller_test.rb
 - test/controllers/comfy/admin/cms/pages_controller_test.rb
-- test/controllers/comfy/admin/cms/revisions_controller_test.rb
+- test/controllers/comfy/admin/cms/revisions/layout_controller_test.rb
+- test/controllers/comfy/admin/cms/revisions/page_controller_test.rb
+- test/controllers/comfy/admin/cms/revisions/snippet_controller_test.rb
+- test/controllers/comfy/admin/cms/revisions/translation_controller_test.rb
 - test/controllers/comfy/admin/cms/sites_controller_test.rb
 - test/controllers/comfy/admin/cms/snippets_controller_test.rb
 - test/controllers/comfy/admin/cms/translations_controller_test.rb

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

@@ -1,67 +0,0 @@
-class Comfy::Admin::Cms::RevisionsController < Comfy::Admin::Cms::BaseController
-
-  before_action :load_record
-  before_action :load_revision, except: :index
-  before_action :authorize
-
-  helper_method :record_path
-
-  def index
-    redirect_to action: :show, id: @record.revisions.order(created_at: :desc).first.try(:id) || 0
-  end
-
-  def show
-    case @record
-    when Comfy::Cms::Page, Comfy::Cms::Translation
-      @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
-      @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
-    else
-      @current_content    = @record.revision_fields.inject({}){|c, f| c[f] = @record.send(f); c }
-      @versioned_content  = @record.revision_fields.inject({}){|c, f| c[f] = @revision.data[f]; c }
-    end
-  end
-
-  def revert
-    @record.restore_from_revision(@revision)
-    flash[:success] = I18n.t('comfy.admin.cms.revisions.reverted')
-    redirect_to record_path
-  end
-
-protected
-
-  def load_record
-    @record = if params[:layout_id]
-      ::Comfy::Cms::Layout.find(params[:layout_id])
-    elsif params[:translation_id]
-      ::Comfy::Cms::Translation.find(params[:translation_id])
-    elsif params[:page_id]
-      ::Comfy::Cms::Page.find(params[:page_id])
-    elsif params[:snippet_id]
-      ::Comfy::Cms::Snippet.find(params[:snippet_id])
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
-    redirect_to comfy_admin_cms_path
-  end
-
-  def load_revision
-    @revision = @record.revisions.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.not_found')
-    redirect_to record_path
-  end
-
-  def record_path(record = @record)
-    case record
-      when ::Comfy::Cms::Layout
-        edit_comfy_admin_cms_site_layout_path(@site, @record)
-      when ::Comfy::Cms::Page
-        edit_comfy_admin_cms_site_page_path(@site, @record)
-      when ::Comfy::Cms::Translation
-        edit_comfy_admin_cms_site_page_translation_path(@site, @record.page, @record)
-      when ::Comfy::Cms::Snippet
-        edit_comfy_admin_cms_site_snippet_path(@site, @record)
-    end
-  end
-end

data/test/controllers/comfy/admin/cms/revisions_controller_test.rb

@@ -1,248 +0,0 @@
-require_relative '../../../../test_helper'
-
-class Comfy::Admin::Cms::RevisionsControllerTest < ActionDispatch::IntegrationTest
-
-  setup do
-    @site         = comfy_cms_sites(:default)
-    @layout       = comfy_cms_layouts(:default)
-    @page         = comfy_cms_pages(:default)
-    @translation  = comfy_cms_translations(:default)
-    @snippet      = comfy_cms_snippets(:default)
-  end
-
-  def test_get_index_for_layouts
-    r :get, comfy_admin_cms_site_layout_revisions_path(@site, @layout)
-    assert_response :redirect
-    assert_redirected_to action: :show, id: comfy_cms_revisions(:layout)
-  end
-
-  def test_get_index_for_pages
-    r :get, comfy_admin_cms_site_page_revisions_path(@site, @page)
-    assert_response :redirect
-    assert_redirected_to action: :show, id: comfy_cms_revisions(:page)
-  end
-
-  def test_get_index_for_snippets
-    r :get, comfy_admin_cms_site_snippet_revisions_path(@site, @snippet)
-    assert_response :redirect
-    assert_redirected_to action: :show, id: comfy_cms_revisions(:snippet)
-  end
-
-  def test_get_index_for_translations
-    r :get, comfy_admin_cms_site_page_translation_revisions_path(@site, @page, @translation)
-    assert_response :redirect
-    assert_redirected_to action: :show, id: comfy_cms_revisions(:translation)
-  end
-
-  def test_get_index_for_snippets_with_no_revisions
-    Comfy::Cms::Revision.delete_all
-    r :get, comfy_admin_cms_site_snippet_revisions_path(@site, @snippet)
-    assert_response :redirect
-    assert_redirected_to action: :show, id: 0
-  end
-
-  def test_get_show_for_layout
-    r :get, comfy_admin_cms_site_layout_revision_path(
-      site_id:    @site,
-      layout_id:  @layout,
-      id:         comfy_cms_revisions(:layout))
-    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_page
-    r :get, comfy_admin_cms_site_page_revision_path(
-      site_id:  @site,
-      page_id:  @page,
-      id:       comfy_cms_revisions(:page))
-    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_translation
-    r :get, comfy_admin_cms_site_page_translation_revision_path(
-      site_id:        @site,
-      page_id:        @page,
-      translation_id: @translation,
-      id:             comfy_cms_revisions(:translation))
-    assert_response :success
-    assert assigns(:record)
-    assert assigns(:revision)
-    assert assigns(:record).is_a?(Comfy::Cms::Translation)
-    assert_template :show
-  end
-
-  def test_get_show_for_snippet
-    r :get, comfy_admin_cms_site_snippet_revision_path(
-      site_id:    @site,
-      snippet_id: @snippet,
-      id:         comfy_cms_revisions(:snippet))
-    assert_response :success
-    assert assigns(:record)
-    assert assigns(:revision)
-    assert assigns(:record).is_a?(Comfy::Cms::Snippet)
-    assert_template :show
-  end
-
-  def test_get_show_for_bad_type
-    r :get, comfy_admin_cms_site_layout_revision_path(
-      site_id:    @site,
-      layout_id:  'invalid',
-      id:         comfy_cms_revisions(:layout))
-    assert_response :redirect
-    assert_redirected_to comfy_admin_cms_path
-    assert_equal 'Record Not Found', flash[:danger]
-  end
-
-  def test_get_show_for_layout_failure
-    r :get, comfy_admin_cms_site_layout_revision_path(
-      site_id:    @site,
-      layout_id:  @layout,
-      id:         '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_get_show_for_page_failure
-    r :get, comfy_admin_cms_site_page_revision_path(
-      site_id: @site,
-      page_id: @page,
-      id:     '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_get_show_for_translation_failure
-    r :get, comfy_admin_cms_site_page_translation_revision_path(
-      site_id:        @site,
-      page_id:        @page,
-      translation_id: @translation,
-      id:             'invalid')
-    assert_response :redirect
-    assert assigns(:record)
-    assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:danger]
-  end
-
-  def test_get_show_for_snippet_failure
-    r :get, comfy_admin_cms_site_snippet_revision_path(
-      site_id:    @site,
-      snippet_id: @snippet,
-      id:         'invalid')
-    assert_response :redirect
-    assert assigns(:record)
-    assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, assigns(:record))
-    assert_equal 'Revision Not Found', flash[:danger]
-  end
-
-  def test_revert_for_layout
-    assert_difference -> {@layout.revisions.count} do
-      r :patch, revert_comfy_admin_cms_site_layout_revision_path(
-        site_id:    @site,
-        layout_id:  @layout,
-        id:         comfy_cms_revisions(:layout)
-      )
-      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
-
-  def test_revert_for_page
-    assert_difference -> {@page.revisions.count} do
-      r :patch, revert_comfy_admin_cms_site_page_revision_path(
-        site_id:  @site,
-        page_id:  @page,
-        id:       comfy_cms_revisions(:page)
-      )
-      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
-
-  def test_revert_for_page
-    assert_difference -> {@translation.revisions.count} do
-      r :patch, revert_comfy_admin_cms_site_page_translation_revision_path(
-        site_id:        @site,
-        page_id:        @page,
-        translation_id: @translation,
-        id:             comfy_cms_revisions(:translation)
-      )
-      assert_response :redirect
-      assert_redirected_to edit_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
-      assert_equal 'Content Reverted', flash[:success]
-
-      @translation.reload
-
-      assert_equal [
-        { identifier: "content",
-          tag:        "text",
-          content:    "old content",
-          datetime:   nil,
-          boolean:    false }
-      ], @translation.fragments_attributes
-    end
-  end
-
-  def test_revert_for_snippet
-    assert_difference -> {@snippet.revisions.count} do
-      r :patch, revert_comfy_admin_cms_site_snippet_revision_path(
-        site_id:    @site,
-        snippet_id: @snippet,
-        id:         comfy_cms_revisions(:snippet)
-      )
-      assert_response :redirect
-      assert_redirected_to edit_comfy_admin_cms_site_snippet_path(@site, @snippet)
-      assert_equal 'Content Reverted', flash[:success]
-
-      @snippet.reload
-      assert_equal 'revision content', @snippet.content
-    end
-  end
-end