comfortable_mexican_sofa 1.12.9 → 1.12.10

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -107,7 +107,9 @@ class ComfortableMexicanSofa::Configuration
       'pl'    => 'Polski',
       'pt-BR' => 'Português Brasileiro',
       'ru'    => 'Русский',
+      'sk'    => 'Slovensky',
       'sv'    => 'Svenska',
+      'tr'    => 'Türkçe',
       'uk'    => 'Українська',
       'zh-CN' => '简体中文',
       'zh-TW' => '正體中文'

data/lib/comfortable_mexican_sofa/routes/cms.rb

@@ -16,8 +16,9 @@ class ActionDispatch::Routing::Mapper
             :format       => :xml
         end
 
-        get '/:format' => 'content#show', :as => 'render_page', :path => "(*cms_path)"
+        get '(*cms_path)' => 'content#show', :as => 'render_page', action: '/:format'
+
       end
     end
   end
-end
+end

data/lib/comfortable_mexican_sofa/version.rb

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

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

@@ -157,6 +157,24 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
       assert_response :unprocessable_entity
     end
   end
+  
+  def test_create_as_plupload_with_selected_category
+    category = comfy_cms_categories(:default)
+    
+    assert_difference 'Comfy::Cms::File.count' do
+      post :create,
+        :source   => 'plupload',
+        :site_id  => @site,
+        :file     => {
+          :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
+        },
+        :category => [category.label]
+      assert_response :success
+      
+      file = Comfy::Cms::File.last
+      assert_equal [category], file.categories
+    end
+  end
 
   def test_update
     put :update, :site_id => @site, :id => @file, :file => {
@@ -173,9 +191,8 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
   end
 
   def test_update_failure
-    file = comfy_cms_files(:default)
     put :update, :site_id => @site, :id => @file, :file => {
-      :file => nil
+      :file_file_name => ""
     }
     assert_response :success
     assert_template :edit
@@ -216,4 +233,5 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_equal 1, file_one.position
     assert_equal 0, file_two.position
   end
+
 end

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

@@ -518,4 +518,5 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_equal 1, page_one.position
     assert_equal 0, page_two.position
   end
+  
 end

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

@@ -135,4 +135,4 @@ class Comfy::Admin::Cms::RevisionsControllerTest < ActionController::TestCase
     end
   end
   
-end
+end

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

@@ -17,7 +17,10 @@ class Comfy::Admin::Cms::SnippetsControllerTest < ActionController::TestCase
   end
 
   def test_get_index_with_category
-    category = comfy_cms_sites(:default).categories.create!(:label => 'Test Category', :categorized_type => 'Comfy::Cms::Snippet')
+    category = comfy_cms_sites(:default).categories.create!(
+      :label            => 'Test Category', 
+      :categorized_type => 'Comfy::Cms::Snippet'
+    )
     category.categorizations.create!(:categorized => comfy_cms_snippets(:default))
 
     get :index, :site_id => comfy_cms_sites(:default), :category => category.label

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

@@ -61,10 +61,10 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
     assert_equal page.id,         json_response['id']
     assert_equal page.site.id,    json_response['site_id']
     assert_equal page.layout.id,  json_response['layout_id']
-    assert_equal nil,             json_response['parent_id']
-    assert_equal nil,             json_response['target_page_id']
+    assert_nil                    json_response['parent_id']
+    assert_nil                    json_response['target_page_id']
     assert_equal 'Default Page',  json_response['label']
-    assert_equal nil,             json_response['slug']
+    assert_nil                    json_response['slug']
     assert_equal '/',             json_response['full_path']
     assert_equal content,         json_response['content_cache']
     assert_equal 0,               json_response['position']

data/test/gemfiles/Gemfile.rails.4.1

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails',            '~> 4.1.0'
 gem 'bootstrap_form',   '>= 2.2.0'
 gem 'active_link_to',   '>= 1.0.0'
-gem 'paperclip',        '>= 3.4.0'
+gem 'paperclip',        '>= 3.4.0', '< 5'
 gem 'kramdown',         '>= 1.0.0'
 gem 'jquery-rails',     '>= 3.0.0'
 gem 'jquery-ui-rails',  '>= 5.0.0'

data/test/gemfiles/Gemfile.rails.4.2

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails',            '~> 4.2.0'
 gem 'bootstrap_form',   '>= 2.2.0'
 gem 'active_link_to',   '>= 1.0.0'
-gem 'paperclip',        '>= 3.4.0'
+gem 'paperclip',        '>= 3.4.0', '< 5'
 gem 'kramdown',         '>= 1.0.0'
 gem 'jquery-rails',     '>= 3.0.0'
 gem 'jquery-ui-rails',  '>= 5.0.0'

data/test/gemfiles/{Gemfile.rails.4.0 → Gemfile.rails.5.0}

@@ -1,11 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'rails',            '~> 4.0.0'
+gem 'rails',            '~> 5.0.0'
 gem 'bootstrap_form',   '>= 2.2.0'
 gem 'active_link_to',   '>= 1.0.0'
-gem 'paperclip',        '>= 3.4.0'
+gem 'paperclip',        '>= 3.4.0', '< 5'
 gem 'kramdown',         '>= 1.0.0'
-gem 'jquery-rails',     '>= 3.0.0', '< 4'
+gem 'jquery-rails',     '>= 3.0.0'
 gem 'jquery-ui-rails',  '>= 5.0.0'
 gem 'haml-rails',       '>= 0.3.0'
 gem 'sass-rails',       '>= 4.0.3'
@@ -19,4 +19,5 @@ group :test do
   gem 'sqlite3'
   gem 'coveralls',  :require => false
   gem 'mocha',      :require => false
+  gem 'rails-controller-testing'
 end

data/test/gemfiles/Gemfile.rails.master

@@ -19,4 +19,5 @@ group :test do
   gem 'sqlite3'
   gem 'coveralls',  :require => false
   gem 'mocha',      :require => false
+  gem 'rails-controller-testing'
 end

data/test/integration/access_control_test.rb

@@ -5,7 +5,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
   module TestAuthentication
     module Authenticate
       def authenticate
-        render :text => 'Test Login Denied', :status => :unauthorized
+        render :plain => 'Test Login Denied', :status => :unauthorized
       end
     end
 
@@ -19,7 +19,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
     module Authorize
       def authorize
         @authorization_vars = self.instance_variables
-        render :text => 'Test Access Denied', :status => :forbidden
+        render :plain => 'Test Access Denied', :status => :forbidden
       end
     end
 
@@ -140,7 +140,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
   def test_public_authentication_custom
     with_routing do |routes|
       routes.draw do
-        get '/:format' => 'access_control_test/test_authentication/content#show', :path => "(*cms_path)"
+        get "(*cms_path)" => 'access_control_test/test_authentication/content#show'
       end
 
       get '/'
@@ -152,7 +152,7 @@ class AccessControlTest < ActionDispatch::IntegrationTest
   def test_public_authorization_custom
     with_routing do |routes|
       routes.draw do
-        get '/:format' => 'access_control_test/test_authorization/content#show', :path => "(*cms_path)"
+        get "(*cms_path)" => 'access_control_test/test_authorization/content#show'
       end
 
       get '/'
@@ -160,5 +160,4 @@ class AccessControlTest < ActionDispatch::IntegrationTest
       assert_equal 'Test Access Denied', response.body
     end
   end
-
 end

data/test/integration/render_cms_test.rb

@@ -39,7 +39,7 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
     def render_basic
       case params[:type]
       when 'text'
-        render :text => 'TestText'
+        render :plain => 'TestText'
       when 'update'
         render :update do |page|
           page.alert('rendered text')

data/test/integration/routing_test.rb

@@ -8,7 +8,7 @@ class RoutingIntergrationTest < ActionDispatch::IntegrationTest
 
   def test_cms_public_prefix
     
-    assert_equal nil, ComfortableMexicanSofa.config.public_cms_path
+    assert_nil ComfortableMexicanSofa.config.public_cms_path
     
     Rails.application.routes.draw do
       comfy_route :cms, :path => '/custom'

data/test/lib/configuration_test.rb

@@ -19,14 +19,14 @@ class ConfigurationTest < ActiveSupport::TestCase
       'en'    => 'English',
       'es'    => 'Español'
     }), config.locales
-    assert_equal nil, config.admin_locale
+    assert_nil config.admin_locale
     assert_equal ({}), config.upload_file_options
-    assert_equal nil, config.admin_cache_sweeper
+    assert_nil config.admin_cache_sweeper
     assert_equal false, config.allow_irb
-    assert_equal nil, config.allowed_helpers
-    assert_equal nil, config.allowed_partials
-    assert_equal nil, config.allowed_templates
-    assert_equal nil, config.hostname_aliases
+    assert_nil config.allowed_helpers
+    assert_nil config.allowed_partials
+    assert_nil config.allowed_templates
+    assert_nil config.hostname_aliases
   end
 
   def test_initialization_overrides

data/test/lib/fixtures/files_test.rb

@@ -83,7 +83,7 @@ class FixtureFilesTest < ActiveSupport::TestCase
   end
 
   def test_export
-    comfy_cms_files(:default).update_column(:block_id, comfy_cms_blocks(:default_field_text))
+    comfy_cms_files(:default).update_attribute(:block, 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')

data/test/lib/fixtures/pages_test.rb

@@ -90,7 +90,7 @@ class FixturePagesTest < ActiveSupport::TestCase
     ComfortableMexicanSofa::Fixture::Page::Importer.new('sample-site', 'default-site').import!
     page.reload
 
-    assert_equal nil, page.slug
+    assert_nil page.slug
     assert_equal 'Test', page.label
     block = page.blocks.where(:identifier => 'content').first
     assert_equal 'test content', block.content

data/test/lib/tag_test.rb

@@ -6,55 +6,55 @@ class TagTest < ActiveSupport::TestCase
     regex = ComfortableMexicanSofa::Tag::TOKENIZER_REGEX
     
     tokens = 'text { text } text'.scan(regex)
-    assert_equal nil,                   tokens[0][0]
+    assert_nil                          tokens[0][0]
     assert_equal 'text { text } text',  tokens[0][1]
     
     tokens = 'content<{{cms:some_tag content'.scan(regex)
-    assert_equal nil,                     tokens[0][0]
+    assert_nil                            tokens[0][0]
     assert_equal 'content<',              tokens[0][1]
-    assert_equal nil,                     tokens[1][0]
+    assert_nil                            tokens[1][0]
     assert_equal '{{',                    tokens[1][1]
-    assert_equal nil,                     tokens[2][0]
+    assert_nil                            tokens[2][0]
     assert_equal 'cms:some_tag content',  tokens[2][1]
     
     tokens = 'content<{{cms some_tag}}>content'.scan(regex)
-    assert_equal nil,                     tokens[0][0]
+    assert_nil                            tokens[0][0]
     assert_equal 'content<',              tokens[0][1]
-    assert_equal nil,                     tokens[1][0]
+    assert_nil                            tokens[1][0]
     assert_equal '{{',                    tokens[1][1]
-    assert_equal nil,                     tokens[2][0]
+    assert_nil                            tokens[2][0]
     assert_equal 'cms some_tag}}>content',tokens[2][1]
     
     tokens = 'content<{{cms:some_tag}}>content'.scan(regex)
-    assert_equal nil,                     tokens[0][0]
+    assert_nil                            tokens[0][0]
     assert_equal 'content<',              tokens[0][1]
     assert_equal '{{cms:some_tag}}',      tokens[1][0]
-    assert_equal nil,                     tokens[1][1]
-    assert_equal nil,                     tokens[2][0]
+    assert_nil                            tokens[1][1]
+    assert_nil                            tokens[2][0]
     assert_equal '>content',              tokens[2][1]
     
     tokens = 'content<{{cms:type:label}}>content'.scan(regex)
-    assert_equal nil,                     tokens[0][0]
+    assert_nil                            tokens[0][0]
     assert_equal 'content<',              tokens[0][1]
     assert_equal '{{cms:type:label}}',    tokens[1][0]
-    assert_equal nil,                     tokens[1][1]
-    assert_equal nil,                     tokens[2][0]
+    assert_nil                            tokens[1][1]
+    assert_nil                            tokens[2][0]
     assert_equal '>content',              tokens[2][1]
     
     tokens = 'content<{{cms:type:label }}>content'.scan(regex)
-    assert_equal nil,                     tokens[0][0]
+    assert_nil                            tokens[0][0]
     assert_equal 'content<',              tokens[0][1]
     assert_equal '{{cms:type:label }}',   tokens[1][0]
-    assert_equal nil,                     tokens[1][1]
-    assert_equal nil,                     tokens[2][0]
+    assert_nil                            tokens[1][1]
+    assert_nil                            tokens[2][0]
     assert_equal '>content',              tokens[2][1]
     
     tokens = 'content<{{ cms:type:la/b el }}>content'.scan(regex)
-    assert_equal nil,                     tokens[0][0]
+    assert_nil                            tokens[0][0]
     assert_equal 'content<',              tokens[0][1]
     assert_equal '{{ cms:type:la/b el }}',tokens[1][0]
-    assert_equal nil,                     tokens[1][1]
-    assert_equal nil,                     tokens[2][0]
+    assert_nil                            tokens[1][1]
+    assert_nil                            tokens[2][0]
     assert_equal '>content',              tokens[2][1]
   end
   
@@ -62,7 +62,7 @@ class TagTest < ActiveSupport::TestCase
     string = '<p>text</p>' * 400
     tokens = string.scan(ComfortableMexicanSofa::Tag::TOKENIZER_REGEX)
     assert_equal 1, tokens.count
-    assert_equal nil, tokens[0][0]
+    assert_nil tokens[0][0]
     assert_equal string, tokens[0][1]
   end
   
@@ -285,7 +285,7 @@ class TagTest < ActiveSupport::TestCase
       comfy_cms_pages(:default), '{{ cms:page:content:string }}'
     )
     assert_equal 'content', tag.identifier
