locomotivecms_steam 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb33db62c8a0c967f8dd571468e3c0a152db1672
-  data.tar.gz: 67c92ee1c3f7bdf143bc1b565a8864317fd406bf
+  metadata.gz: 9a6e18bc9462639abb5ca0ad612c9e25891657dc
+  data.tar.gz: 4671db28b74b0241d7c31fdb6573aa93f0e10350
 SHA512:
-  metadata.gz: e34e6da025b0744a580ca22fb69578e9418c55f983594d90b3943da2ad90bb1d40b510a449b6d04f3ded70e74dce10fc2aba251677c5ef61c2bf81c7ee72fb57
-  data.tar.gz: 666be2d79e33b713d4f3601a4adfaf35b09a4a45bcdfd292c03b5b81d7e5e76bcedd867a02d422b09738d6014283e727787a91c0fa2e817e828ef4b18813a4a6
+  metadata.gz: 237e6723009705ffb9ea1295ea8976074cbaa79ebe5a47f866896f2e34f2af9563640e53951b97d7540b0e0ffb9d2a86b74bc93bab7df02f317ec869a691feb8
+  data.tar.gz: 0847e3956476840614b275101f659ca01ca6a708568f25a66bca0db5cb023c9d1bab620c22e3c66f2806676b74a6cc294d104ebcbfc97a5a82fc34503c37ed44

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.2.0.rc1)
+    locomotivecms_steam (1.2.0.rc2)
       RedCloth (~> 4.3.2)
       autoprefixer-rails (~> 6.3.3.1)
       chronic (~> 0.10.2)
@@ -30,7 +30,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -43,7 +43,7 @@ GEM
     bson (4.1.1)
     byebug (8.2.5)
     chronic (0.10.2)
-    chunky_png (1.3.6)
+    chunky_png (1.3.7)
     codeclimate-test-reporter (0.4.8)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.1)

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

@@ -4,8 +4,39 @@ module Locomotive
       module Filters
         module Resize
 
-          def resize(input, resize_string)
-            @context.registers[:services].image_resizer.resize(input, resize_string)
+          # Optional args include:
+          #   quality: <number> compress image
+          #   auto_orient: <true|false> fix EXIF orientation issues
+          #   strip: <true|false> remove extra possibly unnecessary metadata
+          #   progressive: <true|false> make JPEG progressive
+          #   optimize: <number> shortcut to quality: and also applies strip and progressive
+          #   filters: <string> access to any ImageMagick arguments 
+          def resize(input, resize_string, *args)
+            args ||= {}
+            options = []
+
+            args.flatten.each do |arg|
+              arg.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
+                when :strip
+                  "-strip" if v
+                when :progressive
+                  "-interlace Plane" if v
+                when :filters
+                  v
+                else
+                  next
+                end
+              end
+            end
+
+            @context.registers[:services].image_resizer.resize(input, resize_string, options.join(' '))
           end
 
         end

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

@@ -59,7 +59,7 @@ module Locomotive
               end
 
               # in the live editing mode, tag all the images with their editable path (block + slug)
-              if editable?(context)
+              if editable?(context) && !url.blank?
                 url = url + (url.include?('?') ? '&' : '?') + 'editable-path=' + @path
               end
 

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

@@ -12,7 +12,7 @@ module Locomotive
       end
 
       def compute(source, timestamp = nil)
-        return source if source.nil?
+        return source if source.blank?
 
         timestamp ||= (site.try(:template_version) || site.try(:updated_at)).to_i
 

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

@@ -5,11 +5,13 @@ module Locomotive
 
       attr_accessor_initialize :resizer, :asset_path
 
-      def resize(source, geometry)
+      def resize(source, geometry, convert = "")
         return get_url_or_path(source) if disabled? || geometry.blank?
 
         if file = fetch_file(source)
-          file.thumb(geometry).url
+          transformed_file = file.thumb(geometry)
+          transformed_file = transformed_file.convert(convert) if !convert.blank?
+          transformed_file.url
         else
           Locomotive::Common::Logger.error "Unable to resize on the fly: #{source.inspect}"
           nil

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

data/spec/unit/liquid/filters/resize_spec.rb

@@ -48,6 +48,52 @@ describe Locomotive::Steam::Liquid::Filters::Resize do
 
     end
 
+    describe 'additional filters' do
+      let(:geometry) { '30x40#' }
+      subject {}
+
+      before do
+        @context.registers[:services].image_resizer = instance_spy('ImageResizerService')
+        @image_resizer = @context.registers[:services].image_resizer
+      end
+
+      it 'handles quality' do
+        resize(input, geometry, { 'quality' => 70 })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-quality 70')
+      end
+
+      it 'handles auto_orient' do
+        resize(input, geometry, { 'auto_orient' => true })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-auto-orient')
+      end
+
+      it "doesn't auto_orient if false" do
+        resize(input, geometry, { 'auto_orient' => false })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '')
+      end
+
+      it 'handles optimize' do
+        resize(input, geometry, { 'optimize' => 75 })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-quality 75 -strip -interlace Plane')
+      end
+
+      it 'handles multiple and custom filters' do
+        resize(input, geometry, { 'quality' => 60, 'filters' => '-sepia-tone 80%' })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-quality 60 -sepia-tone 80%')
+      end
+
+      it 'handles progressive display' do
+        resize(input, geometry, { 'progressive' => true })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-interlace Plane')
+      end
+
+      it 'handles strip' do
+        resize(input, geometry, { 'strip' => true })
+        expect(@image_resizer).to have_received(:resize).with(input, geometry, '-strip')
+      end
+
+    end
+
   end
 
 end

data/spec/unit/services/asset_host_service_spec.rb

@@ -65,6 +65,13 @@ describe Locomotive::Steam::AssetHostService do
 
     end
 
+    context 'the source is an empty string' do
+
+      let(:source) { '' }
+      it { is_expected.to eq '' }
+
+    end
+
   end
 
   describe 'the host is a block' do

data/spec/unit/services/image_resizer_service_spec.rb

@@ -68,6 +68,15 @@ describe Locomotive::Steam::ImageResizerService do
 
       end
 
+      describe 'additional filters' do
+        let(:input)  { '/sites/42/theme/images/banner.png' }
+        let (:filters) { [{"quality" => 70, "auto_orient" => true, "filters" => "-swirl 180"}] }
+
+        subject { service.resize(input, geometry, filters) }
+
+        it { is_expected.to match /\/steam\/dynamic\/.*\/banner.png/ }
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler