locomotivecms_steam 1.0.0 → 1.0.1

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

@@ -14,6 +14,10 @@ module Locomotive
             liquify(*self.scoped_pages)
           end
 
+          def metafields
+            @metafields ||= Metafields.new(@_source)
+          end
+
           protected
 
           def repository

data/lib/locomotive/steam/liquid/filters/misc.rb

@@ -14,6 +14,10 @@ module Locomotive
             array.at(position) if array.respond_to?(:at)
           end
 
+          def shuffle(array)
+            array.to_a.shuffle
+          end
+
           def default(input, value)
             input.blank? ? value : input
           end

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

@@ -3,7 +3,7 @@ module Locomotive
     module Liquid
       module Tags
 
-        # Consume web services as easy as pie directly in liquid !
+        # Consume web services as easy as pie directly in liquid!
         #
         # Usage:
         #
@@ -33,11 +33,16 @@ module Locomotive
           def render(context)
             self.set_api_options(context)
 
-            if instance_variable_defined? :@variable_name
+            if instance_variable_defined?(:@variable_name)
               @url = context[@variable_name]
             end
 
-            render_all_and_cache_it(context)
+            if @url.blank?
+              Locomotive::Common::Logger.error "A consume tag can't call an empty URL."
+              ''
+            else
+              render_all_and_cache_it(context)
+            end
           end
 
           protected
@@ -52,11 +57,11 @@ module Locomotive
 
           def set_api_options(context)
             @api_options  = interpolate_options(@default_api_options, context)
-            @expires_in   = @api_options.delete(:expires_in) || 0
+            @expires_in   = @api_options.delete(:expires_in).try(:to_i)
           end
 
           def render_all_and_cache_it(context)
-            cache_service(context).fetch(page_fragment_cache_key, expires_in: @expires_in, force: @expires_in == 0) do
+            cache_service(context).fetch(page_fragment_cache_key, cache_options) do
               self.render_all_without_cache(context)
             end
           end
@@ -64,6 +69,8 @@ module Locomotive
           def render_all_without_cache(context)
             context.stack do
               begin
+                Locomotive::Common::Logger.info "[consume] #{@url.inspect} / #{@api_options.inspect}"
+
                 context.scopes.last[@name] = service(context).consume(@url, @api_options)
               rescue Timeout::Error
                 context.scopes.last[@name] = last_response(context)
@@ -81,12 +88,16 @@ module Locomotive
             context.registers[:services].cache
           end
 
+          def cache_options
+            @expires_in.blank? ? { force: true } : { expires_in: @expires_in }
+          end
+
           def last_response(context)
             cache_service(context).read(page_fragment_cache_key)
           end
 
           def page_fragment_cache_key
-            Digest::SHA1.hexdigest(@name + @url)
+            "Steam-consume-#{Digest::SHA1.hexdigest(@name + @url)}"
           end
 
         end

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

@@ -35,7 +35,7 @@ module Locomotive
 
             # get all the children of a source: site (index page), parent or page.
             pages   = children_of(fetch_starting_page)
-            output  = self.build_entries_output(pages)
+            output  = self.build_entries_output(pages, context)
 
             if self.no_wrapper?
               output
@@ -54,7 +54,7 @@ module Locomotive
           #
           # @return [ String ] The final HTML output
           #
-          def build_entries_output(pages, depth = 1)
+          def build_entries_output(pages, depth = 1, context)
             output  = []
 
             pages.each_with_index do |page, index|
@@ -62,7 +62,7 @@ module Locomotive
               css << 'first'  if index == 0
               css << 'last'   if index == pages.size - 1
 
-              output << self.render_entry_link(page, css.join(' '), depth)
+              output << self.render_entry_link(page, css.join(' '), depth, context)
             end
 
             output.join("\n")
@@ -133,9 +133,9 @@ module Locomotive
           #
           # @return [ String ] The label in HTML
           #
-          def entry_label(page)
+          def entry_label(page, context)
             icon  = @_options[:icon] ? '<span></span>' : ''
-            title = @_options[:liquid_render] ? @_options[:liquid_render].render('page' => page) : page.title
+            title = @_options[:liquid_render] ? @_options[:liquid_render].render({ 'page' => page }, registers: context.registers) : page.title
 
             if icon.blank?
               title
@@ -178,10 +178,10 @@ module Locomotive
           #
           # @return [ String ] The HTML output
           #
-          def render_entry_link(page, css, depth)
+          def render_entry_link(page, css, depth, context)
             page      = decorate_page(page)
             url       = self.entry_url(page)
-            label     = self.entry_label(page)
+            label     = self.entry_label(page, context)
             css       = self.entry_css(page, css)
             options   = ''
 
@@ -193,7 +193,7 @@ module Locomotive
             end
 
             self.render_tag(:li, id: "#{page.slug.to_s.dasherize}-link", css: css) do
