locomotivecms_steam 1.1.0.rc3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c767e4b89256e979cc9e73a2851227052b8478
-  data.tar.gz: 45d39c6d1b6ee403c4797f2793eeecbe03e56d2f
+  metadata.gz: 986fc20a458de01b66d78eddb74cf2cda26733aa
+  data.tar.gz: 0634c879f6b9763beef950cba0012d59db71714c
 SHA512:
-  metadata.gz: cf631f30710f478aa18d766fb9b302fbea3a671ca4cc8b0c02ade4d6e3df11ffe162d779d06a0fac40df2348be9313fca2ef0d258dece9ad4e2666673415f782
-  data.tar.gz: aa70b068ba7218dbd9f29fe765860fb03b3eb3c72ef96956c48c9cb6596d0aaa896b700c1b111950cdb6dfa5ab1d4f1432b734e48aee3215693c00ede75231e9
+  metadata.gz: 4e25cc1a48fa40ec0308d1ea7f4537020eccda5acf8604ccd55e939d50c0f227f83e0bfa1ae7128342004385b038ab19269452c00b4e5a4a54098aa39b11300e
+  data.tar.gz: ead24822aea6ae6b4b08bb9a644627bab606032ee3a7b7593bea68cbd7a66367ad2e295b16fc7047944d776f0af80bf65b71a021cb3b02803a09531900be7418

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.1.0.rc3)
+    locomotivecms_steam (1.1.0)
       RedCloth (~> 4.2.9)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
@@ -175,7 +175,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.21)
+    sass (3.4.22)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)

data/README.md

@@ -20,6 +20,8 @@ The rendering stack used by both Wagon and Engine (WIP). It includes:
 
 ### Command line:
 
+*Warning*: For now, Steam is not aimed to be run standalone. The following is just a proof of concept.
+
 Display all the options:
 
     steam --help
@@ -36,9 +38,14 @@ Once launched, open your browser
 
     open localhost:8080
 
-### Inside a Rails application:
+### Inside Engine / Wagon:
+
+[https://github.com/locomotivecms/engine/blob/master/lib/locomotive/steam_adaptor.rb](https://github.com/locomotivecms/engine/blob/master/lib/locomotive/steam_adaptor.rb)
+[https://github.com/locomotivecms/engine/blob/master/spec/dummy/config/routes.rb](https://github.com/locomotivecms/engine/blob/master/spec/dummy/config/routes.rb#L12)
+
 
-[TODO]
+[https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb](https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb#L65)
+[https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb](https://github.com/locomotivecms/wagon/blob/master/lib/locomotive/wagon/commands/serve_command.rb#L138)
 
 ## TODO
 
@@ -54,4 +61,4 @@ see the list in the issues section.
 
 ## License
 
-Copyright (c) 2015 NoCoffee. MIT Licensed, see LICENSE for details.
+Copyright (c) 2016 NoCoffee. MIT Licensed, see LICENSE for details.

data/lib/locomotive/steam/adapters/filesystem/sanitizers/content_entry.rb

@@ -70,13 +70,15 @@ module Locomotive::Steam
           end
 
           def set_slug(entity, dataset)
-            if entity._label.respond_to?(:translations) # localized?
-              entity._label.each do |locale, label|
-                entity[:_slug][locale] ||= slugify(entity._id, label, dataset, locale)
+            if entity._slug.blank?
+              if entity._label.respond_to?(:translations)
+                entity._label.each do |locale, label|
+                  entity[:_slug][locale] = slugify(entity._id, label, dataset, locale)
+                end
+              else
+                # same value for any locale
+                entity[:_slug].translations = slugify(entity._id, entity._label, dataset)
               end
-            elsif entity[:_slug] && entity[:_slug][:anylocale].nil?
-              # Note: replace the translations of the I18nField by a string
-              entity[:_slug].translations = slugify(entity._id, entity._label, dataset)
             end
           end
 

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

@@ -26,7 +26,8 @@ module Locomotive::Steam
 
     def order_by
       if (order_by = self[:order_by]).present?
-        name, direction = order_by.split
+        # from Filesystem -> string, from MongoDB -> array (string transformed by Engine)
+        name, direction = order_by.respond_to?(:each) ? order_by : order_by.split
         { name.to_sym => direction || 'asc' }
       else
         type == :has_many ? { :"position_in_#{self[:inverse_of]}" => 'asc' } : nil

data/lib/locomotive/steam/initializers/sprockets.rb

@@ -3,9 +3,66 @@ require 'sass'
 require 'coffee_script'
 require 'compass'
 require 'autoprefixer-rails'
+require 'open3'
 
 module Locomotive::Steam
 
+  class YUICompressorRuntimeError < RuntimeError
+    attr_reader :errors
+    #:nocov:
+    def initialize(msg, errors)
+      super(msg)
+      @errors = errors
+    end
+  end
+
+  module YUICompressorErrors
+
+    #:nocov:
+    def compress(stream_or_string)
+      streamify(stream_or_string) do |stream|
+        tempfile      = new_tempfile(stream)
+        full_command  = "%s %s" % [command, tempfile.path]
+
+        output, errors, exit_status = _compress(full_command, tempfile)
+
+        if exit_status.exitstatus.zero?
+          output
+        else
+          # Bourne shells tend to blow up here when the command fails, usually
+          # because java is missing
+          raise YUICompressorRuntimeError.new("Command '%s' returned non-zero exit status" %
+            full_command, errors)
+        end
+      end
+    end
+
+    #:nocov:
+    def _compress(command, tempfile)
+      begin
+        # FIXME: catch only useful information from the stderr output
+        # output, errors, exit_status = '', [], nil
+        output, errors, exit_status = Open3.capture3(command)
+        errors = errors.split("\n").find_all { |l| l =~ /\s+[0-9]/ }
+        [output, errors, exit_status]
+      rescue Exception => e
+        # windows shells tend to blow up here when the command fails
+        raise RuntimeError, "compression failed: %s" % e.message
+      ensure
+        tempfile.close!
+      end
+    end
+
+    #:nocov:
+    def new_tempfile(stream)
+      Tempfile.new('yui_compress').tap do |tempfile|
+        tempfile.write stream.read
+        tempfile.flush
+      end
+    end
+
+  end
+
   class SprocketsEnvironment < ::Sprockets::Environment
 
     def initialize(root, options = {})
@@ -33,9 +90,13 @@ module Locomotive::Steam
     def install_yui_compressor(options)
       return unless options[:minify]
 
-      require 'yui/compressor'
-
       if is_java_installed?
+        require 'yui/compressor'
+
+        [YUI::JavaScriptCompressor, YUI::CssCompressor].each do |klass|
+          klass.send(:include, YUICompressorErrors)
+        end
+
         # minify javascripts and stylesheets
         self.js_compressor  = YUI::JavaScriptCompressor.new
         self.css_compressor = YUI::CssCompressor.new

data/lib/locomotive/steam/liquid/tags/concerns/path.rb

@@ -74,7 +74,7 @@ module Locomotive
             def _retrieve_templatized_page_drop_from(drop)
               entry = drop.send(:_source)
 
-              if page = repository.template_for(entry, @path_options[:with])
+              if page = repository.template_for(entry, template_slug)
                 page.to_liquid.tap { |d| d.context = @context }
               end
             end
@@ -84,7 +84,11 @@ module Locomotive
             end
 
             def locale
-              @path_options[:locale] || @locale
+              @path_options[:locale] || @raw_locale || @locale
+            end
+
+            def template_slug
+              @path_options[:with] || @raw_with
             end
 
             def set_vars_from_context(context)
@@ -101,7 +105,9 @@ module Locomotive
             def make_options_compatible_with_previous_version(options)
               if options
                 %w(with locale).each do |name|
-                  options.gsub!(/#{name}: ([\w-]+)/, name + ': "\1"')
+                  if options =~ /#{name}: ([\w-]+)/
+                    instance_variable_set(:"@raw_#{name}", $1);
+                  end
                 end
               end
             end

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

@@ -35,6 +35,9 @@ module Locomotive::Steam
 
       def fetch_content_entry(slug)
         if type = content_type_repository.find(page.content_type_id)
+          # don't accept a non localized entry in a locale other than the default one
+          return nil if type.localized_names.count == 0 && locale.to_s != default_locale.to_s
+
           decorate(content_entry_repository.with(type).by_slug(slug))
         else
           nil

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

@@ -5,7 +5,7 @@ module Locomotive::Steam
 
       extend Forwardable
 
-      def_delegators :@translations, :values, :blank?, :default
+      def_delegators :@translations, :values, :default
 
       attr_reader :name, :translations
 
@@ -39,6 +39,10 @@ module Locomotive::Steam
         @translations.each(&block)
       end
 
+      def blank?
+        @translations.blank? && @translations[:anything].blank?
+      end
+
       def apply(&block)
         if default
           @translations = Hash.new(yield(default))

data/lib/locomotive/steam/server.rb

@@ -32,7 +32,7 @@ module Locomotive::Steam
           if configuration.serve_assets
             use ::Rack::Static, {
               root: configuration.asset_path,
-              urls: ['/images', '/fonts', '/samples', '/media', '/sites']
+              urls: ['/images', '/fonts', '/samples', '/sites']
             }
             use Middlewares::DynamicAssets, {
               root:   configuration.asset_path,

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.1.0.rc3'
+    VERSION = '1.1.0'
   end
 end

data/spec/fixtures/default/app/views/pages/404.fr.liquid.haml

@@ -0,0 +1,10 @@
+---
+title: Page non trouvée
+---
+{% extends index %}
+
+{% block content %}
+
+%p.error Page non trouvée
+
+{% endblock %}

data/spec/integration/server/basic_spec.rb

@@ -115,6 +115,13 @@ describe Locomotive::Steam::Server do
       expect(last_response.body).to include 'Leader: Eddie'
     end
 
+    it 'redirects to the 404 if a locale other than the default one is asked' do
+      get '/fr/songs/song-number-2'
+      expect(last_response).to be_redirect
+      follow_redirect!
+      expect(last_response.status).to eq(404)
+    end
+
     it 'redirects to the 404 if it does not match a content entry' do
       get '/songs/unknown'
       expect(last_response).to be_redirect

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

@@ -16,7 +16,7 @@ describe Locomotive::Steam::Adapters::Filesystem::YAMLLoaders::Page do
 
     it 'tests various stuff' do
       expect(subject.size).to eq 26
-      expect(subject.first[:title]).to eq(en: 'Page not found')
+      expect(subject.first[:title]).to eq(en: 'Page not found', fr: 'Page non trouvée')
       expect(subject[15][:is_layout]).to eq true
       expect(subject[15][:listed]).to eq false
       expect(subject[15][:published]).to eq false

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

@@ -68,6 +68,15 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
       let(:source) { "{% path_to about_us, locale: 'fr' %}" }
       it { is_expected.to eq '/fr/a-notre-sujet' }
 
+      context 'locale is a variable' do
+
+        let(:assigns) { { 'about_us' => drop, 'language' => 'fr' } }
+        let(:source) { "{% path_to about_us, locale: language %}" }
+
+        it { is_expected.to eq '/fr/a-notre-sujet' }
+
+      end
+
     end
 
   end
@@ -82,7 +91,7 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
     let(:source)      { '{% path_to article %}' }
 
     before do
-      expect(services.repositories.page).to receive(:template_for).with(entry, nil).and_return(page)
+      allow(services.repositories.page).to receive(:template_for).with(entry, nil).and_return(page)
       allow(page).to receive(:to_liquid).and_return(drop)
     end
 
@@ -95,6 +104,21 @@ describe Locomotive::Steam::Liquid::Tags::PathTo do
 
     end
 
+    context 'and a different template' do
+
+      let(:archive) { liquid_instance_double('ArticleTemplate', title: 'Template of an article', handle: 'article', localized_attributes: { fullpath: true }, fullpath: { en: 'my-archives/content_type_template', fr: 'mes-archives/content_type_template' }, content_entry: entry_drop.send(:_source), templatized?: true) }
+      let(:drop)    { Locomotive::Steam::Liquid::Drops::Page.new(archive) }
+
+      before do
+        allow(services.repositories.page).to receive(:template_for).with(entry, 'archives').and_return(archive)
+        allow(archive).to receive(:to_liquid).and_return(drop)
+      end
+
+      let(:source) { "{% path_to article, with: archives, locale: fr %}" }
+      it { is_expected.to eq '/fr/mes-archives/bonjour-monde' }
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc3
+  version: 1.1.0
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -581,6 +581,7 @@ files:
 - spec/fixtures/default/app/content_types/messages.yml
 - spec/fixtures/default/app/content_types/songs.yml
 - spec/fixtures/default/app/content_types/updates.yml
+- spec/fixtures/default/app/views/pages/404.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/404.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us.liquid.haml
@@ -816,9 +817,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1
@@ -832,6 +833,7 @@ test_files:
 - spec/fixtures/default/app/content_types/messages.yml
 - spec/fixtures/default/app/content_types/songs.yml
 - spec/fixtures/default/app/content_types/updates.yml
+- spec/fixtures/default/app/views/pages/404.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/404.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us.fr.liquid.haml
 - spec/fixtures/default/app/views/pages/about_us.liquid.haml