locomotivecms_steam 1.0.0.pre.alpha.1 → 1.0.0.pre.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4defa074871fdae0481e4f65d6e33dfea1fede03
-  data.tar.gz: 3beda891d09f56d5883e284d958f42288be36c40
+  metadata.gz: d356e35a4a40eb38ba622e0f11c80c6c4f96f60c
+  data.tar.gz: 271c77fcbd49d0f728b696b42c5cb53893710876
 SHA512:
-  metadata.gz: 91b5751d14bdf87d35ab308399a222983bc91edbfe5cd9f7cca1c8a0036a12327930d3fe5196494ed4160ff6159db430df6ec7a4beb7a02374e81954472c1341
-  data.tar.gz: c7b56474a51cd689f9c0229d89c0630b376a699aa253909bdcaf1cdb8fc4dc70bc18f9986e20e32b84fd1d6f417fa460e7a97098812317d19f4ad82b0bc2b00f
+  metadata.gz: 9f2b709d5db8a35b9d2f3d17cbf05ed9f47a40190b73336b50c8e7bcbdda1fa83107149618e391db6374efbe8a6e6ed884ebdc6e3163ca988edc11ae887ca92d
+  data.tar.gz: 7665c557df441bcda5e23321d02945712585a1f75b989ade5fd41a414ab3d9733a84e9f6adba2e008714114083c6513ba9296ebfbeff0350ca22d7cf82b077da

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.alpha.1)
+    locomotivecms_steam (1.0.0.pre.alpha.2)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
-      dragonfly (~> 1.0.9)
+      dragonfly (~> 1.0.10)
       haml (~> 4.0.6)
-      httparty (~> 0.13.3)
+      httparty (~> 0.13.5)
       kramdown (~> 1.7.0)
       locomotivecms-solid (~> 4.0.0.alpha2)
       locomotivecms_common (~> 0.0.4)
-      mime-types (~> 2.5.0)
+      mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
       morphine (~> 0.1.1)
@@ -75,10 +75,10 @@ GEM
     docile (1.1.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    dragonfly (1.0.9)
+    dragonfly (1.0.10)
       addressable (~> 2.3)
       multi_json (~> 1.0)
-      rack
+      rack (>= 1.3.0)
     eventmachine (1.0.7)
     execjs (2.5.2)
     ffi (1.9.8)
@@ -87,7 +87,7 @@ GEM
     hike (1.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    httparty (0.13.3)
+    httparty (0.13.5)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
@@ -110,7 +110,7 @@ GEM
       colorize
       stringex (~> 2.5.2)
     method_source (0.8.2)
-    mime-types (2.5)
+    mime-types (2.6.1)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
     minitest (5.6.1)
@@ -145,7 +145,7 @@ GEM
     rack_csrf (2.5.0)
       rack (>= 1.1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rest-client (1.8.0)
@@ -169,7 +169,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
-    sass (3.4.13)
+    sass (3.4.14)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)

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

@@ -13,6 +13,8 @@ module Locomotive
 
               (attributes[:domains] ||= []) << 'localhost'
 
+              attributes[:picture] = File.expand_path(File.join(site_path, 'icon.png'))
+
               [attributes]
             end
 

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

@@ -17,8 +17,10 @@ module Locomotive
 
             def load_array
               [].tap do |array|
-                _load(path).each do |key, values|
-                  array << { key: key.to_s, values: HashConverter.to_string(values) }
+                if (all = _load(path))
+                  all.each do |key, values|
+                    array << { key: key.to_s, values: HashConverter.to_string(values) }
+                  end
                 end
               end
             end
@@ -34,39 +36,3 @@ module Locomotive
     end
   end
 end
-
-# module Locomotive
-#   module Steam
-#     module Repositories
-#       module Filesystem
-#         module YAMLLoaders
-
-#           class Translation < Struct.new(:root_path, :cache)
-
-#             include YAMLLoaders::Concerns::Common
-
-#             def list_of_attributes
-#               cache.fetch('config/translations') { load_array }
-#             end
-
-#             private
-
-#             def load_array
-#               [].tap do |array|
-#                 load(path).each do |key, values|
-#                   array << { key: key.to_s, values: HashConverter.to_string(values) }
-#                 end
-#               end
-#             end
-
-#             def path
-#               File.join(root_path, 'config', 'translations.yml')
-#             end
-
-#           end
-
-#         end
-#       end
-#     end
-#   end
-# end

data/lib/locomotive/steam/adapters/memory/query.rb

@@ -9,7 +9,7 @@ module Locomotive::Steam
         include Enumerable
         extend  Forwardable
 
-        def_delegators :all, :each, :to_s, :to_a, :empty?, :size
+        def_delegators :all, :each, :last, :to_s, :to_a, :empty?, :size
 
         alias :length :size
         alias :count :size

data/lib/locomotive/steam/adapters/mongodb/query.rb

@@ -4,6 +4,8 @@ module Locomotive::Steam
 
       class Query
 
+        SYMBOL_OPERATORS = %w(all elem_match exists gt gte in lt lte mod ne near near_sphere nin with_size with_type within_box within_circle within_polygon within_spherical_circle)
+
         attr_reader :criteria, :sort
 
         def initialize(scope, localized_attributes, &block)
@@ -17,7 +19,7 @@ module Locomotive::Steam
 
         def where(criterion = nil)
           self.tap do
-            @criteria.merge!(criterion) unless criterion.nil?
+            @criteria.merge!(decode_symbol_operators(criterion)) unless criterion.nil?
           end
         end
 
@@ -75,6 +77,22 @@ module Locomotive::Steam
           where(site_id: @scope.site._id) if @scope.site
         end
 
+        def decode_symbol_operators(criterion)
+          criterion.dup.tap do |_criterion|
+            criterion.each do |key, value|
+              next unless key.is_a?(String)
+
+              _key, operator = key.split('.')
+
+              if operator && SYMBOL_OPERATORS.include?(operator)
+                _criterion.delete(key)
+                _key = _key.to_s.to_sym.public_send(operator.to_sym)
+                _criterion[_key] = value
+              end
+            end
+          end
+        end
+
       end
 
     end

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

@@ -28,7 +28,7 @@ module Locomotive::Steam
     end
 
     def key(name, operator)
-      name.__send__(operator)
+      name.to_sym.__send__(operator.to_sym)
     end
 
     def base_url(mapper, scope, entity = nil)

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

@@ -18,19 +18,27 @@ module Locomotive
         private
 
         def source_from_template_file
-          source = File.open(template_path).read.force_encoding('utf-8')
+          source = File.read(template_path).force_encoding('utf-8')
 
           if match = source.match(FRONTMATTER_REGEXP)
             source = match[:template]
           end
 
           if template_path.ends_with?('.haml')
-            Haml::Engine.new(source).render
+            render_haml(source, template_path)
           else
             source
           end
         end
 
+        def render_haml(source, template_path)
+          begin
+            Haml::Engine.new(source).render
+          rescue Haml::SyntaxError => e
+            raise Steam::RenderError.new(e.message, template_path, source, e.line, e.backtrace)
+          end
+        end
+
       end
 
     end

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

@@ -145,6 +145,7 @@ module Locomotive::Steam
     class FileField < Struct.new(:filename, :base, :updated_at)
 
       def url
+        return if filename.blank?
         base.blank? ? filename : "#{base}/#{filename}"
       end
 

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

@@ -8,12 +8,17 @@ module Locomotive::Steam
 
     def initialize(attributes = {})
       super({
+        content: nil,
         source: nil
       }.merge(attributes))
     end
 
+    def source
+      self[:source].blank? ? self.content : self[:source]
+    end
+
     def default_content?
-      !!self[:default_content]
+      self.content.blank?
     end
 
   end

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

@@ -48,6 +48,10 @@ module Locomotive::Steam
       self[:raw_template]
     end
 
+    def depth
+      @depth || self[:depth]
+    end
+
     def to_liquid
       Locomotive::Steam::Liquid::Drops::Page.new(self)
     end

data/lib/locomotive/steam/errors.rb

@@ -0,0 +1,32 @@
+module Locomotive::Steam
+
+  class RenderError < ::StandardError
+
+    LINES_RANGE = 10
+
+    attr_reader :file, :source, :line, :original_backtrace
+
+    def initialize(message, file, source, line, original_backtrace)
+      @file, @source, @line, @original_backtrace = file, source, line, original_backtrace
+      super(message)
+    end
+
+    def code_lines
+      return [] if source.blank? || line.nil?
+
+      lines = source.split("\n")
+
+      start   = line - (LINES_RANGE / 2)
+      start   = 0 if start < 0
+      finish  = line + (LINES_RANGE / 2)
+
+      (start..finish).map { |i| [i, lines[i]] }
+    end
+
+    def backtrace
+      original_backtrace
+    end
+
+  end
+
+end

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

@@ -22,7 +22,8 @@ module Locomotive
 
           def scoped_pages
             conditions = @context['with_scope'] || {}
-            conditions['slug.ne'] = '404'
+            conditions['slug.ne']   = '404'
+            conditions[:published]  = true
             repository.all(conditions)
           end
 

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

@@ -33,7 +33,8 @@ module Locomotive
               if element.source =~ /^https?/
                 element.source
               else
-                "#{element.base_url}/#{element.source}"
+                _url = element.source.start_with?('/') ? element.source : "/#{element.source}"
+                "#{element.base_url}#{_url}"
               end
             end
 

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

@@ -10,7 +10,7 @@ module Locomotive
             parent = options[:parent_finder].find(options[:page], @template_name)
 
             # no need to go further if the parent does not exist
-            raise PageNotFound.new("Page with fullpath '#{@template_name}' was not found") if parent.nil?
+            raise PageNotFound.new("Extending a missing page. Page/Layout with fullpath '#{@template_name}' was not found") if parent.nil?
 
             ActiveSupport::Notifications.instrument("steam.parse.extends", page: options[:page], parent: parent)
 

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

@@ -24,7 +24,7 @@ module Locomotive
             name    = options.shift
             options = options.shift || {}
 
-            form_attributes = { method: 'POST', enctype: 'multipart/form-data' }.merge(options.slice(:id, :class))
+            form_attributes = { method: 'POST', enctype: 'multipart/form-data' }.merge(options.slice(:id, :class, :action))
 
             html_content_tag :form,
               content_type_html(name) + csrf_html + callbacks_html(options) + yield,

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

@@ -54,7 +54,7 @@ module Locomotive
           #
           def paginate_collection(context)
             collection    = context[@collection_name]
-            current_page  = context['current_page']
+            current_page  = context['current_page'].try(:to_i)
 
             raise ::Liquid::ArgumentError.new("Cannot paginate '#{@collection_name}'. Not found.") if collection.nil?
 

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

@@ -17,7 +17,7 @@ module Locomotive
 
             def render_title(context)
               title = self.value_for(:seo_title, context)
-              title = context.registers[:site].name if title.blank?
+              title = context['site'].name if title.blank?
 
               %{
                 <title>#{title}</title>
@@ -38,7 +38,7 @@ module Locomotive
 
             def value_for(attribute, context)
               object = self.metadata_object(context)
-              value = object.try(attribute.to_sym).blank? ? context.registers[:site].send(attribute.to_sym) : object.send(attribute.to_sym)
+              value = object.try(attribute.to_sym).blank? ? context['site'].send(attribute.to_sym) : object.send(attribute.to_sym)
               self.sanitized_string(value)
             end
 

data/lib/locomotive/steam/models/i18n_field.rb

@@ -3,6 +3,10 @@ module Locomotive::Steam
 
     class I18nField
 
+      extend Forwardable
+
+      def_delegators :@translations, :values, :blank?
+
       attr_reader :name, :translations
 
       def initialize(name, translations)
@@ -18,10 +22,6 @@ module Locomotive::Steam
         @translations[locale] = value
       end
 
-      def values
-        @translations.values
-      end
-
       def translations=(translations)
         @translations = (if translations.respond_to?(:fetch)
           translations

data/lib/locomotive/steam/models/repository.rb

@@ -47,6 +47,10 @@ module Locomotive::Steam
         adapter.query(mapper, scope, &block).first
       end
 
+      def last(&block)
+        adapter.query(mapper, scope, &block).last
+      end
+
       def k(name, operator)
         adapter.key(name, operator)
       end

data/lib/locomotive/steam/repositories/content_entry_repository.rb

@@ -162,12 +162,15 @@ module Locomotive
 
         with(entry.content_type)
 
-        name, direction = self.content_type.order_by.first
+        order_by = self.content_type.order_by
+        name, direction = order_by.first
         op = direction == 'asc' ? asc_op : desc_op
 
         conditions = prepare_conditions({ k(name, op) => i18n_value_of(entry, name) })
 
-        first { where(conditions) }
+        public_send(op == 'gt' ? :last : :first) do
+          where(conditions).order_by(order_by)
+        end
       end
 
       def groups_to_array(name, groups)

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

@@ -6,7 +6,7 @@ module Locomotive
       include Locomotive::Steam::Services::Concerns::Decorator
 
       def find(page, block, slug)
-        decorate do
+        decorate(Decorators::I18nDecorator) do
           repository.editable_element_for(page, block, slug).tap do |element|
             element.base_url = repository.base_url(page) if element
           end

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

@@ -67,7 +67,7 @@ module Locomotive
         entry.valid?
 
         # check if the entry has unique values for its
-        # fields marked as unique are really
+        # fields marked as unique
         content_type_repository.look_for_unique_fields(entry.content_type).each do |name, _|
           if repository.with(entry.content_type).exists?(name => entry.send(name))
             entry.errors.add(name, :unique)

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

@@ -8,12 +8,10 @@ module Locomotive
       def find(page, fullpath)
         return nil if fullpath.blank?
 
-        decorate do
-          if fullpath.strip == 'parent'
-            repository.parent_of(page)
-          else
-            repository.by_fullpath(fullpath)
-          end
+        if fullpath.strip == 'parent'
+          decorate { repository.parent_of(page) }
+        else
+          super(fullpath)
         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-alpha.1'
+    VERSION = '1.0.0-alpha.2'
   end
 end

data/lib/locomotive/steam.rb

@@ -3,6 +3,7 @@ require 'locomotive/common'
 require_relative      'steam/configuration'
 require_relative_all  'steam/decorators'
 require_relative      'steam/liquid'
+require_relative      'steam/errors'
 
 require_relative      'steam/models'
 require_relative_all  'steam/entities'

data/locomotivecms_steam.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'sanitize',               '~> 4.0.0'
   spec.add_dependency 'morphine',               '~> 0.1.1'
-  spec.add_dependency 'httparty',               '~> 0.13.3'
+  spec.add_dependency 'httparty',               '~> 0.13.5'
   spec.add_dependency 'chronic',                '~> 0.10.2'
 
   spec.add_dependency 'rack-rewrite',           '~> 1.5.1'
   spec.add_dependency 'rack-cache',             '~> 1.2'
-  spec.add_dependency 'dragonfly',              '~> 1.0.9'
+  spec.add_dependency 'dragonfly',              '~> 1.0.10'
   spec.add_dependency 'moneta',                 '~> 0.8.0'
   spec.add_dependency 'rack_csrf',              '~> 2.5.0'
 
@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'RedCloth',               '~> 4.2.9'
   spec.add_dependency 'haml',                   '~> 4.0.6'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
-  spec.add_dependency 'mime-types',             '~> 2.5.0'
+  spec.add_dependency 'mime-types',             '~> 2.6.1'
 
   spec.add_dependency 'locomotivecms-solid',      '~> 4.0.0.alpha2'
   spec.add_dependency 'locomotivecms_common',     '~> 0.0.4'

data/spec/fixtures/default/app/views/pages/tags/nav.liquid.haml

@@ -1,6 +1,6 @@
 ---
 title: Page to test the nav tag
 listed: false
-published: false
+published: true
 ---
-{% nav site %}
+{% nav site %}

data/spec/integration/repositories/page_repository_spec.rb

@@ -5,6 +5,11 @@ require_relative '../../../lib/locomotive/steam/adapters/mongodb.rb'
 
 describe Locomotive::Steam::PageRepository do
 
+  # before(:all) do
+  #   Moped.logger = Logger.new($stdout)
+  #   Moped.logger.level = Logger::DEBUG
+  # end
+
   shared_examples_for 'a repository' do
 
     let(:site)        { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }
@@ -12,8 +17,14 @@ describe Locomotive::Steam::PageRepository do
     let(:repository)  { described_class.new(adapter, site, locale) }
 
     describe '#all' do
-      subject { repository.all }
+      let(:conditions) { {} }
+      subject { repository.all(conditions) }
       it { expect(subject.size).to eq 24 }
+
+      context 'with conditions' do
+        let(:conditions) { { fullpath: 'index', 'slug.ne' => '404' } }
+        it { expect(subject.size).to eq 1 }
+      end
     end
 
     describe '#query' do

data/spec/integration/server/sitemap_spec.rb

@@ -18,7 +18,7 @@ describe Locomotive::Steam::Server do
 
     it 'checks if it looks valid' do
       expect(Nokogiri::XML(subject).errors.empty?).to eq true
-      expect(subject.scan(/<url>/).size).to eq 45
+      expect(subject.scan(/<url>/).size).to eq 46
       expect(subject).to match("<loc>http://example.org/songs/song-number-2/band</loc>")
       expect(subject).to match((<<-EOF
   <url>

data/spec/unit/decorators/template_decorator_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Decorators::TemplateDecorator do
+
+  let(:template_path)   { 'template.liquid' }
+  let(:page)            { instance_double('Page', localized_attributes: [], template_path: template_path) }
+  let(:locale)          { 'fr' }
+  let(:default_locale)  { nil }
+  let(:decorated)       { described_class.new(page, locale, default_locale) }
+
+  describe '#liquid_source' do
+
+    let(:content) { 'Lorem ipsum' }
+
+    before { allow(File).to receive(:read).and_return(content) }
+
+    subject { decorated.liquid_source.strip }
+
+    it { is_expected.to eq 'Lorem ipsum' }
+
+    context 'HAML file' do
+
+      let(:template_path) { 'template.liquid.haml' }
+      let(:content) { '%p Lorem ipsum' }
+
+      it { is_expected.to eq '<p>Lorem ipsum</p>' }
+
+      context 'incorrect HAML syntax' do
+
+        let(:content) { "foo\n  %p TEST" }
+
+        it 'raises an error' do
+          expect { subject }.to raise_error Locomotive::Steam::RenderError
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/unit/errors_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::RenderError do
+
+  let(:message)   { 'Wrong syntax' }
+  let(:file)      { 'template.liquid.haml' }
+  let(:source)    { %w(a b c d e f g h i j k l m n o p q r s t u v w y z).join("\n") }
+  let(:line)      { 10 }
+  let(:backtrace) { 'Backtrace' }
+  let(:error)     { described_class.new(message, file, source, line, backtrace) }
+
+  describe '#code_lines' do
+
+    subject { error.code_lines }
+
+    it { is_expected.to eq [[5, 'f'], [6, 'g'], [7, 'h'], [8, 'i'], [9, 'j'], [10, 'k'], [11, 'l'], [12, 'm'], [13, 'n'], [14, 'o'], [15, 'p']] }
+
+  end
+
+  describe '#backtrace' do
+
+    subject { error.original_backtrace }
+
+    it { is_expected.to eq 'Backtrace' }
+
+  end
+
+end

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

@@ -71,7 +71,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
     let(:inline_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, base_url: '') }
+    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 }) }
 
@@ -92,7 +92,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
 
     context 'using the default value' do
 
-      let(:element) { instance_double('EditableFile', id: 42, default_source_url: 'http://www.placehold.it/500x500', source?: false, source: nil) }
+      let(:element) { instance_double('EditableFile', id: 42, default_source_url: 'http://www.placehold.it/500x500', source?: false, source: nil, content: nil) }
       it { is_expected.to eq 'http://www.placehold.it/500x500?1183150800' }
 
     end
@@ -100,7 +100,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
     context 'modified value' do
 
       let(:file)    { 'http://www.placehold.it/250x250' }
-      let(:element) { instance_double('EditableFile', source: file, source?: true, default_source_url: false, base_url: '') }
+      let(:element) { instance_double('EditableFile', source: file, default_source_url: false, base_url: '') }
       it { is_expected.to eq 'http://www.placehold.it/250x250?1183150800' }
 
     end

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

@@ -5,9 +5,9 @@ describe Locomotive::Steam::Liquid::Tags::SEO do
   let(:page)          { nil }
   let(:content_entry) { nil }
 
-  let(:site)      { instance_double('Site', name: 'Acme', seo_title: 'Acme (SEO)', meta_description: 'A short site description', meta_keywords: 'test only cat dog') }
-  let(:assigns)   { { 'page' => page, 'content_entry' => content_entry } }
-  let(:context)   { ::Liquid::Context.new(assigns, {}, { site: site }) }
+  let(:site)      { liquid_instance_double('Site', name: 'Acme', seo_title: 'Acme (SEO)', meta_description: 'A short site description', meta_keywords: 'test only cat dog') }
+  let(:assigns)   { { 'site' => site, 'page' => page, 'content_entry' => content_entry } }
+  let(:context)   { ::Liquid::Context.new(assigns, {}, {}) }
 
   subject { render_template(source, context).strip }
 
@@ -30,7 +30,7 @@ describe Locomotive::Steam::Liquid::Tags::SEO do
 
       describe 'no seo_title site property' do
 
-        let(:site) { instance_double('Site', name: 'Acme', seo_title: nil, meta_description: 'A short site description', meta_keywords: 'test only cat dog') }
+        let(:site) { liquid_instance_double('Site', name: 'Acme', seo_title: nil, meta_description: 'A short site description', meta_keywords: 'test only cat dog') }
         it { is_expected.to eq '<title>Acme</title>' }
 
       end

data/spec/unit/models/i18n_field_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Models::I18nField do
+
+  let(:name)          { 'title' }
+  let(:translations)  { nil }
+  let(:field)         { described_class.new(name, translations) }
+
+  describe '#blank?' do
+
+    subject { field.blank? }
+
+    it { is_expected.to eq true }
+
+    context 'with translations' do
+
+      let(:translations) { { en: 'Hello world', fr: nil } }
+
+      it { is_expected.to eq false }
+
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.1
+  version: 1.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.13.5
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +159,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.10
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +327,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: locomotivecms-solid
   requirement: !ruby/object:Gem::Requirement
@@ -434,6 +434,7 @@ files:
 - lib/locomotive/steam/entities/snippet.rb
 - lib/locomotive/steam/entities/theme_asset.rb
 - lib/locomotive/steam/entities/translation.rb
+- lib/locomotive/steam/errors.rb
 - lib/locomotive/steam/initializers.rb
 - lib/locomotive/steam/initializers/dragonfly.rb
 - lib/locomotive/steam/initializers/i18n.rb
@@ -686,12 +687,14 @@ files:
 - spec/unit/adapters/mongodb_adapter_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/decorators/i18n_decorator_spec.rb
+- spec/unit/decorators/template_decorator_spec.rb
 - spec/unit/entities/content_entry_spec.rb
 - spec/unit/entities/content_type_field_spec.rb
 - spec/unit/entities/content_type_spec.rb
 - spec/unit/entities/page_spec.rb
 - spec/unit/entities/site_spec.rb
 - spec/unit/entities/snippet_spec.rb
+- spec/unit/errors_spec.rb
 - spec/unit/initializers/dragonfly_spec.rb
 - spec/unit/initializers/sprockets_spec.rb
 - spec/unit/liquid/drops/content_entry_collection_spec.rb
@@ -732,6 +735,7 @@ files:
 - spec/unit/middlewares/locale_redirection_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/stack_proxy_spec.rb
+- spec/unit/models/i18n_field_spec.rb
 - spec/unit/models/mapper_spec.rb
 - spec/unit/models/pager_spec.rb
 - spec/unit/models/repository_spec.rb
@@ -915,12 +919,14 @@ test_files:
 - spec/unit/adapters/mongodb_adapter_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/decorators/i18n_decorator_spec.rb
+- spec/unit/decorators/template_decorator_spec.rb
 - spec/unit/entities/content_entry_spec.rb
 - spec/unit/entities/content_type_field_spec.rb
 - spec/unit/entities/content_type_spec.rb
 - spec/unit/entities/page_spec.rb
 - spec/unit/entities/site_spec.rb
 - spec/unit/entities/snippet_spec.rb
+- spec/unit/errors_spec.rb
 - spec/unit/initializers/dragonfly_spec.rb
 - spec/unit/initializers/sprockets_spec.rb
 - spec/unit/liquid/drops/content_entry_collection_spec.rb
@@ -961,6 +967,7 @@ test_files:
 - spec/unit/middlewares/locale_redirection_spec.rb
 - spec/unit/middlewares/renderer_spec.rb
 - spec/unit/middlewares/stack_proxy_spec.rb
+- spec/unit/models/i18n_field_spec.rb
 - spec/unit/models/mapper_spec.rb
 - spec/unit/models/pager_spec.rb
 - spec/unit/models/repository_spec.rb