locomotivecms_steam 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7867012e1ff99777a991748f000e8984ce4d9b14
-  data.tar.gz: d03ab3751750b477ad705af2735e886bab54f9b4
+  metadata.gz: b7df606052bd99feb2e413424aee474abc2c38de
+  data.tar.gz: e2f3eacbb044cf3920178315a475d2c8e0fe0a9d
 SHA512:
-  metadata.gz: 008f097e630b8f223df81f751cc75060ae8722649fe393ff0f5f33682737f2886f91b704a8ca4e9d50f4c3bb896e9de82cd86ae4a59b91a3d904b9c9de59e79b
-  data.tar.gz: 9f564651bddec6e4d96db8e5220509c24fcbddf4f2f2037f87b831e36c1064b7a6c701a3cb6081b4b0c2d618f190b8f4409f3c7cde0225f221e1ba52bb590166
+  metadata.gz: 0652e4cdc58c66a22ba3e018265f85114ca14e41bb75429ce91e8ee95dc96cdfbbefba72707c53f701df9c5a99b7104fc38afe6ac063b79e86ebbf5b82c41a44
+  data.tar.gz: 00fa87eb476049549c909406eaff59e4759e415fb87868a60d54c4a3181e1cef8a3bcb351d53719559d840b0eee2c809a732b7e3a7d0ab34cdaee2860235bd8b

data/Gemfile

@@ -34,5 +34,5 @@ group :test do
 end
 
 platform :ruby do
-  ruby '2.2.2'
+  ruby '2.2.3'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc2)
+    locomotivecms_steam (1.0.0.rc3)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -10,7 +10,7 @@ PATH
       haml (~> 4.0.6)
       httparty (~> 0.13.6)
       kramdown (~> 1.8.0)
-      locomotivecms-solid (~> 4.0.0.alpha2)
+      locomotivecms-solid (~> 4.0.1)
       locomotivecms_common (~> 0.0.5)
       mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
@@ -28,7 +28,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.4)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,14 +40,14 @@ GEM
     byebug (4.0.5)
       columnize (= 0.9.0)
     chronic (0.10.2)
-    chunky_png (1.3.4)
+    chunky_png (1.3.5)
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.10.0)
     colorize (0.7.7)
     columnize (0.9.0)
     commonjs (0.2.7)
@@ -106,9 +106,9 @@ GEM
     kramdown (1.8.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
-    locomotivecms-liquid (4.0.0.alpha2)
-    locomotivecms-solid (4.0.0.alpha2)
-      locomotivecms-liquid (~> 4.0.0.alpha2)
+    locomotivecms-liquid (4.0.0)
+    locomotivecms-solid (4.0.1)
+      locomotivecms-liquid (~> 4.0.0)
     locomotivecms_common (0.0.5)
       activesupport (~> 4.2.1)
       attr_extras (~> 4.4.0)
@@ -119,7 +119,7 @@ GEM
     mime-types (2.6.1)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
-    minitest (5.8.1)
+    minitest (5.8.2)
     moneta (0.8.0)
     moped (2.0.6)
       bson (~> 3.0)
@@ -144,7 +144,7 @@ GEM
       pry (~> 0.10)
     puma (2.12.3)
     rack (1.6.1)
-    rack-cache (1.5.0)
+    rack-cache (1.5.1)
       rack (>= 0.4)
     rack-mini-profiler (0.9.7)
       rack (>= 1.1.3)

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

@@ -8,6 +8,7 @@ module Locomotive::Steam
 
     def initialize(attributes = {})
       super({
+        block:          nil,
         content:        nil,
         source:         nil,
         inline_editing: true

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

@@ -18,7 +18,7 @@ module Locomotive
           def initialize(tag_name, markup, options)
             super
 
-            @attributes = { short_name: false, priority: 0 }
+            @attributes = { short_name: false, priority: 0, anchor: true }
             markup.scan(::Liquid::TagAttributes) do |key, value|
               @attributes[key.to_sym] = ::Liquid::Expression.parse(value)
             end
@@ -34,6 +34,14 @@ module Locomotive
             end
           end
 
+          def render(context)
+            (if live_editing?(context) && (@attributes[:anchor] || @attributes[:anchor].nil?)
+              %{<span class="locomotive-block-anchor" data-element-id="#{@name}" style="visibility: hidden"></span>}
+            else
+              ''
+            end) + super
+          end
+
           protected
 
           def contains_super?(nodes)
@@ -60,6 +68,10 @@ module Locomotive
             end
           end
 
+          def live_editing?(context)
+            !!context.registers[:live_editing]
+          end
+
         end
 
         ::Liquid::Template.register_tag('block'.freeze, InheritedBlock)

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

@@ -46,8 +46,11 @@ module Locomotive
                 _key = key.to_s == '_permalink' ? '_slug' : key.to_s
 
                 hash[_key] = (case value
-                  # regexp inside a string
+                # 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)

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

@@ -130,22 +130,32 @@ module Locomotive
       end
 
       def prepare_conditions(*conditions)
-        _conditions = conditions.first.try(:with_indifferent_access)
+        # _conditions = conditions.first.try(:with_indifferent_access)
 
-        prepare_conditions_for_select_fields(_conditions) if _conditions
+        _conditions = Conditions.new(conditions.first, self.content_type.fields).prepare
 
         super({ _visible: true }, _conditions)
       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
+      # # 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?
@@ -194,6 +204,37 @@ module Locomotive
         end
       end
 
+      class Conditions
+
+        def initialize(conditions = {}, fields)
+          @conditions, @fields = conditions.try(:with_indifferent_access) || {}, fields
+        end
+
+        def prepare
+          return {} if @conditions.blank?
+
+          _prepare(@fields.selects) do |field, value|
+            field.select_options.by_name(value).try(:_id)
+          end
+
+          _prepare(@fields.belongs_to) { |field, value| value.try(:_id) }
+
+          @conditions
+        end
+
+        protected
+
+        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)
+            end
+          end
+        end
+
+      end
+
     end
 
   end

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

@@ -22,6 +22,10 @@ module Locomotive
         query { where(type: :select) }.all
       end
 
+      def belongs_to
+        query { where(type: :belongs_to) }.all
+      end
+
       def associations
         query { where(k(:type, :in) => %i(belongs_to has_many many_to_many)) }.all
       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.rc2'
+    VERSION = '1.0.0.rc3'
   end
 end

data/locomotivecms_steam.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
   spec.add_dependency 'mime-types',             '~> 2.6.1'
 
-  spec.add_dependency 'locomotivecms-solid',      '~> 4.0.0.alpha2'
+  spec.add_dependency 'locomotivecms-solid',      '~> 4.0.1'
   spec.add_dependency 'locomotivecms_common',     '~> 0.0.5'
 
   spec.required_ruby_version = '>= 2.0'

data/spec/unit/entities/editable_element_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Locomotive::Steam::EditableElement do
+
+  let(:attributes) { {} }
+  let(:page) { described_class.new(attributes) }
+
+  it { expect(page.block).to eq nil }
+
+end

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

@@ -141,7 +141,7 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
       context 'with inside blocks' do
 
-        let(:source) { '{% block wrapper %}{% block sidebar %}{% editable_text title %}Hello world{% endeditable_text %}{% endblock %}{% endblock %}' }
+        let(:source) { '{% block wrapper, anchor: false %}{% block sidebar, anchor: false %}{% editable_text title %}Hello world{% endeditable_text %}{% endblock %}{% endblock %}' }
         it { is_expected.to eq '<span class="locomotive-editable-text" id="locomotive-editable-text-wrapper-sidebar-title" data-element-id="42">Hello world</span>' }
 
       end

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

@@ -43,4 +43,12 @@ describe Locomotive::Steam::Liquid::Tags::InheritedBlock do
 
   end
 
+  describe 'live editing on' do
+
+    let(:context) { ::Liquid::Context.new({}, {}, { live_editing: true }) }
+
+    it { expect(template.render(context)).to eq 'My product: <span class="locomotive-block-anchor" data-element-id="product" style="visibility: hidden"></span>Skis' }
+
+  end
+
 end

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: []) }
+  let(:_fields) { instance_double('Fields', selects: [], belongs_to: []) }
   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: []) }
+    let(:type_repository) { instance_double('ArticleBelongsToRepository', selects: [], belongs_to: []) }
 
     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: []) }
+    let(:type_repository) { instance_double('AuthorRepository', selects: [], belongs_to: []) }
 
     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: []) }
+    let(:type_repository) { instance_double('AuthorRepository', selects: [], belongs_to: []) }
 
     before do
       allow(type).to receive(:fields).and_return(type_repository)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -341,14 +341,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha2
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha2
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: locomotivecms_common
   requirement: !ruby/object:Gem::Requirement
@@ -698,6 +698,7 @@ files:
 - 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/editable_element_spec.rb
 - spec/unit/entities/page_spec.rb
 - spec/unit/entities/site_spec.rb
 - spec/unit/entities/snippet_spec.rb
@@ -791,7 +792,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: The LocomotiveCMS Steam is the rendering stack used by both Wagon and Engine
@@ -937,6 +938,7 @@ test_files:
 - 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/editable_element_spec.rb
 - spec/unit/entities/page_spec.rb
 - spec/unit/entities/site_spec.rb
 - spec/unit/entities/snippet_spec.rb