locomotivecms_steam 1.2.0.beta1 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2b0e0615f8c591f1c412fe1c9f7f4c6a112287
-  data.tar.gz: c032bbb2a96e67b56a3ad1941889329ad86d644a
+  metadata.gz: eb33db62c8a0c967f8dd571468e3c0a152db1672
+  data.tar.gz: 67c92ee1c3f7bdf143bc1b565a8864317fd406bf
 SHA512:
-  metadata.gz: 9d458caf6b4e974c00ea5c046cec40273aae8845964478e8c762b6147d177b9119247a73d0d34682f8df427bcdcdac10a9f8eeb1c0b397d4e50b4e44c5be945f
-  data.tar.gz: 346b31f343f138e208b95b77edab81f772855ebd499fd4dd98a70c2b5637982d1ef6a02a821584204e71c3d9e2c89110342d8176836fcd89075177d5ed343f4b
+  metadata.gz: e34e6da025b0744a580ca22fb69578e9418c55f983594d90b3943da2ad90bb1d40b510a449b6d04f3ded70e74dce10fc2aba251677c5ef61c2bf81c7ee72fb57
+  data.tar.gz: 666be2d79e33b713d4f3601a4adfaf35b09a4a45bcdfd292c03b5b81d7e5e76bcedd867a02d422b09738d6014283e727787a91c0fa2e817e828ef4b18813a4a6

data/Gemfile

@@ -11,8 +11,9 @@ group :development do
   # gem 'thin'
   gem 'puma'
   gem 'yui-compressor',     '~> 0.12.0'
+  gem 'haml',               '~> 4.0.6'
 
-  gem 'rack-mini-profiler'
+  gem 'rack-mini-profiler', '~> 0.10.1'
   gem 'flamegraph'
   gem 'stackprof' # ruby 2.1+ only
   gem 'memory_profiler'

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.2.0.beta1)
-      RedCloth (~> 4.2.9)
+    locomotivecms_steam (1.2.0.rc1)
+      RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
       dragonfly (~> 1.0.12)
       duktape (~> 1.3.0.6)
-      haml (~> 4.0.6)
       httparty (~> 0.13.6)
       kramdown (~> 1.10.0)
       locomotivecms-solid (~> 4.0.1)
@@ -18,7 +17,7 @@ PATH
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
       morphine (~> 0.1.1)
-      nokogiri (~> 1.6.7.2)
+      nokogiri (~> 1.6.8)
       pony (~> 1.11)
       rack-cache (~> 1.6.1)
       rack-rewrite (~> 1.5.1)
@@ -30,8 +29,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.6)
+    RedCloth (4.3.2)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -44,7 +43,7 @@ GEM
     bson (4.1.1)
     byebug (8.2.5)
     chronic (0.10.2)
-    chunky_png (1.3.5)
+    chunky_png (1.3.6)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)
@@ -52,7 +51,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorize (0.7.7)
+    colorize (0.8.1)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -66,12 +65,12 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.2)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coveralls (0.8.15)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)
     crass (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -81,10 +80,8 @@ GEM
       rack (>= 1.3.0)
     duktape (1.3.0.6)
     execjs (2.7.0)
-    fast_stack (0.2.0)
-    ffi (1.9.10)
-    flamegraph (0.1.0)
-      fast_stack
+    ffi (1.9.14)
+    flamegraph (0.9.5)
     haml (4.0.7)
       tilt
     httparty (0.13.7)
@@ -93,7 +90,7 @@ GEM
     i18n (0.7.0)
     i18n-spec (0.6.0)
       iso
-    iso (0.2.1)
+    iso (0.2.2)
       i18n
     json (1.8.3)
     json_spec (1.1.4)
@@ -114,33 +111,35 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.1.0)
     minitest (5.9.0)
     moneta (0.8.0)
-    mongo (2.2.5)
+    mongo (2.2.7)
       bson (~> 4.0)
     morphine (0.1.1)
-    multi_json (1.12.0)
+    multi_json (1.12.1)
     multi_xml (0.5.5)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    nokogumbo (1.4.7)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    nokogumbo (1.4.9)
       nokogiri
-    origin (2.1.1)
+    origin (2.2.0)
+    pkg-config (1.1.7)
     pony (1.11)
       mail (>= 2.0)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     pry-byebug (3.3.0)
       byebug (~> 8.0)
       pry (~> 0.10)
