comfortable_mexican_sofa 1.11.0 → 1.11.1

data/config/locales/pl.yml

@@ -223,6 +223,7 @@ pl:
           done: Zrobione
           all: Wszystko
           add: Dodaj
+          add_placeholder: Dodać Kategorię
         show:
           are_you_sure: Jesteś pewien?
         edit:

data/config/locales/pt-BR.yml

@@ -223,6 +223,7 @@ pt-BR:
           done: Pronto
           all: Todas
           add: Adicionar
+          add_placeholder: Adicione uma Categoria
         show:
           are_you_sure: Tem certeza?
         edit:

data/config/locales/ru.yml

@@ -223,6 +223,7 @@ ru:
           done: Применить
           all: Все
           add: Добавить
+          add_placeholder: добавить категорию
         show:
           are_you_sure: Вы уверены?
         edit:

data/config/locales/sv.yml

@@ -223,6 +223,7 @@ sv:
           done: Klar
           all: Alla
           add: Lägg till
+          add_placeholder: Lägga Kategori
         show:
           are_you_sure: Är du säker?
         edit:

data/config/locales/zh-CN.yml

@@ -223,6 +223,7 @@ zh-CN:
           done: 完成
           all: 全部
           add: 创建
+          add_placeholder: 添加类别
         show:
           are_you_sure: 确定删除该分类吗？
         edit:

data/lib/comfortable_mexican_sofa/authentication/http_auth.rb

@@ -3,16 +3,23 @@ module ComfortableMexicanSofa::HttpAuth
   # Like this:
   #   ComfortableMexicanSofa::HttpAuth.username = 'myname'
   #   ComfortableMexicanSofa::HttpAuth.password = 'mypassword'
+  #
+  # You can even use bcrypt (gem 'bcrypt-ruby'):
+  #   require 'bcrypt'
+  #   ComfortableMexicanSofa::HttpAuth.username = 'myname'
+  #   ComfortableMexicanSofa::HttpAuth.password = BCrypt::Password.new '... bcrypt hash ...'
+  # Create the bcrypt hash with:
+  #   BCrypt::Password.create('password').to_s
   mattr_accessor  :username,
                   :password
-  
+
   # Simple http_auth. When implementing some other form of authentication
   # this method should return +true+ if everything is great, or redirect user
   # to some other page, thus denying access to cms admin section.
   def authenticate
     authenticate_or_request_with_http_basic do |username, password|
-      username == self.username && password == self.password
+      self.username == username && self.password == password
     end
   end
-  
+
 end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -4,7 +4,7 @@ class ComfortableMexicanSofa::Configuration
 
   # Don't like ComfortableMexicanSofa? Set it to whatever you like. :(
   attr_accessor :cms_title
-  
+
   # Controller that is inherited from CmsAdmin::BaseController
   # 'ApplicationController' is the default
   attr_accessor :base_controller
@@ -70,11 +70,11 @@ class ComfortableMexicanSofa::Configuration
   # e.g. config.site_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
   # Default is nil (not used)
   attr_accessor :hostname_aliases
-  
+
   # Reveal partials that can be overwritten in the admin area.
   # Default is false.
   attr_accessor :reveal_cms_partials
-  
+
   # Configuration defaults
   def initialize
     @cms_title            = 'ComfortableMexicanSofa CMS Engine'
@@ -98,7 +98,8 @@ class ComfortableMexicanSofa::Configuration
       'sv'    => 'Svenska',
       'ru'    => 'Русский',
       'pl'    => 'Polski',
-      'de'    => 'Deutsch'
+      'de'    => 'Deutsch',
+      'nl'    => 'Nederlands'
     }
     @admin_locale         = nil
     @database_config      = nil

data/lib/comfortable_mexican_sofa/extensions/is_categorized.rb

@@ -22,7 +22,7 @@ module ComfortableMexicanSofa::IsCategorized
       
       scope :for_category, lambda { |*categories|
         if (categories = [categories].flatten.compact).present?
-          select("DISTINCT #{table_name}.*").
+          self.distinct.
             joins(:categorizations => :category).
             where('cms_categories.label' => categories)
         end

data/lib/comfortable_mexican_sofa/extensions/is_mirrored.rb

@@ -48,7 +48,7 @@ module ComfortableMexicanSofa::IsMirrored
           m = site.pages.find_by_full_path(self.full_path_was || self.full_path) || site.pages.new
           m.attributes = {
             :slug       => self.slug,
-            :label      => self.slug.blank?? self.label : m.label,
+            :label      => m.label.blank?? self.label : m.label,
             :parent_id  => site.pages.find_by_full_path(self.parent.try(:full_path)).try(:id),
             :layout     => site.layouts.find_by_identifier(self.layout.try(:identifier))
           }
@@ -64,8 +64,9 @@ module ComfortableMexicanSofa::IsMirrored
         mirror.is_mirrored = true
         begin
           mirror.save!
-        rescue ActiveRecord::RecordInvalid
-          logger.detailed_error($!)
+        rescue ActiveRecord::RecordInvalid => e
+          logger.error(e.message)
+          logger.error(e.backtrace.each{|line| error line })
         end
       end
     end
@@ -82,4 +83,4 @@ module ComfortableMexicanSofa::IsMirrored
   
 end
 
-ActiveRecord::Base.send :include, ComfortableMexicanSofa::IsMirrored
+ActiveRecord::Base.send :include, ComfortableMexicanSofa::IsMirrored

data/lib/comfortable_mexican_sofa/extensions/rails.rb

@@ -14,11 +14,4 @@ module Enumerable
     end
     result
   end
-end
-
-class ActiveSupport::Logger
-  def detailed_error(e)
-    error(e.message)
-    e.backtrace.each{|line| error line }
-  end
 end

data/lib/comfortable_mexican_sofa/fixture.rb

@@ -24,7 +24,7 @@ module ComfortableMexicanSofa::Fixture
     end
     
     def get_attributes(file_path)
-      YAML.load_file(file_path)
+      YAML.load_file(file_path) || { }
     end
     
     def save_categorizations!(object, categories)

data/lib/comfortable_mexican_sofa/fixture/file.rb

@@ -60,7 +60,7 @@ module ComfortableMexicanSofa::Fixture::File
           file.file.url
           
         open(::File.join(self.path, ::File.basename(file_path)), 'w') do |f|
-          f.write(open(data_path))
+          open(data_path) { |src| f.write(src.read) }
         end
         
         ComfortableMexicanSofa.logger.warn("[FIXTURES] Exported File \t #{file.file_file_name}")

data/lib/comfortable_mexican_sofa/routes/cms.rb

@@ -1,9 +1,9 @@
 class ActionDispatch::Routing::Mapper
-  
+
   def comfy_route_cms(options = {})
     namespace :cms, :path => options[:path] do
-      get 'cms-css/:site_id/:identifier' => 'content#render_css', :as => 'render_css'
-      get 'cms-js/:site_id/:identifier'  => 'content#render_js',  :as => 'render_js'
+      get 'cms-css/:site_id/:identifier' => 'assets#render_css', :as => 'render_css'
+      get 'cms-js/:site_id/:identifier'  => 'assets#render_js',  :as => 'render_js'
 
       if options[:sitemap]
         get '(:cms_path)/sitemap' => 'content#render_sitemap',
@@ -12,7 +12,7 @@ class ActionDispatch::Routing::Mapper
           :format       => :xml
       end
 
-      get '/' => 'content#render_html', :as => 'render_html', :path => "(*cms_path)"
+      get '/:format' => 'content#show', :as => 'render_page', :path => "(*cms_path)"
     end
   end
 end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

data/test/controllers/admin/cms/layouts_controller_test.rb

@@ -21,7 +21,7 @@ class Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     get :new, :site_id => site
     assert_response :success
     assert assigns(:layout)
-    assert_equal '{{ cms:page:content:text }}', assigns(:layout).content
+    assert_equal '{{ cms:page:content:rich_text }}', assigns(:layout).content
     assert_template :new
     assert_select "form[action=/admin/sites/#{site.id}/layouts]"
     assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"

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

@@ -243,6 +243,13 @@ class Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_response :success
   end
   
+  def test_get_edit_with_layout_and_no_tags
+    page = cms_pages(:default)
+    page.layout.update_column(:content, '')
+    get :edit, :site_id => page.site, :id => page
+    assert_response :success
+  end
+  
   def test_creation
     assert_difference 'Cms::Page.count' do
       assert_difference 'Cms::Block.count', 2 do
@@ -433,11 +440,11 @@ class Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_get_toggle_branch
     page = cms_pages(:default)
-    get :toggle_branch, :site_id => page.site, :id => page, :format => :js
+    xhr :get, :toggle_branch, :site_id => page.site, :id => page, :format => :js
     assert_response :success
     assert_equal [page.id.to_s], session[:cms_page_tree]
 
-    get :toggle_branch, :site_id => page.site, :id => page, :format => :js
+    xhr :get, :toggle_branch, :site_id => page.site, :id => page, :format => :js
     assert_response :success
     assert_equal [], session[:cms_page_tree]
   end

data/test/controllers/cms/assets_controller_test.rb

@@ -0,0 +1,29 @@
+require_relative '../../test_helper'
+
+class Cms::AssetsControllerTest < ActionController::TestCase
+
+  def test_render_css
+    get :render_css, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
+    assert_response :success
+    assert_match 'text/css', response.content_type
+    assert_equal cms_layouts(:default).css, response.body
+  end
+
+  def test_render_css_not_found
+    get :render_css, :site_id => cms_sites(:default).id, :identifier => 'bogus'
+    assert_response 404
+  end
+
+  def test_render_js
+    xhr :get, :render_js, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
+    assert_response :success
+    assert_equal 'text/javascript', response.content_type
+    assert_equal cms_layouts(:default).js, response.body
+  end
+
+  def test_render_js_not_found
+    xhr :get, :render_js, :site_id => cms_sites(:default).id, :identifier => 'bogus'
+    assert_response 404
+  end
+
+end

data/test/controllers/cms/content_controller_test.rb

@@ -2,12 +2,12 @@ require_relative '../../test_helper'
 
 class Cms::ContentControllerTest < ActionController::TestCase
 
-  def test_render_page
-    get :render_html, :cms_path => ''
+  def test_show
+    get :show, :cms_path => ''
     assert_equal cms_sites(:default), assigns(:cms_site)
     assert_equal cms_layouts(:default), assigns(:cms_layout)
     assert_equal cms_pages(:default), assigns(:cms_page)
-    
+
     assert_response :success
     assert_equal rendered_content_formatter(
       '
@@ -22,29 +22,59 @@ class Cms::ContentControllerTest < ActionController::TestCase
     assert_equal 'text/html', response.content_type
   end
   
-  def test_render_page_with_app_layout
+  def test_show_as_json
+    get :show, :cms_path => '', :format => 'json'
+    assert_response :success
+    
+    content = rendered_content_formatter(
+      '
+      layout_content_a
+      default_page_text_content_a
+      default_snippet_content
+      default_page_text_content_b
+      layout_content_b
+      default_snippet_content
+      layout_content_c'
+    )
+    page = cms_pages(:default)
+    json_response = JSON.parse(response.body)
+    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_equal 'Default Page',  json_response['label']
+    assert_equal nil,             json_response['slug']
+    assert_equal '/',             json_response['full_path']
+    assert_equal content,         json_response['content']
+    assert_equal 0,               json_response['position']
+    assert_equal 1,               json_response['children_count']
+    assert_equal true,            json_response['is_published']
+  end
+
+  def test_show_with_app_layout
     cms_layouts(:default).update_columns(:app_layout => 'admin/cms')
-    get :render_html, :cms_path => ''
+    get :show, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
-    assert_select "body[class='c-cms-content a-render-html']"
+    assert_select "body[class='c-cms-content a-show']"
   end
-  
-  def test_render_page_with_xhr
+
+  def test_show_with_xhr
     cms_layouts(:default).update_columns(:app_layout => 'cms_admin')
-    xhr :get, :render_html, :cms_path => ''
+    xhr :get, :show, :cms_path => ''
     assert_response :success
     assert assigns(:cms_page)
-    assert_no_select "body[class='c_cms_content a_render_html']"
+    assert_no_select "body[class='c_cms_content a_show']"
   end
-  
-  def test_render_page_not_found
+
+  def test_show_not_found
     assert_exception_raised ActionController::RoutingError, 'Page Not Found at: "doesnotexist"' do
-      get :render_html, :cms_path => 'doesnotexist'
+      get :show, :cms_path => 'doesnotexist'
     end
   end
-  
-  def test_render_page_not_found_with_custom_404
+
+  def test_show_not_found_with_custom_404
     page = cms_sites(:default).pages.create!(
       :label          => '404',
       :slug           => '404',
@@ -58,48 +88,48 @@ class Cms::ContentControllerTest < ActionController::TestCase
     )
     assert_equal '/404', page.full_path
     assert page.is_published?
-    get :render_html, :cms_path => 'doesnotexist'
+    get :show, :cms_path => 'doesnotexist'
     assert_response 404
     assert assigns(:cms_page)
     assert_match /custom 404 page content/, response.body
   end
-  
-  def test_render_page_with_no_site
+
+  def test_show_with_no_site
     Cms::Site.destroy_all
-    
+
     assert_exception_raised ActionController::RoutingError, 'Site Not Found' do
-      get :render_html, :cms_path => ''
+      get :show, :cms_path => ''
     end
   end
-  
-  def test_render_page_with_no_layout
+
+  def test_show_with_no_layout
     Cms::Layout.destroy_all
-    
-    get :render_html, :cms_path => ''
+
+    get :show, :cms_path => ''
     assert_response 404
     assert_equal 'Layout Not Found', response.body
   end
-  
-  def test_render_page_with_redirect
+
+  def test_show_with_redirect
     cms_pages(:child).update_columns(:target_page_id => cms_pages(:default).id)
     assert_equal cms_pages(:default), cms_pages(:child).target_page
-    get :render_html, :cms_path => 'child-page'
+    get :show, :cms_path => 'child-page'
     assert_response :redirect
     assert_redirected_to cms_pages(:default).url
   end
-  
-  def test_render_page_unpublished
+
+  def test_show_unpublished
     page = cms_pages(:default)
     page.update_columns(:is_published => false)
-    
+
     assert_exception_raised ActionController::RoutingError, 'Page Not Found at: ""' do
-      get :render_html, :cms_path => ''
+      get :show, :cms_path => ''
     end
   end
-  
-  def test_render_page_with_irb_disabled
+
+  def test_show_with_irb_disabled
     assert_equal false, ComfortableMexicanSofa.config.allow_irb
-    
+
     irb_page = cms_sites(:default).pages.create!(
       :label          => 'irb',
       :slug           => 'irb',
@@ -111,14 +141,14 @@ class Cms::ContentControllerTest < ActionController::TestCase
           :content    => 'text <%= 2 + 2 %> text' }
       ]
     )
-    get :render_html, :cms_path => 'irb'
+    get :show, :cms_path => 'irb'
     assert_response :success
     assert_match "text &lt;%= 2 + 2 %&gt; text", response.body
   end
-  
-  def test_render_page_with_irb_enabled
+
+  def test_show_with_irb_enabled
     ComfortableMexicanSofa.config.allow_irb = true
-    
+
     irb_page = cms_sites(:default).pages.create!(
       :label          => 'irb',
       :slug           => 'irb',
@@ -130,34 +160,10 @@ class Cms::ContentControllerTest < ActionController::TestCase
           :content    => 'text <%= 2 + 2 %> text' }
       ]
     )
-    get :render_html, :cms_path => 'irb'
+    get :show, :cms_path => 'irb'
     assert_response :success
     assert_match "text 4 text", response.body
   end
-  
-  def test_render_css
-    get :render_css, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
-    assert_response :success
-    assert_match 'text/css', response.content_type
-    assert_equal cms_layouts(:default).css, response.body
-  end
-  
-  def test_render_css_not_found
-    get :render_css, :site_id => cms_sites(:default).id, :identifier => 'bogus'
-    assert_response 404
-  end
-  
-  def test_render_js
-    get :render_js, :site_id => cms_sites(:default).id, :identifier => cms_layouts(:default).identifier
-    assert_response :success
-    assert_equal 'text/javascript', response.content_type
-    assert_equal cms_layouts(:default).js, response.body
-  end
-  
-  def test_render_js_not_found
-    get :render_js, :site_id => cms_sites(:default).id, :identifier => 'bogus'
-    assert_response 404
-  end
 
   def test_render_sitemap
     get :render_sitemap, :format => :xml
@@ -168,17 +174,17 @@ class Cms::ContentControllerTest < ActionController::TestCase
   def test_render_sitemap_with_path
     site = cms_sites(:default)
     site.update_columns(:path => 'en')
-    
+
     get :render_sitemap, :cms_path => site.path, :format => :xml
     assert_response :success
     assert_equal cms_sites(:default), assigns(:cms_site)
     assert_match '<loc>//test.host/en/child-page</loc>', response.body
   end
-  
+
   def test_render_sitemap_with_path_invalid_with_single_site
     site = cms_sites(:default)
     site.update_columns(:path => 'en')
-    
+
     assert_exception_raised ActionController::RoutingError, 'Site Not Found' do
       get :render_sitemap, :cms_path => 'fr', :format => :xml
     end