comfortable_mexican_sofa 2.0.2 → 2.0.3

data/config/locales/zh-CN.yml

@@ -1,4 +1,3 @@
-# encoding: utf-8
 zh-CN:
   activerecord:
     models:
@@ -146,6 +145,8 @@ zh-CN:
             cancel: 取消
             update: 更新页面
             choose_link: Select page...
+
+        fragments:
           form_fragments:
             no_tags: |-
               布局中没有定义内容标签。<br/>

data/config/locales/zh-TW.yml

@@ -1,4 +1,3 @@
-# encoding: utf-8
 zh-TW:
   activerecord:
     models:
@@ -146,6 +145,8 @@ zh-TW:
             cancel: 取消
             update: 更新頁面
             choose_link: 選擇頁面...
+
+        fragments:
           form_fragments:
             no_tags: |-
               佈局中沒有定義內容標記。<br/>

data/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path("../config/environment", __FILE__)
 run ComfortableMexicanSofa::Application

data/lib/comfortable_mexican_sofa/access_control/admin_authentication.rb

@@ -1,11 +1,11 @@
 module ComfortableMexicanSofa::AccessControl
   module AdminAuthentication
+
     # Set username and password in config/initializers/comfortable_mexican_sofa.rb
     # Like this:
     #   ComfortableMexicanSofa::AccessControl::AdminAuthentication.username = 'myname'
     #   ComfortableMexicanSofa::AccessControl::AdminAuthentication.password = 'mypassword'
 
-
     mattr_accessor  :username,
                     :password
 
@@ -17,5 +17,6 @@ module ComfortableMexicanSofa::AccessControl
         self.username == username && self.password == password
       end
     end
+
   end
 end

data/lib/comfortable_mexican_sofa/access_control/admin_authorization.rb

@@ -1,8 +1,10 @@
 module ComfortableMexicanSofa::AccessControl
   module AdminAuthorization
+
     # By default there's no authorization of any kind
     def authorize
       true
     end
+
   end
 end

data/lib/comfortable_mexican_sofa/access_control/public_authentication.rb

@@ -1,8 +1,10 @@
 module ComfortableMexicanSofa::AccessControl
   module PublicAuthentication
+
     # By defaut all published pages are accessible
     def authenticate
       true
     end
+
   end
-end
+end

data/lib/comfortable_mexican_sofa/access_control/public_authorization.rb

@@ -1,8 +1,10 @@
 module ComfortableMexicanSofa::AccessControl
   module PublicAuthorization
+
     # By default there's no authorization of any kind
     def authorize
       true
     end
+
   end
 end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class ComfortableMexicanSofa::Configuration
 
   # Don't like ComfortableMexicanSofa? Set it to whatever you like. :(
@@ -77,38 +75,38 @@ class ComfortableMexicanSofa::Configuration
 
   # Configuration defaults
   def initialize
-    @cms_title            = 'ComfortableMexicanSofa CMS Engine'
-    @base_controller      = 'ApplicationController'
-    @admin_auth           = 'ComfortableMexicanSofa::AccessControl::AdminAuthentication'
-    @admin_authorization  = 'ComfortableMexicanSofa::AccessControl::AdminAuthorization'
-    @public_auth          = 'ComfortableMexicanSofa::AccessControl::PublicAuthentication'
-    @public_authorization = 'ComfortableMexicanSofa::AccessControl::PublicAuthorization'
+    @cms_title            = "ComfortableMexicanSofa CMS Engine"
+    @base_controller      = "ApplicationController"
+    @admin_auth           = "ComfortableMexicanSofa::AccessControl::AdminAuthentication"
+    @admin_authorization  = "ComfortableMexicanSofa::AccessControl::AdminAuthorization"
+    @public_auth          = "ComfortableMexicanSofa::AccessControl::PublicAuthentication"
+    @public_authorization = "ComfortableMexicanSofa::AccessControl::PublicAuthorization"
     @seed_data_path       = nil
-    @admin_route_redirect = ''
+    @admin_route_redirect = ""
     @enable_sitemap       = true
     @enable_seeds         = false
-    @seeds_path           = File.expand_path('db/cms_seeds', Rails.root)
+    @seeds_path           = File.expand_path("db/cms_seeds", Rails.root)
     @revisions_limit      = 25
     @locales              = {
-      'cs'    => 'Česky',
-      'da'    => 'Dansk',
-      'de'    => 'Deutsch',
-      'en'    => 'English',
-      'es'    => 'Español',
-      'fr'    => 'Français',
-      'it'    => 'Italiano',
-      'ja'    => '日本語',
-      'nb'    => 'Norsk',
-      'nl'    => 'Nederlands',
-      'pl'    => 'Polski',
-      'pt-BR' => 'Português Brasileiro',
-      'ru'    => 'Русский',
-      'sk'    => 'Slovensky',
-      'sv'    => 'Svenska',
-      'tr'    => 'Türkçe',
-      'uk'    => 'Українська',
-      'zh-CN' => '简体中文',
-      'zh-TW' => '正體中文'
+      "cs"    => "Česky",
+      "da"    => "Dansk",
+      "de"    => "Deutsch",
+      "en"    => "English",
+      "es"    => "Español",
+      "fr"    => "Français",
+      "it"    => "Italiano",
+      "ja"    => "日本語",
+      "nb"    => "Norsk",
+      "nl"    => "Nederlands",
+      "pl"    => "Polski",
+      "pt-BR" => "Português Brasileiro",
+      "ru"    => "Русский",
+      "sk"    => "Slovensky",
+      "sv"    => "Svenska",
+      "tr"    => "Türkçe",
+      "uk"    => "Українська",
+      "zh-CN" => "简体中文",
+      "zh-TW" => "正體中文"
     }
     @admin_locale         = nil
     @admin_cache_sweeper  = nil

data/lib/comfortable_mexican_sofa/content/block.rb

@@ -3,9 +3,10 @@
 # {{cms:block}} some content {{cms:end_block}}
 class ComfortableMexicanSofa::Content::Block < ComfortableMexicanSofa::Content::Tag
 
-  attr_accessor :nodes
+  attr_writer :nodes
 
   def nodes
     @nodes ||= []
   end
+
 end

data/lib/comfortable_mexican_sofa/content/params_parser.rb

@@ -2,23 +2,22 @@ module ComfortableMexicanSofa::Content::ParamsParser
 
   class Error < StandardError; end
 
-  SINGLE_STRING_LITERAL = /'[^\']*'/
-  DOUBLE_STRING_LITERAL = /"[^\"]*"/
-  IDENTIFIER            = /[a-z0-9][\w\-\/.]*/i
-  COLUMN                = /\:/
-  COMMA                 = /\,/
+  SINGLE_STRING_LITERAL = %r{'[^']*'}
+  DOUBLE_STRING_LITERAL = %r{"[^"]*"}
+  IDENTIFIER            = %r{[a-z0-9][\w\-/.]*}i
+  COLUMN                = %r{:}
+  COMMA                 = %r{,}
 
   def self.parse(text)
     parameterize(slice(tokenize(text.to_s)))
   end
 
   def self.parameterize(token_groups)
-    params = [ ]
+    params = []
     token_groups.each do |tokens|
-      case
-      when tokens.count == 1
+      if tokens.count == 1
         collect_param_for_string!(params, tokens[0])
-      when tokens.count == 3
+      elsif tokens.count == 3
         collect_param_for_hash!(params, tokens)
       else
         raise Error, "Unexpected tokens found: #{tokens}"
@@ -36,7 +35,7 @@ module ComfortableMexicanSofa::Content::ParamsParser
   def self.collect_param_for_hash!(params, tokens)
     key, col, val = tokens
     key_type, key_value = key
-    col_type, _         = col
+    col_type,           = col
     val_type, val_value = val
 
     unless key_type == :string && col_type == :column && val_type == :string
@@ -50,10 +49,11 @@ module ComfortableMexicanSofa::Content::ParamsParser
 
   # grouping tokens based on the comma and also removing comma tokens
   def self.slice(tokens)
-    tokens.slice_after do |token|
+    slices = tokens.slice_after do |token|
       token[0] == :comma
-    end.map do |expression|
-      expression.reject{|t| t[0] == :comma}
+    end
+    slices.map do |expression|
+      expression.reject { |t| t[0] == :comma }
     end
   end
 
@@ -62,19 +62,20 @@ module ComfortableMexicanSofa::Content::ParamsParser
     tokens = []
     ss = StringScanner.new(args_string)
     until ss.eos?
-      ss.skip(/\s*/)
+      ss.skip(%r{\s*})
       break if ss.eos?
