comfortable_mexican_sofa 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4189f8584e5fbfcc3083d72b892dee0d17407e1893674eed30927e6e5c6d336
-  data.tar.gz: '02964679fbddf7a9f1c46dc35482d11a6a3736409a32daa4a137d0600a921d3d'
+  metadata.gz: 7cc4680084f0e38ab3a3e902264eb28487be58a3cfb10abb3722ead0a917e7c4
+  data.tar.gz: 7fe8523b33056e692bb8f3ee552517adbd994dfcf3e830466ff078e72e646439
 SHA512:
-  metadata.gz: 47387e45ccebcad1bc3429c6b64633dfd9cc8f0810f7c28745dc578f391404e57a16fb8bd1ecd221acdd6701710aded9ee318eb2b110f7d7374e63063fc472b0
-  data.tar.gz: d16d2d2aaeb92e761c6b3559816f33e1339dd239f8691d6b8194bc5cf60d67ec0dbe34aae18ee2cc2a4f1bf24b15edc4105812bcd4427d04b048a850bc339819
+  metadata.gz: e01f50e27b67203265c0d4683ae78d50644a5f64a8a4ea9898f3e94b163c5990c04b83b4d25133ecc8c531ceadadd87a32d249724211562622d5341ede61bd5b
+  data.tar.gz: 26695cba7cf37dcc11ce3955d8dca504231bcaf33b62e736c7eff19304ffe0f0ad920fa12d62f3bda92f0bea087bc25e309ca7ce6c2ddc60a43cdedd7dc008f9

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
 gemfile:
   - test/gemfiles/5.2.gemfile

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -23,7 +23,7 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
         case params[:type]
         when "image"
           file_scope.with_images.collect do |file|
-            { thumb: url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+            { thumb: url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:redactor])),
               image: url_for(file.attachment),
               title: file.label }
           end

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -1,7 +1,7 @@
 %li{data: {id: file.id}}
   :ruby
     file_tag  = cms_file_link_tag(file)
-    thumb_url = url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.image?
+    thumb_url = url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.image?
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block

data/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml

@@ -1,8 +1,10 @@
 .fragment-attachments
   - attachments.each do |attachment|
     :ruby
-      thumb_url = url_for(attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])) if attachment.image?
-      filename  = attachment.filename.to_s
+      thumb_url = if attachment.image?
+        url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
+      end
+      filename = attachment.filename.to_s
       truncated_filename = truncate(filename, length: 40, omission: "...#{filename.last(10)}")
 
       link_data = {

data/lib/comfortable_mexican_sofa/content/params_parser.rb

@@ -2,78 +2,116 @@
 
 require "strscan"
 
-module ComfortableMexicanSofa::Content::ParamsParser
+class ComfortableMexicanSofa::Content::ParamsParser
 
   class Error < StandardError; end
 
-  STRING_LITERAL = %r{'[^']*'|"[^"]*"}
-  IDENTIFIER     = %r{[a-z0-9][\w\-/.]*}i
-  COLON          = %r{:}
-  COMMA          = %r{,}
+  STRING_LITERAL  = %r{'[^']*'|"[^"]*"}
+  IDENTIFIER      = %r{[a-z0-9][\w\-/.]*}i
+  HASH_KEY        = %r{#{IDENTIFIER}:}
+  COMMA           = %r{,}
+  HASH_OPEN       = %r{\{}
+  HASH_CLOSE      = %r{\}}
+  ARRAY_OPEN      = %r{\[}
+  ARRAY_CLOSE     = %r{\]}
 
-  # @param [String] text
+  # @param <String> string
+  def initialize(string = "")
+    @string = string
+  end
+
+  # Takes CMS content tag parameters and converts them into array of strings,
+  # hashes and arrays.
+  #
   # @return [Array<String, {String => String}>]
   # @raise [Error] if the given `text` is malformed.
   #
   # @example
-  #   parse("happy greeting name:Joe show:true")
-  #   #=> ['happy', 'greeting', {'name' => 'Joe', 'show' => 'true'}]
-  def self.parse(text)
-    parse_token_groups(split_on_commas(tokenize(text.to_s)))
+  #   new("a, b, c").parse
+  #   #=> ["a", "b", "c"]
+  #
+  #   new("a, b: c, d: e").parse
+  #   #=> ["a", {"b" => "c", "d" => "e"}]
+  #
+  #   new("a, b: {c: [d, e]}").parse
+  #   #=> ["a", {"b" => {"c" => ["d", "e"]}}]
+  #
+  def params
+    @tokens = tokenize(@string)
+    parse_params
   end
 
-  # @param [Enumerable<Array<(Symbol, String)>>] token_groups
-  # @return [Array<String, {String => String}>]
-  def self.parse_token_groups(token_groups)
-    token_groups.each_with_object([]) do |tokens, params|
-      case tokens.count
-      when 1
-        params << parse_string_param(tokens[0])
-      when 3
-        param = parse_key_value_param(tokens)
-        if params.last.is_a?(Hash)
-          params.last.update(param)
-        else
-          params << param
-        end
-      else
-        raise Error, "Unexpected tokens found: #{tokens}"
-      end
+private
+
+  # Contructs root-level list of arguments sent via content tag
+  def parse_params
+    params = []
+    while (token = @tokens.shift)
+      params << parse_value(token)
     end
+    params
   end
 
-  # @param [(:string, String)] token
-  # @return [String]
-  # @raise [Error] if `token[0] != :string`.
-  def self.parse_string_param(token)
-    type, value = token
-    raise Error, "Unexpected token: #{token}" unless type == :string
-    value
+  # Gets token value. Will trigger parsing of hash and array structures
+  def parse_value(token)
+    case token&.first
+    when :string
+      token[1]
+    when :hash_key
+      @tokens.unshift(token)
+      parse_hash
+    when :hash_open
+      parse_hash
+    when :array_open
+      parse_array
+    else
+      raise Error, "Invalid params: #{@string}"
+    end
   end
 
-  # @param [((:string, String), (:colon, String), (:string, String))] tokens
-  # @return [{String => String}]
-  # @raise [Error] if `tokens[0][0] != :string`, or `tokens[1][0] != :colon`,
-  #   or `tokens[2][0] != :string`.
-  def self.parse_key_value_param(tokens)
-    (key_type, key_value), (col_type, _col_value), (val_type, val_value) = tokens
-    unless key_type == :string && col_type == :colon && val_type == :string
-      raise Error, "Unexpected tokens: #{tokens}"
+  # Hash constructor method. Will handle nested hashes as well
+  def parse_hash
+    opens = 1
+    hash = {}
+
+    while (token = @tokens.shift)
+      case token&.first
+      when :hash_key
+        hash[token[1]] = parse_value(@tokens.shift)
+      when :hash_close
+        opens -= 1
+      when :hash_open
+        opens += 1
+      else
+        raise Error, "Invalid params: #{@string}"
+      end
+
+      return hash if opens.zero?
     end
-    { key_value => val_value }
+
+    # We're can't really detect unclosed hashes as we can construct them without
+    # opening brakets. For example, `a: b, c: d` is same as `{a: b, c: d}` and
+    # `{a: b, c: d` is also ends up to be a valid hash. It will error out if
+    # unclosed hash is followed by some other unexpected token. Like: `{a: b, c`
+    hash
   end
 
-  # Splits tokens on commas. The result contains no `:comma` tokens.
-  #
-  # @param [Enumerable<(Symbol, String)>] tokens
-  # @return [Enumerable<Array<(Symbol, String)>>] Token groups.
-  def self.split_on_commas(tokens)
-    slices = tokens.slice_after do |token|
-      token[0] == :comma
-    end
-    slices.map do |expression|
-      expression.reject { |t| t[0] == :comma }
+  # Array construction method. Will handle nested arrays
+  def parse_array
+    opens = 1
+    array = []
+    while (token = @tokens.shift)
+      case token&.first
+      when :array_close
+        opens -= 1
+      else
+        array << parse_value(token)
+      end
+
+      return array if opens.zero?
     end
+
+    raise Error, "Unclosed array param: #{@string}"
   end
 
   # Tokenizing input string into a list of touples
@@ -81,22 +119,30 @@ module ComfortableMexicanSofa::Content::ParamsParser
   #
   # @param [String] args_string
   # @return [Array<String>] tokens
-  def self.tokenize(args_string)
+  def tokenize(args_string)
     args_string = args_string.tr("“”‘’", %q(""''))
     ss = StringScanner.new(args_string)
     tokens = []
     loop do
       ss.skip(%r{\s*})
       break if ss.eos?
+
+      # commas are just separators like spaces
+      next if ss.scan(COMMA)
+
       tokens <<
         if    (t = ss.scan(STRING_LITERAL)) then [:string, t[1...-1]]
+        elsif (t = ss.scan(HASH_KEY))       then [:hash_key, t[0...-1]]
         elsif (t = ss.scan(IDENTIFIER))     then [:string, t]
-        elsif (t = ss.scan(COLON))          then [:colon, t]
-        elsif (t = ss.scan(COMMA))          then [:comma, t]
+        elsif (t = ss.scan(HASH_OPEN))      then [:hash_open, t]
+        elsif (t = ss.scan(HASH_CLOSE))     then [:hash_close, t]
+        elsif (t = ss.scan(ARRAY_OPEN))     then [:array_open, t]
+        elsif (t = ss.scan(ARRAY_CLOSE))    then [:array_close, t]
         else
           raise Error, "Unexpected char: #{ss.getch}"
         end
     end
+
     tokens
   end
 

data/lib/comfortable_mexican_sofa/content/renderer.rb

@@ -122,7 +122,7 @@ class ComfortableMexicanSofa::Content::Renderer
           # @type [ComfortableMexicanSofa::Content::Tag]
           tag = klass.new(
             context:  @context,
-            params:   ComfortableMexicanSofa::Content::ParamsParser.parse(token[:tag_params]),
+            params:   ComfortableMexicanSofa::Content::ParamsParser.new(token[:tag_params]).params,
             source:   token[:source]
           )
           nodes.last << tag

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

@@ -3,11 +3,7 @@
 # Tag for text content that is going to be rendered using text input with date widget
 #   {{ cms:date identifier }}
 #
-class ComfortableMexicanSofa::Content::Tag::Date < ComfortableMexicanSofa::Content::Tag::Fragment
-
-  def content
-    fragment.datetime
-  end
+class ComfortableMexicanSofa::Content::Tag::Date < ComfortableMexicanSofa::Content::Tag::Datetime
 
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"

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

@@ -1,14 +1,31 @@
 # frozen_string_literal: true
 
 # Tag for text content that is going to be rendered using text input with datetime widget
-#   {{ cms:datetime identifier }}
+#   {{ cms:datetime identifier, strftime: "at %I:%M%p" }}
+#
+# `strftime` - Format datetime string during rendering
 #
 class ComfortableMexicanSofa::Content::Tag::Datetime < ComfortableMexicanSofa::Content::Tag::Fragment
 
+  attr_reader :strftime
+
+  def initialize(context:, params: [], source: nil)
+    super
+    @strftime = options["strftime"]
+  end
+
   def content
     fragment.datetime
   end
 
+  def render
+    if strftime.present?
+      content.strftime(strftime)
+    else
+      content.to_s
+    end
+  end
+
   def form_field(object_name, view, index)
     name    = "#{object_name}[fragments_attributes][#{index}][datetime]"
     options = { id: form_field_id, class: "form-control", data: { "cms-datetime" => true } }

data/lib/comfortable_mexican_sofa/content/tags/mixins/file_content.rb

@@ -13,7 +13,7 @@ module ComfortableMexicanSofa::Content::Tag::Mixins
       return "" unless file
 
       if variant_attrs.present? && attachment.image?
-        file = file.variant(variant_attrs)
+        file = file.variant(combine_options: variant_attrs)
       end
 
       url = rails_blob_path(file)

data/lib/comfortable_mexican_sofa/version.rb

@@ -2,6 +2,6 @@
 
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.13"
+  VERSION = "2.0.14"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to