-    puma (3.4.0)
-    rack (1.6.4)
+    puma (3.6.0)
+    rack (2.0.1)
     rack-cache (1.6.1)
       rack (>= 0.4)
-    rack-mini-profiler (0.9.9.2)
+    rack-mini-profiler (0.10.1)
       rack (>= 1.2.0)
     rack-rewrite (1.5.1)
     rack-test (0.6.3)
@@ -169,9 +168,9 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.22)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
@@ -179,14 +178,14 @@ GEM
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     stackprof (0.2.9)
-    stringex (2.6.0)
+    stringex (2.6.1)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.4)
+    tilt (2.0.5)
     timecop (0.8.1)
-    tins (1.6.0)
+    tins (1.12.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yui-compressor (0.12.0)
@@ -199,15 +198,16 @@ DEPENDENCIES
   codeclimate-test-reporter (~> 0.4.7)
   coveralls (~> 0.8.1)
   flamegraph
+  haml (~> 4.0.6)
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.4)
   locomotivecms_steam!
   memory_profiler
-  mongo (~> 2.2.3)
-  origin (~> 2.1.1)
+  mongo (~> 2.2.7)
+  origin (~> 2.2.0)
   pry-byebug (~> 3.3.0)
   puma
-  rack-mini-profiler
+  rack-mini-profiler (~> 0.10.1)
   rack-test (~> 0.6.3)
   rake (~> 10.4.2)
   rspec (~> 3.4.0)

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

@@ -31,7 +31,15 @@ module Locomotive
 
             def modify_for_selects(attributes)
               content_type.select_fields.each do |field|
-                attributes[:"#{field.name}_id"] = attributes.delete(field.name.to_sym)
+                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)
+                    memo
+                  end
+                else
+                  attributes[:"#{field.name}_id"] = option
+                end
               end
             end
 

data/lib/locomotive/steam/decorators/page_decorator.rb

@@ -0,0 +1,20 @@
+require_relative 'template_decorator'
+
+module Locomotive
+  module Steam
+    module Decorators
+
+      class PageDecorator < TemplateDecorator
+
+        def redirect?
+          redirect.nil? ? redirect_url.present? : redirect
+        end
+
+      end
+
+    end
+  end
+end
+
+
+

data/lib/locomotive/steam/decorators/template_decorator.rb

@@ -1,4 +1,3 @@
-require 'haml'
 require_relative 'i18n_decorator'
 
 module Locomotive

data/lib/locomotive/steam/entities/content_entry.rb

@@ -164,16 +164,17 @@ module Locomotive::Steam
     end
 
     def _cast_select(field)
-      _cast_convertor(:"#{field.name}_id") do |value|
-        field.select_options.find(value).try(:name)
+      _cast_convertor(:"#{field.name}_id", true) do |value, locale|
+        name = field.select_options.find(value).try(:name)
+        locale.nil? ? name : name.try(:[], locale)
       end
     end
 
-    def _cast_convertor(name, &block)
+    def _cast_convertor(name, nil_locale = false, &block)
       if (value = attributes[name]).respond_to?(:translations)
         value.apply(&block)
       else
-        yield(value)
+        nil_locale ? yield(value, nil) : yield(value)
       end
     end
 

data/lib/locomotive/steam/entities/content_type.rb

@@ -30,9 +30,14 @@ module Locomotive::Steam
     end
 
     def localized_names
+      # FIXME: select_fields ALWAYS returns I18nField even if the site is not localized
       fields.localized_names + select_fields.map(&:name)
     end
 
+    def localized?
+      !fields.localized_names.blank?
+    end
+
     def persisted_field_names
       [].tap do |names|
         fields_by_name.each do |name, field|

data/lib/locomotive/steam/entities/page.rb

@@ -21,7 +21,7 @@ module Locomotive::Steam
         raw_template:       nil,
         source:             nil,
         editable_elements:  {},
-        redirect:           false,
+        redirect:           nil,
         redirect_url:       {},
         redirect_type:      nil,
         parent_id:          nil,
@@ -33,7 +33,6 @@ module Locomotive::Steam
     def listed?; !!listed; end
     def published?; !!published; end
     def templatized?; !!templatized; end
-    def redirect?; redirect.nil? ? redirect_url.present? : redirect; end
 
     def content_type_id
       self.target_klass_name =~ Locomotive::Steam::CONTENT_ENTRY_ENGINE_CLASS_NAME

