locomotivecms_steam 1.2.0.beta1 → 1.2.0.rc1

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

@@ -11,6 +11,7 @@ module Locomotive::Steam
       ENTRY_SUBMISSION_REGEXP = /^\/entry_submissions\/(\w+)/o
       SUBMITTED_TYPE_PARAM    = 'submitted_type_slug'
       SUBMITTED_PARAM         = 'submitted_entry_slug'
+      CONTENT_TYPE_PARAM      = 'content_type_slug'
 
       def _call
         # we didn't go through the locale middleware yet,
@@ -72,8 +73,26 @@ module Locomotive::Steam
       end
 
       def entry_to_query_string(entry)
-        type, slug = entry.content_type_slug, entry._slug
-        "#{SUBMITTED_TYPE_PARAM}=#{type}&#{SUBMITTED_PARAM}=#{slug}"
+        service_params = [
+          services.csrf_protection.field,
+          CONTENT_TYPE_PARAM,
+          SUBMITTED_TYPE_PARAM,
+          SUBMITTED_PARAM,
+          'success_callback',
+          'error_callback',
+          'content',
+          'entry'
+        ]
+
+        [].tap do |list|
+          params.each do |key, value|
+            next if service_params.include?(key)
+            list << "#{key}=#{value}"
+          end
+
+          list << "#{SUBMITTED_TYPE_PARAM}=#{entry.content_type_slug}"
+          list << "#{SUBMITTED_PARAM}=#{entry._slug}"
+        end.join('&')
       end
 
       def with_locale(&block)
@@ -109,8 +128,8 @@ module Locomotive::Steam
       # or from the presence of the content_type_slug param (model_form tag).
       #
       def get_content_type_slug
-        if request.post? && (request.path_info =~ ENTRY_SUBMISSION_REGEXP || params[:content_type_slug])
-          $1 || params[:content_type_slug]
+        if request.post? && (request.path_info =~ ENTRY_SUBMISSION_REGEXP || params[CONTENT_TYPE_PARAM])
+          $1 || params[CONTENT_TYPE_PARAM]
         end
       end
 

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

@@ -26,11 +26,21 @@ module Locomotive::Steam
       protected
 
       def fetch_page
-        services.page_finder.match(path).tap do |pages|
+        page = page_finder.match(path).tap do |pages|
           if pages.size > 1
             self.log "Found multiple pages: #{pages.map(&:title).join(', ')}"
           end
-        end.first || services.page_finder.find('404')
+        end.first
+
+        if page && (page.published? || page.not_found? || live_editing?)
+          page
+        else
+          page_finder.find('404')
+        end
+      end
+
+      def page_finder
+        services.page_finder
       end
 
     end

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

@@ -16,7 +16,7 @@ module Locomotive::Steam
       private
 
       def render_page
-        if page.redirect_url.presence
+        if page.redirect?
           redirect_to(page.redirect_url, page.redirect_type)
         else
           content = parse_and_render_liquid
@@ -73,7 +73,7 @@ module Locomotive::Steam
           'today'             => Date.today,
           'mode'              => Locomotive::Steam.configuration.mode,
           'wagon'             => Locomotive::Steam.configuration.mode == :test,
-          'live_editing'      => !!env['steam.live_editing']
+          'live_editing'      => live_editing?
         }
       end
 
@@ -98,14 +98,15 @@ module Locomotive::Steam
 
       def _request_liquid_assigns
         {
-          'path'        => request.path,
+          'base_url'    => request.base_url,
           'fullpath'    => request.fullpath,
-          'url'         => request.url,
           'ip_address'  => request.ip,
+          'mounted_on'  => mounted_on,
+          'path'        => request.path,
           'post?'       => request.post?,
-          'base_url'    => request.base_url,
+          'referer'     => request.referer,
+          'url'         => request.url,
           'user_agent'  => request.user_agent,
-          'mounted_on'  => mounted_on
         }
       end
 

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

@@ -53,6 +53,8 @@ module Locomotive::Steam
       def build_templatized_page_xml(page, locale)
         content_type = repositories.content_type.find(page.content_type_id)
 
+        return nil unless build_templatized_page_xml?(page, content_type, locale)
+
         repositories.content_entry.with(content_type).all.map do |entry|
           _entry = Locomotive::Steam::Decorators::I18nDecorator.new(entry, locale)
 
@@ -88,6 +90,15 @@ module Locomotive::Steam
         services.url_builder.url_for(page, locale)
       end
 
+      def build_templatized_page_xml?(page, content_type, locale)
+        return true if content_type.localized? || default_locale == locale
+
+        # does the templatized page have the same source
+        # (liquid template) as in the default locale?
+        # If so, no need to add a xml entry for this page
+        !page.source.blank?
+      end
+
       def base_url
         "#{request.scheme}://#{request.host_with_port}"
       end

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

@@ -61,6 +61,10 @@ module Locomotive::Steam::Middlewares
       @params ||= self.request.params.with_indifferent_access
     end
 
+    def live_editing?
+      !!env['steam.live_editing']
+    end
+
   end
 
 end

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

@@ -31,7 +31,7 @@ module Locomotive::Steam
         @translations = (if translations.respond_to?(:fetch)
           translations
         else
-          Hash.new { translations }
+          Hash.new(translations)
         end).with_indifferent_access
       end
 

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

@@ -58,7 +58,9 @@ module Locomotive
       end
 
       def localized_names
-        query { where(localized: true) }.all.map(&:name)
+        query { where(localized: true) }.all.map do |field|
+          field.type == :select ? [field.name, "#{field.name}_id"] : field.name
+        end.flatten
       end
 
       def default

data/lib/locomotive/steam/server.rb

@@ -1,4 +1,3 @@
-require 'haml'
 require 'mimetype_fu'
 require 'mime-types'
 require 'mime/types'

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

@@ -16,6 +16,10 @@ module Locomotive
         username, password = options.delete(:username), options.delete(:password)
         options[:basic_auth] = { username: username, password: password } if username
 
+        # authorization header ?
+        header_auth = options.delete(:header_auth)
+        options[:headers] = { 'Authorization' => header_auth } if header_auth
+
         perform_request_to(path, options)
       end
 
@@ -37,7 +41,10 @@ module Locomotive
 
         # sanitize the options
         options[:format]  = options[:format].gsub(/[\'\"]/, '').to_sym if options.has_key?(:format)
-        options[:headers] = { 'User-Agent' => 'LocomotiveCMS' } if options[:with_user_agent]
+        if options[:with_user_agent]
+          user_agent = { 'User-Agent' => 'LocomotiveCMS' }
+          options[:headers] ? options[:headers].merge!(user_agent) : options[:headers] = user_agent
+        end
 
         response        = self.class.get(path, options)
         parsed_response = response.parsed_response

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

@@ -6,7 +6,7 @@ module Locomotive
       attr_accessor_initialize :resizer, :asset_path
 
       def resize(source, geometry)
-        return nil if disabled? || geometry.blank?
+        return get_url_or_path(source) if disabled? || geometry.blank?
 
         if file = fetch_file(source)
           file.thumb(geometry).url

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

@@ -27,6 +27,10 @@ module Locomotive
 
       private
 
+      def decorate(&block)
+        super(Decorators::PageDecorator, &block)
+      end
+
       # Instead of hitting the DB each time we want a page from its handle,
       # just get all the handles at once and cache the result. (up to 20% boost)
       #

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.2.0.beta1'
+    VERSION = '1.2.0.rc1'
   end
 end

data/locomotivecms_steam.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_development_dependency 'mongo',      '~> 2.2.3'
-  spec.add_development_dependency 'origin',     '~> 2.1.1'
+  spec.add_development_dependency 'mongo',      '~> 2.2.7'
+  spec.add_development_dependency 'origin',     '~> 2.2.0'
 
-  spec.add_dependency 'nokogiri',               '~> 1.6.7.2'
+  spec.add_dependency 'nokogiri',               '~> 1.6.8'
   spec.add_dependency 'sanitize',               '~> 4.0.1'
   spec.add_dependency 'morphine',               '~> 0.1.1'
   spec.add_dependency 'httparty',               '~> 0.13.6'
@@ -40,8 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'autoprefixer-rails',     '~> 6.3.3.1'
 
   spec.add_dependency 'kramdown',               '~> 1.10.0'
-  spec.add_dependency 'RedCloth',               '~> 4.2.9'
-  spec.add_dependency 'haml',                   '~> 4.0.6'
+  spec.add_dependency 'RedCloth',               '~> 4.3.2'
   spec.add_dependency 'mimetype-fu',            '~> 0.1.2'
   spec.add_dependency 'mime-types',             '~> 2.6.1'
   spec.add_dependency 'duktape',                '~> 1.3.0.6'

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

@@ -1,7 +1,7 @@
 ---
 title: All the pages
 listed: false
-published: false
+published: true
 ---
 {% extends parent %}
 {% block content %}
@@ -10,4 +10,7 @@ published: false
 <li>{{ page.title }}</li>
 {% endfor %}
 </ul>
+
+<!-- TEST -->{{ site.index.children | map: 'title' | join: " - " }}<!-- TEST -->
+
 {% endblock %}

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

@@ -13,10 +13,17 @@ position: 4
     Ut imperdiet velit eu metus semper tristique. Vivamus risus nisi, tincidunt et euismod a, auctor pretium eros. Vestibulum sed magna et velit pulvinar euismod. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sed velit quis nisl blandit vulputate id non tortor. Mauris nec placerat massa. Vivamus sed odio non ligula pharetra pretium. Ut convallis, purus et lobortis suscipit, mauris orci ullamcorper lectus, nec vulputate turpis mauris sed augue. Maecenas faucibus ultricies nisl, non ullamcorper justo bibendum nec. Duis vitae mauris condimentum risus commodo mattis vel sed libero. Fusce diam elit, porta id vestibulum ut, aliquet mattis neque.
   {% endeditable_long_text %}
 
+{% if message.errors %}
+.text
+  %p Form with errors
+{% endif %}
+
 %form#contactform{ :name => 'contact', :action => '{{ contents.messages.public_submission_url }}.json', :method => 'post' }
   / %input{ type: 'hidden', name: 'success_callback', value: '/events' }
   / %input{ type: 'hidden', name: 'error_callback', value: '/contact' }
 
+  %input{ type: 'hidden', name: 'some_variable', value: '42' }
+
   %p
     %label{ :for => 'name' } Name
     %input{ :type => 'text', :id => 'name', :name => 'content[name]', :placeholder => 'First and last name', :tabindex => '1', required: 'required', value: '{{ message.name }}' }
@@ -51,4 +58,4 @@ position: 4
     });
   });
 
-{% endblock %}
+{% endblock %}

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

@@ -5,8 +5,15 @@ position: 5
 
 {% block content %}
 
+{% if message.errors %}
+.text
+  %p Form with errors
+{% endif %}
+
 %p Thank you {{ message.name }} !
 
+%p Some variable: {{ params.some_variable }}
+
 #events.unit.size2of3
   %h2 Upcoming events
 

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

@@ -1,6 +1,6 @@
 ---
 title: Page to test the nav tag with a high depth
 listed: false
-published: false
+published: true
 ---
-{% nav 'site', depth: 2 %}
+{% nav 'site', depth: 2 %}

data/spec/fixtures/default/data/updates.yml

@@ -5,7 +5,9 @@
       en: john posted a new post
       fr: phrase FR
     date: 2009/11/16
-    category: General
+    category:
+      en: General
+      fr: Général
 - "Update #5":
     title:
       fr: "Mise a jour #5"
@@ -45,4 +47,4 @@
       en: added some free stuff
       fr: phrase FR
     date: 2009/05/12
-    category: General
+    category: General

data/spec/integration/server/contact_form_spec.rb

@@ -78,6 +78,10 @@ describe 'ContactForm' do
           expect(response.status).to eq 200
         end
 
+        it 'displays a global error message' do
+          expect(response.body.to_s).to include "Form with errors"
+        end
+
         it 'displays errors' do
           expect(response.body.to_s).to include "can't be blank"
         end
@@ -104,6 +108,10 @@ describe 'ContactForm' do
           expect(response.status).to eq 200
         end
 
+        it "doesn't display a global error message" do
+          expect(response.body.to_s).not_to include "Form with errors"
+        end
+
         it 'displays a success message' do
           expect(response.body.to_s).to include 'Thank you John'
         end
@@ -130,6 +138,7 @@ describe 'ContactForm' do
     let(:url) { '/events' }
     let(:params) { {
       'content_type_slug' => 'messages',
+      'some_variable'     => '42',
       'entry' => { 'name' => 'John', 'email' => 'j@doe.net', 'message' => 'Bla bla' } } }
     let(:response) { post_contact_form(url, params) }
     let(:status) { response.status }
@@ -160,6 +169,10 @@ describe 'ContactForm' do
         expect(response.body.to_s).to include 'Thank you John'
       end
 
+      it 'stores hidden fields from the form' do
+        expect(response.body.to_s).to include 'Some variable: 42'
+      end
+
     end
 
     context 'in a different locale' do

data/spec/integration/server/nav_spec.rb

@@ -29,6 +29,10 @@ describe Locomotive::Steam::Server do
       is_expected.to include('<li>A song template</li>')
     end
 
+    it 'lists all the pages from the site liquid drop' do
+      is_expected.to include('<!-- TEST -->About Us - Music - Store - Contact Us - Events - Basic page - A sample contest - Various uses of the with_scope tag - Grunge leaders - Tags - Unlisted pages - Archives - All the pages - Layouts - Songs<!-- TEST -->')
+    end
+
     describe 'with wrapper' do
 
       subject { get '/tags/nav'; last_response.body }

data/spec/integration/server/sitemap_spec.rb

@@ -21,7 +21,7 @@ describe Locomotive::Steam::Server do
 
     it 'checks if it looks valid' do
       expect(Nokogiri::XML(subject).errors.empty?).to eq true
-      expect(subject.scan(/<url>/).size).to eq 46
+      expect(subject.scan(/<url>/).size).to eq 40
       expect(subject).to match("<loc>http://example.org/songs/song-number-2/band</loc>")
       expect(subject).to match((<<-EOF
   <url>
@@ -36,7 +36,7 @@ describe Locomotive::Steam::Server do
     context 'existing sitemap page' do
 
       let(:template)  { %{<?xml version="1.0" encoding="utf-8"?>OK</xml>} }
-      let(:page)      { instance_double('Page', liquid_source: template, templatized?: false, redirect_url: false, to_liquid: template, not_found?: false, response_type: 'application/xml') }
+      let(:page)      { instance_double('Page', liquid_source: template, templatized?: false, redirect?: false, to_liquid: template, not_found?: false, response_type: 'application/xml') }
       let(:env)       { { 'steam.page' => page } }
 
       it 'renders the existing sitemap page' do

data/spec/support/helpers.rb

@@ -23,6 +23,8 @@ module Spec
     end
 
     def run_server
+      require 'haml'
+
       output = ENV['STEAM_VERBOSE'] ? nil : File.join(default_fixture_site_path, 'log/steam.log')
       setup_common(output)
 

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

@@ -45,6 +45,23 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::ContentEntry do
 
     end
 
+    context 'a content type with a localized field' do
+
+      let(:options_scope) { instance_double('Scope', :locale= => true) }
+      let(:options)       { instance_double('SelectOptionsRepository', scope: options_scope) }
+      let(:field)         { instance_double('Field', name: 'category', type: :select, localized: true, select_options: options) }
+      let(:content_type)  { instance_double('Updates', slug: 'updates', select_fields: [field], association_fields: [], file_fields: []) }
+
+      it 'adds a new localized attribute for the foreign key' do
+        option = instance_double('Option', _id: 'General')
+        allow(options).to receive(:by_name).with('General').and_return(option)
+        allow(options).to receive(:by_name).with('Général').and_return(option)
+        expect(subject.last[:category_id]).to eq({ en: 'General', fr: 'General' })
+        expect(subject.last[:category]).to eq nil
+      end
+
+    end
+
     context 'a content type with a file field' do
 
       let(:field)         { instance_double('Field', name: 'cover', type: :file) }