locomotivecms_steam 1.0.0.rc6 → 1.0.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73dc9ea0190083dd20c33f5e820da421b36d11b4
-  data.tar.gz: 5e74931081e00c151d857c449f0c14c3219e0f67
+  metadata.gz: 193721014cf846cba6f95200c9d8f4d9d40e82fb
+  data.tar.gz: 1a0121ad4705b29db57e30535fb15c7725904805
 SHA512:
-  metadata.gz: b4e2759d7ab8798c17f8a4a40b0779228410c8b0f0fb96b4aad83dd7589a2059e1baae8dae58be3f448ccd07ca2933e1ddd2a8a1e918924f3fb44a730825a4f9
-  data.tar.gz: 7b443e9021b581bd62cee286dd74bb02ee966086064313866f1379055069d23a30f5b198de07aa9da308772eb89003f0e5ae6f6eef07b317c4e2bcbed6d728c8
+  metadata.gz: e3930c146bea95ec4aa7c60802020e0ea2d6e485693bbd417b25cb6d80dc21fa0ec54c64e59974de0f0529a089e6d1da7ccb2ba96f6cef869c4e33c856753b53
+  data.tar.gz: 0b4f8ff10324d481564b9807fb02c2b6188b25d25049ec4eb592315398dd00184aea9003c01181a4b625804a9b3f6a50c1bd4a3458f4a43a9cb327596d67038f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc6)
+    locomotivecms_steam (1.0.0.rc8)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -17,6 +17,7 @@ PATH
       moneta (~> 0.8.0)
       mongo (~> 2.1.2)
       morphine (~> 0.1.1)
+      nokogiri (~> 1.6.6.4)
       origin (~> 2.1.1)
       rack-cache (~> 1.2)
       rack-rewrite (~> 1.5.1)
@@ -43,7 +44,7 @@ GEM
       columnize (= 0.9.0)
     chronic (0.10.2)
     chunky_png (1.3.5)
-    codeclimate-test-reporter (0.4.7)
+    codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-script (2.4.1)
@@ -65,16 +66,17 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    coveralls (0.8.1)
+    coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+      simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+      tins (~> 1.6.0)
     crass (1.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
     dragonfly (1.0.12)
       addressable (~> 2.3)
@@ -115,9 +117,9 @@ GEM
       attr_extras (~> 4.4.0)
       colorize
       stringex (~> 2.5.2)
-    memory_profiler (0.9.4)
+    memory_profiler (0.9.6)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
     minitest (5.8.3)
@@ -125,26 +127,26 @@ GEM
     mongo (2.1.2)
       bson (~> 3.0)
     morphine (0.1.1)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
-    netrc (0.10.3)
+    netrc (0.11.0)
     nokogiri (1.6.6.4)
       mini_portile (~> 0.6.0)
     nokogumbo (1.4.1)
       nokogiri
     origin (2.1.1)
-    pry (0.10.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 (~> 0.10)
-    puma (2.12.3)
-    rack (1.6.1)
+    puma (2.15.3)
+    rack (1.6.4)
     rack-cache (1.5.1)
       rack (>= 0.4)
-    rack-mini-profiler (0.9.7)
+    rack-mini-profiler (0.9.8)
       rack (>= 1.1.3)
     rack-rewrite (1.5.1)
     rack-test (0.6.3)
@@ -165,12 +167,12 @@ GEM
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
       rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.0)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
@@ -179,7 +181,7 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
     sass (3.4.19)
-    simplecov (0.10.0)
+    simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
@@ -198,13 +200,13 @@ GEM
       tilt (~> 1.1)
     stackprof (0.2.7)
     stringex (2.5.2)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.7.4)
-    tins (1.5.2)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)

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

@@ -57,7 +57,7 @@ module Locomotive::Steam
               entity._label.each do |locale, label|
                 entity[:_slug][locale] ||= slugify(entity._id, label, dataset, locale)
               end
-            else
+            elsif entity[:_slug] && entity[:_slug][:anylocale].nil?
               # Note: replace the translations of the I18nField by a string
               entity[:_slug].translations = slugify(entity._id, entity._label, dataset)
             end

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

@@ -66,7 +66,7 @@ module Locomotive
                     if (option = list.at(position)).nil?
                       list << { _id: name, name: { locale => name }, position: position }
                     else
-                      option[name][locale] = name
+                      option[:name][locale] = name
                     end
                   end
                 end
@@ -76,7 +76,8 @@ module Locomotive
             def build_select_options_from_array(options)
               [].tap do |list|
                 options.each_with_index do |name, position|
-                  list << { _id: name, name: name, position: position }
+                  _id = name.is_a?(Hash) ? name.values.first : name
+                  list << { _id: _id, name: name, position: position }
                 end
               end
             end

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

@@ -42,14 +42,19 @@ module Locomotive
               slug        = fullpath.split('/').last
               attributes  = get_attributes(filepath, fullpath)
 
-              {
+              _attributes = {
                 title:              { locale => attributes.delete(:title) || (default_locale == locale ? slug.humanize : nil) },
                 slug:               { locale => attributes.delete(:slug) || slug.dasherize },
                 template_path:      { locale => template_path(filepath, attributes, locale) },
-                redirect_url:       { locale => attributes.delete(:redirect_url) },
                 editable_elements:  build_editable_elements(attributes.delete(:editable_elements), locale),
                 _fullpath:          fullpath
-              }.merge(attributes)
+              }
+
+              [:redirect_url, :seo_title, :meta_description, :meta_keywords].each do |name|
+                _attributes[name] = { locale => attributes.delete(name) }
+              end
+
+              _attributes.merge!(attributes)
             end
 
             def update(leaf, filepath, fullpath, locale)
@@ -59,7 +64,10 @@ module Locomotive
               leaf[:title][locale]              = attributes.delete(:title) || slug.humanize
               leaf[:slug][locale]               = attributes.delete(:slug) || slug.dasherize
               leaf[:template_path][locale]      = template_path(filepath, attributes, locale)
-              leaf[:redirect_url][locale]       = attributes.delete(:redirect_url)
+
+              [:redirect_url, :seo_title, :meta_description, :meta_keywords].each do |name|
+                leaf[name][locale] = attributes.delete(name)
+              end
 
               update_editable_elements(leaf, attributes.delete(:editable_elements), locale)
 

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

@@ -41,7 +41,7 @@ module Locomotive::Steam
         end
 
         def inspect
-          "#{field}.#{operator} #{value}"
+          "#{field}#{operator != :== ? '.' : ' '}#{operator} #{value}"
         end
 
         protected
@@ -92,7 +92,7 @@ module Locomotive::Steam
           if target.size == 0
             source.size == 0
           else
-            source & target == target
+            (source & target).size != 0
           end
         end
 

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

@@ -25,6 +25,11 @@ module Locomotive::Steam
         def apply_to(entry, locale)
           @list.collect do |(name, direction)|
             value = entry.send(name)
+
+            if value.respond_to?(:translations) # localized
+              value = value[locale]
+            end
+
             asc?(direction) ? Asc.new(value) : Desc.new(value)
           end
         end

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

@@ -139,7 +139,7 @@ module Locomotive::Steam
     end
 
     def _cast_date_time(field)
-      _cast_time(field, :to_date)
+      _cast_time(field, :to_datetime)
     end
 
     def _cast_time(field, end_method)

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

@@ -8,6 +8,7 @@ module Locomotive::Steam
 
     def initialize(attributes = {})
       super({
+        label:          nil,
         block:          nil,
         content:        nil,
         source:         nil,
@@ -23,10 +24,6 @@ module Locomotive::Steam
       self[:format] || 'html' # only editable_text elements
     end
 
-    def default_content?
-      self.content.blank?
-    end
-
   end
 
 end

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

@@ -62,32 +62,52 @@ module Locomotive
           end
 
           def build_editable_elements_hash
-              {}.tap do |hash|
-                repository.editable_elements_of(@_source).each do |el|
-                  safe_slug = el.slug.parameterize.underscore
-                  keys      = el.block.try(:split, '/').try(:compact) || []
+            {}.tap do |hash|
+              # default content from the template itself
+              _build_default_editable_elements_hash(hash)
 
-                  _hash = _build_editable_elements_hashes(hash, keys)
+              # content updated by the users
+              _build_editable_elements_hash(hash)
+            end
+          end
 
-                  _hash[safe_slug] = el.content
-                end
-              end
+          def _build_default_editable_elements_hash(hash)
+            (@context.registers[:default_editable_content] || []).each do |key, content|
+              keys = key.split('/')
+              _build_editable_elements_hashes(hash, keys, keys.pop, content)
             end
+          end
 
-            def _build_editable_elements_hashes(hash, keys)
-              _hash = hash
+          def _build_editable_elements_hash(hash)
+            (repository.editable_elements_of(@_source) || []).each do |el|
+              keys = el.block.try(:split, '/').try(:compact) || []
 
-              keys.each do |key|
-                safe_key = key.parameterize.underscore
+              # decorate the el instance which is localized because
+              # el.content returns a I18nField.
+              content = editable_element_content(el)
 
-                _hash[safe_key] = {} if _hash[safe_key].nil?
+              _build_editable_elements_hashes(hash, keys, el.slug, content)
+            end
+          end
 
-                _hash = _hash[safe_key]
-              end
+          def editable_element_content(element)
+            Locomotive::Steam::Decorators::I18nDecorator.new(element,
+              @_source.__locale__,
+              @_source.__default_locale__).content
+          end
+
+          def _build_editable_elements_hashes(hash, keys, slug, content)
+            last_hash = hash
 
-              _hash
+            # go the last hash
+            keys.each do |key|
+              safe_key  = key.parameterize.underscore
+              last_hash = (last_hash[safe_key] ||= {})
             end
 
+            last_hash[slug.parameterize.underscore] = content
+          end
+
         end
       end
     end

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

@@ -12,9 +12,11 @@ module Locomotive
             def initialize(tag_name, markup, options)
               if markup =~ Syntax
                 @page_fullpath    = options[:page].fullpath
-                @slug             = $1.gsub(/[\"\']/, '')
+                @label_or_slug    = $1.gsub(/[\"\']/, '')
                 @element_options  = { fixed: false, inline_editing: true }
                 markup.scan(::Liquid::TagAttributes) { |key, value| @element_options[key.to_sym] = value.gsub(/^[\"\']/, '').gsub(/[\"\']$/, '') }
+
+                self.set_label_and_slug
               else
                 raise ::Liquid::SyntaxError.new("Valid syntax: #{tag_name} <slug>(, <options>)")
               end
@@ -25,6 +27,8 @@ module Locomotive
             def parse(tokens)
               super.tap do
                 ActiveSupport::Notifications.instrument("steam.parse.editable.#{@tag_name}", page: options[:page], attributes: default_element_attributes)
+
+                register_default_content
               end
             end
 
@@ -56,9 +60,29 @@ module Locomotive
               pages[@page_fullpath] ||= service.find(@page_fullpath)
             end
 
+            def register_default_content
+              return if options[:default_editable_content].nil?
+
+              hash  = options[:default_editable_content]
+              key   = [current_inherited_block_name, @slug].compact.join('/')
+
+              hash[key] = render_default_content
+            end
+
+            def set_label_and_slug
+              @slug   = @label_or_slug
+              @label  = @element_options[:label]
+
+              if @element_options[:slug].present?
+                @slug   = @element_options[:slug]
+                @label  ||= @label_or_slug
+              end
+            end
+
             def default_element_attributes
               {
                 block:          self.current_inherited_block_name,
+                label:          @label,
                 slug:           @slug,
                 hint:           @element_options[:hint],
                 priority:       @element_options[:priority] || 0,

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

@@ -9,6 +9,10 @@ module Locomotive
               default_render(context)
             end
 
+            def render_default_content
+              nil
+            end
+
           end
 
           ::Liquid::Template.register_tag('editable_model'.freeze, Model)

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

@@ -9,7 +9,7 @@ module Locomotive
 
             def render_element(context, element)
               with_inline_editing(context, element) do
-                content = if element.default_content?
+                content = if default_content?(element)
                   render_default_content
                 else
                   element.content
@@ -39,6 +39,10 @@ module Locomotive
               !!context.registers[:live_editing] && element.inline_editing
             end
 
+            def default_content?(element)
+              element.content.blank?
+            end
+
             def default_element_attributes
               super.merge(
                 content_from_default: self.render_default_content,

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

@@ -4,6 +4,13 @@ module Locomotive
       module Tags
         class Extends < ::Liquid::Extends
 
+          def render(context)
+            context.stack do
+              context['layout_name'] = @layout_name
+              super
+            end
+          end
+
           private
 
           def parse_parent_template
@@ -14,6 +21,10 @@ module Locomotive
 
             ActiveSupport::Notifications.instrument('steam.parse.extends', page: options[:page], parent: parent)
 
+            # define the layout name which is basically the handle of the parent page
+            # if there is no handle, we take the slug which might or might not be localized.
+            @layout_name = parent.handle || parent.slug
+
             # the source has already been parsed before
             options[:parser]._parse(parent, options.merge(page: parent))
           end

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

@@ -45,18 +45,20 @@ module Locomotive
                 # _slug instead of _permalink
                 _key = key.to_s == '_permalink' ? '_slug' : key.to_s
 
-                hash[_key] = (case value
-                # regexp inside a string
-                when /^\/[^\/]*\/$/ then Regexp.new(value[1..-2])
-                # content entry drop? Use the source (entity) instead
-                when Locomotive::Steam::Liquid::Drops::ContentEntry
-                  value.send(:_source)
-                else
-                  value
-                end)
+                hash[_key] = cast_value(value)
               end
             end
           end
+
+          def cast_value(value)
+            case value
+            when Array then value.map { |_value| cast_value(_value) }
+            when /^\/[^\/]*\/$/ then Regexp.new(value[1..-2])
+            else
+              value.respond_to?(:_id) ? value.send(:_source) : value
+            end
+          end
+
         end
 
       end

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

@@ -0,0 +1,33 @@
+module Locomotive
+  module Steam
+    module Liquid
+
+      class Template < ::Liquid::Template
+
+        # When we render a Locomotive template, we need to know what are
+        # the default content of all the editable elements.
+        # Without this, developers are unable to use statements like
+        # the following: {{ page.editable_elements.content.header.title }}
+        def render(*args)
+          if args.first && args.first.is_a?(::Liquid::Context)
+            content = @options[:default_editable_content]
+            args.first.registers[:default_editable_content] = content
+          end
+
+          super
+        end
+
+        class << self
+
+          def parse(source, options = {})
+            template = new
+            template.parse(source, options)
+          end
+
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -28,7 +28,8 @@ module Locomotive::Steam
           # log it
           log "Found content entry: #{entry._label}"
         else
-          redirect_to '/404', 302
+          url = services.url_builder.url_for(page_not_found, locale)
+          redirect_to url, 302
         end
       end
 
@@ -40,11 +41,6 @@ module Locomotive::Steam
         end
       end
 
-      def decorate(entry)
-        return nil if entry.nil?
-        Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale, default_locale)
-      end
-
       def content_type_repository
         services.repositories.content_type
       end
@@ -53,6 +49,15 @@ module Locomotive::Steam
         services.repositories.content_entry
       end
 
+      def page_not_found
+        services.page_finder.find('404')
+      end
+
+      def decorate(entry)
+        return nil if entry.nil?
+        Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale, default_locale)
+      end
+
     end
   end
 end

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

@@ -95,6 +95,10 @@ module Locomotive::Steam
         value.respond_to?(:translations) ? value[locale] : value
       end
 
+      def reset_entity_map
+        @entity_map = {}
+      end
+
       private
 
       # create a proxy class for each localized attribute

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

@@ -11,6 +11,7 @@ module Locomotive::Steam
       attr_accessor :adapter, :scope, :local_conditions
 
       def_delegators :@scope, :site, :site=, :locale, :locale=
+      def_delegators :all, :each
 
       def initialize(adapter, site = nil, locale = nil)
         @adapter  = adapter

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

@@ -130,33 +130,11 @@ module Locomotive
       end
 
       def prepare_conditions(*conditions)
-        # _conditions = conditions.first.try(:with_indifferent_access)
-
         _conditions = Conditions.new(conditions.first, self.content_type.fields).prepare
 
         super({ _visible: true }, _conditions)
       end
 
-      # # belongs_to fields? if so, make sure we use the _id and we deal with the ID, not the object itself
-      # def prepare_conditions_for_belongs_to_fields(conditions)
-      #   self.content_type.fields.belongs_to.each do |field|
-      #     if value = conditions[name = field.name.to_s]
-      #       conditions.delete(name)
-      #       conditions[name + '_id'] = value.try(:_id)
-      #     end
-      #   end
-      # end
-
-      # # select fields? if so, use the _id of the option instead of the option name
-      # def prepare_conditions_for_select_fields(conditions)
-      #   self.content_type.fields.selects.each do |field|
-      #     if value = conditions[name = field.name.to_s]
-      #       conditions.delete(name)
-      #       conditions[name + '_id'] = field.select_options.by_name(value).try(:_id)
-      #     end
-      #   end
-      # end
-
       def add_localized_fields_to_mapper(mapper)
         unless self.content_type.localized_names.blank?
           mapper.localized_attributes(*self.content_type.localized_names)
@@ -207,17 +185,25 @@ module Locomotive
       class Conditions
 
         def initialize(conditions = {}, fields)
-          @conditions, @fields = conditions.try(:with_indifferent_access) || {}, fields
+          @conditions, @fields, @operators = conditions.try(:with_indifferent_access) || {}, fields, {}
+
+          @conditions.each do |name, value|
+            _name, operator = name.to_s.split('.')
+            @operators[_name] = operator if operator
+          end
         end
 
         def prepare
-          return {} if @conditions.blank?
-
+          # selects
           _prepare(@fields.selects) do |field, value|
             field.select_options.by_name(value).try(:_id)
           end
 
-          _prepare(@fields.belongs_to) { |field, value| value.try(:_id) }
+          # belongs_to
+          _prepare(@fields.belongs_to) { |field, value| value_to_id(value) }
+
+          # many_to_many
+          _prepare(@fields.many_to_many) { |field, value| values_to_ids(value) }
 
           @conditions
         end
@@ -226,13 +212,35 @@ module Locomotive
 
         def _prepare(fields, &block)
           fields.each do |field|
-            if value = @conditions[name = field.name.to_s]
-              @conditions.delete(name)
-              @conditions[name + '_id'] = yield(field, value)
+            name      = field.name.to_s
+            operator  = @operators[name]
+            _name     = operator ? "#{name}.#{operator}" : name
+
+            if value = @conditions[_name]
+              # delete old name
+              @conditions.delete(_name)
+
+              # build the new name with the prefix and the operator if there is one
+              _name = field.persisted_name + (operator ? ".#{operator}" : '')
+
+              # store the new name
+              @conditions[_name] = yield(field, value)
             end
           end
         end
 
+        def value_to_id(value)
+          if value.respond_to?(:each) # array
+            values_to_ids(value)
+          else
+            value.respond_to?(:_id) ? value._id : value
+          end
+        end
+
+        def values_to_ids(value)
+          [*value].map { |_value| value_to_id(_value) }
+        end
+
       end
 
     end

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

@@ -26,6 +26,10 @@ module Locomotive
         query { where(type: :belongs_to) }.all
       end
 
+      def many_to_many
+        query { where(type: :many_to_many) }.all
+      end
+
       def associations
         query { where(k(:type, :in) => %i(belongs_to has_many many_to_many)) }.all
       end

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

@@ -30,7 +30,7 @@ module Locomotive
         query do
           where(k(:handle, :ne) => nil).
             only(:_id, :title, :handle, :fullpath)
-        end.all
+        end.all.tap { mapper.reset_entity_map }
       end
 
       def by_handle(handle)
@@ -81,7 +81,7 @@ module Locomotive
       end
 
       def editable_element_for(page, block, slug)
-        return nil if page.nil?
+        return nil if page.nil? || page.editable_elements.nil?
         page.editable_elements.first do
           where(block: block, slug: slug)
         end

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

@@ -7,15 +7,16 @@ module Locomotive
 
       def parse(page)
         _parse(page,
-          page:             page,
-          parent_finder:    parent_finder,
-          snippet_finder:   snippet_finder,
-          parser:           self)
+          page:                       page,
+          parent_finder:              parent_finder,
+          snippet_finder:             snippet_finder,
+          parser:                     self,
+          default_editable_content:   {})
       end
 
       def _parse(object, options = {})
         # Note: the template must not be parsed here
-        ::Liquid::Template.parse(object.liquid_source, options)
+        Locomotive::Steam::Liquid::Template.parse(object.liquid_source, options)
       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.rc6'
+    VERSION = '1.0.0.rc8'
   end
 end

data/locomotivecms_steam.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mongo',                  '~> 2.1.2'
   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 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.13.6'

data/spec/integration/liquid/drops/page_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::Liquid::Drops::Page do
+
+  describe '#editable_elements' do
+
+    let(:source) { <<-EOF
+  <h1>{{ page.editable_elements.content.header.title }}</h1>
+  {% block content %}
+    {% block header %}
+      {% editable_text title %}Hello world{% endeditable_text %}
+    {% endblock %}
+  {% endblock %}
+  EOF
+    }
+
+    let(:elements)  { nil }
+    let(:page)      { instance_double('Page', localized_attributes: [], fullpath: 'index', editable_elements: elements) }
+    let(:drop)      { described_class.new(page) }
+    let(:services)  { Locomotive::Steam::Services.build_instance }
+    let(:context)   { ::Liquid::Context.new({ 'page' => drop }, {}, { page: page, services: services }, true) }
+
+    subject { render_template(source, context, { page: page, default_editable_content: {} }) }
+
+    it { is_expected.to match /<h1>Hello world<\/h1>/ }
+
+    context 'content updated by an user' do
+
+      let(:elements) { [instance_double('EditableText', block: 'content/header', slug: 'title', content: 'Bonjour le monde', :base_url= => nil, localized_attributes: [], format: 'raw')] }
+
+      before do
+        services.locale = :en
+        services.repositories.current_site = instance_double('Site', default_locale: :en)
+        allow(services.repositories.page).to receive(:editable_elements_of).and_return(elements)
+      end
+
+      it { is_expected.to match /<h1>Bonjour le monde<\/h1>/ }
+
+    end
+
+  end
+
+end

data/spec/support/liquid.rb

@@ -1,7 +1,7 @@
 def render_template(source, context = nil, options = {})
   context ||= ::Liquid::Context.new
   context.exception_handler = ->(e) { true }
-  ::Liquid::Template.parse(source, options).render(context)
+  Locomotive::Steam::Liquid::Template.parse(source, options).render(context)
 end
 
 def parse_template(source, options = nil)

data/spec/unit/adapters/filesystem/yaml_loaders/content_type_spec.rb

@@ -23,4 +23,25 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentType do
 
   end
 
+  describe '#build_select_options_from_hash' do
+
+    let(:options) { { en: ['General', 'Gigs', 'Bands'], fr: ['Général', 'Concerts', 'Groupes'] } }
+
+    subject { loader.send(:build_select_options_from_hash, options) }
+
+    it { is_expected.to eq [{ _id: 'General', name: { en: 'General', fr: 'Général' }, position: 0 }, { _id: 'Gigs', name: { en: 'Gigs', fr: 'Concerts' }, position: 1 }, { _id: 'Bands', name: { en: 'Bands', fr: 'Groupes' }, position: 2 }] }
+
+  end
+
+  describe '#build_select_options_from_array' do
+
+    # let(:options) { { en: ['General', 'Gigs', 'Bands'], fr: ['Général', 'Concerts', 'Groupes'] } }
+    let(:options) { [{ en: 'General', fr: 'Général' }, { en: 'Gigs', fr: 'Concerts'}, { en: 'Bands', fr: 'Groupes' }] }
+
+    subject { loader.send(:build_select_options_from_array, options) }
+
+    it { is_expected.to eq [{ _id: 'General', name: { en: 'General', fr: 'Général' }, position: 0 }, { _id: 'Gigs', name: { en: 'Gigs', fr: 'Concerts' }, position: 1 }, { _id: 'Bands', name: { en: 'Bands', fr: 'Groupes' }, position: 2 }] }
+
+  end
+
 end

data/spec/unit/adapters/memory/condition_spec.rb

@@ -90,7 +90,15 @@ describe Locomotive::Steam::Adapters::Memory::Condition do
   describe '#array_contains?' do
     let(:source) { [1, 2, 3, 4] }
     let(:target) { [1, 2, 3] }
-    context 'with target contains in source' do
+    context 'target contains the source' do
+      specify('should be true') do
+        expect(subject.send(:array_contains?, source, target)).to eq true
+      end
+    end
+
+    context 'target contains at least one element' do
+      let(:source) { [1] }
+      let(:target) { [1, 2, 3] }
       specify('should be true') do
         expect(subject.send(:array_contains?, source, target)).to eq true
       end

data/spec/unit/adapters/memory/order_spec.rb

@@ -44,6 +44,15 @@ describe Locomotive::Steam::Adapters::Memory::Order do
     let(:entry) { instance_double('Entry', title: 'foo', date: Time.zone.now) }
     it { expect(subject.map(&:class)).to eq([Locomotive::Steam::Adapters::Memory::Order::Asc, Locomotive::Steam::Adapters::Memory::Order::Desc]) }
 
+    context 'localized field' do
+
+      let(:now)   { Time.zone.now }
+      let(:field) { instance_double('TitleI18nField', :[] => 'Hello world', translations: true) }
+      let(:entry) { instance_double('Entry', title: field, date: now) }
+      it { expect(subject.map(&:obj)).to eq(['Hello world', now]) }
+
+    end
+
   end
 
   describe 'sort' do

data/spec/unit/entities/content_entry_spec.rb

@@ -151,11 +151,11 @@ describe Locomotive::Steam::ContentEntry do
 
     context 'a date time' do
       let(:field_type)  { :date_time }
-      let(:value)       { '2007/06/29 00:00:00' }
-      let(:datetime)    { DateTime.parse('2007/06/29 00:00:00') }
+      let(:value)       { '2007/06/29 10:00:00' }
+      let(:datetime)    { DateTime.parse('2007/06/29 10:00:00') }
       it { is_expected.to eq datetime }
       context 'localized' do
-        let(:value) { build_i18n_field(en: '2007/06/29 00:00:00', fr: datetime) }
+        let(:value) { build_i18n_field(en: '2007/06/29 10:00:00', fr: datetime) }
         it { expect(subject.translations).to eq('en' => datetime, 'fr' => datetime) }
       end
     end

data/spec/unit/liquid/drops/page_spec.rb

@@ -70,7 +70,7 @@ describe Locomotive::Steam::Liquid::Drops::Page do
 
   describe '#editable_elements' do
 
-    let(:elements) { [instance_double('EditableElement', block: 'top/left', slug: 'banner', content: 'Hello world')] }
+    let(:elements) { [instance_double('EditableElement', block: 'top/left', slug: 'banner', content: 'Hello world', localized_attributes: [])] }
 
     before do
       allow(services.repositories.page).to receive(:editable_elements_of).with(page).and_return(elements)

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

@@ -57,12 +57,31 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
         it { is_expected.to include(block: nil) }
         it { is_expected.to include(type: :editable_text) }
         it { is_expected.to include(slug: 'title') }
+        it { is_expected.to include(label: nil) }
         it { is_expected.to include(hint: 'Simple short text') }
         it { is_expected.to include(format: 'html') }
         it { is_expected.to include(rows: 10) }
         it { is_expected.to include(line_break: true) }
         it { is_expected.to include(content_from_default: 'Hello world') }
 
+        context 'with a defined slug' do
+
+          let(:source) { "{% editable_text 'First column', slug: 'column_1' %}{% endeditable_text %}" }
+
+          it { is_expected.to include(slug: 'column_1') }
+          it { is_expected.to include(label: 'First column') }
+
+        end
+
+        context 'with a defined label' do
+
+          let(:source) { "{% editable_text 'first_column', label: 'Column #1' %}{% endeditable_text %}" }
+
+          it { is_expected.to include(slug: 'first_column') }
+          it { is_expected.to include(label: 'Column #1') }
+
+        end
+
       end
 
     end
@@ -75,7 +94,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
     let(:element_editing) { true }
 
     let(:child_page)  { instance_double('Page', fullpath: 'child-page') }
-    let(:element)     { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: element_editing, inline_editing: element_editing, format: 'html') }
+    let(:element)     { instance_double('EditableText', _id: 42, id: 42, content: nil, inline_editing?: element_editing, inline_editing: element_editing, format: 'html') }
     let(:services)    { Locomotive::Steam::Services.build_instance(nil) }
     let(:context)     { ::Liquid::Context.new({}, {}, { page: child_page, services: services, live_editing: live_editing }) }
 
@@ -102,7 +121,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
       let(:layout)  { instance_double('Page', fullpath: 'layout') }
       let(:source)  { "{% editable_text title, hint: 'Simple short text', fixed: true %}Hello world{% endeditable_text %}" }
       let(:options) { { page: layout } }
-      let(:element) { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: element_editing, inline_editing: element_editing, format: 'html', fixed: true) }
+      let(:element) { instance_double('EditableText', _id: 42, id: 42, content: nil, inline_editing?: element_editing, inline_editing: element_editing, format: 'html', fixed: true) }
 
       it 'fetches the related page in order to get the element' do
         expect(services.page_finder).to receive(:find).with('layout').and_return(layout)
@@ -113,7 +132,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
     context 'modified content' do
 
-      let(:element) { instance_double('EditableText', content: 'Hello world!', default_content?: false, format: 'html') }
+      let(:element) { instance_double('EditableText', content: 'Hello world!', format: 'html') }
       it { is_expected.to eq 'Hello world!' }
 
     end
@@ -129,7 +148,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
     context 'markdown format' do
 
-      let(:element) { instance_double('EditableText', content: "#Hello world!\nLorem ipsum", default_content?: false, format: 'markdown') }
+      let(:element) { instance_double('EditableText', content: "#Hello world!\nLorem ipsum", format: 'markdown') }
       it { is_expected.to eq "<h1>Hello world!</h1>\n<p>Lorem ipsum</p>\n" }
 
     end

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

@@ -27,12 +27,30 @@ describe Locomotive::Steam::Liquid::Tags::Extends do
 
     let!(:template) { parse_template(source, options) }
 
-    let(:parent) { instance_double('Index', localized_attributes: { source: true, template: true }, source: { en: 'Hello world!' }, template: { en: nil }) }
+    let(:parent) { instance_double('Index', handle: nil, slug: nil, localized_attributes: { source: true, template: true }, source: { en: 'Hello world!' }, template: { en: nil }) }
 
     it { expect(listener.event_names.first).to eq 'steam.parse.extends' }
     it { expect(template.render).to eq 'Hello world!' }
     it { expect(options[:page]).to eq page }
 
+    describe 'set the layout name' do
+
+      let(:source) { '{% extends parent %}{% block message %}My layout: {{ layout_name }}{% endblock %}' }
+
+      let(:parent) { instance_double('Index', handle: nil, slug: 'index', localized_attributes: { source: true, template: true }, source: { en: 'Hello world! {% block message %}{% endblock %}' }, template: { en: nil }) }
+
+      it { expect(template.render).to eq 'Hello world! My layout: index' }
+
+      context 'the handle of the parent page exists' do
+
+        let(:parent) { instance_double('Index', handle: 'home', slug: 'index', localized_attributes: { source: true, template: true }, source: { en: 'Hello world! {% block message %}{% endblock %}' }, template: { en: nil }) }
+
+        it { expect(template.render).to eq 'Hello world! My layout: home' }
+
+      end
+
+    end
+
   end
 
 end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Locomotive::Steam::Liquid::Tags::InheritedBlock do
 
   let(:parent_source) { 'My product: {% block product %}Random{% endblock %}' }
-  let(:parent)        { instance_double('Index', liquid_source: parent_source, template: nil, :template= => nil) }
+  let(:parent)        { instance_double('Index', liquid_source: parent_source, template: nil, :template= => nil, slug: nil, handle: nil) }
   let(:source)        { '{% extends parent %}{% block product %}Skis{% endblock %}' }
   let(:page)          { instance_double('Page') }
 

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

@@ -25,6 +25,27 @@ describe Locomotive::Steam::Liquid::Tags::WithScope do
 
   end
 
+  describe 'decode content entry' do
+
+    let(:entry) {
+      instance_double('ContentEntry', _id: 1, _source: 'entity').tap do |_entry|
+        allow(_entry).to receive(:to_liquid).and_return(_entry)
+      end }
+    let(:assigns) { { 'my_project' => entry } }
+    let(:source)  { "{% with_scope project: my_project %}{% assign conditions = with_scope %}{% endwith_scope %}" }
+
+    it { expect(conditions['project']).to eq 'entity' }
+
+    context 'an array of content entries' do
+
+      let(:source) { "{% with_scope project: [my_project, my_project, my_project] %}{% assign conditions = with_scope %}{% endwith_scope %}" }
+
+      it { expect(conditions['project']).to eq ['entity', 'entity', 'entity'] }
+
+    end
+
+  end
+
   describe 'decode context variable' do
 
     let(:assigns) { { 'params' => { 'type' => 'posts' } } }

data/spec/unit/repositories/content_entry_repository_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../../lib/locomotive/steam/adapters/filesystem.rb'
 
 describe Locomotive::Steam::ContentEntryRepository do
 
-  let(:_fields) { instance_double('Fields', selects: [], belongs_to: []) }
+  let(:_fields) { instance_double('Fields', selects: [], belongs_to: [], many_to_many: []) }
   let(:type)    { build_content_type('Articles', label_field_name: :title, localized_names: [:title], fields: _fields, fields_by_name: { title: instance_double('Field', name: :title, type: :string) }) }
   let(:entries) { [{ content_type_id: 1, _position: 0, _label: 'Update #1', title: { fr: 'Mise a jour #1' }, text: { en: 'added some free stuff', fr: 'phrase FR' }, date: '2009/05/12', category: 'General' }] }
   let(:locale)  { :en }
@@ -248,7 +248,7 @@ describe Locomotive::Steam::ContentEntryRepository do
     let(:other_type)    { build_content_type('Authors', _id: 2, label_field_name: :name, fields: _fields, fields_by_name: { name: instance_double('Field', name: :name, type: :string) }) }
     let(:other_entries) { [{ content_type_id: 2, _id: 'john-doe', name: 'John Doe' }] }
 
-    let(:type_repository) { instance_double('ArticleBelongsToRepository', selects: [], belongs_to: []) }
+    let(:type_repository) { instance_double('ArticleBelongsToRepository', selects: [], belongs_to: [], many_to_many: []) }
 
     before do
       allow(type).to receive(:fields).and_return(type_repository)
@@ -281,7 +281,7 @@ describe Locomotive::Steam::ContentEntryRepository do
         ]
       }
 
-    let(:type_repository) { instance_double('AuthorRepository', selects: [], belongs_to: []) }
+    let(:type_repository) { instance_double('AuthorRepository', selects: [], belongs_to: [], many_to_many: []) }
 
     before do
       allow(type).to receive(:fields).and_return(type_repository)
@@ -314,7 +314,7 @@ describe Locomotive::Steam::ContentEntryRepository do
         ]
       }
 
-    let(:type_repository) { instance_double('AuthorRepository', selects: [], belongs_to: []) }
+    let(:type_repository) { instance_double('AuthorRepository', selects: [], belongs_to: [], many_to_many: []) }
 
     before do
       allow(type).to receive(:fields).and_return(type_repository)
@@ -333,6 +333,76 @@ describe Locomotive::Steam::ContentEntryRepository do
 
   end
 
+  describe '#conditions_without_order_by' do
+
+    let(:conditions) { {} }
+
+    subject { repository.with(type).send(:conditions_without_order_by, conditions) }
+
+    it { is_expected.to eq([{ _visible: true, content_type_id: 1 }, nil]) }
+
+    context 'select fields' do
+
+      let(:value)       { 'CMS' }
+      let(:option)      { instance_double('Option', _id: 42)}
+      let(:options)     { instance_double('OptionRepository', by_name: option) }
+      let(:field)       { instance_double('SelectField', name: 'category', persisted_name: 'category_id', select_options: options) }
+      let(:_fields)     { instance_double('Fields', selects: [field], belongs_to: [], many_to_many: []) }
+      let(:conditions)  { { 'category' => value } }
+
+      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'category_id' => 42 }, nil]) }
+
+    end
+
+    context 'belongs_to fields' do
+
+      let(:value)       { 42 }
+      let(:field)       { instance_double('BelongsToField', name: 'person', persisted_name: 'person_id') }
+      let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [field], many_to_many: []) }
+      let(:conditions)  { { 'person' => value } }
+
+      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => 42 }, nil]) }
+
+      context 'the target value is a content entry' do
+
+        let(:value) { instance_double('TargetContentEntry', _id: 1) }
+
+        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id' => 1 }, nil]) }
+
+      end
+
+      context 'the target value is an arry of content entry' do
+
+        let(:value) { [instance_double('TargetContentEntry', _id: 1), instance_double('TargetContentEntry', _id: 2)] }
+        let(:conditions)  { { 'person.in' => value } }
+
+        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'person_id.in' => [1, 2] }, nil]) }
+
+      end
+
+    end
+
+    context 'many_to_many fields' do
+
+      let(:value)       { 42 }
+      let(:field)       { instance_double('ManyToManyField', name: 'tags', persisted_name: 'tag_ids') }
+      let(:_fields)     { instance_double('Fields', selects: [], belongs_to: [], many_to_many: [field]) }
+      let(:conditions)  { { 'tags.in' => value } }
+
+      it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'tag_ids.in' => [42] }, nil]) }
+
+      context 'the target value is a content entry' do
+
+        let(:value) { [instance_double('TargetContentEntry', _id: 1), 42] }
+
+        it { is_expected.to eq([{ _visible: true, content_type_id: 1, 'tag_ids.in' => [1, 42] }, nil]) }
+
+      end
+
+    end
+
+  end
+
   def build_content_type(name, attributes = {})
     instance_double(name,
       {

data/spec/unit/repositories/page_repository_spec.rb

@@ -331,6 +331,12 @@ describe Locomotive::Steam::PageRepository do
 
       end
 
+      context 'looping over' do
+
+        it { i = 0; subject.each { |el| i += 1 }; expect(i).to eq 1 }
+
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc6
+  version: 1.0.0.rc8
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.6.4
 - !ruby/object:Gem::Dependency
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
@@ -489,6 +503,7 @@ files:
 - lib/locomotive/steam/liquid/tags/session_assign.rb
 - lib/locomotive/steam/liquid/tags/snippet.rb
 - lib/locomotive/steam/liquid/tags/with_scope.rb
+- lib/locomotive/steam/liquid/template.rb
 - lib/locomotive/steam/middlewares.rb
 - lib/locomotive/steam/middlewares/default_env.rb
 - lib/locomotive/steam/middlewares/dynamic_assets.rb
@@ -649,6 +664,7 @@ files:
 - spec/fixtures/mongodb/locomotive_translations.metadata.json
 - spec/fixtures/mongodb/system.indexes.bson
 - spec/integration/integration_helper.rb
+- spec/integration/liquid/drops/page_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
@@ -890,6 +906,7 @@ test_files:
 - spec/fixtures/mongodb/locomotive_translations.metadata.json
 - spec/fixtures/mongodb/system.indexes.bson
 - spec/integration/integration_helper.rb
+- spec/integration/liquid/drops/page_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