locomotivecms_steam 1.4.1 → 1.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be08a6c057a0d05663e1564b6c1ef395d389d7d070a87e1a242a86d0200c1552
-  data.tar.gz: 69000665df92a36611e86e5b9187a4e61bfc28f8d115f61db9cdb4f815dddb28
+  metadata.gz: a416940aeda3a368c649ab613068cb52eca1cab73eb55539c96d7b8669683789
+  data.tar.gz: 4d82964327f6732779fffc0bc0d58761409b0beeb1dcab05c996a7f9f7191aae
 SHA512:
-  metadata.gz: 93b8824303d4a8b3aff815393c24a7acd206c0725dfea17653204371b05024e7613fadec33d93fb54ee20069fc918fd8bf513a1b30e6631680a7666e2d444f0a
-  data.tar.gz: '018d6823e5f6aeb95fda7e37e79a4cd798c2446816289d43d94c5aa9cf0a711eaaffcaf2c811d5273201d16b164a047d7d848e69d7db7018e92f4317f9cbb933'
+  metadata.gz: b705994d68051d9abc826b1fae9968bcf48c3c52d3f74487c56ba704755744115a0081f8c65315ce0f3b5ced476472223474aa6a19a9f79814cc28f56ac65263
+  data.tar.gz: c7946edfacbaa652feca82ebba5c41a9f674f1b20a7e5b2f7b7b61d4e1c336ae76fcf4a0ac2028b50d1904d11784fd64ac8c903ee2c722aadf3a1185e293c01c

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b'
+  gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '4d1bd56'
   # gem 'locomotivecms_common', path: '../common'
   # gem 'locomotivecms_models', '~> 0.0.1', path: '../models'
   # gem 'locomotivecms_models', '0.0.1.pre.alpha'

data/Gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: git://github.com/locomotivecms/common.git
+  revision: 4d1bd565246262ab4b1b824e21c7847846f4cc5c
+  ref: 4d1bd56
+  specs:
+    locomotivecms_common (0.3.1)
+      activesupport (>= 5.1.5, < 6.0)
+      attr_extras (~> 5.2.0)
+      colorize
+      stringex (~> 2.8.2)
+
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.4.1)
+    locomotivecms_steam (1.5.0.beta1)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 8.0.0)
       bcrypt (~> 3.1.11)
@@ -13,7 +24,7 @@ PATH
       httparty (~> 0.16.0)
       kramdown (~> 1.16.2)
       locomotivecms-solid (~> 4.0.1)
-      locomotivecms_common (~> 0.3.0)
+      locomotivecms_common (~> 0.3.1)
       mime-types (~> 3.1.0)
       mimetype-fu (~> 0.1.2)
       moneta (~> 1.0.0)
@@ -32,7 +43,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (5.1.6)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -66,15 +77,15 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
+    coveralls (0.8.22)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
     crass (1.0.4)
     diff-lcs (1.3)
-    docile (1.1.5)
+    docile (1.3.1)
     dragonfly (1.1.5)
       addressable (~> 2.3)
       multi_json (~> 1.0)
@@ -86,10 +97,9 @@ GEM
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    httparty (0.16.3)
-      mime-types (~> 3.0)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     i18n-spec (0.6.0)
       iso
@@ -103,14 +113,9 @@ GEM
     locomotivecms-liquid (4.0.0)
     locomotivecms-solid (4.0.1)
       locomotivecms-liquid (~> 4.0.0)
-    locomotivecms_common (0.3.0)
-      activesupport (~> 5.1.5)
-      attr_extras (~> 5.2.0)
-      colorize
-      stringex (~> 2.8.2)
-    mail (2.7.1)
+    mail (2.7.0)
       mini_mime (>= 0.1.1)
-    memory_profiler (0.9.10)
+    memory_profiler (0.9.11)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
@@ -119,12 +124,12 @@ GEM
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     moneta (1.0.0)
-    mongo (2.5.1)
+    mongo (2.5.3)
       bson (>= 4.3.0, < 5.0.0)
     morphine (0.1.1)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    nokogiri (1.8.5)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     nokogumbo (1.5.0)
       nokogiri
@@ -132,8 +137,8 @@ GEM
     pony (1.12)
       mail (>= 2.0)
     public_suffix (3.0.3)
-    puma (3.11.3)
-    rack (2.0.4)
+    puma (3.12.0)
+    rack (2.0.5)
     rack-cache (1.7.2)
       rack (>= 0.4)
     rack-mini-profiler (0.10.7)
@@ -143,7 +148,7 @@ GEM
       rack (>= 1.0, < 3)
     rack_csrf (2.6.0)
       rack (>= 1.1.0)
-    rake (12.3.0)
+    rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -165,16 +170,16 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4)
     sass (3.4.25)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    stackprof (0.2.11)
-    stringex (2.8.5)
+    stackprof (0.2.12)
+    stringex (2.8.4)
     temple (0.8.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
@@ -199,6 +204,7 @@ DEPENDENCIES
   haml (~> 5.0.4)
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.5)
+  locomotivecms_common!
   locomotivecms_steam!
   memory_profiler
   mongo (~> 2.5.1)

data/Rakefile

@@ -22,8 +22,8 @@ namespace :mongodb do
         `mv #{dump_path} #{db_path}`
       end
 
-      `mongo steam_test_1_4_x --eval "db.dropDatabase()"`
-      `mongorestore -d steam_test_1_4_x #{db_path}`
+      `mongo steam_test_1_5_x --eval "db.dropDatabase()"`
+      `mongorestore -d steam_test_1_5_x #{db_path}`
 
       puts "Done! Update now the spec/support/helpers.rb file by setting the new id of the site returned by the mongodb_site_id method"
     end

data/config/locales/pt-BR.yml

@@ -23,14 +23,18 @@ pt-BR:
         one: 'é muito curto (mínimo: 1 caracter)'
         other: 'é muito curto (mínimo: %{count} caracteres)'
 
-  date:
-    formats:
-      default: "%d/%m/%Y"
-
   pagination:
     previous: "« Anterior"
     next: "Próximo »"
 
+  date:
+    formats:
+      default: "%d/%m/%Y"
+      short: "%e %b"
+      long: "%e %B %Y"
+      long_ordinal: "%e %B %Y"
+      only_day: "%e"
+
   date:
     formats:
       default: "%d/%m/%Y"
@@ -115,26 +119,52 @@ pt-BR:
 
 
   number:
-    format:
-      precision: 3
-      separator: ','
-      delimiter: '. '
     currency:
       format:
-        unit: 'R$'
+        delimiter: ! '.'
+        format: ! '%u %n'
         precision: 2
-        format: '%n %u'
+        separator: ','
+        significant: false
+        strip_insignificant_zeros: false
+        unit: 'R$'
+    format:
+      delimiter: ! '.'
+      precision: 3
+      separator: ','
+      significant: false
+      strip_insignificant_zeros: false
     human:
+      decimal_units:
+        format: ! '%n %u'
+        units:
+          billion: Bilhão
+          million: Milhão
+          quadrillion: Quadrilhão
+          thousand: Mil
+          trillion: Trilhão
+          unit: ''
       format:
-        precision: 2
+        delimiter: ''
+        precision: 3
+        significant: true
+        strip_insignificant_zeros: true
       storage_units:
-        format: '%n %u'
+        format: ! '%n %u'
         units:
-          byte: 'Byte'
+          byte:
+            one: Byte
+            other: Bytes
           kb: 'Kb'
           mb: 'Mb'
           gb: 'Gb'
           tb: 'Tb'
+    percentage:
+      format:
+        delimiter: ''
+    precision:
+      format:
+        delimiter: ''
 
   support:
     array:

data/lib/locomotive/steam.rb

@@ -13,15 +13,20 @@ require_relative      'steam/services'
 module Locomotive
   module Steam
 
-    FRONTMATTER_REGEXP = /^(?<yaml>(---\s*\n.*?\n?)^(---\s*$\n?))?(?<template>.*)/mo.freeze
+    FRONTMATTER_REGEXP      = /^(?<yaml>(---\s*\n.*?\n?)^(---\s*$\n?))?(?<template>.*)/mo.freeze
+    JSON_FRONTMATTER_REGEXP = /^---\s*\n(?<json>(.*?\n?))?^(---\s*$\n?)(?<template>.*)/mo.freeze
 
     WILDCARD = 'content_type_template'.freeze
 
-    CONTENT_ENTRY_ENGINE_CLASS_NAME = /^Locomotive::ContentEntry(.*)$/o.freeze
+    CONTENT_ENTRY_ENGINE_CLASS_NAME   = /^Locomotive::ContentEntry(.*)$/o.freeze
 