data/lib/locomotive/steam/liquid/drops/base.rb

@@ -14,30 +14,34 @@ module Locomotive
             (@_source.respond_to?(:id) ? @_source.id : nil) || 'new'
           end
 
+          def as_json(options = nil)
+            @_source.as_json(options)
+          end
+
+          protected
+
           # converts an array of records to an array of liquid drops
-          def self.liquify(*records, &block)
+          def liquify(*records, &block)
             i = -1
             records =
               records.inject [] do |all, r|
-                i+=1
+                i += 1
                 attrs = (block && block.arity == 1) ? [r] : [r, i]
-                all << (block ? block.call(*attrs) : r.to_liquid)
+                all << (block ? block.call(*attrs) : r.to_liquid).tap do |_r|
+                  # For unknown reasons, Liquid doesn't always set the context
+                  #
+                  # Example:
+                  #   {{ site.index.children | map: 'title' | join: " - " }}
+                  #   was not working before
+                  #
+                  _r.context = @context if _r.respond_to?(:context=)
+                end
                 all
               end
             records.compact!
             records
           end
 
-          def as_json(options = nil)
-            @_source.as_json(options)
-          end
-
-          protected
-
-          def liquify(*records, &block)
-            self.class.liquify(*records, &block)
-          end
-
           def _source
             @_source
           end

data/lib/locomotive/steam/liquid/drops/content_entry.rb

@@ -43,7 +43,11 @@ module Locomotive
           end
 
           def errors
-            @_source.errors.messages.to_hash.stringify_keys
+            if @_source.errors.blank?
+              false
+            else
+              @_source.errors.messages.to_hash.stringify_keys
+            end
           end
 
           def before_method(meth)

data/lib/locomotive/steam/liquid/drops/metafields.rb

@@ -22,7 +22,7 @@ module Locomotive
 
           def find_value(name)
             if field = fields[name]
-              safe_value(t(values[name], field['localized']))
+              safe_value(t(values[name], field['localized']), field['type'])
             else
               Locomotive::Common::Logger.warn "[Liquid template] unknown site metafield \"#{name}\" under #{@namespace['name']}"
               nil
@@ -66,8 +66,13 @@ module Locomotive
             value[key]
           end
 
-          def safe_value(value)
-            value.blank? ? nil : value
+          def safe_value(value, type = 'string')
+            case type
+            when 'boolean'
+              ['1', 'true', true].include?(value) ? true : false
+            else
+              value.blank? ? nil : value
+            end
           end
 
         end

data/lib/locomotive/steam/liquid/filters/misc.rb

@@ -31,7 +31,7 @@ module Locomotive
             ::Liquid::StandardFilters::InputIterator.new(input).map do |e|
               e = e.call if e.is_a?(Proc)
 
-              if property == "to_liquid".freeze
+              if property == 'to_liquid'.freeze
                 e
               elsif property == 'to_f'.freeze
                 e.to_f

data/lib/locomotive/steam/liquid/filters/resize.rb

@@ -5,7 +5,7 @@ module Locomotive
         module Resize
 
           def resize(input, resize_string)
-            @context.registers[:services].image_resizer.resize(input, resize_string) || input
+            @context.registers[:services].image_resizer.resize(input, resize_string)
           end
 
         end

data/lib/locomotive/steam/liquid/tags/with_scope.rb

@@ -20,6 +20,12 @@ module Locomotive
 
           SYMBOL_OPERATORS_REGEXP = /(\w+\.(#{OPERATORS.join('|')})){1}\s*\:/o
 
+          REGEX_OPTIONS = {
+            'i' => Regexp::IGNORECASE,
+            'm' => Regexp::MULTILINE,
+            'x' => Regexp::EXTENDED
+          }
+
           # register the tag
           tag_name :with_scope
 
@@ -54,7 +60,12 @@ module Locomotive
           def cast_value(value)
             case value
             when Array then value.map { |_value| cast_value(_value) }
-            when /^\/[^\/]*\/$/ then Regexp.new(value[1..-2])
+            when /^\/([^\/]*)\/([imx]+)?$/
+              _value, options_str = $1, $2
+              options = options_str.blank? ? nil : options_str.split('').uniq.inject(0) do |_options, letter|
+                _options |= REGEX_OPTIONS[letter]
+              end
+              Regexp.new(_value, options)
             else
               value.respond_to?(:_id) ? value.send(:_source) : value
             end