locomotivecms_steam 1.3.0.rc1 → 1.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f196a0b63817aacbd1564c4f1e48f11f3d9a099
-  data.tar.gz: f2abdbd4a45e167bec4ec66ed0e4fe8ecb51f41a
+  metadata.gz: 1535dbba02a328de41369d5887f7ea9971b76127
+  data.tar.gz: 3e039bd983df5359ddf2d9a65fb0f548a50448ed
 SHA512:
-  metadata.gz: 70e71b96955c2395129bfb9c42b83a581592a7c55ec814b682b3f3919a2b55d63c87a42fe5fc671600ff4674202c19d6c2e462d9581fd2341f820fbe2d3027c8
-  data.tar.gz: efc45f6d8acb3117e4b9154830b1b43fbeb299358c60e57d606692b0eb3a86fe0ea4ac05d095f080331bcb0ea6358a9d8f23cbed96311bac21239f4de40a4c39
+  metadata.gz: c09afe41b49e1426bc7ff4793a9ddc56e6e2888a134afaf0ce7117380da4bcee13c54247b6f7d7d549ea8e642b36a5d0f55593b8f63ead2dfa57860c838be8be
+  data.tar.gz: eb77af54a2142c206e9c0b0a5a52a3a641e49752b60e165cc166e2ee84232f26822de94db329cfaadc00cec4ff3bfe233c5cd5b03188d5abba26dc76bd2dede3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.3.0.rc1)
+    locomotivecms_steam (1.3.0.rc2)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 6.7.2)
       bcrypt (~> 3.1.11)
@@ -37,10 +37,10 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     attr_extras (4.4.0)
-    autoprefixer-rails (6.7.6)
+    autoprefixer-rails (6.7.7.2)
       execjs
     bcrypt (3.1.11)
     bson (4.2.1)
@@ -107,7 +107,7 @@ GEM
       attr_extras (~> 4.4.0)
       colorize
       stringex (~> 2.6.0)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     memory_profiler (0.9.7)
     method_source (0.8.2)
@@ -116,7 +116,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimetype-fu (0.1.2)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     moneta (1.0.0)
     mongo (2.4.1)
       bson (>= 4.2.1, < 5.0.0)
@@ -125,7 +125,7 @@ GEM
     multi_xml (0.6.0)
     nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
-    nokogumbo (1.4.10)
+    nokogumbo (1.4.12)
       nokogiri
     origin (2.3.0)
     pony (1.11)
@@ -170,7 +170,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
-    sass (3.4.23)
+    sass (3.4.24)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -189,9 +189,9 @@ GEM
     tilt (2.0.6)
     timecop (0.8.1)
     tins (1.13.2)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (3.1.6)
+    uglifier (3.1.13)
       execjs (>= 0.3.0, < 3)
 
 PLATFORMS

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

@@ -80,7 +80,12 @@ module Locomotive::Steam
       hash = {}
 
       # default attributes
-      _attributes = %i(_id _slug _label _visible _position content_type_slug created_at updated_at)
+      _attributes = %i(_id _slug _visible _position content_type_slug created_at updated_at)
+
+      # stack level too deep raised if the _label field is an association (belongs_to, ...etc)
+      unless content_type.fields_by_name[content_type.label_field_name].is_relationship?
+        _attributes << :_label
+      end
 
       # dynamic attributes
       _attributes += content_type.persisted_field_names

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

@@ -33,6 +33,7 @@ module Locomotive::Steam
     def listed?; !!listed; end
     def published?; !!published; end
     def templatized?; !!templatized; end
+    def redirect?; redirect.nil? ? !redirect_url.blank? : redirect; end
 
     def content_type_id
       self.target_klass_name =~ Locomotive::Steam::CONTENT_ENTRY_ENGINE_CLASS_NAME

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

@@ -55,7 +55,28 @@ module Locomotive
             def apply_transformation(url, context)
               # resize image with the image_resizer service?
               if (format = @element_options[:resize]).present?
-                url = context.registers[:services].image_resizer.resize(url, format) || url
+                options = []
+
+                @element_options.each do |k, v|
+                  options << case k.to_sym
+                  when :quality
+                    "-quality #{v}"
+                  when :optimize # Shortcut helper to set quality, progressive and strip
+                    "-quality #{v} -strip -interlace Plane"
+                  when :auto_orient
+                    "-auto-orient" if v.downcase == "true"
+                  when :strip
+                    "-strip" if v.downcase == "true"
+                  when :progressive
+                    "-interlace Plane" if v.downcase == "true"
+                  when :filters
+                    v
+                  else
+                    next
+                  end
+                end
+
+                url = context.registers[:services].image_resizer.resize(url, format, options.join(' ')) || url
               end
 
               # in the live editing mode, tag all the images with their editable path (block + slug)

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

@@ -28,7 +28,7 @@ module Locomotive::Steam
 
       def build_pages_to_xml
         page_repository.published.map do |page|
-          next if page.index? || page.not_found? || page.layout? || (!page.templatized? && !page.listed?)
+          next if skip_page?(page)
 
           build_page_xml(page)
         end.flatten.join.strip
@@ -80,6 +80,14 @@ module Locomotive::Steam
         EOF
       end
 
+      def skip_page?(page)
+        page.index? ||
+        page.not_found? ||
+        page.layout? ||
+        page.redirect? ||
+        (!page.templatized? && !page.listed?)
+      end
+
       def repositories
         services.repositories
       end

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

@@ -35,7 +35,29 @@ module Locomotive::Steam
       def redirect_url
         return false if site.url_redirections.nil? || site.url_redirections.size == 0
 
-        site.url_redirections.to_h[requested_url]
+        redirections_hash = site.url_redirections.to_h
+
+        redirections_hash[requested_url] || find_dynamic_url_redirection(redirections_hash)
+      end
+
+      def find_dynamic_url_redirection(redirections_hash)
+        number_of_segments = requested_url.split('/').size
+
+        # attempt to find the first dynamic route which matches
+        redirections_hash.each do |route, redirection|
+          # a little bit of optimization
+          next unless route.include?(':') && route.split('/').size == number_of_segments
+
+          _regexp = route.gsub(/:([^\/]+)/, "(?<\\1>[^\/]+)").gsub('/', '\/')
+
+          if matches = Regexp.new(_regexp).match(requested_url)
+            matches.names.each { |n| redirection.gsub!(":#{n}", matches[n]) }
+
+            return redirection
+          end
+        end
+
+        false
       end
 
     end

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

@@ -40,7 +40,8 @@ module Locomotive::Steam
       end
 
       def blank?
-        @translations.blank? && @translations[:anything].blank?
+        @translations.blank? ||
+        @translations.values.all? { |v| v.blank? }
       end
 
       def apply(&block)

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

@@ -26,25 +26,25 @@ module Locomotive
 
       def fetch_file(source)
         return nil if source.blank?
-
         url_or_path = get_url_or_path(source)
 
         if url_or_path =~ Steam::IsHTTP
           resizer.fetch_url(url_or_path)
-        else
+        elsif url_or_path
           path = url_or_path.sub(/(\?.*)$/, '')
           resizer.fetch_file(File.join(asset_path || '', path))
         end
       end
 
       def get_url_or_path(source)
-        if source.is_a?(Hash)
+        value = if source.is_a?(Hash)
           source['url']
         elsif source.respond_to?(:url)
           source.url
         else
           source
-        end.strip
+        end
+        value.strip if value
       end
 
     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.3.0.rc1'
+    VERSION = '1.3.0.rc2'
   end
 end

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 27
+      expect(subject.scan(/<url>/).size).to eq 25
       expect(subject).to match("<loc>http://example.org/songs/song-number-2/band</loc>")
       expect(subject).to match((<<-EOF
   <url>

data/spec/unit/entities/content_entry_spec.rb

@@ -72,7 +72,7 @@ describe Locomotive::Steam::ContentEntry do
 
   describe '#to_hash' do
 
-    let(:fields)      { [instance_double('TitleField', name: :title, type: :string), instance_double('PictureField', name: :picture, type: :file, localized: true)] }
+    let(:fields)      { [instance_double('TitleField', name: :title, type: :string, is_relationship?: false), instance_double('PictureField', name: :picture, type: :file, localized: true)] }
     let(:attributes)  { { id: 42, title: 'Hello world', _slug: 'hello-world', picture: Locomotive::Steam::Models::I18nField.new(:picture, fr: 'foo.png', en: 'bar.png'), custom_fields_recipe: ['hello', 'world'], _type: 'Entry' } }
 
     subject { content_entry.to_hash }
@@ -101,7 +101,7 @@ describe Locomotive::Steam::ContentEntry do
 
   describe '#as_json' do
 
-    let(:fields)      { [instance_double('TitleField', name: :title, type: :string), instance_double('PictureField', name: :picture, type: :file, localized: true)] }
+    let(:fields)      { [instance_double('TitleField', name: :title, type: :string, is_relationship?: false), instance_double('PictureField', name: :picture, type: :file, localized: true)] }
     let(:attributes)  { { id: 42, title: 'Hello world', _slug: 'hello-world', picture: Locomotive::Steam::Models::I18nField.new(:picture, fr: 'foo.png', en: 'bar.png'), custom_fields_recipe: ['hello', 'world'], _type: 'Entry' } }
     let(:decorated)   { Locomotive::Steam::Decorators::I18nDecorator.new(content_entry, :fr, :en) }
 

data/spec/unit/entities/page_spec.rb

@@ -82,4 +82,28 @@ describe Locomotive::Steam::Page do
 
   end
 
+  describe '#redirect?' do
+
+    subject { page.redirect? }
+
+    it { is_expected.to eq false }
+
+    context 'redirect_url has been set' do
+
+      let(:attributes) { { redirect: nil, redirect_url: 'http://www.google.fr' } }
+
+      it { is_expected.to eq true }
+
+      context 'but redirect is set to false' do
+
+        let(:attributes) { { redirect: false, redirect_url: 'http://www.google.fr' } }
+
+        it { is_expected.to eq false }
+
+      end
+
+    end
+
+  end
+
 end

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

@@ -75,6 +75,8 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
     let(:services)    { Locomotive::Steam::Services.build_instance }
     let(:context)     { ::Liquid::Context.new({}, {}, { page: page, services: services, live_editing: live_editing }) }
 
+    before { @context = context }
+
     before { allow(services).to receive(:current_site).and_return(nil) }
 
     before { allow(services.editable_element).to receive(:find).and_return(element) }
@@ -142,6 +144,62 @@ describe Locomotive::Steam::Liquid::Tags::Editable::File do
         it { is_expected.to eq '<span class="locomotive-block-anchor" data-element-id="header" style="visibility: hidden"></span>/steam/dynamic/W1siZnUiLCJodHRwOi8vd3d3LnBsYWNlaG9sZC5pdC81MDB4NTAwIl0sWyJwIiwidGh1bWIiLCI1MDB4MTAwIyJdXQ/1c79f4581f33aae4/500x500?editable-path=header--banner' }
 
       end
+    end
+
+    context 'additional image filters' do
+      let(:geometry) { '30x40#' }
+      let(:input) { 'http://www.placehold.it/500x500' }
+      let(:source) { "{%% block header %%}{%% editable_file banner, hint: 'some text', resize: '#{geometry}', %{filter} %%}#{input}{%% endeditable_file %%}{%% endblock %%}" }
+
+      before do
+        @context.registers[:services].image_resizer = instance_spy('ImageResizerService')
+        @image_resizer = @context.registers[:services].image_resizer
+      end
+
+      it 'handles quality' do
+        render_template(source % {filter: "quality: 70"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-quality 70')
+      end
+
+      it 'handles auto_orient' do
+        render_template(source % {filter: "auto_orient: true"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-auto-orient')
+      end
+
+      it "doesn't auto_orient if false" do
+        render_template(source % {filter: "auto_orient: false"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '')
+      end
+
+      it 'handles optimize' do
+        render_template(source % {filter: "optimize: 75"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-quality 75 -strip -interlace Plane')
+      end
+
+      it 'handles multiple and custom filters' do
+        render_template(source % {filter: "quality: 60, filters: '-sepia-tone 80%'"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-quality 60 -sepia-tone 80%')
+      end
+
+      it 'handles progressive display' do
+        render_template(source % {filter: "progressive: true"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-interlace Plane')
+      end
+
+      it 'doesn\'t progressive display if false' do
+        render_template(source % {filter: "progressive: false"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '')
+      end
+
+      it 'handles strip' do
+        render_template(source % {filter: "strip: true"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-strip')
+      end
+
+      it 'doesn\'t strip if false' do
+        render_template(source % {filter: "strip: false"}, context, options)
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '')
+      end
 
     end
 

data/spec/unit/middlewares/url_redirection_spec.rb

@@ -54,6 +54,15 @@ describe Locomotive::Steam::Middlewares::UrlRedirection do
 
       end
 
+      describe 'url matching a pattern' do
+
+        let(:redirections) { [['/old_images/:file', '/images/old/:file']] }
+        let(:url) { 'http://models.example.com/old_images/cat.png' }
+
+        it { is_expected.to eq [301, '/images/old/cat.png'] }
+
+      end
+
       describe 'let the parent app know about the redirection when it happens' do
 
         let(:events) { [] }

data/spec/unit/services/image_resizer_service_spec.rb

@@ -68,6 +68,25 @@ describe Locomotive::Steam::ImageResizerService do
 
       end
 
+      describe 'nil file' do
+        let(:geometry) { '' }
+        let(:input)  { nil }
+
+        it { is_expected.to eq nil }
+      end
+
+      describe 'nil hash file' do
+        let(:input) { { 'url' => nil } }
+
+        it { is_expected.to eq nil }
+      end
+
+      describe 'nil object file' do
+        let(:input)  { instance_double('UploadedFile', url: nil) }
+
+        it { is_expected.to eq nil }
+      end
+
       describe 'additional filters' do
         let(:input)  { '/sites/42/theme/images/banner.png' }
         let (:filters) { [{"quality" => 70, "auto_orient" => true, "filters" => "-swirl 180"}] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+  version: 1.3.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler