locomotivecms_steam 1.0.0.pre.alpha.2 → 1.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d356e35a4a40eb38ba622e0f11c80c6c4f96f60c
-  data.tar.gz: 271c77fcbd49d0f728b696b42c5cb53893710876
+  metadata.gz: 4b4546173ae3156b352326063ab3f4627794f376
+  data.tar.gz: cf990d7b68ff7214aea8b6751fbd21364242d9c6
 SHA512:
-  metadata.gz: 9f2b709d5db8a35b9d2f3d17cbf05ed9f47a40190b73336b50c8e7bcbdda1fa83107149618e391db6374efbe8a6e6ed884ebdc6e3163ca988edc11ae887ca92d
-  data.tar.gz: 7665c557df441bcda5e23321d02945712585a1f75b989ade5fd41a414ab3d9733a84e9f6adba2e008714114083c6513ba9296ebfbeff0350ca22d7cf82b077da
+  metadata.gz: c99b54430322c95af6613c5092fe0d37098d312fa1d4b1552733e4fe28af2cacc17c3df3d7d3818909456290db94235a16720c3e0091de563e3cf8d7e4e027f1
+  data.tar.gz: 9d5dea9b461f371a46eec6f43ee8dfde680df5a3794098ea7c63d856232cb8100ed034958a34533de7cdf30450daa1a7643be39f8473ba27eeb02bff9c811132

data/Gemfile

@@ -13,18 +13,18 @@ group :development do
 end
 
 group :test do
-  gem 'rspec',              '~> 3.2.0'
+  gem 'rspec',              '~> 3.3.0'
   gem 'json_spec',          '~> 1.1.4'
   gem 'i18n-spec',          '~> 0.6.0'
 
-  gem 'timecop',            '~> 0.7.1'
+  gem 'timecop',            '~> 0.7.4'
 
   gem 'pry-byebug',         '~> 3.1.0'
 
   gem 'rack-test',          '~> 0.6.3'
 
   gem 'codeclimate-test-reporter',  '~> 0.4.7',  require: false
-  gem 'coveralls',                  '~> 0.7.12', require: false
+  gem 'coveralls',                  '~> 0.8.1', require: false
 end
 
 platform :ruby do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.pre.alpha.2)
+    locomotivecms_steam (1.0.0.pre.alpha.3)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -28,14 +28,14 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    bson (2.3.0)
+    bson (3.1.0)
     byebug (4.0.5)
       columnize (= 0.9.0)
     chronic (0.10.2)
@@ -63,10 +63,10 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     connection_pool (2.2.0)
-    coveralls (0.7.12)
-      multi_json (~> 1.10)
+    coveralls (0.8.1)
+      json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.9.1)
+      simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
     crass (1.0.2)
@@ -95,7 +95,7 @@ GEM
       iso
     iso (0.2.1)
       i18n
-    json (1.8.2)
+    json (1.8.3)
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
@@ -113,14 +113,14 @@ GEM
     mime-types (2.6.1)
     mimetype-fu (0.1.2)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     moneta (0.8.0)
-    moped (2.0.4)
-      bson (~> 2.2)
+    moped (2.0.6)
+      bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
     morphine (0.1.1)
-    multi_json (1.11.0)
+    multi_json (1.11.1)
     multi_xml (0.5.5)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
@@ -152,29 +152,29 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     sanitize (4.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.4.1)
     sass (3.4.14)
-    simplecov (0.9.2)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.9.0)
-    simplecov-html (0.9.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     sprockets (2.12.3)
       hike (~> 1.2)
@@ -197,8 +197,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    timecop (0.7.3)
-    tins (1.5.1)
+    timecop (0.7.4)
+    tins (1.5.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -212,16 +212,16 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.7)
   codeclimate-test-reporter (~> 0.4.7)
-  coveralls (~> 0.7.12)
+  coveralls (~> 0.8.1)
   i18n-spec (~> 0.6.0)
   json_spec (~> 1.1.4)
   locomotivecms_steam!
-  moped (~> 2.0.4)
+  moped (~> 2.0.6)
   origin (~> 2.1.1)
   pry-byebug (~> 3.1.0)
   rack-test (~> 0.6.3)
   rake (~> 10.4.2)
-  rspec (~> 3.2.0)
+  rspec (~> 3.3.0)
   thin
-  timecop (~> 0.7.1)
+  timecop (~> 0.7.4)
   yui-compressor (~> 0.12.0)

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

@@ -9,7 +9,7 @@ module Locomotive
 
             def default_element_attributes
               super.merge({
-                content: render_default_content,
+                content_from_default: self.render_default_content,
                 options: @element_options[:options]
               })
             end

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

@@ -19,25 +19,30 @@ module Locomotive
 
             def with_inline_editing(context, element, &block)
               if editable?(context, element)
-                %{<span class="locomotive-editable-text" data-element-id="#{element.id}">#{yield}</span>}
+                %{<span class="locomotive-editable-text" id="#{dom_id(context)}" data-element-id="#{element._id}">#{yield}</span>}
               else
                 yield
               end
             end
 
             def editable?(context, element)
-              !!context['inline_editing'] && element.inline_editing?
+              !!context.registers[:live_editing]
             end
 
             def default_element_attributes
               super.merge(
                 content_from_default: self.render_default_content,
-                format:               @options[:format] || 'html',
-                rows:                 @options[:rows] || 10,
-                line_break:           @options[:line_break].blank? ? true : @options[:line_break]
+                format:               @element_options[:format] || 'html',
+                rows:                 @element_options[:rows] || 10,
+                line_break:           @element_options[:line_break].blank? ? true : @element_options[:line_break]
               )
             end
 
+            def dom_id(context)
+              block_name = context['block'].try(:name).try(:gsub, '/', '-')
+              ['locomotive-editable-text', block_name, @slug].compact.join('-')
+            end
+
           end
 
           ::Liquid::Template.register_tag('editable_text'.freeze, Text)

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

@@ -12,7 +12,7 @@ module Locomotive
             # no need to go further if the parent does not exist
             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)
+            ActiveSupport::Notifications.instrument('steam.parse.extends', page: options[:page], parent: parent)
 
             # the source has already been parsed before
             options[:parser]._parse(parent, options.merge(page: parent))

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

@@ -6,7 +6,7 @@ module Locomotive
 
           def parse(tokens)
             super.tap do
-              ActiveSupport::Notifications.instrument("steam.parse.inherited_block", page: options[:page], name: @name, found_super: self.contains_super?(nodelist))
+              ActiveSupport::Notifications.instrument('steam.parse.inherited_block', page: options[:page], name: @name, found_super: self.contains_super?(nodelist))
             end
           end
 

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

@@ -15,12 +15,12 @@ module Locomotive
         #
         class Paginate < ::Liquid::Block
 
-          Syntax = /(#{::Liquid::QuotedFragment}+)\s+by\s+([0-9]+)/o
+          Syntax = /(#{::Liquid::QuotedFragment}+)\s+by\s+(#{::Liquid::QuotedFragment}+)/o
 
           def initialize(tag_name, markup, options)
             if markup =~ Syntax
               @collection_name  = $1
-              @per_page         = $2.to_i
+              @per_page         = $2
               @paginate_options = {}
               markup.scan(::Liquid::TagAttributes) { |key, value| @paginate_options[key.to_sym] = value.gsub(/^'/, '').gsub(/'$/, '') }
             else
@@ -54,11 +54,12 @@ module Locomotive
           #
           def paginate_collection(context)
             collection    = context[@collection_name]
+            per_page      = context[@per_page].to_i
             current_page  = context['current_page'].try(:to_i)
 
             raise ::Liquid::ArgumentError.new("Cannot paginate '#{@collection_name}'. Not found.") if collection.nil?
 
-            pager = Locomotive::Steam::Models::Pager.new(collection, current_page, @per_page)
+            pager = Locomotive::Steam::Models::Pager.new(collection, current_page, per_page)
 
             # make sure the pagination object is a hash with strings as keys (and not symbol)
             HashConverter.to_string(pager.to_liquid).tap do |_pagination|

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

@@ -18,7 +18,7 @@ module Locomotive::Steam
       end
 
       def redirect_to(location, type = 301)
-        _location = mounted_on && (location =~ Steam::IsHTTP).nil? ? "#{mounted_on}#{location}" : location
+        _location = mounted_on && (location =~ Locomotive::Steam::IsHTTP).nil? ? "#{mounted_on}#{location}" : location
 
         self.log "Redirected to #{_location}".blue
 

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

@@ -16,7 +16,7 @@ module Locomotive::Steam
       private
 
       def render_page
-        if page.redirect_url
+        if page.redirect_url.presence
           redirect_to(page.redirect_url, page.redirect_type)
         else
           content = parse_and_render_liquid
@@ -46,7 +46,8 @@ module Locomotive::Steam
           page:           page,
           services:       services,
           repositories:   services.repositories,
-          logger:         Locomotive::Common::Logger
+          logger:         Locomotive::Common::Logger,
+          live_editing:   !!env['steam.live_editing']
         }
       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.2'
+    VERSION = '1.0.0-alpha.3'
   end
 end

data/lib/locomotive/steam.rb

@@ -19,7 +19,7 @@ module Locomotive
 
     CONTENT_ENTRY_ENGINE_CLASS_NAME = /^Locomotive::ContentEntry(.*)$/o
 
-    IsHTTP = /^https?:\/\//o
+    IsHTTP = /\Ahttps?:\/\//o
 
     class << self
       attr_writer :configuration

data/locomotivecms_steam.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_development_dependency 'moped',      '~> 2.0.4'
+  spec.add_development_dependency 'moped',      '~> 2.0.6'
   spec.add_development_dependency 'origin',     '~> 2.1.1'
 
   spec.add_dependency 'sanitize',               '~> 4.0.0'

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

@@ -30,7 +30,7 @@ describe Locomotive::Steam::Liquid::Tags::Consume do
 
     describe 'raises an error if the syntax is incorrect' do
       let(:source) { '{% consume blog http://www.locomotiveapp.org %}{% endconsume %}' }
-      it { expect { subject }.to raise_exception }
+      it { expect { subject }.to raise_exception(Liquid::SyntaxError) }
     end
 
   end

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

@@ -59,7 +59,8 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Control do
         it { is_expected.to include(slug: 'menu') }
         it { is_expected.to include(options: 'true=Yes,false=No') }
         it { is_expected.to include(hint: 'some text') }
-        it { is_expected.to include(content: 'false') }
+        it { is_expected.to include(content_from_default: 'false') }
+        it { is_expected.not_to include(content: 'false') }
 
       end
 

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

@@ -71,12 +71,12 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
   describe 'rendering' do
 
-    let(:inline_editing) { false }
+    let(:live_editing) { false }
 
     let(:page)        { instance_double('Page', fullpath: 'hello-world') }
-    let(:element)     { instance_double('EditableText', id: 42, default_content?: true, inline_editing?: true) }
+    let(:element)     { instance_double('EditableText', _id: 42, id: 42, default_content?: true, inline_editing?: true) }
     let(:services)    { Locomotive::Steam::Services.build_instance(nil) }
-    let(:context)     { ::Liquid::Context.new({ 'inline_editing' => inline_editing }, {}, { page: page, services: services }) }
+    let(:context)     { ::Liquid::Context.new({}, {}, { page: page, services: services, live_editing: live_editing }) }
 
     before { allow(services.editable_element).to receive(:find).and_return(element) }
 
@@ -109,8 +109,15 @@ describe Locomotive::Steam::Liquid::Tags::Editable::Text do
 
     context 'inline-editing mode' do
 
-      let(:inline_editing) { true }
-      it { is_expected.to eq '<span class="locomotive-editable-text" data-element-id="42">Hello world</span>' }
+      let(:live_editing) { true }
+      it { is_expected.to eq '<span class="locomotive-editable-text" id="locomotive-editable-text-title" data-element-id="42">Hello world</span>' }
+
+      context 'with inside blocks' do
+
+        let(:source) { '{% block wrapper %}{% block sidebar %}{% 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
 
     end
 

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

@@ -18,7 +18,7 @@ describe Locomotive::Steam::Liquid::Tags::FetchPage do
 
     describe 'raises an error if the syntax is incorrect' do
       let(:source) { "{% fetch_page 'about_us' %}{{ a_page.title }}" }
-      it { expect { subject }.to raise_exception }
+      it { expect { subject }.to raise_exception(::SyntaxError) }
     end
 
   end

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

@@ -10,7 +10,7 @@ describe Locomotive::Steam::Liquid::Tags::GoogleAnalytics do
 
   describe 'raises an error if the syntax is incorrect' do
     let(:source) { '{% google_analytics %}' }
-    it { expect { subject }.to raise_exception }#(::Liquid::SyntaxError) }
+    it { expect { subject }.to raise_exception(::Liquid::SyntaxError) }
   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.2
+  version: 1.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement