locomotivecms_steam 1.0.0.rc9 → 1.0.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1d5af761258aca259b67088438e3e79272ead4e
-  data.tar.gz: 1d6e1ec7dbf6bef557662bf314261f237c17dc03
+  metadata.gz: 08118e0a2969d025bcffcd655e906bc397f8a2f1
+  data.tar.gz: 80fad7857d84473f15b614900b7a6350bc132732
 SHA512:
-  metadata.gz: b1e9bcd2e5a5c89943ea36c582f0dc023c47e5ae6d89b1428a041fe70f591cb7809b65ed57f839205d983e70bbef361dd0382210ede9172331c16f56d0dfc091
-  data.tar.gz: 9937c436f582495e9bf5d8363961c1f8f2944621641a70a39c064d280423e8200d339b9a9830f91e9d2accfe09a1a52dd8c14f07fe376fb8a9f4664a8ee1fb3a
+  metadata.gz: 297db1a5512db9cbc9b34c1646b09f1445cf6a07942b93298ea5386bfaafaa85a26e8d12512ff4097131e619c348d6950cb6cc679c5c5d83c546ef07716f42ec
+  data.tar.gz: 179a3cc3ba5eea81689127242d9e53e53efe389314ac3ab2cbf9d6e0c786bb42aadcc1e25f1108ac5ef9a6b4097c927411202540b204d9382c0f6a0f35ccbbd0

data/Gemfile

@@ -9,7 +9,6 @@ group :development do
   # gem 'locomotivecms-liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid'
   # gem 'thin'
   gem 'puma'
-  # gem 'sprockets-sass',     '~> 1.2.0'
   gem 'yui-compressor',     '~> 0.12.0'
 
   gem 'rack-mini-profiler'
@@ -19,13 +18,13 @@ group :development do
 end
 
 group :test do
-  gem 'rspec',              '~> 3.3.0'
+  gem 'rspec',              '~> 3.4.0'
   gem 'json_spec',          '~> 1.1.4'
   gem 'i18n-spec',          '~> 0.6.0'
 
-  gem 'timecop',            '~> 0.7.4'
+  gem 'timecop',            '~> 0.8.0'
 
-  gem 'pry-byebug',         '~> 3.1.0'
+  gem 'pry-byebug',         '~> 3.3.0'
 
   gem 'rack-test',          '~> 0.6.3'
 

data/Gemfile.lock

@@ -1,31 +1,33 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc9)
+    locomotivecms_steam (1.0.0.rc10)
       RedCloth (~> 4.2.9)
+      autoprefixer-rails (~> 6.2.3)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
       dragonfly (~> 1.0.12)
       haml (~> 4.0.6)
       httparty (~> 0.13.6)
-      kramdown (~> 1.8.0)
+      kramdown (~> 1.9.0)
+      less (~> 2.6.0)
       locomotivecms-solid (~> 4.0.1)
       locomotivecms_common (~> 0.0.5)
       mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
-      mongo (~> 2.1.2)
+      mongo (~> 2.2.1)
       morphine (~> 0.1.1)
-      nokogiri (~> 1.6.6.4)
+      nokogiri (~> 1.6.7.1)
       origin (~> 2.1.1)
       rack-cache (~> 1.2)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
-      sanitize (~> 4.0.0)
-      sprockets (~> 2.12.3)
-      sprockets-less (~> 0.6.1)
-      sprockets-sass (~> 1.3.1)
+      sanitize (~> 4.0.1)
+      sass (~> 3.4.20)
+      sprockets (~> 3.5.2)
+      therubyracer (~> 0.12.2)
 
 GEM
   remote: https://rubygems.org/
@@ -39,9 +41,11 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.4.0)
     attr_extras (4.4.0)
-    bson (3.2.6)
-    byebug (4.0.5)
-      columnize (= 0.9.0)
+    autoprefixer-rails (6.2.3)
+      execjs
+      json
+    bson (4.0.0)
+    byebug (8.2.1)
     chronic (0.10.2)
     chunky_png (1.3.5)
     codeclimate-test-reporter (0.4.8)
@@ -52,7 +56,6 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.7.7)
-    columnize (0.9.0)
     commonjs (0.2.7)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -66,6 +69,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.0.0)
     coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -91,7 +95,6 @@ GEM
       fast_stack
     haml (4.0.7)
       tilt
-    hike (1.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     httparty (0.13.7)
@@ -106,9 +109,10 @@ GEM
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (1.8.0)
+    kramdown (1.9.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
+    libv8 (3.16.14.13)
     locomotivecms-liquid (4.0.0)
     locomotivecms-solid (4.0.1)
       locomotivecms-liquid (~> 4.0.0)
@@ -121,26 +125,26 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.2)
     mimetype-fu (0.1.2)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.8.3)
     moneta (0.8.0)
-    mongo (2.1.2)
-      bson (~> 3.0)
+    mongo (2.2.1)
+      bson (~> 4.0)
     morphine (0.1.1)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     netrc (0.11.0)
-    nokogiri (1.6.6.4)
-      mini_portile (~> 0.6.0)
-    nokogumbo (1.4.6)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogumbo (1.4.7)
       nokogiri
     origin (2.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
     puma (2.15.3)
     rack (1.6.4)
@@ -156,26 +160,27 @@ GEM
     rake (10.4.2)
     rake-compiler (0.9.5)
       rake
-    rb-fsevent (0.9.6)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     sanitize (4.0.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
@@ -187,25 +192,20 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-less (0.6.1)
-      less (~> 2.4)
-      tilt (~> 1.1)
-    sprockets-sass (1.3.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
     stackprof (0.2.7)
     stringex (2.5.2)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
-    timecop (0.7.4)
+    tilt (2.0.1)
+    timecop (0.8.0)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -226,14 +226,14 @@ DEPENDENCIES
   json_spec (~> 1.1.4)
   locomotivecms_steam!
   memory_profiler
-  pry-byebug (~> 3.1.0)
+  pry-byebug (~> 3.3.0)
   puma
   rack-mini-profiler
   rack-test (~> 0.6.3)
   rake (~> 10.4.2)
-  rspec (~> 3.3.0)
+  rspec (~> 3.4.0)
   stackprof
-  timecop (~> 0.7.4)
+  timecop (~> 0.8.0)
   yui-compressor (~> 0.12.0)
 
 BUNDLED WITH

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

@@ -144,7 +144,14 @@ module Locomotive::Steam
 
     def _cast_time(field, end_method)
       _cast_convertor(field.name) do |value|
-        value.is_a?(String) ? Chronic.parse(value).send(end_method) : value
+        if value.is_a?(String)
+          # context: time from a YAML file (String).
+          # In that case, use the timezone defined by the site.
+          Chronic.time_class = Time.zone
+          Chronic.parse(value).send(end_method)
+        else
+          value
+        end
       end
     end
 

data/lib/locomotive/steam/initializers/sprockets.rb

@@ -1,10 +1,9 @@
 require 'sprockets'
-require 'sprockets-sass'
-require 'sprockets-less'
+require 'sass'
+require 'less'
 require 'coffee_script'
 require 'compass'
-
-Sprockets::Sass.add_sass_functions = false
+require 'autoprefixer-rails'
 
 module Locomotive::Steam
 
@@ -18,6 +17,8 @@ module Locomotive::Steam
       append_steam_paths
 
       install_yui_compressor(options)
+
+      install_autoprefixer
     end
 
     private
@@ -26,6 +27,8 @@ module Locomotive::Steam
       %w(fonts stylesheets javascripts).each do |name|
         append_path File.join(@steam_path, name)
       end
+
+      Compass::Frameworks::ALL.each { |f| append_path(f.stylesheets_directory) }
     end
 
     def install_yui_compressor(options)
@@ -44,6 +47,13 @@ module Locomotive::Steam
       end
     end
 
+    def install_autoprefixer
+      file   = File.join(root, '..', 'config', 'autoprefixer.yml')
+      params = (File.exist?(file) ? ::YAML.load_file(file) : {}).symbolize_keys
+
+      AutoprefixerRails.install(self, params)
+    end
+
     def is_java_installed?
       `which java` != '' && (!ENV['JAVA_HOME'].blank? && File.exists?(ENV['JAVA_HOME']))
     end

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

@@ -5,8 +5,14 @@ module Locomotive
 
         module Translate
 
-          def translate(input, locale = nil, scope = nil)
-            @context.registers[:services].translator.translate(input, locale, scope) || input
+          def translate(input, options = nil, legacy_scope = nil)
+            options ||= {}
+
+            unless options.respond_to?(:values) # String
+              options = { 'locale' => options, 'scope' => legacy_scope }
+            end
+
+            @context.registers[:services].translator.translate(input, options) || input
           end
 
         end

data/lib/locomotive/steam/liquid/patches.rb

@@ -32,6 +32,7 @@ module Liquid
       return nil if string.blank?
 
       string = string.gsub(/^(\s*,)/, '')
+
       Solid::Arguments.parse(string)
     end
 

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

@@ -22,7 +22,7 @@ module Locomotive
               @name = $1.to_s
 
               self.prepare_url($2)
-              @api_options = parse_options_from_string($3)
+              @default_api_options = parse_options_from_string($3)
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in 'consume' - Valid syntax: consume <var> from \"<url>\" [username: value, password: value]")
             end
@@ -51,7 +51,7 @@ module Locomotive
           end
 
           def set_api_options(context)
-            @api_options  = interpolate_options(@api_options, context)
+            @api_options  = interpolate_options(@default_api_options, context)
             @expires_in   = @api_options.delete(:expires_in) || 0
           end
 

data/lib/locomotive/steam/liquid/tags/editable/base.rb

@@ -49,6 +49,24 @@ module Locomotive
 
             protected
 
+            def render_default_content
+              begin
+                if nodelist.all? { |n| n.is_a? String }
+                  @body.render(::Liquid::Context.new)
+                else
+                  raise ::Liquid::SyntaxError.new("No liquid tags are allowed inside the #{@tag_name} \"#{@slug}\" (block: #{current_inherited_block_name || 'default'})")
+                end
+              end
+            end
+
+            def editable?(context, element = nil)
+              !(
+                element.try(:inline_editing) == false ||
+                [false, 'false'].include?(default_element_attributes[:inline_editing]) ||
+                context.registers[:live_editing].blank?
+              )
+            end
+
             def fetch_page(context)
               page = context.registers[:page]
 
@@ -102,16 +120,6 @@ module Locomotive
               options[:inherited_blocks].try(:[], :nested).try(:last)
             end
 
-            def render_default_content
-              begin
-                if nodelist.all? { |n| n.is_a? String }
-                  @body.render(::Liquid::Context.new)
-                else
-                  raise ::Liquid::SyntaxError.new("No liquid tags are allowed inside the #{@tag_name} \"#{@slug}\" (block: #{current_inherited_block_name || 'default'})")
-                end
-              end
-            end
-
             #:nocov:
             def render_element(element)
               raise 'FIXME: has to be overidden'

data/lib/locomotive/steam/liquid/tags/editable/file.rb

@@ -5,15 +5,31 @@ module Locomotive
         module Editable
           class File < Base
 
+            def parse(tokens)
+              super.tap do
+                @path = [current_inherited_block_name, @slug].compact.join('--').gsub('/', '--')
+              end
+            end
+
+            def render(context)
+              apply_transformation(super, context)
+            end
+
             protected
 
             def default_element_attributes
               super.merge({
-                default_source_url: render_default_content.strip
+                default_source_url: render_default_content.strip,
+                resize_format:      @element_options[:resize]
               })
             end
 
             def render_element(context, element)
+              url, timestamp = url_with_timestamp(context, element)
+              context.registers[:services].asset_host.compute(url, timestamp)
+            end
+
+            def url_with_timestamp(context, element)
               default_timestamp = context.registers[:page].updated_at.to_i
 
               url, timestamp = (if element.source
@@ -25,8 +41,6 @@ module Locomotive
                   [render_default_content, nil]
                 end
               end)
-
-              context.registers[:services].asset_host.compute(url, timestamp)
             end
 
             def source_url(element)
@@ -38,6 +52,20 @@ module Locomotive
               end
             end
 
+            def apply_transformation(url, context)
+              # resize image with the image_resizer service?
+              if (format = @element_options[:resize]).present?
+                url = context.registers[:services].image_resizer.resize(url, format) || url
+              end
+
+              # in the live editing mode, tag all the images with their editable path (block + slug)
+              if editable?(context)
+                url = url + (url.include?('?') ? '&' : '?') + 'editable-path=' + @path
+              end
+
+              url
+            end
+
           end
 
           ::Liquid::Template.register_tag('editable_file'.freeze, File)

data/lib/locomotive/steam/liquid/tags/editable/text.rb

@@ -35,10 +35,6 @@ module Locomotive
               end
             end
 
-            def editable?(context, element)
-              !!context.registers[:live_editing] && element.inline_editing
-            end
-
             def default_content?(element)
               element.content.blank?
             end

data/lib/locomotive/steam/middlewares/dynamic_assets.rb

@@ -5,11 +5,13 @@ module Locomotive::Steam
 
       REGEXP = /^\/(javascripts|stylesheets)\/(.*)$/o
 
+      @@sprocket_environments = {}
+
       attr_reader :app, :assets
 
       def initialize(app, options)
         @app    = app
-        @assets = Locomotive::Steam::SprocketsEnvironment.new(options[:root], options)
+        @assets = self.class.sprocket_environment(options[:root], options)
       end
 
       def call(env)
@@ -21,6 +23,10 @@ module Locomotive::Steam
         end
       end
 
+      def self.sprocket_environment(root, options)
+        @@sprocket_environments[root] ||= Locomotive::Steam::SprocketsEnvironment.new(root, options)
+      end
+
     end
 
   end

data/lib/locomotive/steam/middlewares/renderer.rb

@@ -82,7 +82,7 @@ module Locomotive::Steam
 
       def _locale_liquid_assigns
         {
-          'locale'         => locale,
+          'locale'         => locale.to_s,
           'default_locale' => site.default_locale.to_s,
           'locales'        => site.locales.map(&:to_s)
         }

data/lib/locomotive/steam/services/translator_service.rb

@@ -8,21 +8,23 @@ module Locomotive
       # Return the translation described by a key.
       #
       # @param [ String ] key The key of the translation.
-      # @param [ String ] locale The locale we want the translation in
-      # @param [ String ] scope If specified, instead of looking in the translations, it will use I18n instead.
+      # @param [ Hash ] options This includes the following options: count, locale (The locale we want the translation in), scope (If specified, instead of looking in the translations, it will use I18n instead)
       #
       # @return [ String ] the translated text or nil if not found
       #
-      def translate(input, locale, scope = nil)
-        locale ||= self.current_locale
+      def translate(input, options = {})
+        locale  = options['locale'] || self.current_locale
+        scope   = options.delete('scope')
 
         if scope.blank?
+          input = "#{input}_#{pluralize_prefix(options['count'])}" if options['count']
+
           values = repository.by_key(input).try(:values) || {}
 
           # FIXME: important to check if the returned value is nil (instead of nil + false)
           # false being reserved for an existing key but without provided translation)
           if (translation = values[locale.to_s]).present?
-            translation
+            _translate(translation, options)
           else
             Locomotive::Common::Logger.warn "Missing translation '#{input}' for the '#{locale}' locale".yellow
             ActiveSupport::Notifications.instrument('steam.missing_translation', input: input, locale: locale)
@@ -33,6 +35,21 @@ module Locomotive
         end
       end
 
+      private
+
+      def _translate(string, options)
+        ::Liquid::Template.parse(string).render(options)
+      end
+
+      def pluralize_prefix(count)
+        case count.to_i
+        when 0 then 'zero'
+        when 1 then 'one'
+        when 2 then 'two'
+        else 'other'
+        end
+      end
+
     end
 
   end

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.0.0.rc9'
+    VERSION = '1.0.0.rc10'
   end
 end

data/locomotivecms_steam.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_dependency 'mongo',                  '~> 2.1.2'
+  spec.add_dependency 'mongo',                  '~> 2.2.1'
   spec.add_dependency 'origin',                 '~> 2.1.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.6.6.4'
-  spec.add_dependency 'sanitize',               '~> 4.0.0'
+  spec.add_dependency 'nokogiri',               '~> 1.6.7.1'
+  spec.add_dependency 'sanitize',               '~> 4.0.1'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.13.6'
   spec.add_dependency 'chronic',                '~> 0.10.2'
@@ -33,13 +33,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'moneta',                 '~> 0.8.0'
   spec.add_dependency 'rack_csrf',              '~> 2.5.0'
 
-  spec.add_dependency 'sprockets',              '~> 2.12.3'
-  spec.add_dependency 'sprockets-sass',         '~> 1.3.1'
-  spec.add_dependency 'sprockets-less',         '~> 0.6.1'
+  spec.add_dependency 'sprockets',              '~> 3.5.2'
+  spec.add_dependency 'sass',                   '~> 3.4.20'
+  spec.add_dependency 'less',                   '~> 2.6.0'
+  spec.add_dependency 'therubyracer',           '~> 0.12.2'
   spec.add_dependency 'coffee-script',          '~> 2.4.1'
   spec.add_dependency 'compass',                '~> 1.0.3'
+  spec.add_dependency 'autoprefixer-rails',     '~> 6.2.3'
 
-  spec.add_dependency 'kramdown',               '~> 1.8.0'
+  spec.add_dependency 'kramdown',               '~> 1.9.0'
   spec.add_dependency 'RedCloth',               '~> 4.2.9'
   spec.add_dependency 'haml',                   '~> 4.0.6'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'

data/spec/integration/liquid/filters/translate_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Filters::Translate do
+
+  let(:source) { "{{ 'welcome_message' | translate }}" }
+
+  let(:site)        { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }
+  let(:services)    { Locomotive::Steam::Services.build_instance }
+  let(:translator)  { services.translator }
+  let(:assigns)     { {} }
+  let(:context)     { ::Liquid::Context.new(assigns, {}, { services: services }) }
+
+  before { services.locale = :en }
+
+  subject { render_template(source, context) }
+
+  context 'missing translation' do
+
+    before { allow(translator).to receive(:translate).and_return(nil) }
+
+    it { is_expected.to eq 'welcome_message' }
+
+  end
+
+  context 'existing translation' do
+
+    before { allow(translator).to receive(:translate).and_return('Hello world') }
+
+    it { is_expected.to eq 'Hello world' }
+
+  end
+
+  describe 'passing a locale and a scope' do
+
+    before { allow(translator).to receive(:translate).and_return('Bonjour monde') }
+
+    describe 'legacy syntax' do
+
+      let(:source) { "{{ 'welcome_message' | translate: 'fr', 'locomotive.default' }}" }
+      it { expect(translator).to receive(:translate).with('welcome_message', 'locale' => 'fr', 'scope' => 'locomotive.default'); subject }
+
+    end
+
+    describe 'new syntax' do
+
+      let(:source) { "{{ 'welcome_message' | translate: locale: 'fr', scope: 'locomotive.default' }}" }
+      it { expect(translator).to receive(:translate).with('welcome_message', 'locale' => 'fr', 'scope' => 'locomotive.default'); subject }
+
+    end
+
+  end
+
+  describe 'pluralization' do
+
+    let(:translation) { instance_double('Translation', values: { 'en' => '{{ name }} has {{ count }} articles' }) }
+    before { expect(translator.repository).to receive(:by_key).with('post_count_two').and_return(translation) }
+
+    let(:source) { "{{ 'post_count' | translate: count: 2, name: 'John' }}" }
+    it { expect(subject).to eq('John has 2 articles') }
+
+  end
+
+end

data/spec/unit/entities/content_entry_spec.rb

@@ -155,6 +155,7 @@ describe Locomotive::Steam::ContentEntry do
     end
 
     context 'a date time' do
+      before { Time.zone = 'UTC' }
       let(:field_type)  { :date_time }
       let(:value)       { '2007/06/29 10:00:00' }
       let(:datetime)    { DateTime.parse('2007/06/29 10:00:00') }

data/spec/unit/liquid/tags/consume_spec.rb

@@ -63,6 +63,14 @@ describe Locomotive::Steam::Liquid::Tags::Consume do
 
     end
 
+    describe 'inside a loop' do
+
+      let(:assigns) { { 'urls' => ['http://blog.locomotiveapp.org/api/read', 'http://blog.locomotiveapp.org/api/read'] } }
+      let(:source)  { "{% for url in urls %}{% consume blog from url %}{{ blog.title }}{% endconsume %}{% endfor %}" }
+      it { is_expected.to eq 'Locomotive rocks!Locomotive rocks!' }
+
+    end
+
   end
 
   describe 'timeout' do

data/spec/unit/liquid/tags/editable/file_spec.rb

@@ -68,12 +68,12 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
 
   describe 'rendering' do
 
-    let(:inline_editing) { false }
+    let(:live_editing) { false }
 
     let(:page)        { instance_double('Page', fullpath: 'hello-world', updated_at: DateTime.parse('2007-06-29 21:00:00')) }
     let(:element)     { instance_double('EditableFile', id: 42, default_source_url: nil, source?: false, source: nil, content: nil, base_url: '') }
     let(:services)    { Locomotive::Steam::Services.build_instance }
-    let(:context)     { ::Liquid::Context.new({}, {}, { page: page, services: services }) }
+    let(:context)     { ::Liquid::Context.new({}, {}, { page: page, services: services, live_editing: live_editing }) }
 
     before { allow(services).to receive(:current_site).and_return(nil) }
 
@@ -83,6 +83,22 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
 
     it { is_expected.to eq 'http://www.placehold.it/500x500' }
 
+    context 'live editing' do
+
+      let(:live_editing) { true }
+
+      it { is_expected.to eq 'http://www.placehold.it/500x500?editable-path=banner' }
+
+      context 'inside a block' do
+
+        let(:source) { "{% block head %}{% editable_file banner, hint: 'some text' %}http://www.placehold.it/500x500?123456{% endeditable_file %}{% endblock %}" }
+
+        it { is_expected.to include('http://www.placehold.it/500x500?123456&editable-path=head--banner') }
+
+      end
+
+    end
+
     context 'no element found, render the default content' do
 
       let(:element) { nil }
@@ -114,6 +130,21 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
 
     end
 
+    context 'resize image' do
+
+      let(:source) { "{% block header %}{% editable_file banner, hint: 'some text', resize: '500x100#' %}http://www.placehold.it/500x500{% endeditable_file %}{% endblock %}" }
+      it { is_expected.to eq '/steam/dynamic/W1siZnUiLCJodHRwOi8vd3d3LnBsYWNlaG9sZC5pdC81MDB4NTAwIl0sWyJwIiwidGh1bWIiLCI1MDB4MTAwIyJdXQ/1c79f4581f33aae4/500x500' }
+
+      context 'live editing on' do
+
+        let(:live_editing) { true }
+
+        it { is_expected.to eq '<span class="locomotive-block-anchor" data-element-id="header" style="visibility: hidden"></span>/steam/dynamic/W1siZnUiLCJodHRwOi8vd3d3LnBsYWNlaG9sZC5pdC81MDB4NTAwIl0sWyJwIiwidGh1bWIiLCI1MDB4MTAwIyJdXQ/1c79f4581f33aae4/500x500?editable-path=header--banner' }
+
+      end
+
+    end
+
   end
 
 end

data/spec/unit/services/translator_service_spec.rb

@@ -8,15 +8,16 @@ describe Locomotive::Steam::TranslatorService do
 
   describe '#translate' do
 
-    let(:input)   { 'example_test' }
-    let(:locale)  { nil }
-    let(:scope)   { nil }
+    let(:input)         { 'example_test' }
+    let(:locale)        { nil }
+    let(:scope)         { nil }
+    let(:interpolation) { {} }
 
     before do
       allow(repository).to receive(:by_key).with('example_test').and_return(translation)
     end
 
-    subject { service.translate(input, locale, scope) }
+    subject { service.translate(input, interpolation.merge('locale' => locale, 'scope' => scope)) }
 
     describe 'existing translation' do
 
@@ -24,14 +25,14 @@ describe Locomotive::Steam::TranslatorService do
 
       it { is_expected.to eq 'Example text' }
 
-      context 'specifying a locale' do
+      describe 'specifying a locale' do
 
         let(:locale) { 'es' }
         it { is_expected.to eq 'Texto de ejemplo' }
 
       end
 
-      context "specifying a locale that doesn't exist" do
+      describe "specifying a locale that doesn't exist" do
 
         let(:locale) { 'nl' }
 
@@ -41,7 +42,7 @@ describe Locomotive::Steam::TranslatorService do
 
       end
 
-      context 'specifying a scope' do
+      context 'with a scope' do
 
         let(:input)   { 'fr' }
         let(:locale)  { 'en' }
@@ -51,6 +52,63 @@ describe Locomotive::Steam::TranslatorService do
 
       end
 
+      describe 'interpolation' do
+
+        let(:interpolation) { { 'name' => 'John' } }
+        let(:translation)   { instance_double('Translation', values: { 'en' => 'Hello {{ name }}', 'es' => 'Texto de ejemplo' }) }
+
+        it { is_expected.to eq 'Hello John' }
+
+      end
+
+      describe 'pluralization' do
+
+        context 'zero' do
+
+          let(:interpolation) { { 'count' => '0' } }
+          let(:translation)   { instance_double('Translation', values: { 'en' => 'No posts' }) }
+
+          before { expect(repository).to receive(:by_key).with('example_test_zero').and_return(translation) }
+
+          it { is_expected.to eq 'No posts' }
+
+        end
+
+        context 'one' do
+
+          let(:interpolation) { { 'count' => '1' } }
+          let(:translation)   { instance_double('Translation', values: { 'en' => '1 post' }) }
+
+          before { expect(repository).to receive(:by_key).with('example_test_one').and_return(translation) }
+
+          it { is_expected.to eq '1 post' }
+
+        end
+
+        context 'two' do
+
+          let(:interpolation) { { 'count' => 2 } }
+          let(:translation)   { instance_double('Translation', values: { 'en' => '2 posts' }) }
+
+          before { expect(repository).to receive(:by_key).with('example_test_two').and_return(translation) }
+
+          it { is_expected.to eq '2 posts' }
+
+        end
+
+        context 'other' do
+
+          let(:interpolation) { { 'count' => 42 } }
+          let(:translation)   { instance_double('Translation', values: { 'en' => '{{ count }} posts' }) }
+
+          before { expect(repository).to receive(:by_key).with('example_test_other').and_return(translation) }
+
+          it { is_expected.to eq '42 posts' }
+
+        end
+
+      end
+
     end
 
     describe 'missing translation' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc9
+  version: 1.0.0.rc10
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -75,28 +75,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6.4
+        version: 1.6.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.6.4
+        version: 1.6.7.1
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: morphine
   requirement: !ruby/object:Gem::Requirement
@@ -215,42 +215,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: 3.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.2
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: 3.4.20
 - !ruby/object:Gem::Dependency
-  name: sprockets-sass
+  name: less
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: sprockets-less
+  name: therubyracer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -279,20 +293,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: autoprefixer-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.2.3
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -666,6 +694,7 @@ files:
 - spec/fixtures/mongodb/system.indexes.bson
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/drops/page_spec.rb
+- spec/integration/liquid/filters/translate_spec.rb
 - spec/integration/liquid/tags/paginate_spec.rb
 - spec/integration/repositories/content_entry_repository_spec.rb
 - spec/integration/repositories/content_type_repository_spec.rb
@@ -910,6 +939,7 @@ test_files:
 - spec/fixtures/mongodb/system.indexes.bson
 - spec/integration/integration_helper.rb
 - spec/integration/liquid/drops/page_spec.rb
+- spec/integration/liquid/filters/translate_spec.rb
 - spec/integration/liquid/tags/paginate_spec.rb
 - spec/integration/repositories/content_entry_repository_spec.rb
 - spec/integration/repositories/content_type_repository_spec.rb