-              children_output = depth.succ <= @_options[:depth].to_i ? self.render_entry_children(page, depth.succ) : ''
+              children_output = depth.succ <= @_options[:depth].to_i ? self.render_entry_children(page, depth.succ, context) : ''
               %{<a href="#{url}"#{options}>#{label}</a>} + children_output
             end
           end
@@ -205,13 +205,13 @@ module Locomotive
           #
           # @return [ String ] The HTML code
           #
-          def render_entry_children(page, depth)
+          def render_entry_children(page, depth, context)
             entries = children_of(page)
             css     = self.bootstrap? ? 'dropdown-menu' : ''
 
             unless entries.empty?
               self.render_tag(:ul, id: "#{@_options[:id]}-#{page.slug.to_s.dasherize}", css: css) do
-                self.build_entries_output(entries, depth)
+                self.build_entries_output(entries, depth, context)
               end
             else
               ''
@@ -254,7 +254,13 @@ module Locomotive
             source = if template_name.include?('{{')
               template_name
             else
-              services.snippet_finder.find(template_name).try(:source)
+              snippet = services.snippet_finder.find(template_name)
+              if snippet
+                snippet.liquid_source
+              else
+                Locomotive::Common::Logger.warn "[Liquid][Nav] unable to find the #{template_name} snippet"
+                nil
+              end
             end
 
             source ? ::Liquid::Template.parse(source) : nil

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 =~ Locomotive::Steam::IsHTTP).nil? ? "#{mounted_on}#{location}" : location
+        _location = mounted_on && !location.starts_with?(mounted_on) && (location =~ Locomotive::Steam::IsHTTP).nil? ? "#{mounted_on}#{location}" : location
 
         self.log "Redirected to #{_location}".blue
 

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

@@ -15,6 +15,7 @@ module Locomotive::Steam
           if !page.not_found?
             log "Found page \"#{page.title}\" [#{page.fullpath}]"
           else
+            ActiveSupport::Notifications.instrument('steam.render.page_not_found', path: path, locale: locale, default_locale: default_locale)
             log "Page not found, rendering the 404 page.".magenta
           end
         end

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

@@ -25,8 +25,14 @@ module Locomotive::Steam
       end
 
       def render_missing_404
-        log "[Warning] Your 404 page is missing. Please create it.".red
-        render_response('Missing 404 page', 404)
+        message = (if locale != default_locale
+          "Your 404 page is missing in the #{locale} locale."
+        else
+          "Your 404 page is missing."
+        end) + " Please create it."
+
+        log "[Warning] #{message}".red
+        render_response(message, 404)
       end
 
       def parse_and_render_liquid

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

@@ -32,6 +32,10 @@ module Locomotive::Steam
         adapter.create(mapper, scope, entity)
       end
 
+      def inc(entity, attribute, amount = 1)
+        adapter.inc(mapper, entity, attribute, amount)
+      end
+
       def delete(entity)
         adapter.delete(mapper, scope, entity)
       end

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

@@ -53,6 +53,10 @@ module Locomotive
         query { where(localized: true) }.all.map(&:name)
       end
 
+      def default
+        query { where(k(:default, :neq) => nil, k(:type, :in) => [:string, :text, :color, :select, :boolean, :email, :integer, :float]) }.all
+      end
+
       def select_options(name)
         if field = first { where(name: name, type: :select) }
           field.select_options.all

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'
+    VERSION = '1.0.1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mongo',      '~> 2.2.1'
   spec.add_development_dependency 'origin',     '~> 2.1.1'
 
-  spec.add_dependency 'nokogiri',               '~> 1.6.7.1'
+  spec.add_dependency 'nokogiri',               '~> 1.6.7.2'
   spec.add_dependency 'sanitize',               '~> 4.0.1'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.13.6'

data/spec/fixtures/default/app/content_types/events.yml

@@ -12,6 +12,7 @@ fields:
 - city:
     type: string
     label: City of the event
+    default: Chicago
 - state:
     type: string
     label: State of the event

data/spec/fixtures/default/app/views/pages/basic.liquid.haml

@@ -12,3 +12,15 @@ position: 6
   %body
     %p
       This is a basic page
+
+    %ul
+      %li Color scheme={{ site.metafields.theme.color_scheme }}
+      %li Facebook ID={{ site.metafields.social.facebook_id }}
+      %li Google ID={{ site.metafields.social.google_id }}
+      %li API URL={{ site.metafields.github.api_url }}
+      %li Expires In={{ site.metafields.github.expires_in }}
+
+    %ul
+      {% for property in site.metafields.social %}
+      %li.property {{ property.label }}({{ property.name }})={{ property.value }}
+      {% endfor %}

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

@@ -4,3 +4,5 @@ listed: false
 published: true
 ---
 {% nav site %}
+
+{% nav site, snippet: "-{{ page.title }}-" %}

data/spec/fixtures/default/config/metafields_schema.yml

@@ -0,0 +1,33 @@
+theme:
+  fields:
+    color_scheme:
+      localized: true
+
+social:
+  label:
+    fr: Social (FR)
+  position: 1
+  fields:
+    - facebook_id
+    - google_id
+
+github:
+  position: 0
+  fields:
+    api_url:
+      label:
+        en: 'API Url'
+        fr: "Url de l'API"
+      type: string
+      hint: 'API endpoint'
+    expires_in:
+      label:
+        en: 'Expires in'
+        fr: 'Expire dans'
+      hint:
+        en: 'Cache - In milliseconds'
+        fr: 'Cache - En millisecondes'
+      type: integer
+      min: 0
+      max: 3600
+

data/spec/fixtures/default/config/site.yml

@@ -19,3 +19,16 @@ meta_keywords:
 meta_description: some meta description
 
 robots_txt: "User-agent: *\nDisallow:"
+
+metafields:
+  theme:
+    color_scheme:
+      en: 'white'
+      fr: 'blue'
+      nb: 'red'
+  social:
+    facebook_id: 'FB42'
+    google_id: 'G42'
+  github:
+    api_url: https://api.github.com/repos/vmg/redcarpet/issues?state=closed
+    expires_in: 42

data/spec/fixtures/default/data/events.yml

@@ -45,9 +45,8 @@
     state: Missouri
 - Ballydoyle's:
     date: 2011/06/05
-    city: Aurora
     state: Illinois
 - The Belmont:
     date: 2011/06/04
     city: Hamtramk
-    state: Michigan
+    state: Michigan

data/spec/integration/adapters/mongodb_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+require_relative '../../../lib/locomotive/steam/adapters/mongodb.rb'
+
+describe Locomotive::Steam::MongoDBAdapter do
+
+  let(:adapter) { Locomotive::Steam::MongoDBAdapter.new(database: 'steam_test', hosts: ['127.0.0.1:27017'], min_pool_size: 2, max_pool_size: 5) }
+
+  before(:all) do
+    described_class.disconnect_session
+    @before_connections = current_connections
+  end
+
+  describe '#session' do
+
+    subject { adapter.send(:session) }
+
+    it { is_expected.not_to eq nil }
+
+    it "don't create more Mongo sessions than the max pool" do
+      10.times { subject['locomotive_sites'].find.count }
+      _after = current_connections
+      expect(_after).to be >= (@before_connections + 2) # min_pool_size
+      expect(_after).to be <= (@before_connections + 5) # max_pool_size
+    end
+
+  end
+
+  describe '.disconnect_session' do
+
+    let(:connection) { adapter.send(:session) }
+
+    subject { described_class.disconnect_session }
+
+    it { is_expected.to eq nil }
+
+    it 'closes clients' do
+      10.times { connection['locomotive_sites'].find.count }
+      subject
+      expect(current_connections).to eq @before_connections
+    end
+
+  end
+
+  def current_connections
+    `mongo --eval "db.serverStatus().connections.current"`.split("\n").last.to_i
+  end
+
+end

data/spec/integration/repositories/content_entry_repository_spec.rb

@@ -61,6 +61,16 @@ describe Locomotive::Steam::ContentEntryRepository do
       it { expect(subject.map { |h| h[:entries].size }).to eq([2, 1, 0]) }
     end
 
+    describe '#order_by' do
+      let(:order_by) { 'name' }
+      subject { repository.all(order_by: order_by) }
+      it { expect(subject.map { |h| h[:name] }).to eq(['Alice in Chains', 'Pearl Jam', 'The who']) }
+      context 'a field and a direction' do
+        let(:order_by) { 'name.desc, leader asc' }
+        it { expect(subject.map { |h| h[:name] }).to eq(['The who', 'Pearl Jam', 'Alice in Chains']) }
+      end
+    end
+
     describe '#create' do
 
       let(:type) { type_repository.by_slug('songs') }
@@ -76,6 +86,22 @@ describe Locomotive::Steam::ContentEntryRepository do
 
     end
 
+    describe '#inc' do
+
+      let(:type) { type_repository.by_slug('songs') }
+      let(:attributes) { { title: 'Jeremy', band: 'pearl-jam', short_description: '"Jeremy" is a song by the American rock band Pearl Jam', views: 41 } }
+      let(:entry) { repository.with(type).build(attributes) }
+
+      before { repository.create(entry) }
+
+      subject { repository.inc(entry, :views) }
+
+      it { expect(subject.views).to eq 42 }
+
+      after { repository.delete(entry) }
+
+    end
+
   end
 
   context 'MongoDB' do