-    assert_equal nil, tag.namespace
+    assert_nil tag.namespace
     
     assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
       comfy_cms_pages(:default), '{{ cms:page:home.content:string }}'

data/test/lib/tags/helper_test.rb

@@ -62,7 +62,7 @@ class HelperTagTest < ActiveSupport::TestCase
         comfy_cms_pages(:default), "{{ cms:helper:#{method}:Rails.env }}"
       )
       assert_equal "<%= #{method}('Rails.env') %>", tag.content
-      assert_equal nil, tag.render
+      assert_nil tag.render
     end
   end
   
@@ -80,7 +80,7 @@ class HelperTagTest < ActiveSupport::TestCase
       comfy_cms_pages(:default), "{{ cms:helper:invalid:Rails.env }}"
     )
     assert_equal "<%= invalid('Rails.env') %>", tag.content
-    assert_equal nil, tag.render
+    assert_nil tag.render
   end
   
 end

data/test/lib/tags/page_file_test.rb

@@ -9,7 +9,7 @@ class PageFileTagTest < ActiveSupport::TestCase
     assert_equal 'label', tag.identifier
     assert_nil tag.namespace
     assert 'url', tag.type
-    assert_equal nil, tag.dimensions
+    assert_nil tag.dimensions
     
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
       comfy_cms_pages(:default), '{{ cms:page_file:label:partial }}'
@@ -50,7 +50,7 @@ class PageFileTagTest < ActiveSupport::TestCase
     assert_equal "<%= render :partial => 'partials/page_file', :locals => {:identifier => nil} %>", tag.render
     
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file }}')
-    assert_equal nil, tag.content
+    assert_nil tag.content
     assert_equal '', tag.render
     
     page.update_attributes!(

data/test/lib/tags/page_files_test.rb

@@ -8,8 +8,8 @@ class PageFilesTagTest < ActiveSupport::TestCase
     )
     assert 'url', tag.type
     assert_equal 'label', tag.identifier
-    assert_equal nil, tag.namespace
-    assert_equal nil, tag.dimensions
+    assert_nil tag.namespace
+    assert_nil tag.dimensions
 
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
       comfy_cms_pages(:default), '{{ cms:page_files:label:partial }}'

data/test/lib/tags/partial_test.rb

@@ -70,7 +70,7 @@ class PartialTagTest < ActiveSupport::TestCase
       comfy_cms_pages(:default), '{{cms:partial:unsafe/path}}'
     )
     assert_equal "<%= render :partial => 'unsafe/path' %>", tag.content
-    assert_equal nil, tag.render
+    assert_nil tag.render
   end
   
 end

data/test/lib/tags/snippet_test.rb

@@ -39,7 +39,7 @@ class SnippetTagTest < ActiveSupport::TestCase
     tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
       comfy_cms_pages(:default), "{{cms:snippet:doesnot_exist}}"
     )
-    assert_equal nil, tag.content
+    assert_nil tag.content
     assert_equal '', tag.render
   end
 end

data/test/lib/tags/template_test.rb

@@ -50,7 +50,7 @@ class TemplateTagTest < ActiveSupport::TestCase
       comfy_cms_pages(:default), '{{cms:template:unsafe/path}}'
     )
     assert_equal "<%= render :template => 'unsafe/path' %>", tag.content
-    assert_equal nil, tag.render
+    assert_nil tag.render
   end
 
 end

data/test/models/block_test.rb

@@ -31,7 +31,7 @@ class CmsBlockTest < ActiveSupport::TestCase
     block = Comfy::Cms::Block.new
 
     block.content = fixture_file_upload('files/image.jpg', 'image/jpeg')
-    assert_equal nil, block.content
+    assert_nil block.content
     assert_equal 1, block.temp_files.size
   end
 
@@ -125,7 +125,7 @@ class CmsBlockTest < ActiveSupport::TestCase
       assert_equal 1, page.blocks.count
       block = page.blocks.first
       assert_equal 'file', block.identifier
-      assert_equal nil, block.content
+      assert_nil block.content
       assert_equal 1, block.files.count
       assert_equal 'image.jpg', block.files.first.file_file_name
 
@@ -173,7 +173,7 @@ class CmsBlockTest < ActiveSupport::TestCase
         assert_equal 1, page.blocks.count
         block = page.blocks.first
         assert_equal 'files', block.identifier
-        assert_equal nil, block.content
+        assert_nil block.content
         assert_equal 2, block.files.count
         assert_equal ['image.jpg', 'image.gif'], block.files.collect(&:file_file_name)
       end