comfortable_mexican_sofa 1.6.23 → 1.6.24

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -1,20 +1,20 @@
 # encoding: utf-8
 
 class ComfortableMexicanSofa::Configuration
-  
+
   # Don't like ComfortableMexicanSofa? Set it to whatever you like. :(
   attr_accessor :cms_title
-  
+
   # Module that will handle authentication to access cms-admin area
   attr_accessor :admin_auth
-  
+
   # Module that will handle authentication for public pages
   attr_accessor :public_auth
-  
-  # Default url to access admin area is http://yourhost/cms-admin/ 
+
+  # Default url to access admin area is http://yourhost/cms-admin/
   # You can change 'cms-admin' to 'admin', for example.
   attr_accessor :admin_route_prefix
-  
+
   # When arriving at /cms-admin you may chose to redirect to arbirtary path,
   # for example '/cms-admin/users'
   attr_accessor :admin_route_redirect
@@ -22,59 +22,59 @@ class ComfortableMexicanSofa::Configuration
   # Normally we include default routes from https://github.com/comfy/comfortable-mexican-sofa/blob/master/config/routes.rb
   # If you want to include the routes manually set this to false
   attr_accessor :use_default_routes
-  
+
   # /sitemap.xml that is used by search engines for indexing. It's enabled by
   # default, but you may turn it off.
   attr_accessor :enable_sitemap
-  
+
   # Upload settings
   attr_accessor :upload_file_options
-  
+
   # With each page load, files will be synched with the database. Database entries are
   # destroyed if there's no corresponding file. Fixtures are disabled by default.
   attr_accessor :enable_fixtures
-  
+
   # Path where fixtures can be located.
   attr_accessor :fixtures_path
-  
+
   # Number of revisions kept. Default is 25. If you wish to disable: set this to 0.
   attr_accessor :revisions_limit
-  
+
   # Locale definitions. If you want to define your own locale merge
   # {:locale => 'Locale Title'} with this.
   attr_accessor :locales
-  
+
   # Admin interface will respect the locale of the site being managed. However you can
   # force it to English by setting this to `:en`
   attr_accessor :admin_locale
-  
+
   # Database prefix.  If you want to keep your comfortable mexican sofa tables
   # in a location other than the default databases add a database_config.
   # Setting this to `cms` will look for a cms_#{Rails.env} database definition
   # in your database.yml file
   attr_accessor :database_config
-  
+
   # A class that is included as a sweeper to admin base controller if it's set
   attr_accessor :admin_cache_sweeper
-  
+
   # Not allowing irb code to be run inside page content. False by default.
   attr_accessor :allow_irb
-  
+
   # Whitelist of all helper methods that can be used via {{cms:helper}} tag. By default
   # all helpers are allowed except `eval`, `send`, `call` and few others. Empty array
   # will prevent rendering of all helpers.
   attr_accessor :allowed_helpers
-  
+
   # Whitelist of partials paths that can be used via {{cms:partial}} tag. All partials
   # are accessible by default. Empty array will prevent rendering of all partials.
   attr_accessor :allowed_partials
 
-  # Site aliases, if you want to have aliases for your site. Good for harmonizing 
+  # Site aliases, if you want to have aliases for your site. Good for harmonizing
   # production env with dev/testing envs.
   # 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
-  
+
   # Configuration defaults
   def initialize
     @cms_title            = 'ComfortableMexicanSofa CMS Engine'
@@ -89,13 +89,14 @@ class ComfortableMexicanSofa::Configuration
     @enable_fixtures      = false
     @fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
     @revisions_limit      = 25
-    @locales              = { 
+    @locales              = {
       'en'    => 'English',
       'es'    => 'Español',
       'pt-BR' => 'Português Brasileiro',
       'zh-CN' => '简体中文',
       'ja'    => '日本語',
-      'sv'    => 'Svenska'
+      'sv'    => 'Svenska',
+      'ru'    => 'Русский'
     }
     @admin_locale         = nil
     @database_config      = nil
@@ -105,5 +106,5 @@ class ComfortableMexicanSofa::Configuration
     @allowed_partials     = nil
     @hostname_aliases     = nil
   end
-  
+
 end

data/lib/comfortable_mexican_sofa/tag.rb

@@ -10,10 +10,12 @@ require 'csv'
 #   end
 module ComfortableMexicanSofa::Tag
   
-  TOKENIZER_REGEX = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
+  TOKENIZER_REGEX   = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
+  IDENTIFIER_REGEX  = /\w+[\-\.\w]+\w+/
   
   attr_accessor :page,
                 :identifier,
+                :namespace,
                 :params,
                 :parent
   
@@ -29,6 +31,8 @@ module ComfortableMexicanSofa::Tag
     
     # Initializing tag object for a particular Tag type
     # First capture group in the regex is the tag identifier
+    # Namespace is the string separated by a dot. So if identifier is:
+    # 'sidebar.about' namespace is: 'sidebar'
     def initialize_tag(page, tag_signature)
       if match = tag_signature.match(regex_tag_signature)
         
@@ -41,6 +45,7 @@ module ComfortableMexicanSofa::Tag
         tag = self.new
         tag.page        = page
         tag.identifier  = match[1]
+        tag.namespace   = (ns = tag.identifier.split('.')[0...-1].join('.')).blank?? nil : ns
         tag.params      = params
         tag
       end

data/lib/comfortable_mexican_sofa/tags/asset.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::Asset
   include ComfortableMexicanSofa::Tag
 
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:asset:(#{identifier}):?(.*?)\s*\}\}/
   end
 

data/lib/comfortable_mexican_sofa/tags/collection.rb

@@ -8,7 +8,7 @@ class ComfortableMexicanSofa::Tag::Collection
   # A more complete example of the above:
   #   {{ cms:collection:album:foo/my_album:albums/show:title:slug:param_a:param_b }}
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\/\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:collection:(#{identifier}):(.*?)\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/field_datetime.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::FieldDateTime
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:field:(#{identifier}):datetime\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/field_integer.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::FieldInteger
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:field:(#{identifier}):integer\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/field_rich_text.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::FieldRichText
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:field:(#{identifier}):rich_text\s*?\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/field_string.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::FieldString
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:field:(#{identifier}):?(?:string)?\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/field_text.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::FieldText
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:field:(#{identifier}):?(?:text)?\s*?\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/file.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::File
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-\.]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:file:(#{identifier}):?(.*?)\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_datetime.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::PageDateTime
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page:(#{identifier}):datetime\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_file.rb

@@ -6,7 +6,7 @@ class ComfortableMexicanSofa::Tag::PageFile
   # Simple tag can be:
   #   {{ cms:page_file:some_label }}
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page_file:(#{identifier}):?(.*?)\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_files.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::PageFiles
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page_files:(#{identifier}):?(.*?)\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_integer.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::PageInteger
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page:(#{identifier}):integer\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::PageRichText
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page:(#{identifier}):rich_text\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_string.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::PageString
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page:(#{identifier}):string\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/tags/page_text.rb

@@ -2,7 +2,7 @@ class ComfortableMexicanSofa::Tag::PageText
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(identifier = nil)
-    identifier ||= /[\w\-]+/
+    identifier ||= IDENTIFIER_REGEX
     /\{\{\s*cms:page:(#{identifier}):?(?:text)?\s*\}\}/
   end
   

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -35,7 +35,16 @@ module ComfortableMexicanSofa::ViewMethods
   def cms_page_content(identifier, page = nil)
     return '' unless page ||= @cms_page
     return '' unless block = page.blocks.find_by_identifier(identifier)
-    render :inline => ComfortableMexicanSofa::Tag.process_content(page, block.content)
+    # If block is a page_file(s) we will return objects instead of attempting
+    # to render them out
+    case block.tag
+    when ComfortableMexicanSofa::Tag::PageFile
+      block.files.first
+    when ComfortableMexicanSofa::Tag::PageFiles
+      block.files
+    else
+      render :inline => ComfortableMexicanSofa::Tag.process_content(page, block.content)
+    end
   end
 end
 

data/test/functional/cms_admin/pages_controller_test.rb

@@ -47,7 +47,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_field_datetime
-    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
@@ -55,7 +55,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_field_integer
-    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:integer}}')
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:integer}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
@@ -63,7 +63,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_field_string
-    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:string}}')
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:string}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
@@ -71,7 +71,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_field_text
-    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:text}}')
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
@@ -79,7 +79,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_new_with_field_rich_text
-    cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:rich_text}}')
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
@@ -87,7 +87,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_page_datetime
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
@@ -95,7 +95,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_page_integer
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:integer}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:integer}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
@@ -103,7 +103,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_page_string
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:string}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:string}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
@@ -111,7 +111,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_page_text
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
@@ -119,7 +119,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_new_with_page_file
-    cms_layouts(:default).update_attribute(:content, '{{cms:page_file:test_label}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page_file:test_label}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='file'][name='page[blocks_attributes][0][content]']"
@@ -127,7 +127,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_new_with_page_files
-    cms_layouts(:default).update_attribute(:content, '{{cms:page_files:test_label}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page_files:test_label}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='file'][name='page[blocks_attributes][0][content][]'][multiple=multiple]"
@@ -136,7 +136,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_get_new_with_collection
     snippet = cms_snippets(:default)
-    cms_layouts(:default).update_attribute(:content, '{{cms:collection:snippet:cms/snippet}}')
+    cms_layouts(:default).update_column(:content, '{{cms:collection:snippet:cms/snippet}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "select[name='page[blocks_attributes][0][content]']" do
@@ -147,7 +147,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new_with_page_rich_text
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
@@ -155,7 +155,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_new_with_several_tag_fields
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:label_a}}{{cms:page:label_b}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:label_a}}{{cms:page:label_b}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]']"
@@ -165,13 +165,13 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_new_with_crashy_tag
-    cms_layouts(:default).update_attribute(:content, '{{cms:collection:label:invalid}}')
+    cms_layouts(:default).update_column(:content, '{{cms:collection:label:invalid}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
   end
   
   def test_get_new_with_repeated_tag
-    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}{{cms:page:test_label}}')
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}{{cms:page:test_label}}')
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
@@ -207,7 +207,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
 
   def test_get_edit_with_blank_layout
     page = cms_pages(:default)
-    page.update_attribute(:layout_id, nil)
+    page.update_column(:layout_id, nil)
     get :edit, :site_id => page.site, :id => page
     assert_response :success
     assert assigns(:page)
@@ -216,7 +216,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_get_edit_with_non_english_locale
     site = cms_sites(:default)
-    site.update_attribute(:locale, 'es')
+    site.update_column(:locale, 'es')
     get :edit, :site_id => site, :id => cms_pages(:default)
     assert_response :success
   end