comfortable_mexican_sofa 1.6.18 → 1.6.19

data/.travis.yml

@@ -2,19 +2,15 @@ before_install:
   - gem update --system
   - gem --version
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  # - rbx-2.0
-  - ree
-  # - jruby
 gemfile:
   - test/gemfiles/Gemfile.rails.3.0
   - test/gemfiles/Gemfile.rails.3.1
   - test/gemfiles/Gemfile.rails.3.2
 notifications:
   recipients:
-    - oleg@twg.ca
+    - oleg@khabarov.ca
 branches:
   only:
     - master

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '>=3.0.0'
-gem 'active_link_to', '~>1.0.0'
-gem 'paperclip',      '>=2.3.0'
+gem 'rails',          '>= 3.0.0'
+gem 'active_link_to', '~> 1.0.0'
+gem 'paperclip',      '>= 2.3.0'
 
 group :test do
   gem 'sqlite3'

data/VERSION

@@ -1 +1 @@
-1.6.18
+1.6.19

data/app/controllers/cms_admin/files_controller.rb

@@ -12,7 +12,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   def new
     @file = @site.files.new
   end
-  
+
   def create
     respond_to do |format|
       format.html do
@@ -36,11 +36,26 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
         io = Rails.env.test??
           request.env['RAW_POST_DATA'].clone :
           request.env['rack.input'].clone
-        io.class.class_eval { attr_accessor :original_filename, :content_type }
-        io.original_filename  = request.env['HTTP_X_FILE_NAME']
-        io.content_type       = request.env['CONTENT_TYPE']
+        # Unfortunately, this ends up copying the data twice.
+        # Once from the stream to the tempfile here, and second, in
+        # the file to another tempfile down in PaperClip UploadFileAdapter..
+        file = Tempfile.new(request.env["HTTP_X_FILE_NAME"])
+        file.binmode
+        # FileUtils.copy_stream ends up throwing Conversion Errors from ASCII-8BIT to UTF-8
+        # FileUtils.copy_stream(io, file)
+        while data = io.read(16*1024)
+          file.write(data)
+        end
+        file.rewind
+        # We use a delegation class on the file returned
+        upload = ActionDispatch::Http::UploadedFile.new(
+          :filename => request.env['HTTP_X_FILE_NAME'],
+          :tempfile => file,
+          :type     => request.env['CONTENT_TYPE'],
+          :head     => request.headers # Not really needed
+        )
         @file = @site.files.create!(
-          (params[:file] || { }).merge(:file => io)
+          (params[:file] || { }).merge(:file => upload)
         )
       end
     end

data/app/controllers/cms_content_controller.rb

@@ -60,7 +60,7 @@ protected
   
   def load_cms_page
     @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
-    return redirect_to(@cms_page.target_page.full_path) if @cms_page.target_page
+    return redirect_to(@cms_page.target_page.url) if @cms_page.target_page
     
   rescue ActiveRecord::RecordNotFound
     if @cms_page = @cms_site.pages.published.find_by_full_path('/404')

data/app/models/cms/page.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Cms::Page < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
@@ -24,10 +25,12 @@ class Cms::Page < ActiveRecord::Base
   # -- Callbacks ------------------------------------------------------------
   before_validation :assigns_label,
                     :assign_parent
+  after_validation :escape_slug
   before_create :assign_position
   before_save :assign_full_path,
               :set_cached_content
   after_save  :sync_child_pages
+  after_find :unescape_slug_and_path
   
   # -- Validations ----------------------------------------------------------
   validates :site_id, 
@@ -36,7 +39,7 @@ class Cms::Page < ActiveRecord::Base
     :presence   => true
   validates :slug,
     :presence   => true,
-    :format     => /^\w[\.a-z0-9_-]*$/i,
+    :format     => /^\p{Alnum}[\.\p{Alnum}_-]*$/i,
     :uniqueness => { :scope => :parent_id },
     :unless     => lambda{ |p| p.site && (p.site.pages.count == 0 || p.site.pages.root == self) }
   validates :layout,
@@ -60,7 +63,8 @@ class Cms::Page < ActiveRecord::Base
   end
   
   # -- Instance Methods -----------------------------------------------------
-  # For previewing purposes sometimes we need to have full_path set
+  # For previewing purposes sometimes we need to have full_path set. This
+  # full path take care of the pages and its childs but not of the site path
   def full_path
     self.read_attribute(:full_path) || self.assign_full_path
   end
@@ -119,7 +123,7 @@ class Cms::Page < ActiveRecord::Base
   
   # Full url for a page
   def url
-    "http://#{self.site.hostname}#{self.full_path}"
+    "http://" + "#{self.site.hostname}/#{self.site.path}/#{self.full_path}".squeeze("/")
   end
   
   # Method to collect prevous state of blocks for revisions
@@ -139,7 +143,7 @@ protected
   end
   
   def assign_full_path
-    self.full_path = self.parent ? "#{self.parent.full_path}/#{self.slug}".squeeze('/') : '/'
+    self.full_path = self.parent ? "#{CGI::escape(self.parent.full_path).gsub('%2F', '/')}/#{self.slug}".squeeze('/') : '/'
   end
   
   def assign_position
@@ -166,5 +170,16 @@ protected
   def sync_child_pages
     children.each{ |p| p.save! } if full_path_changed?
   end
+
+  # Escape slug unless it's nonexistent (root)
+  def escape_slug
+    self.slug = CGI::escape(self.slug) unless self.slug.nil?
+  end
+
+  # Unescape the slug and full path back into their original forms unless they're nonexistent
+  def unescape_slug_and_path
+    self.slug = CGI::unescape(self.slug) unless self.slug.nil?
+    self.full_path = CGI::unescape(self.full_path) unless self.full_path.nil?
+  end
   
 end

data/app/views/cms_admin/categories/_form.html.erb

@@ -2,11 +2,11 @@
 <% if (categories = @site.categories.of_type(object.class.to_s)).present? %>
   <%= form.simple_field t('.label'), nil, :class => 'categories' do %>
     <% categories.each do |category| %>
-      <%= hidden_field_tag "#{object.class.to_s.demodulize.downcase}[category_ids][#{category.id}]", 0, :id => nil %>
+      <%= hidden_field_tag "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]", 0, :id => nil %>
       <label>
-        <%= check_box_tag "#{object.class.to_s.demodulize.downcase}[category_ids][#{category.id}]", 1, object.categories.member?(category), :id => nil %>
+        <%= check_box_tag "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]", 1, object.categories.member?(category), :id => nil %>
         <%= category.label %>
       </label>
     <% end %>
   <% end %>
-<% end %>
+<% end %>

data/app/views/cms_admin/revisions/show.html.erb

@@ -13,16 +13,16 @@
 <%= comfy_form_for @revision, :url => {:action => :revert} do |form| %>
   <%= form.simple_field do %>
     <div class='current'>
-      <div class='title'>Current</div>
+      <div class='title'><%= t('.current') %></div>
     </div>
     <div class='versioned'>
-      <div class='title'><%= @revision.created_at %></div>
+      <div class='title'><%= l(@revision.created_at) %></div>
     </div>
   <% end %>
   
   <% @current_content.each do |label, content| %>
   
-    <%= form.simple_field label do %>
+    <%= form.simple_field Cms::Layout.human_attribute_name(label) do %>
       <div class='current'>
         <div class='content'><%= content %></div>
       </div>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.18"
+  s.version = "1.6.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = "2012-03-27"
+  s.date = "2012-05-24"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -322,7 +322,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/comfy/comfortable-mexican-sofa"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.21"
   s.summary = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications"
 
   if s.respond_to? :specification_version then

data/config/initializers/comfortable_mexican_sofa.rb

@@ -33,7 +33,7 @@ ComfortableMexicanSofa.configure do |config|
   # File uploads use Paperclip and can support filesystem or s3 uploads.  Override
   # the upload method and appropriate settings based on Paperclip.  For S3 see:
   # http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3, and for 
-  # filesystem see: http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3
+  # filesystem see: http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/Filesystem
   #   config.upload_file_options = {:url => '/system/:class/:id/:attachment/:style/:filename'}
   
   # Sofa allows you to setup entire site from files. Database is updated with each

data/config/locales/en.yml

@@ -190,6 +190,7 @@ en:
         full_path: Full Path
         slug: Slug
         update: Update to this Revision
+        current: Current
       
     files:
       index:

data/config/locales/es.yml

@@ -190,6 +190,7 @@ es:
         full_path: Ruta completa
         slug: Identificador
         update: Actualizar a esta versión
+        current: Corriente
         
     files:
       index:

data/config/locales/ja.yml

@@ -190,6 +190,7 @@ ja:
         full_path: フルパス
         slug: スラッグ
         update: このリビジョンに更新
+        current: Current
       
     files:
       index:

data/config/locales/pt-BR.yml

@@ -190,6 +190,7 @@ pt-BR:
         full_path: Caminho completo
         slug: Identificador
         update: Atualizar para esta revisão
+        current: Atual
       
     files:
       index:

data/config/locales/zh-CN.yml

@@ -190,6 +190,7 @@ zh-CN:
         full_path: 全路径
         slug: 嵌条
         update: 更新到该修订版本
+        current: Current
 
     files:
       index:

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -43,7 +43,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def label_for(field, options={})
-    label = options.delete(:label) || object.class.human_attribute_name(field).capitalize
+    label = options.delete(:label) || object.class.human_attribute_name(field)
     for_value = options[:id] || "#{object_name}_#{field}"
     %Q{<label for="#{for_value}">#{label}</label>}.html_safe
   end

data/test/functional/cms_admin/files_controller_test.rb

@@ -61,7 +61,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       post :create, :site_id => cms_sites(:default), :file => {
         :label        => 'Test File',
         :description  => 'Test Description',
-        :file         => [fixture_file_upload('files/image.jpg')]
+        :file         => [fixture_file_upload('files/image.jpg', "image/jpeg")]
       }
       assert_response :redirect
       file = Cms::File.last
@@ -90,8 +90,8 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
         :label        => 'Test File',
         :description  => 'Test Description',
         :file         => [
-          fixture_file_upload('files/image.jpg'),
-          fixture_file_upload('files/image.gif')
+          fixture_file_upload('files/image.jpg', "image/jpeg"),
+          fixture_file_upload('files/image.gif', "image/gif")
         ]
       }
       assert_response :redirect
@@ -170,7 +170,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
   def test_reorder
     file_one = cms_files(:default)
     file_two = cms_sites(:default).files.create(
-      :file => fixture_file_upload('files/image.jpg')
+      :file => fixture_file_upload('files/image.jpg', "image/jpeg")
     )
     assert_equal 0, file_one.position
     assert_equal 1, file_two.position

data/test/gemfiles/Gemfile.rails.3.0

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '3.0.12'
 gem 'active_link_to', '1.0.0'
-gem 'paperclip',      '>=2.3.0'
+gem 'paperclip',      '>= 2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/gemfiles/Gemfile.rails.3.1

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '3.1.4'
 gem 'active_link_to', '1.0.0'
-gem 'paperclip',      '>=2.3.0'
+gem 'paperclip',      '>= 2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/gemfiles/Gemfile.rails.3.2

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',          '3.2.2'
 gem 'active_link_to', '1.0.0'
-gem 'paperclip',      '>=2.3.0'
+gem 'paperclip',      '>= 2.3.0'
 
 group :test do
   gem 'sqlite3'

data/test/test_helper.rb

@@ -32,7 +32,8 @@ class ActiveSupport::TestCase
         'en'    => 'English',
         'es'    => 'Español',
         'pt-BR' => 'Português Brasileiro',
-        'zh-CN' => '简体中文' 
+        'zh-CN' => '简体中文',
+        'ja'    => '日本語'
       }
       config.admin_locale         = nil
       config.upload_file_options  = { :url => '/system/:class/:id/:attachment/:style/:filename' }

data/test/unit/configuration_test.rb

@@ -20,7 +20,8 @@ class ConfigurationTest < ActiveSupport::TestCase
       'en'    => 'English',
       'es'    => 'Español',
       'pt-BR' => 'Português Brasileiro',
-      'zh-CN' => '简体中文' 
+      'zh-CN' => '简体中文',
+      'ja'    => '日本語'
     }), config.locales
     assert_equal nil, config.admin_locale
     assert_equal nil, config.database_config

data/test/unit/models/block_test.rb

@@ -98,7 +98,7 @@ class CmsBlockTest < ActiveSupport::TestCase
         :parent_id  => cms_pages(:default).id,
         :blocks_attributes => [
           { :identifier => 'file',
-            :content    => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/document.pdf')] }
+            :content    => [fixture_file_upload('files/image.jpg', "image/jpeg"), fixture_file_upload('files/document.pdf', "application/pdf")] }
         ]
       )
       assert_equal 1, page.blocks.count
@@ -116,7 +116,7 @@ class CmsBlockTest < ActiveSupport::TestCase
       page.update_attributes!(
         :blocks_attributes => [
           { :identifier => 'file',
-            :content    => fixture_file_upload('files/document.pdf') }
+            :content    => fixture_file_upload('files/document.pdf', "application/pdf") }
         ]
       )
       page.reload
@@ -142,7 +142,7 @@ class CmsBlockTest < ActiveSupport::TestCase
           :parent_id  => cms_pages(:default).id,
           :blocks_attributes => [
             { :identifier => 'files',
-              :content    => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/image.gif')] }
+              :content    => [fixture_file_upload('files/image.jpg', "image/jpeg"), fixture_file_upload('files/image.gif', "image/gif")] }
           ]
         )
         assert_equal 1, page.blocks.count
