comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/fixtures/generators/scaffold/tests/model.rb

@@ -11,15 +11,14 @@ class FooTest < ActiveSupport::TestCase
   def test_validation
     foo = Foo.new
     assert foo.invalid?
-    assert_errors_on foo, :bar
+    assert_equal [:bar], foo.errors.keys
   end
 
   def test_creation
     assert_difference 'Foo.count' do
       Foo.create(
-        :bar => 'test bar',
+        bar: 'test bar',
       )
     end
   end
-
-end
+end

data/test/fixtures/generators/scaffold/views/_form.haml

@@ -1,4 +1,5 @@
 = form.text_field :bar
 
-= form.form_group :class => 'form-actions' do
-  = form.submit :class => 'btn btn-primary'
+= form.form_actions do
+  = form.submit class: "btn btn-primary"
+  = link_to 'Cancel', admin_foos_path, class: "btn btn-link"

data/test/fixtures/generators/scaffold/views/edit.haml

@@ -2,4 +2,4 @@
   %h2 Edit Foo
 
 = comfy_form_for [:admin, @foo] do |form|
-  = render form
+  = render form

data/test/fixtures/generators/scaffold/views/index.haml

@@ -1,19 +1,21 @@
 .page-header
-  = link_to 'New Foo', new_admin_foo_path, :class => 'btn btn-default pull-right'
+  = link_to 'New Foo', new_admin_foo_path, class: 'btn btn-secondary pull-right'
   %h2= 'Foos'
 
-= paginate @foos, :theme => 'comfy'
+= paginate @foos, theme: 'comfy'
 
-%table.table.table-hover.table-bordered
-  %tr
-    %th.main Bar
-    %th
+%ul.list
   - @foos.each do |foo|
-    %tr
-      %td.main= foo.bar
-      %td
-        .btn-group.btn-group-sm
-          = link_to 'Edit', edit_admin_foo_path(foo), :class => 'btn btn-default'
-          = link_to 'Delete', admin_foo_path(foo), :method => :delete, :data => { :confirm => 'Are you sure?' }, :class => 'btn btn-danger'
+    %li
+      .row
+        .col-md-8.item
+          .item-content
+            .item-title
+              = foo.bar
 
-= paginate @foos, :theme => 'comfy'
+        .col-md-4.d-flex.align-items-center.justify-content-md-end
+          .btn-group.btn-group-sm
+            = link_to 'Edit', edit_admin_foo_path(foo), class: 'btn btn-outline-secondary'
+            = link_to 'Delete', admin_foo_path(foo), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger'
+
+= paginate @foos, theme: 'comfy'

data/test/fixtures/generators/scaffold/views/new.haml

@@ -2,4 +2,4 @@
   %h2 New Foo
 
 = comfy_form_for [:admin, @foo] do |form|
-  = render form
+  = render form

data/test/fixtures/generators/scaffold/views/show.haml

@@ -1,4 +1,4 @@
 .page-header
   %h2 Foo
-  
-= debug @foo
+
+= debug @foo

data/test/gemfiles/Gemfile.rails.5.2

@@ -0,0 +1,32 @@
+source 'http://rubygems.org'
+
+gem "rails", ">= 5.2.0.beta1"
+
+gem "bootstrap_form",
+  github: "bootstrap-ruby/rails-bootstrap-forms",
+  branch: "bootstrap-v4"
+
+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
+  gem 'mocha',      require: false
+  gem 'rails-controller-testing'
+end

data/test/generators/cms_assets_generator_test.rb

@@ -6,8 +6,7 @@ class CmsAssetsGeneratorTest < Rails::Generators::TestCase
 
   def test_generator
     run_generator
-    assert_directory 'app/assets/images/comfy/admin/cms'
     assert_directory 'app/assets/javascripts/comfy/admin/cms'
     assert_directory 'app/assets/stylesheets/comfy/admin/cms'
   end
-end
+end

data/test/generators/cms_generator_test.rb

@@ -13,7 +13,9 @@ class CmsGeneratorTest < Rails::Generators::TestCase
 
     assert_file 'config/routes.rb', read_file('cms/routes.rb')
 
-    assert_directory 'db/cms_fixtures'
+    assert_file 'config/application.rb', read_file('cms/application.rb')
+
+    assert_directory 'db/cms_seeds'
 
     assert_file 'app/assets/javascripts/comfy/admin/cms/custom.js.coffee'
 

data/test/generators/cms_views_generator_test.rb

@@ -9,4 +9,4 @@ class CmsViewsGeneratorTest < Rails::Generators::TestCase
     assert_directory 'app/views/comfy'
     assert_file 'app/views/comfy/admin/cms/pages/index.html.haml'
   end
-end
+end

data/test/generators/scaffold_generator_test.rb

@@ -24,7 +24,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
     assert_file 'config/routes.rb', read_file('scaffold/routes.rb')
 
     assert_file 'app/views/comfy/admin/cms/partials/_navigation_inner.html.haml' do |file|
-      assert_match "%li= active_link_to 'Foos', admin_foos_path", file
+      assert_match "%li.nav-item\n  = active_link_to 'Foos', admin_foos_path, class: 'nav-link'", file
     end
   end
-end
+end

data/test/helpers/cms_helper_test.rb

@@ -11,114 +11,93 @@ class ViewMethodsTest < ActionView::TestCase
   end
   ActionView::Base.send :include, TestViewHelpers
 
-  def setup
+  setup do
+    # we're simulating instance variables that are present on the view/controller
     @cms_site = comfy_cms_sites(:default)
     @cms_page = comfy_cms_pages(:default)
-    comfy_cms_blocks(:default_page_text).update_column(:content, 'default_page_text_content')
   end
 
-  def test_cms_block_content
-    assert_equal 'default_page_text_content', cms_block_content(:default_page_text)
-    assert_equal 'default_page_text_content', cms_block_content(:default_page_text, @cms_page)
-    assert_equal 'default_field_text_content', cms_block_content(:default_field_text)
+  def test_cms_fragment_content
+    assert_equal "content", cms_fragment_content(:content)
+    assert_equal "content", cms_fragment_content(:content, @cms_page)
+    assert_equal "", cms_fragment_content(:invalid)
   end
 
-  def test_cms_block_content_render
-    assert_equal 'default_field_text_content', cms_block_content_render(:default_field_text)
+  def test_cms_fragment_content_with_datetime
+    frag = comfy_cms_fragments(:datetime)
+    assert_equal "datetime", frag.tag
+    assert_equal "1981-10-04 12:34:56 UTC", cms_fragment_content(frag.identifier).to_s
   end
 
-  def test_cms_block_render
-    assert_equal 'default_page_text_content', cms_block_render(:default_page_text)
-    assert_equal '', cms_block_render(:default_field_text)
+  def test_cms_fragment_content_with_date
+    frag = comfy_cms_fragments(:datetime)
+    frag.update_columns(tag: "date", datetime: "2017-01-01")
+    assert_equal "2017-01-01 00:00:00 UTC", cms_fragment_content(frag.identifier).to_s
   end
 
-  def test_cms_block_with_erb
-    comfy_cms_blocks(:default_page_text).update_column(:content, '<%= 1 + 1 %>')
-    assert_equal '<%= 1 + 1 %>', cms_block_content(:default_page_text)
-    assert_equal '&lt;%= 1 + 1 %&gt;', cms_block_render(:default_page_text)
+  def test_cms_fragment_content_with_boolean
+    frag = comfy_cms_fragments(:boolean)
+    assert_equal true, cms_fragment_content(frag.identifier)
   end
 
-  def test_cms_block_with_tags
-    comfy_cms_blocks(:default_page_text).update_column(:content, '{{ cms:helper:hello }}')
-    assert_equal '{{ cms:helper:hello }}', cms_block_content(:default_page_text)
-    assert_equal 'hello', cms_block_render(:default_page_text)
+  def test_cms_fragment_content_with_files
+    frag = comfy_cms_fragments(:file)
+    assert_equal frag.attachments.to_a, cms_fragment_content(frag.identifier).to_a
   end
 
-  def test_cms_block_missing
-    assert_equal '', cms_block_content(:invalid)
-    assert_equal '', cms_block_content(:invalid, @cms_page)
-    assert_equal '', cms_block_content(:invalid)
-    assert_equal '', cms_block_content(:default_page_text, @invalid)
-
-    assert_equal '', cms_block_render(:invalid)
+  def test_cms_fragment_render
+    assert_equal "content", cms_fragment_render(:content)
+    assert_equal "", cms_fragment_render(:invalid)
   end
 
-  def test_cms_block_with_files
-    @cms_page.layout.update_column(:content, '{{cms:page_files:files}}')
-    @cms_page.update_attributes!(
-      :blocks_attributes => [
-        {
-          :identifier => 'files',
-          :content    => [
-            fixture_file_upload('files/image.jpg', "image/jpeg"),
-            fixture_file_upload('files/image.gif', "image/gif")
-          ]
-        }
-      ]
-    )
+  def test_cms_fragment_render_with_tags
+    comfy_cms_fragments(:default).update_column(:content, "a {{cms:helper hello }} b")
+    assert_equal "a hello b", cms_fragment_render(:content)
+  end
 
-    block = @cms_page.blocks.find_by(:identifier => 'files')
-    assert_equal block.files, cms_block_content(:files)
-    assert_equal 2, block.files.count
+  def test_cms_fragment_render_with_erb
+    comfy_cms_fragments(:default).update_column(:content, "<%= 1 + 1 %>")
+    assert_equal "&lt;%= 1 + 1 %&gt;", cms_fragment_render(:content)
+  end
 
-    assert_equal block.files.collect{|file| file.file.url}.join(', '), cms_block_render(:files)
+  def test_cms_fragment_render_with_datetime
+    comfy_cms_layouts(:default).update_column(:content, "{{cms:datetime datetime}}")
+    assert_equal "1981-10-04 12:34:56 UTC", cms_fragment_render(:datetime)
   end
 
-  def test_cms_snippet_content
-    assert_equal 'default_snippet_content', cms_snippet_content(:default)
-    assert_equal 'default_snippet_content', cms_snippet_content(:default, @cms_site)
+  def test_cms_fragment_render_with_boolean
+    comfy_cms_layouts(:default).update_column(:content, "{{cms:checkbox boolean}}")
+    assert_equal "true", cms_fragment_render(:boolean)
   end
 
-  def test_cms_snippet_content_with_site_loading
-    @cms_site = nil
-    assert_equal 'default_snippet_content', cms_snippet_content(:default)
+  def test_cms_fragment_render_with_files
+    frag = comfy_cms_fragments(:file)
+    comfy_cms_layouts(:default).update_column(:content, "{{cms:file file}}")
+    assert_equal url_for(frag.attachments.first), cms_fragment_render(:file)
   end
 
-  def test_cms_snippet_missing
-    assert_equal '', cms_snippet_content(:invalid)
-    assert_equal '', cms_snippet_render(:invalid)
+  def test_cms_snippet_content
+    assert_equal "snippet content", cms_snippet_content(:default)
+    assert_equal "snippet content", cms_snippet_content(:default, @cms_site)
+    assert_equal "", cms_snippet_content(:invalid)
   end
 
-  def test_cms_snippet_render_with_no_site
+  def test_cms_snippet_content_with_site_loading
     @cms_site = nil
-    assert_equal '', cms_snippet_render(:default)
+    assert_equal "snippet content", cms_snippet_content(:default)
   end
 
   def test_cms_snippet_render
-    assert_equal 'default_snippet_content', cms_snippet_render(:default)
+    assert_equal "snippet content", cms_snippet_render(:default)
   end
 
   def test_cms_snippet_with_erb
-    comfy_cms_snippets(:default).update_column(:content, '<%= 1 + 1 %>')
-    assert_equal '<%= 1 + 1 %>', cms_snippet_content(:default)
-    assert_equal '&lt;%= 1 + 1 %&gt;', cms_snippet_render(:default)
+    comfy_cms_snippets(:default).update_column(:content, "<%= 1 + 1 %>")
+    assert_equal "&lt;%= 1 + 1 %&gt;", cms_snippet_render(:default)
   end
 
   def test_cms_snippet_render_with_tags
-    comfy_cms_snippets(:default).update_column(:content, '{{ cms:helper:hello }}')
-    assert_equal 'hello', cms_snippet_render(:default)
-  end
-
-  def test_cms_snippet_content_with_block
-    assert_difference 'Comfy::Cms::Snippet.count' do
-      content = cms_snippet_content(:new_snippet) do
-        'new content'
-      end
-      assert_equal 'new content', content
-      snippet = Comfy::Cms::Snippet.last
-      assert_equal 'new content', snippet.content
-      assert_equal @cms_site, snippet.site
-    end
+    comfy_cms_snippets(:default).update_column(:content, "a {{cms:helper hello}} b")
+    assert_equal "a hello b", cms_snippet_render(:default)
   end
-
 end

data/test/integration/access_control_test.rb

@@ -5,7 +5,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
   module TestAuthentication
     module Authenticate
       def authenticate
-        render :plain => 'Test Login Denied', :status => :unauthorized
+        render plain: "Test Login Denied", status: :unauthorized
       end
     end
 
@@ -19,31 +19,32 @@ class AccessControlTest < ActionDispatch::IntegrationTest
     module Authorize
       def authorize
         @authorization_vars = self.instance_variables
-        render :plain => 'Test Access Denied', :status => :forbidden
+        render plain: "Test Access Denied", status: :forbidden
       end
     end
 
     # 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 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::RevisionsController;     include Authorize; end
+    class TranslationsController  < Comfy::Admin::Cms::TranslationsController;  include Authorize; end
+    class ContentController       < Comfy::Cms::ContentController;              include Authorize; end
   end
 
-
+  # -- Tests -------------------------------------------------------------------
   def test_admin_authentication_default
     assert_equal 'ComfortableMexicanSofa::AccessControl::AdminAuthentication',
       ComfortableMexicanSofa.config.admin_auth
 
-    get '/admin/sites'
+    get comfy_admin_cms_sites_path
     assert_response :unauthorized
 
-    http_auth :get, '/admin/sites'
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
   end
 
@@ -64,7 +65,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
       ComfortableMexicanSofa.config.admin_authorization
 
     Comfy::Admin::Cms::BaseController.send(:include, ComfortableMexicanSofa::AccessControl::AdminAuthorization)
-    http_auth :get, "/admin/sites/#{comfy_cms_sites(:default).to_param}/edit"
+    r :get, "/admin/sites/#{comfy_cms_sites(:default).to_param}/edit"
     assert_response :success, response.body
   end
 
@@ -74,48 +75,54 @@ class AccessControlTest < ActionDispatch::IntegrationTest
       routes.draw do
         s   = '/admin/sites'
         ns  = 'access_control_test/test_authorization'
-        get "#{s}/:id/edit"                                   => "#{ns}/sites#edit"
-        get "#{s}/:site_id/layouts/:id/edit"                  => "#{ns}/layouts#edit"
-        get "#{s}/:site_id/layouts/:layout_id/revisions/:id"  => "#{ns}/revisions#show"
-        get "#{s}/:site_id/pages/:id/edit"                    => "#{ns}/pages#edit"
-        get "#{s}/:site_id/snippets/:id/edit"                 => "#{ns}/snippets#edit"
-        get "#{s}/:site_id/files/:id/edit"                    => "#{ns}/files#edit"
-        get "#{s}/:site_id/categories/:id/edit"               => "#{ns}/categories#edit"
+        get "#{s}/:id/edit"                                       => "#{ns}/sites#edit"
+        get "#{s}/:site_id/layouts/:id/edit"                      => "#{ns}/layouts#edit"
+        get "#{s}/:site_id/layouts/:layout_id/revisions/:id"      => "#{ns}/revisions#show"
+        get "#{s}/:site_id/pages/:id/edit"                        => "#{ns}/pages#edit"
+        get "#{s}/:site_id/pages/:page_id/translations/:id/edit"  => "#{ns}/pages#edit"
+        get "#{s}/:site_id/snippets/:id/edit"                     => "#{ns}/snippets#edit"
+        get "#{s}/:site_id/files/:id/edit"                        => "#{ns}/files#edit"
+        get "#{s}/:site_id/categories/:id/edit"                   => "#{ns}/categories#edit"
       end
 
-      http_auth :get, "/admin/sites/#{site.id}/edit"
+      r :get, "/admin/sites/#{site.id}/edit"
       assert_response :forbidden
       assert_equal 'Test Access Denied', response.body
       assert assigns(:authorization_vars)
       assert assigns(:authorization_vars).member?(:@site)
 
       layout = comfy_cms_layouts(:default)
-      http_auth :get, "/admin/sites/#{site.id}/layouts/#{layout.id}/edit"
+      r :get, "/admin/sites/#{site.id}/layouts/#{layout.id}/edit"
       assert assigns(:authorization_vars).member?(:@site)
       assert assigns(:authorization_vars).member?(:@layout)
 
       revision = comfy_cms_revisions(:layout)
-      http_auth :get, "/admin/sites/#{site.id}/layouts/#{layout.id}/revisions/#{revision.id}"
+      r :get, "/admin/sites/#{site.id}/layouts/#{layout.id}/revisions/#{revision.id}"
       assert assigns(:authorization_vars).member?(:@site)
       assert assigns(:authorization_vars).member?(:@record)
 
       page = comfy_cms_pages(:default)
-      http_auth :get, "/admin/sites/#{site.id}/pages/#{page.id}/edit"
+      r :get, "/admin/sites/#{site.id}/pages/#{page.id}/edit"
+      assert assigns(:authorization_vars).member?(:@site)
+      assert assigns(:authorization_vars).member?(:@page)
+
+      translation = comfy_cms_translations(:default)
+      r :get, "/admin/sites/#{site.id}/pages/#{page.id}/translations/#{translation.id}/edit"
       assert assigns(:authorization_vars).member?(:@site)
       assert assigns(:authorization_vars).member?(:@page)
 
       snippet = comfy_cms_snippets(:default)
-      http_auth :get, "/admin/sites/#{site.id}/snippets/#{snippet.id}/edit"
+      r :get, "/admin/sites/#{site.id}/snippets/#{snippet.id}/edit"
       assert assigns(:authorization_vars).member?(:@site)
       assert assigns(:authorization_vars).member?(:@snippet)
 
       file = comfy_cms_files(:default)
-      http_auth :get, "/admin/sites/#{site.id}/files/#{file.id}/edit"
+      r :get, "/admin/sites/#{site.id}/files/#{file.id}/edit"
       assert assigns(:authorization_vars).member?(:@site)
       assert assigns(:authorization_vars).member?(:@file)
 
       category = comfy_cms_categories(:default)
-      http_auth :get, "/admin/sites/#{site.id}/categories/#{category.id}/edit"
+      r :get, "/admin/sites/#{site.id}/categories/#{category.id}/edit"
       assert assigns(:authorization_vars).member?(:@site)
       assert assigns(:authorization_vars).member?(:@category)
     end