locomotive_cms 2.5.6 → 2.5.7

data/lib/locomotive/liquid/drops/content_types.rb

@@ -41,11 +41,17 @@ module Locomotive
         protected
 
         def collection
+          options = {}
+
           if @context['with_scope']
             self.modify_with_scope
+
+            options = { where: @context['with_scope'] }
+
+            options[:order_by] = options[:where].delete(:order_by)
           end
 
-          @collection ||= @content_type.ordered_entries(@context['with_scope']).visible
+          @collection ||= @content_type.ordered_entries(options).visible
         end
 
         # Modify the attributes of the with_scope tag so that

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

@@ -3,14 +3,24 @@ module Locomotive
     module Drops
       class Page < Base
 
-        delegate :seo_title, :meta_keywords, :meta_description, :redirect_url, :handle, to: :@_source
+        delegate :seo_title, :meta_keywords, :meta_description, :redirect_url, :handle, :layout, to: :@_source
 
         def title
-          @_source.templatized? ? @context['entry']._label : @_source.title
+          title =  @_source.templatized? ? @context['entry'].try(:_label) : nil
+          title || @_source.title
         end
 
         def slug
-          @_source.templatized? ? @context['entry']._slug.singularize : @_source.slug
+          slug = @_source.templatized? ? @context['entry'].try(:_slug).try(:singularize) : nil
+          slug || @_source.slug
+        end
+
+        def original_title
+          @_source.title
+        end
+
+        def original_slug
+          @_source.slug
         end
 
         def parent
@@ -45,6 +55,10 @@ module Locomotive
           @_source.redirect?
         end
 
+        def is_layout?
+          @_source.is_layout?
+        end
+
         def templatized?
           @_source.templatized?
         end
@@ -57,10 +71,44 @@ module Locomotive
           end
         end
 
+        def editable_elements
+          @editable_elements_hash ||= build_editable_elements_hash
+        end
+
         def before_method(meth)
+          # @deprecated
           @_source.editable_elements.where(slug: meth).try(:first).try(:content)
         end
 
+        private
+
+        def build_editable_elements_hash
+            {}.tap do |hash|
+              @_source.editable_elements.each do |el|
+                safe_slug = el.slug.parameterize.underscore
+                keys      = el.block.try(:split, '/').try(:compact) || []
+
+                _hash = _build_editable_elements_hashes(hash, keys)
+
+                _hash[safe_slug] = el.content
+              end
+            end
+          end
+
+          def _build_editable_elements_hashes(hash, keys)
+            _hash = hash
+
+            keys.each do |key|
+              safe_key = key.parameterize.underscore
+
+              _hash[safe_key] = {} if _hash[safe_key].nil?
+
+              _hash = _hash[safe_key]
+            end
+
+            _hash
+          end
+
       end
     end
   end

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

@@ -1,6 +1,7 @@
 module Locomotive
   module Liquid
       module Tags
+
       # Consume web services as easy as pie directly in liquid !
       #
       # Usage:
@@ -13,14 +14,14 @@ module Locomotive
       #
       class Consume < ::Liquid::Block
 
-        Syntax = /(#{::Liquid::VariableSignature}+)\s*from\s*(#{::Liquid::QuotedString}|#{::Liquid::VariableSignature}+)/
+        Syntax = /(#{::Liquid::VariableSignature}+)\s*from\s*(#{::Liquid::QuotedString}|#{::Liquid::VariableSignature}+)(.*)?/
 
         def initialize(tag_name, markup, tokens, context)
           if markup =~ Syntax
             @target = $1
 
             self.prepare_url($2)
-            self.prepare_options(markup)
+            self.prepare_api_arguments($3)
           else
             raise ::Liquid::SyntaxError.new("Syntax Error in 'consume' - Valid syntax: consume <var> from \"<url>\" [username: value, password: value]")
           end
@@ -31,9 +32,12 @@ module Locomotive
         end
 
         def render(context)
+          self.set_api_options(context)
+
           if instance_variable_defined? :@variable_name
             @url = context[@variable_name]
           end
+
           render_all_and_cache_it(context)
         end
 
@@ -49,13 +53,14 @@ module Locomotive
           end
         end
 
-        def prepare_options(markup)
-          @options = {}
-          markup.scan(::Liquid::TagAttributes) do |key, value|
-            @options[key] = value if key != 'http'
-          end
-          @options['timeout'] = @options['timeout'].to_f if @options['timeout']
-          @expires_in = (@options.delete('expires_in') || 0).to_i
+        def prepare_api_arguments(string)
+          string = string.gsub(/^(\s*,)/, '').strip
+          @api_arguments = Solid::Arguments.parse(string)
+        end
+
+        def set_api_options(context)
+          @api_options  = @api_arguments ? @api_arguments.interpolate(context).first || {} : {}
+          @expires_in   = @api_options.delete(:expires_in) || 0
         end
 
         def page_fragment_cache_key(url)
@@ -81,7 +86,7 @@ module Locomotive
         def render_all_without_cache(context)
           context.stack do
             begin
-              context.scopes.last[@target.to_s] = Locomotive::Httparty::Webservice.consume(@url, @options.symbolize_keys)
+              context.scopes.last[@target.to_s] = Locomotive::Httparty::Webservice.consume(@url, @api_options)
               self.cached_response = context.scopes.last[@target.to_s]
             rescue Timeout::Error
               context.scopes.last[@target.to_s] = self.cached_response

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

@@ -12,7 +12,7 @@ module Locomotive
             if markup =~ Syntax
               @slug = $1.gsub(/[\"\']/, '')
               @options = { fixed: false }
-              markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/^'/, '').gsub(/'$/, '') }
+              markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/^[\"\']/, '').gsub(/[\"\']$/, '') }
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in 'editable_xxx' - Valid syntax: editable_xxx <slug>(, <options>)")
             end

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

@@ -49,7 +49,12 @@ module Locomotive
               # key to h4s symbol
               _key = _key.to_s.to_sym.send(_operator.to_sym) if _operator
 
-              hash[_key] = value
+              hash[_key] = (case value
+                # regexp inside a string
+              when /^\/[^\/]*\/$/ then Regexp.new(value[1..-2])
+              else
+                value
+              end)
             end
           end
         end

data/lib/locomotive/presentable.rb

@@ -213,4 +213,4 @@ module Locomotive
     end # ClassMethods
 
   end # Presentable
-end # Locomotive
+end # Locomotive

data/lib/locomotive/regexps.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     SUBDOMAIN           = /^[a-z][a-z0-9_-]*[a-z0-9]{1}$/
 
-    DOMAIN              = /^(([a-z])([a-z\d-]){0,61}([a-z\d]))(\.([a-z])([a-z\d-]){0,61}([a-z\d]))*$/i
+    DOMAIN              = /^(([a-z\d])([a-z\d-]){0,61}([a-z\d]))(\.([a-z\d])([a-z\d-]){0,61}([a-z\d]))*$/i
 
     URL                 = /((http|https|ftp):\/)?\/\S*/
 

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.6'
+  VERSION = '2.5.7'
 end

data/lib/tasks/locomotive.rake

@@ -123,4 +123,4 @@ namespace :locomotive do
 
   end
 
-end
+end

data/spec/dummy/config/application.rb

@@ -2,7 +2,7 @@ require File.expand_path('../boot', __FILE__)
 
 require 'action_controller/railtie'
 require 'action_mailer/railtie'
-require 'active_resource/railtie'
+# require 'active_resource/railtie'
 require "sprockets/railtie"
 
 Bundler.require *Rails.groups(:assets) if defined?(Bundler)

data/spec/dummy/config/mongoid.yml

@@ -5,7 +5,7 @@ development:
     default:
       # Defines the name of the default database that Mongoid can connect to.
       # (required).
-      database: locomotive_engine_dev
+      database: locomotive_engine_2_5_dev
       # database: locomotive_mounter_dev
       # Provides the hosts the default session can connect to. Must be an array
       # of host:port pairs. (required)
@@ -102,4 +102,4 @@ production:
 # production:
 #   <<: *defaults
 #   identity_map_enabled: true
-#   database: locomotive_engine_production
+#   database: locomotive_engine_production

data/spec/lib/locomotive/httparty/webservice_spec.rb

@@ -9,17 +9,17 @@ describe Locomotive::Httparty::Webservice do
     end
 
     it 'sets the base uri from a simple url' do
-      Locomotive::Httparty::Webservice.expects(:get).with('/', { base_uri: 'http://blog.locomotiveapp.org' }).returns(@response)
+      Locomotive::Httparty::Webservice.expects(:get).with('/', base_uri: 'http://blog.locomotiveapp.org').returns(@response)
       Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org')
     end
 
     it 'sets the base uri from a much more complex url' do
-      Locomotive::Httparty::Webservice.expects(:get).with('/feed/weather.ashx?key=secretapikey&format=json', { base_uri: 'http://free.worldweatheronline.com' }).returns(@response)
+      Locomotive::Httparty::Webservice.expects(:get).with('/feed/weather.ashx', base_uri: 'http://free.worldweatheronline.com', query: { 'key' => 'secretapikey', 'format' => 'json' }).returns(@response)
       Locomotive::Httparty::Webservice.consume('http://free.worldweatheronline.com/feed/weather.ashx?key=secretapikey&format=json')
     end
 
     it 'sets both the base uri and the path from an url with parameters' do
-      Locomotive::Httparty::Webservice.expects(:get).with('/api/read/json?num=3', { base_uri: 'http://blog.locomotiveapp.org' }).returns(@response)
+      Locomotive::Httparty::Webservice.expects(:get).with('/api/read/json', base_uri: 'http://blog.locomotiveapp.org', query: { 'num' => '3' }).returns(@response)
       Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org/api/read/json?num=3')
     end
 
@@ -28,6 +28,11 @@ describe Locomotive::Httparty::Webservice do
       Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org', { username: 'john', password: 'foo' })
     end
 
+    it 'sends a post request' do
+      Locomotive::Httparty::Webservice.expects(:post).with('/api/charge.json', { base_uri: 'http://blog.locomotiveapp.org', body: { 'source' => 'abc', 'amount' => '42000' } }).returns(@response)
+      Locomotive::Httparty::Webservice.consume('http://blog.locomotiveapp.org/api/charge.json?source=abc&amount=42000', method: :post)
+    end
+
   end
 
   context 'in a real-world' do

data/spec/lib/locomotive/liquid/drops/page_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Locomotive::Liquid::Drops::Page do
 
   before(:each) do
-    @site  = FactoryGirl.build(:site)
-    @home  = FactoryGirl.build(:page, site: @site, meta_keywords: 'Libidinous, Angsty', meta_description: "Quite the combination.")
+    @site   = FactoryGirl.build(:site)
+    @home   = FactoryGirl.build(:page, site: @site, meta_keywords: 'Libidinous, Angsty', meta_description: "Quite the combination.")
   end
 
   context '#rendering tree' do
@@ -53,6 +53,19 @@ describe Locomotive::Liquid::Drops::Page do
 
   end
 
+  context '#layout' do
+    before(:each) do
+      @layout = FactoryGirl.build(:page, title: 'Simple playout', is_layout: true)
+      @home.layout = @layout
+    end
+
+    it 'renders title of parent page' do
+      content = render_template '{{ page.layout.title }}', { 'page' => @home }
+      content.should == "Simple playout"
+    end
+
+  end
+
   context '#breadcrumbs' do
     before(:each) do
       @sub_page = FactoryGirl.build(:sub_page, meta_keywords: 'Sub Libidinous, Angsty', meta_description: "Sub Quite the combination.")
@@ -77,6 +90,7 @@ describe Locomotive::Liquid::Drops::Page do
       entry = Locomotive::Liquid::Drops::ContentEntry.new(mock('entry', _label: 'Locomotive rocks !'))
 
       render_template('{{ page.title }}', 'page' => templatized, 'entry' => entry).should == 'Locomotive rocks !'
+      render_template('{{ page.original_title }}', 'page' => templatized, 'entry' => entry).should == 'Lorem ipsum template'
     end
 
   end
@@ -88,11 +102,12 @@ describe Locomotive::Liquid::Drops::Page do
     end
 
     it 'renders the content instance slug instead for a templatized page' do
-      templatized = FactoryGirl.build(:page, title: 'Lorem ipsum template', templatized: true)
+      templatized = FactoryGirl.build(:page, title: 'Lorem ipsum template', slug: 'content-type-template', templatized: true)
 
       entry = Locomotive::Liquid::Drops::ContentEntry.new(mock('entry', _slug: 'my_entry'))
 
       render_template('{{ page.slug }}', 'page' => templatized, 'entry' => entry).should == 'my_entry'
+      render_template('{{ page.original_slug }}', 'page' => templatized, 'entry' => entry).should == 'content-type-template'
     end
 
   end
@@ -102,12 +117,12 @@ describe Locomotive::Liquid::Drops::Page do
     before(:each) do
       @site = FactoryGirl.create(:site)
       @home = @site.pages.root.first
-      @home.update_attributes raw_template: "{% block body %}{% editable_short_text 'body' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
+      @home.update_attributes raw_template: "{% editable_text title %}Hello world{% endeditable_text %}{% block body %}{% editable_short_text 'message' %}Lorem ipsum{% endeditable_short_text %}{% endblock %}"
       @home.editable_elements.first.content = 'Lorem ipsum'
     end
 
     it 'renders the text of the editable field' do
-      render_template('{{ home.body }}').should == 'Lorem ipsum'
+      render_template('{{ home.editable_elements.body.message }}').should == 'Lorem ipsum'
     end
 
   end

data/spec/lib/locomotive/liquid/tags/consume_spec.rb

@@ -4,84 +4,97 @@ describe Locomotive::Liquid::Tags::Consume do
 
   context '#validating syntax' do
 
-    it 'validates a basic syntax' do
-      markup = 'blog from "http://blog.locomotiveapp.org"'
-      lambda do
-        Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"], {})
-      end.should_not raise_error
+    let(:markup) { '' }
+    let(:tag) { Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"], {}) }
+    subject { lambda { tag } }
+
+    describe 'validates a basic syntax' do
+
+      let(:markup) { 'blog from "http://blog.locomotiveapp.org"' }
+      it { should_not raise_exception }
+
     end
 
-    it 'validates more complex syntax with attributes' do
-      markup = 'blog from "http://www.locomotiveapp.org" username: "john", password: "easyone"'
-      lambda do
-        Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"], {})
-      end.should_not raise_error
+    describe 'validates more complex syntax with attributes' do
+
+      let(:markup) { 'blog from "http://www.locomotiveapp.org", username: "john", password: password_from_context' }
+      it { should_not raise_exception }
+
     end
 
-    it 'should parse the correct url with complex syntax with attributes' do
-      markup = 'blog from "http://www.locomotiveapp.org" username: "john", password: "easyone"'
-      tag = Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"], {})
-      tag.instance_variable_get(:@url).should == "http://www.locomotiveapp.org"
+    describe 'should parse the correct url with complex syntax with attributes' do
+
+      let(:markup) { 'blog from "http://www.locomotiveapp.org" username: "john", password: "easyone"' }
+      it { should_not raise_exception }
+      it { tag.instance_variable_get(:@url).should eq "http://www.locomotiveapp.org" }
+
     end
 
-    it 'raises an error if the syntax is incorrect' do
-      markup = 'blog http://www.locomotiveapp.org'
-      lambda do
-        Locomotive::Liquid::Tags::Consume.new('consume', markup, ["{% endconsume %}"], {})
-      end.should raise_error
+    describe 'raises an error if the syntax is incorrect' do
+
+      let(:markup) { 'blog http://www.locomotiveapp.org' }
+      it { should raise_exception }
+
     end
 
   end
 
   context '#rendering' do
 
-    it 'puts the response into the liquid variable' do
-      response = mock('response', code: 200, parsed_response: parsed_response('title' => 'Locomotive rocks !'))
-      Locomotive::Httparty::Webservice.stubs(:get).returns(response)
-      template = "{% consume blog from \"http://blog.locomotiveapp.org/api/read\" %}{{ blog.title }}{% endconsume %}"
-      Liquid::Template.parse(template).render.should == 'Locomotive rocks !'
+    let(:assigns)     { {} }
+    let(:template)    { '' }
+    let(:api_options) { { base_uri: 'http://blog.locomotiveapp.org' } }
+    let(:response)    { { 'title' => 'Locomotive rocks !' } }
+    let(:mocked_response) { mock('response', code: 200, parsed_response: parsed_response(response)) }
+
+    before { Locomotive::Httparty::Webservice.expects(:get).with('/api/read', api_options).returns(mocked_response) }
+
+    subject { render_template(template, assigns) }
+
+    describe 'assign the response into the liquid variable' do
+
+      let(:template) { "{% consume blog from \"http://blog.locomotiveapp.org/api/read\" %}{{ blog.title }}{% endconsume %}" }
+      it { should eq 'Locomotive rocks !' }
+
     end
 
-    it 'puts the response into the liquid variable using a url from a variable' do
-      response = mock('response', code: 200, parsed_response: parsed_response('title' => 'Locomotive rocks !'))
-      Locomotive::Httparty::Webservice.stubs(:get).returns(response)
-      template = "{% consume blog from url %}{{ blog.title }}{% endconsume %}"
-      Liquid::Template.parse(template).render('url' => "http://blog.locomotiveapp.org/api/read").should == 'Locomotive rocks !'
+    describe 'assign the response into the liquid variable using a url from a variable' do
+
+      let(:assigns)   { { 'url' => 'http://blog.locomotiveapp.org/api/read' } }
+      let(:template)  { "{% consume blog from url %}{{ blog.title }}{% endconsume %}" }
+      it { should eq 'Locomotive rocks !' }
+
     end
 
-    it 'puts the response into the liquid variable using a url from a variable that changes within an iteration' do
-      base_uri = 'http://blog.locomotiveapp.org'
-      template = "{% consume blog from url %}{{ blog.title }}{% endconsume %}"
-      compiled_template = Liquid::Template.parse(template)
+    describe 'accept options for the web service' do
+
+      let(:assigns)     { { 'secret_password' => 'bar' } }
+      let(:api_options) { { base_uri: 'http://blog.locomotiveapp.org', basic_auth: { username: 'foo', password: 'bar' } } }
+      let(:template) { "{% consume blog from \"http://blog.locomotiveapp.org/api/read\", username: 'foo', password: secret_password %}{{ blog.title }}{% endconsume %}" }
+      it { should eq 'Locomotive rocks !' }
 
-      [['/api/read', 'Locomotive rocks !'], ['/api/read_again', 'Locomotive still rocks !']].each do |path, title|
-        response = mock('response', code: 200, parsed_response: parsed_response('title' => title))
-        Locomotive::Httparty::Webservice.stubs(:get).with(path, {:base_uri => base_uri}).returns(response)
-        compiled_template.render('url' => base_uri + path).should == title
-      end
     end
+
   end
 
   context 'timeout' do
 
-    before(:each) do
-      @url = 'http://blog.locomotiveapp.org/api/read'
-      @template = %{{% consume blog from "#{@url}" timeout:5 %}{{ blog.title }}{% endconsume %}}
-    end
+    let(:url) { 'http://blog.locomotiveapp.org/api/read' }
+    let(:template) { %{{% consume blog from "#{url}" timeout:5.0 %}{{ blog.title }}{% endconsume %}} }
+
+    subject { render_template(template) }
 
     it 'should pass the timeout option to httparty' do
-      Locomotive::Httparty::Webservice.expects(:consume).with(@url, {timeout: 5.0})
-      Liquid::Template.parse(@template).render
+      Locomotive::Httparty::Webservice.expects(:consume).with(url, { timeout: 5.0 })
+      subject
     end
 
     it 'should return the previous successful response if a timeout occurs' do
       Locomotive::Httparty::Webservice.stubs(:consume).returns({ 'title' => 'first response' })
-      template = Liquid::Template.parse(@template)
-
-      template.render.should == 'first response'
+      subject.should eq 'first response'
 
       Locomotive::Httparty::Webservice.stubs(:consume).raises(Timeout::Error)
-      template.render.should == 'first response'
+      subject.should eq 'first response'
     end
 
   end
@@ -89,4 +102,9 @@ describe Locomotive::Liquid::Tags::Consume do
   def parsed_response(attributes)
     OpenStruct.new(underscore_keys: attributes)
   end
+
+  def render_template(template, assigns = {})
+    _context = Liquid::Context.new(assigns, {}, {})
+    Liquid::Template.parse(template).render(_context)
+  end
 end