-      token = case
-        when t = ss.scan(SINGLE_STRING_LITERAL) then [:string, t[1...t.size - 1]]
-        when t = ss.scan(DOUBLE_STRING_LITERAL) then [:string, t[1...t.size - 1]]
-        when t = ss.scan(IDENTIFIER)            then [:string, t]
-        when t = ss.scan(COLUMN)                then [:column, t]
-        when t = ss.scan(COMMA)                 then [:comma, t]
+      token =
+        if    (t = ss.scan(SINGLE_STRING_LITERAL)) then [:string, t[1...t.size - 1]]
+        elsif (t = ss.scan(DOUBLE_STRING_LITERAL)) then [:string, t[1...t.size - 1]]
+        elsif (t = ss.scan(IDENTIFIER))            then [:string, t]
+        elsif (t = ss.scan(COLUMN))                then [:column, t]
+        elsif (t = ss.scan(COMMA))                 then [:comma, t]
         else
           raise Error, "Unexpected char: #{ss.getch}"
-      end
+        end
       tokens << token
     end
     tokens
   end
+
 end

data/lib/comfortable_mexican_sofa/content/renderer.rb

@@ -18,7 +18,7 @@ class ComfortableMexicanSofa::Content::Renderer
   MAX_DEPTH = 100
 
   # tags are in this format: {{ cms:tag_class params }}
-  TAG_REGEX = /\{\{\s*?cms:(?<class>\w+)(?<params>.*?)\}\}/
+  TAG_REGEX = %r{\{\{\s*?cms:(?<class>\w+)(?<params>.*?)\}\}}
 
   class << self
 
@@ -29,6 +29,7 @@ class ComfortableMexicanSofa::Content::Renderer
     def register_tag(name, klass)
       tags[name.to_s] = klass
     end
+
   end
 
   def initialize(context)
@@ -59,7 +60,7 @@ class ComfortableMexicanSofa::Content::Renderer
     if allow_erb
       string.to_s
     else
-      string.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
+      string.to_s.gsub("<%", "&lt;%").gsub("%>", "%&gt;")
     end
   end
 
@@ -67,14 +68,14 @@ class ComfortableMexicanSofa::Content::Renderer
   def tokenize(string)
     tokens = []
     ss = StringScanner.new(string.to_s)
-    while string = ss.scan_until(TAG_REGEX)
-      text = string.sub(ss[0], '')
-      tokens << text if text.length > 0
-      tokens << {tag_class: ss[:class], tag_params: ss[:params].strip}
+    while (string = ss.scan_until(TAG_REGEX))
+      text = string.sub(ss[0], "")
+      tokens << text unless text.empty?
+      tokens << { tag_class: ss[:class], tag_params: ss[:params].strip }
     end
     text = ss.rest
     tokens << text if text.present?
-    return tokens
+    tokens
   end
 
   # Constructing node tree for content. It's a list of strings and tags with
@@ -97,7 +98,7 @@ class ComfortableMexicanSofa::Content::Renderer
           nodes.pop
 
         else
-          unless klass = self.class.tags[tag_class]
+          unless (klass = self.class.tags[tag_class])
             raise SyntaxError, "Unrecognized tag #{tag_class}: #{token}"
           end
 
@@ -122,4 +123,5 @@ class ComfortableMexicanSofa::Content::Renderer
 
     nodes.flatten
   end
+
 end

data/lib/comfortable_mexican_sofa/content/tag.rb

@@ -34,4 +34,5 @@ class ComfortableMexicanSofa::Content::Tag
   def parse_params_string(string)
     ComfortableMexicanSofa::Content::ParamsParser.parse(string)
   end
+
 end

data/lib/comfortable_mexican_sofa/content/tags/asset.rb

@@ -29,15 +29,15 @@ class ComfortableMexicanSofa::Content::Tag::Asset < ComfortableMexicanSofa::Cont
   def content
     return "" unless layout
 
-    base = ComfortableMexicanSofa.config.public_cms_path || ''
+    base = ComfortableMexicanSofa.config.public_cms_path || ""
     unless base.ends_with?("/")
-      base = base + "/"
+      base += "/"
     end
 
     case @type
     when "css"
       out = "#{base}cms-css/#{context.site.id}/#{@identifier}/#{layout.cache_buster}.css"
-      if @as == 'tag'
+      if @as == "tag"
         out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />"
       end
       out
@@ -49,6 +49,7 @@ class ComfortableMexicanSofa::Content::Tag::Asset < ComfortableMexicanSofa::Cont
       out
     end
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/checkbox.rb

@@ -7,13 +7,14 @@ class ComfortableMexicanSofa::Content::Tag::Checkbox < ComfortableMexicanSofa::C
     fragment.boolean
   end
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name = "#{object_name}[fragments_attributes][#{index}][boolean]"
     checkbox_hidden = view.hidden_field_tag(name, "0", id: nil)
-    checkbox_input  = view.check_box_tag(name, "1", self.content.present?, id: nil)
+    checkbox_input  = view.check_box_tag(name, "1", content.present?, id: nil)
 
     yield [checkbox_hidden, checkbox_input].join.html_safe
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/date.rb

@@ -7,14 +7,15 @@ class ComfortableMexicanSofa::Content::Tag::Date < ComfortableMexicanSofa::Conte
     fragment.datetime
   end
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
-    options = {id: nil, class: "form-control", data: {"cms-date" => true}}
-    value   = self.content.present?? self.content.to_s(:db) : ""
+    options = { id: nil, class: "form-control", data: { "cms-date" => true } }
+    value   = content.present? ? content.to_s(:db) : ""
     input   = view.send(:text_field_tag, name, value, options)
 
     yield input
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/datetime.rb

@@ -7,14 +7,15 @@ class ComfortableMexicanSofa::Content::Tag::Datetime < ComfortableMexicanSofa::C
     fragment.datetime
   end
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
-    options = {id: nil, class: "form-control", data: {"cms-datetime" => true}}
-    value   = self.content.present?? self.content.to_s(:db) : ""
+    options = { id: nil, class: "form-control", data: { "cms-datetime" => true } }
+    value   = content.present? ? content.to_s(:db) : ""
     input   = view.send(:text_field_tag, name, value, options)
 
     yield input
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/file.rb

@@ -36,20 +36,21 @@ class ComfortableMexicanSofa::Content::Tag::File < ComfortableMexicanSofa::Conte
     end
   end
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][files]"
-    input   = view.send(:file_field_tag, name, {id: nil})
+    input   = view.send(:file_field_tag, name, id: nil)
 
-    attachments_partial = if fragment.attachments
-      view.render(
-        partial: "comfy/admin/cms/pages/fragment_attachments",
-        locals: {
-          object_name:  object_name,
-          index:        index,
-          attachments:  fragment.attachments
-        }
-      )
-    end
+    attachments_partial =
+      if fragment.attachments
+        view.render(
+          partial: "comfy/admin/cms/fragments/form_fragment_attachments",
+          locals: {
+            object_name:  object_name,
+            index:        index,
+            attachments:  fragment.attachments
+          }
+        )
+      end
 
     yield [input, attachments_partial].join.html_safe
   end
@@ -67,9 +68,10 @@ protected
   def url_for(attachment)
     ApplicationController.render(
       inline: "<%= url_for(@attachment) %>",
-      assigns: {attachment: attachment}
+      assigns: { attachment: attachment }
     )
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/file_link.rb

@@ -10,7 +10,7 @@
 #
 class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::Content::Tag
 
-  attr_reader :identifier, :as, :label, :variant_attrs
+  attr_reader :identifier, :as, :variant_attrs
 
   def initialize(context, params_string)
     super
@@ -26,7 +26,11 @@ class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::C
   end
 
   def file
-    @file ||= context.site.files.detect{|f| f.id == self.identifier.to_i}
+    @file ||= context.site.files.detect { |f| f.id == identifier.to_i }
+  end
+
+  def label
+    @file.label.present? ? @file.label : @file.attachment.filename
   end
 
   def content
@@ -49,16 +53,13 @@ class ComfortableMexicanSofa::Content::Tag::FileLink < ComfortableMexicanSofa::C
 
 protected
 
-  def label
-    @file.label.present?? @file.label : @file.attachment.filename
-  end
-
   def url_for(attachment)
     ApplicationController.render(
       inline: "<%= url_for(@attachment) %>",
-      assigns: {attachment: attachment}
+      assigns: { attachment: attachment }
     )
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/files.rb

@@ -15,23 +15,25 @@ class ComfortableMexicanSofa::Content::Tag::Files < ComfortableMexicanSofa::Cont
     end.join(" ")
   end
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][files][]"
-    input   = view.send(:file_field_tag, name, {id: nil, multiple: true})
-
-    attachments_partial = if fragment.attachments
-      view.render(
-        partial: "comfy/admin/cms/pages/fragment_attachments",
-        locals: {
-          object_name:  object_name,
-          index:        index,
-          attachments:  fragment.attachments
-        }
-      )
-    end
+    input   = view.send(:file_field_tag, name, id: nil, multiple: true)
+
+    attachments_partial =
+      if fragment.attachments
+        view.render(
+          partial: "comfy/admin/cms/fragments/form_fragment_attachments",
+          locals: {
+            object_name:  object_name,
+            index:        index,
+            attachments:  fragment.attachments
+          }
+        )
+      end
 
     yield [input, attachments_partial].join.html_safe
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/fragment.rb

@@ -21,13 +21,13 @@ class ComfortableMexicanSofa::Content::Tag::Fragment < ComfortableMexicanSofa::C
     end
 
     @namespace  = @options["namespace"] || "default"
-    @renderable = @options["render"].to_s.downcase == "false" ? false : true
+    @renderable = @options["render"].to_s.downcase != "false"
   end
 
   # Grabs existing fragment record or spins up a new instance if there's none
   def fragment
-    self.context.fragments.detect{|f| f.identifier == self.identifier} ||
-    self.context.fragments.build(identifier: self.identifier)
+    context.fragments.detect { |f| f.identifier == identifier } ||
+      context.fragments.build(identifier: identifier)
   end
 
   def content
@@ -37,10 +37,10 @@ class ComfortableMexicanSofa::Content::Tag::Fragment < ComfortableMexicanSofa::C
   # If `render: false` was passed in we won't render anything. Assuming that
   # that fragment content will be rendered manually
   def render
-    self.renderable ? content : ""
+    renderable ? content : ""
   end
 
-  # Tag renders its own form inputs via `form_field(template, index, &block)`
+  # Tag renders its own form inputs via `form_field(template, index)`
   # For example:
   #   class MyTag < ComfortableMexicanSofa::Content::Tag::Fragment
   #     def form_field(view, index, &block)
@@ -48,7 +48,8 @@ class ComfortableMexicanSofa::Content::Tag::Fragment < ComfortableMexicanSofa::C
   #       yield view.text_area "input_name", "value"
   #     end
   #   end
-  def form_field(object_name, view, index, &block)
+  def form_field
     raise "Form field rendering not implemented for this Tag"
   end
+
 end

data/lib/comfortable_mexican_sofa/content/tags/helper.rb

@@ -7,7 +7,7 @@
 #
 class ComfortableMexicanSofa::Content::Tag::Helper < ComfortableMexicanSofa::Content::Tag
 
-  BLACKLIST = %w(eval class_eval instance_eval render)
+  BLACKLIST = %w[eval class_eval instance_eval render].freeze
 
   attr_reader :method_name
 
@@ -45,6 +45,7 @@ class ComfortableMexicanSofa::Content::Tag::Helper < ComfortableMexicanSofa::Con
       content unless BLACKLIST.member?(method_name)
     end
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/markdown.rb

@@ -4,16 +4,17 @@
 class ComfortableMexicanSofa::Content::Tag::Markdown < ComfortableMexicanSofa::Content::Tag::Fragment
 
   def render
-    self.renderable ? Kramdown::Document.new(self.content.to_s).to_html : ""
+    renderable ? Kramdown::Document.new(content.to_s).to_html : ""
   end
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = {id: nil, data: {"cms-cm-mode" => "text/x-markdown"}}
-    input   = view.send(:text_area_tag, name, self.content, options)
+    options = { id: nil, data: { "cms-cm-mode" => "text/x-markdown" } }
+    input   = view.send(:text_area_tag, name, content, options)
 
     yield input
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/number.rb

@@ -3,13 +3,14 @@
 #
 class ComfortableMexicanSofa::Content::Tag::Number < ComfortableMexicanSofa::Content::Tag::Fragment
 
-  def form_field(object_name, view, index, &block)
+  def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][content]"
-    options = {id: nil, class: "form-control"}
-    input   = view.send(:number_field_tag, name, self.content, options)
+    options = { id: nil, class: "form-control" }
+    input   = view.send(:number_field_tag, name, content, options)
 
     yield input
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(

data/lib/comfortable_mexican_sofa/content/tags/partial.rb

@@ -35,6 +35,7 @@ class ComfortableMexicanSofa::Content::Tag::Partial < ComfortableMexicanSofa::Co
       content
     end
   end
+
 end
 
 ComfortableMexicanSofa::Content::Renderer.register_tag(