-    IsHTTP = /\Ahttps?:\/\//o.freeze
+    SECTIONS_SETTINGS_VARIABLE_REGEXP = /^\s*([a-z]+\.)?settings\.(?<id>.*)\s*$/o.freeze
+    SECTIONS_BLOCK_FORLOOP_REGEXP     = /(?<name>.+)-section\.blocks$/o.freeze
+    SECTIONS_LINK_TARGET_REGEXP       = /[^\"]+\/_locomotive-link\/(?<link>[^\"]+)/mo.freeze
 
-    IsLAYOUT = /\Alayouts(\/|\z)/o.freeze
+    IsHTTP    = /\Ahttps?:\/\//o.freeze
+
+    IsLAYOUT  = /\Alayouts(\/|\z)/o.freeze
 
     class << self
       attr_writer   :configuration

data/lib/locomotive/steam/adapters/filesystem.rb

@@ -9,7 +9,6 @@ require_relative 'filesystem/sanitizer'
 require_relative_all 'filesystem/sanitizers'
 
 module Locomotive::Steam
-
   class FilesystemAdapter
 
     include Morphine
@@ -116,7 +115,7 @@ module Locomotive::Steam
     end
 
     def build_yaml_loaders
-      %i(sites pages content_types content_entries snippets translations theme_assets).inject({}) do |memo, name|
+      %i(sites pages content_types content_entries snippets sections translations theme_assets).inject({}) do |memo, name|
         memo[name] = build_klass('YAMLLoaders', name).new(site_path)
         memo
       end
@@ -124,7 +123,7 @@ module Locomotive::Steam
 
     def build_sanitizers
       hash = Hash.new { build_klass('Sanitizers', :simple).new }
-      %i(sites pages content_types content_entries snippets).inject(hash) do |memo, name|
+      %i(sites pages content_types content_entries snippets sections).inject(hash) do |memo, name|
         memo[name] = build_klass('Sanitizers', name).new
         memo
       end
@@ -138,9 +137,5 @@ module Locomotive::Steam
     def site_path
       options.respond_to?(:has_key?) ? options[:path] : options
     end
-
   end
-
 end
-
-

data/lib/locomotive/steam/adapters/filesystem/sanitizer.rb

@@ -1,9 +1,7 @@
 module Locomotive::Steam
   module Adapters
     module Filesystem
-
       module Sanitizer
-
         extend Forwardable
 
         def_delegators :@scope, :site, :locale, :locales, :default_locale

data/lib/locomotive/steam/adapters/filesystem/sanitizers/page.rb

@@ -37,6 +37,8 @@ module Locomotive::Steam
                 set_fullpath_for(page, locale)
 
                 use_default_locale_template_path(page, locale)
+
+                transform_sections_content(page, locale)
               end
             end
           end
@@ -137,6 +139,15 @@ module Locomotive::Steam
             page[:target_klass_name]    = "Locomotive::ContentEntry#{content_type}"
           end
 
+          def transform_sections_content(page, locale)
+            [:sections_dropzone_content, :sections_content].each do |name|
+              if content = page[name][locale]
+                return unless content.is_a?(String)
+                page[name][locale] = JSON.parse(content)
+              end
+            end
+          end
+
           def modify_if_parent_templatized(page, locale)
             parent_templatized = @templatized_ids[page.parent_id]
 

data/lib/locomotive/steam/adapters/filesystem/sanitizers/section.rb

@@ -0,0 +1,37 @@
+module Locomotive::Steam
+  module Adapters
+    module Filesystem
+      module Sanitizers
+        class Section
+
+          include Adapters::Filesystem::Sanitizer
+
+          def apply_to_entity(entity)
+            super
+            parse_json(entity)
+          end
+
+          private
+
+          def parse_json(entity)
+            content = File.read(entity.template_path)
+            match   = content.match(JSON_FRONTMATTER_REGEXP)
+
+            raise_parsing_error(entity, content) if match.nil?
+
+            json, template = match[:json], match[:template]
+
+            entity.definition = JSON.parse(json)
+            entity.template   = template
+          end
+
+          def raise_parsing_error(entity, content)
+            message = 'Your section requires a valid JSON header'
+            raise Locomotive::Steam::ParsingRenderingError.new(message, entity.template_path, content, 0, nil)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/locomotive/steam/adapters/filesystem/sanitizers/site.rb

@@ -9,6 +9,7 @@ module Locomotive::Steam
 
           def apply_to_entity(entity)
             entity.metafields_schema = clean_metafields_schema(entity.metafields_schema)
+            entity.routes            = build_routes(entity.routes)
           end
 
           private
@@ -47,6 +48,23 @@ module Locomotive::Steam
             end
           end
 
+          def build_routes(definitions)
+            return [] if definitions.blank?
+
+            definitions.map do |definition|
+              if definition.size == 1
+                # format: { '/posts/:year/:month' => 'blog' }
+                {
+                  'route'       => definition.keys.first,
+                  'page_handle' => definition.values.first
+                }
+              else
+                # format: { 'route' => '/posts/:year/:month', 'page_handle' => 'blog' }
+                definition.stringify_keys
+              end
+            end
+          end
+
         end
       end
     end

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/content_entry.rb

@@ -34,12 +34,13 @@ module Locomotive
               content_type.select_fields.each do |field|
                 if (option = attributes.delete(field.name.to_sym)).is_a?(Hash)
                   attributes[:"#{field.name}_id"] = option.inject({}) do |memo, (locale, name)|
-                    field.select_options.scope.locale = locale
-                    memo[locale] = field.select_options.by_name(name).try(:_id)
+                    field.select_options.scope.with_locale(locale) do
+                      memo[locale] = field.select_options.by_name(name).try(:_id)
+                    end
                     memo
                   end
                 else
-                  attributes[:"#{field.name}_id"] = option
+                  attributes[:"#{field.name}_id"] = field.select_options.by_name(option).try(:_id)
                 end
               end
             end