comfortable_mexican_sofa 2.0.6 → 2.0.7

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

@@ -51,7 +51,7 @@ class Comfy::Cms::Layout < ActiveRecord::Base
 
   # -- Instance Methods --------------------------------------------------------
   # Tokenized layout content that also pulls in parent layout (if there's one)
-  # and merges on the {{cms:fragment content}} tag (if parent layout has that).
+  # and merges on the {{cms:tag_type content}} tag (if parent layout has that).
   # Returns a list of tokens that can be fed into the renderer.
   def content_tokens
     renderer  = ComfortableMexicanSofa::Content::Renderer.new(nil)
@@ -59,14 +59,16 @@ class Comfy::Cms::Layout < ActiveRecord::Base
 
     if parent
       fragment_tags = ComfortableMexicanSofa::Content::Tag::Fragment.subclasses.map do |c|
-        c.to_s.demodulize.underscore
+        ComfortableMexicanSofa::Content::Renderer.tags.key(c)
       end
+
       parent_tokens = parent.content_tokens
       replacement_position = parent_tokens.index do |n|
         n.is_a?(Hash) &&
         fragment_tags.member?(n[:tag_class]) &&
         n[:tag_params].split(%r{\s}).first == "content"
       end
+
       if replacement_position
         parent_tokens[replacement_position] = tokens
         tokens = parent_tokens.flatten

data/app/views/comfy/admin/cms/files/destroy.js.coffee

@@ -1,2 +1,2 @@
-$("#<%= dom_id(@file) %>").fadeOut 'slow', ->
+$("li[data-id=<%= @file.id %>]").fadeOut 'slow', ->
   $(this).remove()

data/comfortable_mexican_sofa.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.2.2"
 
   s.add_dependency "active_link_to",        ">= 1.0.0"
-  s.add_dependency "codemirror-rails",      ">= 5.16.0"
   s.add_dependency "coffee-rails",          ">= 4.2.0"
   s.add_dependency "comfy_bootstrap_form",  ">= 4.0.0.beta1"
   s.add_dependency "haml-rails",            ">= 1.0.0"
@@ -26,7 +25,6 @@ Gem::Specification.new do |s|
   s.add_dependency "kramdown",              ">= 1.0.0"
   s.add_dependency "mimemagic",             ">= 0.3.2"
   s.add_dependency "mini_magick",           ">= 4.8.0"
-  s.add_dependency "plupload-rails",        ">= 1.2.1"
   s.add_dependency "rails",                 ">= 5.2.0.beta1"
   s.add_dependency "rails-i18n",            ">= 5.0.0"
   s.add_dependency "sass-rails",            ">= 5.0.0"

data/lib/comfortable_mexican_sofa/engine.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require "comfortable_mexican_sofa"
 require "rails"
 require "rails-i18n"
@@ -9,8 +8,6 @@ require "jquery-rails"
 require "haml-rails"
 require "sass-rails"
 require "coffee-rails"
-require "codemirror-rails"
-require "plupload-rails"
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine

data/lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb

@@ -29,7 +29,7 @@ module ComfortableMexicanSofa::ActsAsTree
         foreign_key:  configuration[:foreign_key],
         dependent:    configuration[:dependent]
 
-      class_eval <<-RUBY
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
         include ComfortableMexicanSofa::ActsAsTree::InstanceMethods
 
         scope :roots, -> {

data/lib/comfortable_mexican_sofa/extensions/has_revisions.rb

@@ -7,7 +7,7 @@ module ComfortableMexicanSofa::HasRevisions
   module ClassMethods
 
     def cms_has_revisions_for(*fields)
-      include ComfortableMexicanSofa::HasRevisions::InstanceMethods
+      include ComfortableMexicanSofa::HasRevisions::InstanceMethods # rubocop:disable Style/MixinUsage
 
       attr_accessor :revision_data
 

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,5 +1,5 @@
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.6".freeze
+  VERSION = "2.0.7".freeze
 
 end

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

@@ -22,7 +22,7 @@ class Comfy::Admin::Cms::SitesControllerTest < ActionDispatch::IntegrationTest
     r :get, new_comfy_admin_cms_site_path
     assert_response :success
     assert assigns(:site)
-    assert_equal "test.host", assigns(:site).hostname
+    assert_equal "www.example.com", assigns(:site).hostname
     assert_template :new
     assert_select "form[action='/admin/sites']"
   end

data/test/fixtures/comfy/cms/layouts.yml

@@ -4,7 +4,7 @@ default:
   identifier: default
   parent:
   content: |-
-    {{cms:text content}}
+    {{cms:textarea content}}
   css: default_css
   js: default_js
   position: 0
@@ -16,7 +16,7 @@ nested:
   parent:
   content: |-
     {{cms:text header}}
-    {{cms:text content}}
+    {{cms:textarea content}}
   css: nested_css
   js: nested_js
   position: 0
@@ -27,8 +27,8 @@ child:
   identifier: child
   parent: nested
   content: |-
-    {{cms:text left_column}}
-    {{cms:text right_column}}
+    {{cms:textarea left_column}}
+    {{cms:textarea right_column}}
   css: child_css
   js: child_js
   position: 0

data/test/fixtures/comfy/cms/sites.yml

@@ -1,5 +1,5 @@
 default:
   label: Default Site
   identifier: default-site
-  hostname: test.host
+  hostname: www.example.com
   path:

data/test/gemfiles/Gemfile.rails.5.2

@@ -2,11 +2,17 @@ source 'http://rubygems.org'
 
 gemspec path: "../../"
 
-gem 'kaminari', '>= 0.14.0'
+group :development, :test do
+  gem "byebug", platforms: %i[mri mingw x64_mingw]
+  gem "capybara"
+  gem "kaminari"
+  gem "puma"
+  gem "rubocop", require: false
+  gem "selenium-webdriver"
+  gem "sqlite3"
+end
 
 group :test do
-  gem "rubocop", "~> 0.51.0", require: false
-  gem "sqlite3"
   gem "coveralls",  require: false
   gem "mocha",      require: false
   gem "rails-controller-testing"

data/test/integration/seeds_test.rb

@@ -35,7 +35,7 @@ class SeedsIntergrationTest < ActionDispatch::IntegrationTest
           assert_equal "Default Seed Snippet", Comfy::Cms::Snippet.find_by_identifier("default").label
 
           file_path = url_for(ActiveStorage::Blob.find_by(filename: "header.png"))
-          file_path = file_path.sub("http://test.host", "")
+          file_path = file_path.sub("http://www.example.com", "")
           out = <<-HTML.strip_heredoc
             <html>
               <body>

data/test/integration/sites_test.rb

@@ -23,14 +23,14 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
     get "/"
     assert_response :success
     assert assigns(:cms_site)
-    assert_equal "test.host", assigns(:cms_site).hostname
+    assert_equal "www.example.com", assigns(:cms_site).hostname
   end
 
   def test_get_public_page_with_sites_with_different_paths
     Comfy::Cms::Site.delete_all
-    site_a = Comfy::Cms::Site.create!(identifier: "site-a", hostname: "test.host", path: "")
-    site_b = Comfy::Cms::Site.create!(identifier: "site-b", hostname: "test.host", path: "path-b")
-    site_c = Comfy::Cms::Site.create!(identifier: "site-c", hostname: "test.host", path: "path-c/child")
+    site_a = Comfy::Cms::Site.create!(identifier: "site-a", hostname: "www.example.com", path: "")
+    site_b = Comfy::Cms::Site.create!(identifier: "site-b", hostname: "www.example.com", path: "path-b")
+    site_c = Comfy::Cms::Site.create!(identifier: "site-c", hostname: "www.example.com", path: "path-c/child")
 
     [site_a, site_b, site_c].each do |site|
       layout = site.layouts.create!(identifier: "test")
@@ -62,8 +62,8 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
 
   def test_get_public_page_with_host_with_port
     Comfy::Cms::Site.delete_all
-    site_a = Comfy::Cms::Site.create!(identifier: "site-a", hostname: "test.host:3000")
-    site_b = Comfy::Cms::Site.create!(identifier: "site-b", hostname: "test.host")
+    site_a = Comfy::Cms::Site.create!(identifier: "site-a", hostname: "www.example.com:3000")
+    site_b = Comfy::Cms::Site.create!(identifier: "site-b", hostname: "www.example.com")
 
     [site_a, site_b].each do |site|
       layout = site.layouts.create!(identifier: "test")

data/test/lib/seeds/layouts_test.rb

@@ -79,11 +79,11 @@ class SeedsLayoutsTest < ActiveSupport::TestCase
 
     ComfortableMexicanSofa::Seeds::Layout::Importer.new("sample-site", "default-site").import!
     layout.reload
-    assert_equal "default",               layout.identifier
-    assert_equal "Default Layout",        layout.label
-    assert_equal "{{cms:text content}}",  layout.content
-    assert_equal "default_css",           layout.css
-    assert_equal "default_js",            layout.js
+    assert_equal "default",                   layout.identifier
+    assert_equal "Default Layout",            layout.label
+    assert_equal "{{cms:textarea content}}",  layout.content
+    assert_equal "default_css",               layout.css
+    assert_equal "default_js",                layout.js
   end
 
   def test_export
@@ -107,7 +107,7 @@ class SeedsLayoutsTest < ActiveSupport::TestCase
       position: 0
 
       [content]
-      {{cms:text content}}
+      {{cms:textarea content}}
       [js]
       default_js
       [css]
@@ -124,7 +124,7 @@ class SeedsLayoutsTest < ActiveSupport::TestCase
 
       [content]
       {{cms:text header}}
-      {{cms:text content}}
+      {{cms:textarea content}}
       [js]
       nested_js
       [css]
@@ -140,8 +140,8 @@ class SeedsLayoutsTest < ActiveSupport::TestCase
       position: 0
 
       [content]
-      {{cms:text left_column}}
-      {{cms:text right_column}}
+      {{cms:textarea left_column}}
+      {{cms:textarea right_column}}
       [js]
       child_js
       [css]

data/test/models/page_test.rb

@@ -477,8 +477,8 @@ class CmsPageTest < ActiveSupport::TestCase
   end
 
   def test_url
-    assert_equal "//test.host/", @page.url
-    assert_equal "//test.host/child-page", comfy_cms_pages(:child).url
+    assert_equal "//www.example.com/", @page.url
+    assert_equal "//www.example.com/child-page", comfy_cms_pages(:child).url
 
     assert_equal "/", @page.url(relative: true)
     assert_equal "/child-page", comfy_cms_pages(:child).url(relative: true)
@@ -487,8 +487,8 @@ class CmsPageTest < ActiveSupport::TestCase
     @page.reload
     comfy_cms_pages(:child).reload
 
-    assert_equal "//test.host/en/site/", @page.url
-    assert_equal "//test.host/en/site/child-page", comfy_cms_pages(:child).url
+    assert_equal "//www.example.com/en/site/", @page.url
+    assert_equal "//www.example.com/en/site/child-page", comfy_cms_pages(:child).url
 
     assert_equal "/en/site/", @page.url(relative: true)
     assert_equal "/en/site/child-page", comfy_cms_pages(:child).url(relative: true)
@@ -496,8 +496,8 @@ class CmsPageTest < ActiveSupport::TestCase
 
   def test_url_with_public_cms_path
     ComfortableMexicanSofa.config.public_cms_path = "/custom"
-    assert_equal "//test.host/custom/", @page.url
-    assert_equal "//test.host/custom/child-page", comfy_cms_pages(:child).url
+    assert_equal "//www.example.com/custom/", @page.url
+    assert_equal "//www.example.com/custom/child-page", comfy_cms_pages(:child).url
 
     assert_equal "/custom/", @page.url(relative: true)
     assert_equal "/custom/child-page", comfy_cms_pages(:child).url(relative: true)

data/test/models/site_test.rb

@@ -110,19 +110,19 @@ class CmsSiteTest < ActiveSupport::TestCase
 
   def test_find_site
     site_a = @site
-    assert_equal "test.host", site_a.hostname
+    assert_equal "www.example.com", site_a.hostname
     assert_nil site_a.path
 
-    assert_equal site_a, Comfy::Cms::Site.find_site("test.host")
-    assert_equal site_a, Comfy::Cms::Site.find_site("test.host", "/some/path")
+    assert_equal site_a, Comfy::Cms::Site.find_site("www.example.com")
+    assert_equal site_a, Comfy::Cms::Site.find_site("www.example.com", "/some/path")
     assert_equal site_a, Comfy::Cms::Site.find_site("test99.host", "/some/path")
 
     site_b = Comfy::Cms::Site.create!(identifier: "test_a", hostname: "test2.host", path: "en")
     site_c = Comfy::Cms::Site.create!(identifier: "test_b", hostname: "test2.host", path: "fr")
 
-    assert_equal site_a,  Comfy::Cms::Site.find_site("test.host")
-    assert_equal site_a,  Comfy::Cms::Site.find_site("test.host", "/some/path")
-    assert_equal site_a,  Comfy::Cms::Site.find_site("test.host", "/some/path")
+    assert_equal site_a,  Comfy::Cms::Site.find_site("www.example.com")
+    assert_equal site_a,  Comfy::Cms::Site.find_site("www.example.com", "/some/path")
+    assert_equal site_a,  Comfy::Cms::Site.find_site("www.example.com", "/some/path")
     assert_nil            Comfy::Cms::Site.find_site("test99.host", "/some/path")
 
     assert_nil            Comfy::Cms::Site.find_site("test2.host")
@@ -141,7 +141,7 @@ class CmsSiteTest < ActiveSupport::TestCase
 
   def test_find_site_with_public_cms_path
     ComfortableMexicanSofa.config.public_cms_path = "/custom"
-    assert_equal "//test.host/custom", comfy_cms_sites(:default).url
+    assert_equal "//www.example.com/custom", @site.url
 
     site_a = Comfy::Cms::Site.create!(identifier: "test_a", hostname: "test2.host", path: "en")
     site_b = Comfy::Cms::Site.create!(identifier: "test_b", hostname: "test2.host", path: "fr")
@@ -165,8 +165,8 @@ class CmsSiteTest < ActiveSupport::TestCase
     site_b = Comfy::Cms::Site.create!(identifier: "site_b", hostname: "test2.host")
 
     ComfortableMexicanSofa.config.hostname_aliases = {
-      "test.host"   => "alias_a.host",
-      "test2.host"  => %w[alias_b.host alias_c.host]
+      "www.example.com" => "alias_a.host",
+      "test2.host"      => %w[alias_b.host alias_c.host]
     }
 
     assert_equal site_a, Comfy::Cms::Site.find_site("alias_a.host")
@@ -175,14 +175,14 @@ class CmsSiteTest < ActiveSupport::TestCase
   end
 
   def test_url
-    assert_equal "//test.host", @site.url
-    assert_nil                  @site.url(relative: true)
+    assert_equal "//www.example.com", @site.url
+    assert_nil @site.url(relative: true)
 
     @site.update_column(:path, "/site-path")
-    assert_equal "//test.host/site-path", @site.url
+    assert_equal "//www.example.com/site-path", @site.url
 
     ComfortableMexicanSofa.config.public_cms_path = "cms"
-    assert_equal "//test.host/cms/site-path", @site.url
+    assert_equal "//www.example.com/cms/site-path", @site.url
 
     assert_equal "/cms/site-path", @site.url(relative: true)
   end

data/test/system/layouts_frontend_test.rb

@@ -0,0 +1,15 @@
+require_relative "../test_helper"
+
+class LayoutsFrontendTest < ApplicationSystemTestCase
+
+  setup do
+    @site = comfy_cms_sites(:default)
+  end
+
+  def test_new_identifier
+    visit_p new_comfy_admin_cms_site_layout_path(@site)
+    fill_in "Layout Name", with: "Test Layout"
+    assert_equal "test-layout", find_field("Identifier").value
+  end
+
+end

data/test/system/pages_frontend_test.rb

@@ -0,0 +1,15 @@
+require_relative "../test_helper"
+
+class PagesFrontendTest < ApplicationSystemTestCase
+
+  setup do
+    @site = comfy_cms_sites(:default)
+  end
+
+  def test_new_identifier
+    visit_p new_comfy_admin_cms_site_page_path(@site)
+    fill_in "Label", with: "Test Page"
+    assert_equal "test-page", find_field("Slug").value
+  end
+
+end

data/test/system/sites_frontend_test.rb

@@ -0,0 +1,11 @@
+require_relative "../test_helper"
+
+class SitesFrontendTest < ApplicationSystemTestCase
+
+  def test_new_identifier
+    visit_p new_comfy_admin_cms_site_path
+    fill_in "Label", with: "Test Site"
+    assert_equal "test-site", find_field("Identifier").value
+  end
+
+end

data/test/system/snippets_frontend_test.rb

@@ -0,0 +1,15 @@
+require_relative "../test_helper"
+
+class SnippetsFrontendTest < ApplicationSystemTestCase
+
+  setup do
+    @site = comfy_cms_sites(:default)
+  end
+
+  def test_new_identifier
+    visit_p new_comfy_admin_cms_site_snippet_path(@site)
+    fill_in "Label", with: "Test Snippet"
+    assert_equal "test-snippet", find_field("Identifier").value
+  end
+
+end

data/test/test_helper.rb

@@ -1,12 +1,17 @@
 ENV["RAILS_ENV"] = "test"
 
-require "simplecov"
-require "coveralls"
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-SimpleCov.start do
-  add_filter "lib/generators"
-  add_filter "lib/comfortable_mexican_sofa/engine.rb "
+# In CI envoronment I don't want to send coverage report for system tests that
+# obviously don't cover everything 100%
+unless ENV["SKIP_COV"]
+  require "simplecov"
+  require "coveralls"
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter "lib/generators"
+    add_filter "lib/comfortable_mexican_sofa/engine.rb "
+  end
 end
+
 require_relative "../config/environment"
 
 require "rails/test_help"
@@ -121,12 +126,6 @@ end
 
 class ActionDispatch::IntegrationTest
 
-  setup :setup_host
-
-  def setup_host
-    host! "test.host"
-  end
-
   # Attaching http_auth stuff with request. Example use:
   #   r :get, '/cms-admin/pages'
   def r(method, path, options = {})
@@ -186,3 +185,17 @@ class Rails::Generators::TestCase
   end
 
 end
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+
+  driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
+
+  # Visiting path and passing in BasicAuth credentials at the same time
+  # I have no idea how to set headers here.
+  def visit_p(path)
+    username = ComfortableMexicanSofa::AccessControl::AdminAuthentication.username
+    password = ComfortableMexicanSofa::AccessControl::AdminAuthentication.password
+    visit("http://#{username}:#{password}@#{Capybara.server_host}:#{Capybara.server_port}#{path}")
+  end
+
+end