@@ -159,7 +159,7 @@ class CmsBlockTest < ActiveSupport::TestCase
         page.update_attributes!(
           :blocks_attributes => [
             { :identifier => 'files',
-              :content    => [fixture_file_upload('files/document.pdf'), fixture_file_upload('files/image.gif')] }
+              :content    => [fixture_file_upload('files/document.pdf', "application/pdf"), fixture_file_upload('files/image.gif', "image/gif")] }
           ]
         )
         page.reload
@@ -190,7 +190,7 @@ class CmsBlockTest < ActiveSupport::TestCase
             },
             '1' => {
               :identifier => 'file',
-              :content    => fixture_file_upload('files/document.pdf')
+              :content    => fixture_file_upload('files/document.pdf', "application/pdf")
             },
             '2' => {
               :identifier => 'footer',

data/test/unit/models/file_test.rb

@@ -12,7 +12,7 @@ class CmsFileTest < ActiveSupport::TestCase
     assert_no_difference 'Cms::File.count' do
       file = Cms::File.create
       assert file.errors.present?
-      assert_has_errors_on file, :site_id, :file_file_name, :file
+      assert_has_errors_on file, :site_id, :file
     end
   end
   
@@ -60,7 +60,7 @@ class CmsFileTest < ActiveSupport::TestCase
   
   def test_create_failure
     assert_no_difference 'Cms::File.count' do
-      cms_sites(:default).files.create(:file => '')
+      cms_sites(:default).files.create
     end
   end
   

data/test/unit/models/page_test.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class CmsPageTest < ActiveSupport::TestCase
@@ -51,6 +52,9 @@ class CmsPageTest < ActiveSupport::TestCase
     
     page.slug = 'inva lid'
     assert page.invalid?
+
+    page.slug = 'acción'
+    assert page.valid?
   end
   
   def test_label_assignment
@@ -201,8 +205,32 @@ class CmsPageTest < ActiveSupport::TestCase
   end
   
   def test_url
+    site = cms_sites(:default)
+    
     assert_equal 'http://test.host/', cms_pages(:default).url
     assert_equal 'http://test.host/child-page', cms_pages(:child).url
+    
+    site.update_attribute(:path, '/en/site')
+    cms_pages(:default).reload
+    cms_pages(:child).reload
+    
+    assert_equal 'http://test.host/en/site/', cms_pages(:default).url
+    assert_equal 'http://test.host/en/site/child-page', cms_pages(:child).url
+  end
+
+  def test_unicode_slug_escaping
+    page = cms_pages(:child)
+    page_1 = cms_sites(:default).pages.create!(new_params(:parent => page, :slug => 'tést-ünicode-slug'))
+    assert_equal CGI::escape('tést-ünicode-slug'), page_1.slug
+    assert_equal CGI::escape('/child-page/tést-ünicode-slug').gsub('%2F', '/'), page_1.full_path
+  end
+
+  def test_unicode_slug_unescaping
+    page = cms_pages(:child)
+    page_1 = cms_sites(:default).pages.create!(new_params(:parent => page, :slug => 'tést-ünicode-slug'))
+    found_page = cms_sites(:default).pages.where(:slug => CGI::escape('tést-ünicode-slug')).first
+    assert_equal 'tést-ünicode-slug', found_page.slug
+    assert_equal '/child-page/tést-ünicode-slug', found_page.full_path
   end
   
 protected

data/test/unit/tags/page_file_test.rb

@@ -48,7 +48,7 @@ class PageFileTagTest < ActiveSupport::TestCase
     page.update_attributes!(
       :blocks_attributes => [
         { :identifier => 'file',
-          :content    => fixture_file_upload('files/image.jpg') }
+          :content    => fixture_file_upload('files/image.jpg', "image/jpeg") }
       ]
     )
     file = tag.block.files.first

data/test/unit/tags/page_files_test.rb

@@ -48,7 +48,7 @@ class PageFilesTagTest < ActiveSupport::TestCase
     page.update_attributes!(
       :blocks_attributes => [
         { :identifier => 'files',
-          :content    => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/image.gif')] }
+          :content    => [fixture_file_upload('files/image.jpg', "image/jpeg"), fixture_file_upload('files/image.gif', "image/gif")] }
       ]
     )
     files = tag.block.files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.18
+  version: 1.6.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70136202167420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70136202167420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70136202165640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70136202165640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70136202164120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70136202164120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -369,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4174227568118290577
+      hash: 1154446217690371427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -378,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications