comfortable_mexican_sofa 1.12.8 → 1.12.9

data/lib/comfortable_mexican_sofa/tags/asset.rb

@@ -10,14 +10,19 @@ class ComfortableMexicanSofa::Tag::Asset
     return unless (layout = Comfy::Cms::Layout.find_by_identifier(identifier))
     type    = params[0]
     format  = params[1]
-    
+
+    base = ComfortableMexicanSofa.config.public_cms_path || ''
+    unless base.ends_with?("/") # => true
+      base = base + "/"
+    end
+
     case type
     when 'css'
-      out = "/cms-css/#{blockable.site.id}/#{identifier}/#{layout.cache_buster}.css"
+      out = "#{base}cms-css/#{blockable.site.id}/#{identifier}/#{layout.cache_buster}.css"
       out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />" if format == 'html_tag'
       out
     when 'js'
-      out = "/cms-js/#{blockable.site.id}/#{identifier}/#{layout.cache_buster}.js"
+      out = "#{base}cms-js/#{blockable.site.id}/#{identifier}/#{layout.cache_buster}.js"
       out = "<script src='#{out}' type='text/javascript'></script>" if format == 'html_tag'
       out
     end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.12.8"
+  VERSION = "1.12.9"
 end

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

@@ -449,6 +449,28 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     end
   end
 
+  def test_preview_language
+    site = @site
+    site.update_columns(:locale => 'de')
+    layout = comfy_cms_layouts(:default)
+
+    assert_equal :en, I18n.locale
+
+    post :create, :site_id => site, :preview => 'Preview', :page => {
+      :label      => 'Test Page',
+      :slug       => 'test-page',
+      :parent_id  => comfy_cms_pages(:default).id,
+      :layout_id  => layout.id,
+      :blocks_attributes => [
+        { :identifier => 'default_page_text',
+          :content    => 'preview content' }
+      ]
+    }
+
+    assert_response :success
+    assert_equal :de, I18n.locale
+  end
+
   def test_get_new_with_no_layout
     Comfy::Cms::Layout.destroy_all
     get :new, :site_id => @site

data/test/controllers/comfy/cms/content_controller_test.rb

@@ -20,6 +20,18 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
       layout_content_c'
     ), response.body
     assert_equal 'text/html', response.content_type
+
+    assert_equal :en, assigns(:locale)
+    assert_equal :en, I18n.locale
+  end
+
+  def test_show_with_locale
+    comfy_cms_sites(:default).update_column(:locale, 'fr')
+    get :show, :cms_path => ''
+    assert_response :success
+
+    assert_equal :fr, assigns(:locale)
+    assert_equal :fr, I18n.locale
   end
 
   def test_show_default_html

data/test/integration/access_control_test.rb

@@ -24,6 +24,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
     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
@@ -31,6 +32,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
     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
   end
 
 
@@ -127,6 +129,14 @@ class AccessControlTest < ActionDispatch::IntegrationTest
     assert_response :success, response.body
   end
 
+  def test_public_authorization_default
+    assert_equal 'ComfortableMexicanSofa::AccessControl::PublicAuthorization',
+      ComfortableMexicanSofa.config.public_authorization
+
+    get '/'
+    assert_response :success, response.body
+  end
+
   def test_public_authentication_custom
     with_routing do |routes|
       routes.draw do
@@ -138,4 +148,17 @@ class AccessControlTest < ActionDispatch::IntegrationTest
       assert_equal 'Test Login Denied', response.body
     end
   end
-end
+
+  def test_public_authorization_custom
+    with_routing do |routes|
+      routes.draw do
+        get '/:format' => 'access_control_test/test_authorization/content#show', :path => "(*cms_path)"
+      end
+
+      get '/'
+      assert_response :forbidden
+      assert_equal 'Test Access Denied', response.body
+    end
+  end
+
+end

data/test/lib/fixtures/files_test.rb

@@ -3,105 +3,107 @@
 require_relative '../../test_helper'
 
 class FixtureFilesTest < ActiveSupport::TestCase
-  
+
   def test_creation
     Comfy::Cms::File.delete_all
-    
+
     # need to have categories present before linking
     site = comfy_cms_sites(:default)
     site.categories.create!(:categorized_type => 'Comfy::Cms::File', :label => 'category_a')
     site.categories.create!(:categorized_type => 'Comfy::Cms::File', :label => 'category_b')
-    
+
     assert_difference 'Comfy::Cms::File.count' do
       ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site').import!
       assert file = Comfy::Cms::File.last
-      
-      assert_equal 'Fixture File',       file.label
-      assert_equal 'sample.jpg',           file.file_file_name
+
+      assert_equal 'Fixture File',        file.label
+      assert_equal 'sample.jpg',          file.file_file_name
       assert_equal 'Fixture Description', file.description
-      
+
       assert_equal 2, file.categories.count
       assert_equal ['category_a', 'category_b'], file.categories.map{|c| c.label}
     end
   end
-  
+
   def test_update
     file = comfy_cms_files(:default)
     file.update_column(:updated_at, 10.years.ago)
-    assert_equal 'sample.jpg',           file.file_file_name
+    assert_equal 'sample.jpg',          file.file_file_name
     assert_equal 'Default File',        file.label
     assert_equal 'Default Description', file.description
-    
+
     assert_no_difference 'Comfy::Cms::Snippet.count' do
       ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site').import!
       file.reload
-      assert_equal 'sample.jpg',           file.file_file_name
-      assert_equal 'Fixture File',       file.label
+      assert_equal 'sample.jpg',          file.file_file_name
+      assert_equal 'Fixture File',        file.label
       assert_equal 'Fixture Description', file.description
     end
   end
-  
+
   def test_update_ignore
     file = comfy_cms_files(:default)
     file_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'sample-site', 'files', 'sample.jpg')
     attr_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'sample-site', 'files', '_sample.jpg.yml')
-    
+
     assert file.updated_at >= File.mtime(file_path)
     assert file.updated_at >= File.mtime(attr_path)
-    
+
     ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site').import!
     file.reload
     assert_equal 'sample.jpg',          file.file_file_name
     assert_equal 'Default File',        file.label
     assert_equal 'Default Description', file.description
   end
-  
+
   def test_update_force
     file = comfy_cms_files(:default)
     ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site').import!
     file.reload
     assert_equal 'Default File', file.label
-    
+
     ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site', :forced).import!
     file.reload
     assert_equal 'Fixture File', file.label
   end
-  
+
   def test_delete
     old_file = comfy_cms_files(:default)
     old_file.update_column(:file_file_name, 'old')
-    
+
     assert_no_difference 'Comfy::Cms::File.count' do
       ComfortableMexicanSofa::Fixture::File::Importer.new('sample-site', 'default-site').import!
       assert file = Comfy::Cms::File.last
       assert_equal 'sample.jpg',          file.file_file_name
       assert_equal 'Fixture File',        file.label
       assert_equal 'Fixture Description', file.description
-      
+
       assert Comfy::Cms::File.where(:id => old_file.id).blank?
     end
   end
-  
+
   def test_export
+    comfy_cms_files(:default).update_column(:block_id, comfy_cms_blocks(:default_field_text))
+
     host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
     attr_path = File.join(host_path, 'files/_sample.jpg.yml')
     file_path = File.join(host_path, 'files/sample.jpg')
-    
+
     Paperclip::Attachment.any_instance.stubs(:path).
       returns(File.join(Rails.root, 'db/cms_fixtures/sample-site/files/sample.jpg'))
     ComfortableMexicanSofa::Fixture::File::Exporter.new('default-site', 'test-site').export!
-    
+
     assert File.exists?(attr_path)
     assert File.exists?(file_path)
     assert_equal ({
       'label'       => 'Default File',
       'description' => 'Default Description',
       'categories'  => ['Default'],
-      'page'        => nil,
-      'block'       => nil
+      'page'        => '/',
+      'block'       => 'default_field_text'
     }), YAML.load_file(attr_path)
-    
+
     FileUtils.rm_rf(host_path)
   end
-  
+
 end

data/test/lib/tags/asset_test.rb

@@ -1,7 +1,7 @@
 require_relative '../../test_helper'
 
 class AssetTagTest < ActiveSupport::TestCase
-  
+
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       comfy_cms_pages(:default), '{{ cms:asset:default:css:html_tag }}'
@@ -9,7 +9,7 @@ class AssetTagTest < ActiveSupport::TestCase
     assert_equal 'default', tag.identifier
     assert_equal ['css', 'html_tag'], tag.params
   end
-  
+
   def test_initialize_tag_failure
     [
       '{{cms:asset}}',
@@ -21,14 +21,14 @@ class AssetTagTest < ActiveSupport::TestCase
       )
     end
   end
-  
+
   def test_render_no_params
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       comfy_cms_pages(:default), '{{ cms:asset:default }}'
     )
     assert_equal '', tag.render
   end
-  
+
   def test_render_for_css
     site = comfy_cms_sites(:default)
     layout = site.layouts.last
@@ -37,13 +37,30 @@ class AssetTagTest < ActiveSupport::TestCase
       comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:css }}"
     )
     assert_equal "/cms-css/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.css", tag.render
-    
+
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:css:html_tag }}"
     )
     assert_equal "<link href='/cms-css/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.css' media='screen' rel='stylesheet' type='text/css' />", tag.render
   end
-  
+
+  def test_render_for_css_with_non_root_mount
+    site = comfy_cms_sites(:default)
+    layout = site.layouts.last
+
+    ComfortableMexicanSofa.config.public_cms_path = '/custom'
+
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:css }}"
+    )
+    assert_equal "/custom/cms-css/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.css", tag.render
+
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:css:html_tag }}"
+    )
+    assert_equal "<link href='/custom/cms-css/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.css' media='screen' rel='stylesheet' type='text/css' />", tag.render
+  end
+
   def test_render_for_js
     site = comfy_cms_sites(:default)
     layout = site.layouts.last
@@ -52,11 +69,27 @@ class AssetTagTest < ActiveSupport::TestCase
       comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:js }}"
     )
     assert_equal "/cms-js/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.js", tag.render
-    
+
     tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
       comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:js:html_tag }}"
     )
     assert_equal "<script src='/cms-js/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.js' type='text/javascript'></script>", tag.render
   end
-  
-end
+
+  def test_render_for_js_with_non_root_mount
+    site = comfy_cms_sites(:default)
+    layout = site.layouts.last
+
+    ComfortableMexicanSofa.config.public_cms_path = '/custom'
+
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:js }}"
+    )
+    assert_equal "/custom/cms-js/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.js", tag.render
+
+    tag = ComfortableMexicanSofa::Tag::Asset.initialize_tag(
+      comfy_cms_pages(:default), "{{ cms:asset:#{layout.identifier}:js:html_tag }}"
+    )
+    assert_equal "<script src='/custom/cms-js/#{site.id}/#{layout.identifier}/#{layout.cache_buster}.js' type='text/javascript'></script>", tag.render
+  end
+end

data/test/test_helper.rb

@@ -1,9 +1,13 @@
 # encoding: utf-8
 ENV['RAILS_ENV'] = 'test'
 
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear! 'rails'
-
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter 'lib/generators'
+  add_filter 'lib/comfortable_mexican_sofa/engine.rb '
+end
 require_relative '../config/environment'
 
 require 'rails/test_help'
@@ -30,6 +34,7 @@ class ActiveSupport::TestCase
       config.admin_auth           = 'ComfortableMexicanSofa::AccessControl::AdminAuthentication'
       config.admin_authorization  = 'ComfortableMexicanSofa::AccessControl::AdminAuthorization'
       config.public_auth          = 'ComfortableMexicanSofa::AccessControl::PublicAuthentication'
+      config.public_authorization = 'ComfortableMexicanSofa::AccessControl::PublicAuthorization'
       config.admin_route_redirect = ''
       config.enable_fixtures      = false
       config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
@@ -161,4 +166,4 @@ class Rails::Generators::TestCase
     )
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.12.8
+  version: 1.12.9
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,6 +226,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/fonts/comfy/admin/cms/lib/redactor-font.eot
 - app/assets/images/comfy/admin/cms/arrow_bottom.gif
 - app/assets/images/comfy/admin/cms/arrow_right.gif
 - app/assets/images/comfy/admin/cms/checkerboard.gif
@@ -448,6 +449,7 @@ files:
 - lib/comfortable_mexican_sofa/access_control/admin_authentication.rb
 - lib/comfortable_mexican_sofa/access_control/admin_authorization.rb
 - lib/comfortable_mexican_sofa/access_control/public_authentication.rb
+- lib/comfortable_mexican_sofa/access_control/public_authorization.rb
 - lib/comfortable_mexican_sofa/configuration.rb
 - lib/comfortable_mexican_sofa/engine.rb
 - lib/comfortable_mexican_sofa/error.rb
@@ -633,7 +635,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rails 4 CMS Engine