comfortable_mexican_sofa 1.12.9 → 1.12.10

data/test/models/file_test.rb

@@ -103,7 +103,7 @@ class CmsFileTest < ActiveSupport::TestCase
     assert file.block.blank?
     assert_equal 1, Comfy::Cms::File.not_page_file.count
     
-    file.update_column(:block_id, comfy_cms_blocks(:default_field_text))
+    file.update_attribute(:block, comfy_cms_blocks(:default_field_text))
     assert_equal 0, Comfy::Cms::File.not_page_file.count
   end
   

data/test/models/layout_test.rb

@@ -54,13 +54,24 @@ class CmsLayoutTest < ActiveSupport::TestCase
     FileUtils.touch(File.expand_path('app/views/layouts/comfy/admin/cms/nested.html.erb', Rails.root))
     FileUtils.touch(File.expand_path('app/views/layouts/comfy/_partial.html.erb', Rails.root))
     FileUtils.touch(File.expand_path('app/views/layouts/comfy/not_a_layout.erb', Rails.root))
-    
-    assert_equal ['comfy/admin/cms', 'comfy/admin/cms/nested'], Comfy::Cms::Layout.app_layouts_for_select
-    
+
+    view_paths = [File.expand_path('app/views/', Rails.root)]
+    assert_equal ['comfy/admin/cms', 'comfy/admin/cms/nested'], Comfy::Cms::Layout.app_layouts_for_select(view_paths)
+  ensure
     FileUtils.rm(File.expand_path('app/views/layouts/comfy/admin/cms/nested.html.erb', Rails.root))
     FileUtils.rm(File.expand_path('app/views/layouts/comfy/_partial.html.erb', Rails.root))
     FileUtils.rm(File.expand_path('app/views/layouts/comfy/not_a_layout.erb', Rails.root))
   end
+
+  def test_multiple_view_paths
+    FileUtils.mkdir_p(File.expand_path('app/additional_views/layouts', Rails.root))
+    FileUtils.touch(File.expand_path('app/additional_views/layouts/additional_layout.html.erb', Rails.root))
+
+    view_paths = [File.expand_path('app/views/', Rails.root), File.expand_path('app/additional_views', Rails.root)]
+    assert_equal ['additional_layout', 'comfy/admin/cms'], Comfy::Cms::Layout.app_layouts_for_select(view_paths)
+  ensure
+    FileUtils.rm_r(File.expand_path('app/additional_views', Rails.root))
+  end
   
   def test_merged_content_with_same_child_content
     parent_layout = comfy_cms_layouts(:nested)

data/test/models/site_test.rb

@@ -107,7 +107,7 @@ class CmsSiteTest < ActiveSupport::TestCase
   def test_find_site
     site_a = comfy_cms_sites(:default)
     assert_equal 'test.host', site_a.hostname
-    assert_equal nil, site_a.path
+    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')
@@ -119,15 +119,15 @@ class CmsSiteTest < ActiveSupport::TestCase
     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 nil,     Comfy::Cms::Site.find_site('test99.host', '/some/path')
+    assert_nil            Comfy::Cms::Site.find_site('test99.host', '/some/path')
     
-    assert_equal nil,     Comfy::Cms::Site.find_site('test2.host')
-    assert_equal nil,     Comfy::Cms::Site.find_site('test2.host', '/some/path')
+    assert_nil            Comfy::Cms::Site.find_site('test2.host')
+    assert_nil            Comfy::Cms::Site.find_site('test2.host', '/some/path')
     assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en')
     assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en?a=b')
     assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en/some/path?a=b')
     
-    assert_equal nil,     Comfy::Cms::Site.find_site('test2.host', '/english/some/path')
+    assert_nil            Comfy::Cms::Site.find_site('test2.host', '/english/some/path')
     
     assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr')
     assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr?a=b')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.12.9
+  version: 1.12.10
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
-description: ComfortableMexicanSofa is a powerful Rails 4 CMS Engine
+description: ComfortableMexicanSofa is a powerful Rails 4/5 CMS Engine
 email:
 - oleg@khabarov.ca
 executables: []
@@ -248,20 +248,53 @@ files:
 - app/assets/javascripts/comfy/admin/cms/lib/redactor.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/definedlinks.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/filemanager.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ar.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/az.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ba.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/bg.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/by.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ca.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/cs.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/da.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/de.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/el.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/en.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/eo.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/es.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/es_AR.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/fa.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/fi.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/fr.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ge.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/he.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/hr.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/hu.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/id.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/it.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ja.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/kn.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ko.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/lt.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/lv.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/mk.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/nb.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/nl.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/pl.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/pt-BR.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/pt.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ro.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ru.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sk.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sl.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sq.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sr-CIR.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sr-LAT.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/sv.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/th.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/tr.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/ua.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/uk.js
+- app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/vi.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/zh-CN.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/i18n/zh-TW.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/imagemanager.js
@@ -410,7 +443,9 @@ files:
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/sk.yml
 - config/locales/sv.yml
+- config/locales/tr.yml
 - config/locales/uk.yml
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
@@ -555,9 +590,9 @@ files:
 - test/fixtures/views/render_test/_test.html.erb
 - test/fixtures/views/render_test/new.html.erb
 - test/fixtures/views/render_test/render_layout.html.erb
-- test/gemfiles/Gemfile.rails.4.0
 - test/gemfiles/Gemfile.rails.4.1
 - test/gemfiles/Gemfile.rails.4.2
+- test/gemfiles/Gemfile.rails.5.0
 - test/gemfiles/Gemfile.rails.master
 - test/generators/cms_assets_generator_test.rb
 - test/generators/cms_controllers_generator_test.rb
@@ -627,7 +662,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -635,8 +670,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Rails 4 CMS Engine
+summary: Rails 4/5 CMS Engine
 test_files: []