light_resizer 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 635a29878155e03c0d5142699597f9e67cd89129
-  data.tar.gz: aa311b1cc54b289522ad3d517f782c0335310506
+  metadata.gz: bc5c78b129e5231781ba262d6dac0f7752edd977
+  data.tar.gz: 838eb313c7c7cc204308ae399ab14ed2442df8c7
 SHA512:
-  metadata.gz: c9c9e118c322f0ec895d1277384c61db52f61b38a4a484d0c9bd0f4a42014641de038991186b2811d4cae0d4ed3d75865610fafd32a9133c3d2114f41bc43208
-  data.tar.gz: 2825c896f1e8b5c6adb81bf2e2c26fb2fae4a5192e96a4be7e9163222cd7fadc810e78a4a27ecd22bee133fb219cdd33c8156b756a35f847ecbea2a532df8ef0
+  metadata.gz: 1a146c0e1021f487ae735be544bee6bd1191bd2e83a1a6ab4b339fa5dc288a2268dd813b33c5d4a4176060ae5f36e964e113a2b58610fbcc3a12f7a98b6e742e
+  data.tar.gz: 69c813f29b65347c5c73e309a7617e2db3b747d000f785d54bfffbb35dd3a80d4d882f737e6df409f3ef2faada0e0e51c58ac29ce5d200b6ba0e2d4f3caa5fc1

data/README.md

@@ -4,4 +4,41 @@ light-resizer
 [![Build Status](https://travis-ci.org/Rademade/light_resizer.svg?branch=master)](https://travis-ci.org/Rademade/light_resizer)
 
 Rack middleware for image resizer. Can be integrated with CarrierWave.
+Instalation
+===========
+Install gem:
+
+    $ gem install light_resizer
+
+And set it in config:
+```ruby
+config.middleware.insert_before(Rack::Sendfile, LightResizer::Middleware, Rails.root)
+```
+
+
+Usage
+=====
+For example we have image in public folder by next url:
+
+>example.com/images/kitten.jpg
+
+Url of resized image will be:
+
+>example.com/images/**light_resize/100x150_kitten.jpg**
+
+light_resizer will find */public/images/kitten.jpg* and create *light_resize* with resized to size of 100x150px image.
+
+If you change extension of original image:
+
+>example.com/images/light_resize/100x150_kitten.**png**
+
+light_resize will convert image to a new extension.
+
+Default resize doesn't crop image and fill new space with transparent background.
+
+To crop image use '*crop*' in url:
+>example.com/images/light_resize/100x150_crop_kitten.png
+
+
+
 

data/lib/light_resizer/carrierwave_resize.rb

@@ -1,22 +1,24 @@
 module LightResizer
   module CarrierWaveResize
-    def resize(width, height)
+    def resize_without_crop(width, height)
       filename_prefix = "#{width}x#{height}_"
-      resized_image_path(filename_prefix)
+      resized_image_path(filename_prefix, 'png')
     end
 
-    def resize_crop(width, height)
+    alias_method :resize, :resize_without_crop
+
+    def resize_with_crop(width, height)
       filename_prefix = "#{width}x#{height}_crop_"
       resized_image_path(filename_prefix)
     end
 
     private
-      def resized_image_path(prefix)
+      def resized_image_path(prefix, extension = nil)
         if url
           path        = File.dirname(url)
-          filename    = File.basename(url)
-          new_filname = prefix + filename
-          
+          filename    = File.basename(url, '.*')
+          new_filname = prefix + filename + '.png'
+
           File.join(path, 'light_resize', new_filname)
         end
       end

data/lib/light_resizer/image_loader/original_image.rb

@@ -31,7 +31,7 @@ module LightResizer
 
       # {Bool} original image exist
       def image_exist?
-        File.exist? full_path
+        !Dir[full_path + '.*'].empty?
       end
 
     end

data/lib/light_resizer/middleware/path.rb

@@ -3,7 +3,7 @@ module LightResizer
   class Middleware
     class Path
 
-      PREFIX_REGEXP = /^[0-9]+x[0-9]+(_crop)?_/
+      PREFIX_REGEXP = /^[0-9]+x[0-9]+(_crop|_convert)*_/
 
       attr_reader :request_path
 
@@ -20,7 +20,12 @@ module LightResizer
 
       # {Bool} returns true if image should be croped on resize
       def crop_path?
-        prefix.end_with?('crop')
+        prefix =~ /crop/
+      end
+
+      # {Bool} returns true if image should be converted on resize
+      def convert_path?
+        prefix =~ /convert/
       end
 
       # {String} last part of request – relative path
@@ -29,6 +34,10 @@ module LightResizer
         File.join(dir, original_filename)
       end
 
+      def image_extension
+        File.extname(request_path)
+      end
+
 
       # {String} returns prefix of resized image name
       # 200x200_crop_image.png => 200x200_crop
@@ -51,13 +60,12 @@ module LightResizer
       end
 
       def filename
-        File.basename(request_path)
+        File.basename(request_path, '.*')
       end
 
       def name_segments
         @segments ||= request_path.split('/')
       end
-
     end
   end
 end

data/lib/light_resizer/middleware/resizer.rb

@@ -3,9 +3,9 @@ module LightResizer
   class Middleware
     class Resizer
 
-      def resize(dimensions, original_path, resize_path, crop)
+      def resize(dimensions, original_path, resize_path, crop, extension, convert)
         check_resized_dir(resize_path)
-        store_image(dimensions, original_path, resize_path, crop)
+        store_image(dimensions, original_path, resize_path, crop, extension)
       end
 
       private
@@ -15,27 +15,34 @@ module LightResizer
         #todo permissions?
       end
 
-      def store_image(dimensions, original_path, resize_path, crop)
-        @image = MiniMagick::Image.open original_path
+      def store_image(dimensions, original_path, resize_path, crop, extension)
+        original_path += '.*'
+        @image = MiniMagick::Image.open Dir[original_path].first
 
+        @extension = extension[1..-1]
+
+        # WARNING: DO NOT CHANGE COMMANDS ORDER FOR @IMAGE OBJECT
+        # realy, don't do this
+        @image.format(@extension)
         crop ? set_crop_options(dimensions) : set_options(dimensions)
 
-        @image.write resize_path
+        @image.write (resize_path + extension)
       end
 
       def set_options(dimensions)
         @image.combine_options do |c|
-          c.resize dimensions
-          c.unsharp '0x1'
+          c.adaptive_resize dimensions
+          c.add_command 'quality', '0'
           c.add_command 'extent', dimensions
           c.gravity 'center'
+          c.background 'transparent'
         end
       end
 
       def set_crop_options(dimensions)
         @image.combine_options do |c|
-          c.resize dimensions+'^'
-          c.unsharp '0x1'
+          c.adaptive_resize dimensions+'^'
+          c.add_command 'quality', '0'
           c.add_command 'extent', dimensions
           c.gravity 'center'
         end

data/lib/light_resizer/middleware.rb

@@ -36,7 +36,7 @@ module LightResizer
 
     def resize
       unless @image_loader.resized_image_exist?
-        @resizer.resize(@path.dimensions, @image_loader.original_path, @image_loader.resize_path, @path.crop_path?)
+        @resizer.resize(@path.dimensions, @image_loader.original_path, @image_loader.resize_path, @path.crop_path?, @path.image_extension, @path.convert_path?)
       end
     end
 

data/lib/light_resizer/version.rb

@@ -1,3 +1,3 @@
 module LightResizer
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/light_resizer.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pry"
 end

data/spec/integration/middleware_spec.rb

@@ -1,27 +1,37 @@
 require 'spec_helper'
 
 describe LightResizer::Middleware do
-  let(:app) { AppEmulator.new }
+  let(:app) { double("app") }
   let(:resizer) { described_class.new(app, ROOT, 'fixtures') }
   let(:env) { { 'PATH_INFO' =>  resize_relative_path} }
 
-  let(:resize_relative_path) { '/light_resize/150x100_avatar.png' } #todo depends for many constant
   let(:resize_full_path) { File.join(ROOT, 'fixtures', resize_relative_path) }
 
-  after(:each) do
-    File.delete(resize_full_path)
-  end
+  context 'image path' do
+    after(:each) do
+      File.delete(resize_full_path)
+    end
+    let(:resize_relative_path) { '/light_resize/200x100_sample.png' } #todo depends for many constant
 
-  it 'should approve resize request' do
-    resizer.call(env)
+    it 'should approve resize request' do
+      resizer.call(env)
 
-    expect(resizer.resize_request?).to be_true
-  end
+      expect(resizer.resize_request?).to be_true
+    end
 
-  it 'should create resized image' do
-    expect(File.exist?(resize_full_path)).to be_false
-    resizer.call(env)
-    expect(File.exist?(resize_full_path)).to be_true
+    it 'should create resized image' do
+      expect(File.exist?(resize_full_path)).to be_false
+      resizer.call(env)
+      expect(File.exist?(resize_full_path)).to be_true
+    end
   end
 
+  context 'non image path' do
+    let(:resize_relative_path) { 'some/other/path' }
+
+    it 'should call app with right environment' do
+      expect(app).to receive(:call).with(env)
+      resizer.call(env)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,18 +1,12 @@
 require 'coveralls'
 Coveralls.wear!
 
+require 'pry'
+
 require 'rack'
 require 'light_resizer'
 ROOT = File.dirname(__FILE__)
 
-class AppEmulator
-  attr_reader :env
-  def call(env)
-    @env = env
-  end
-end
-
-
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

data/spec/unit/image_loader_original_spec.rb

@@ -4,7 +4,7 @@ describe LightResizer::ImageLoader::OriginalImage do
 
   let(:root_dir) { File.join(ROOT, 'fixtures') }
   let(:store_dir) { '/some/dir' }
-  let(:filename) { 'image.png' }
+  let(:filename) { 'image' }
   let(:image_full_path) { File.join(root_dir, store_dir, filename) }
   let(:original_image) { described_class.new root_dir }
 

data/spec/unit/middleware_path_spec.rb

@@ -12,7 +12,9 @@ describe LightResizer::Middleware::Path do
 
     it { expect(path.image_path?).to be_true }
 
-    it { expect(path.image_path).to eq('/some_dir/image.png') }
+    it { expect(path.image_path).to eq('/some_dir/image') }
+
+    it { expect(path.image_extension).to eq('.png') }
 
     it { expect(path.dimensions).to eq('150x150') }
 
@@ -22,16 +24,20 @@ describe LightResizer::Middleware::Path do
 
   context 'resize with crop' do
     before(:each) do
-      path.request_path = '/some_dir/light_resize/150x150_crop_image.png'
+      path.request_path = '/some_dir/light_resize/150x150_crop_convert_image.png'
     end
 
     it { expect(path.crop_path?).to be_true }
 
-    it { expect(path.image_path).to eq('/some_dir/image.png') }
+    it { expect(path.convert_path?).to be_true }
+
+    it { expect(path.image_path).to eq('/some_dir/image') }
+
+    it { expect(path.image_extension).to eq('.png') }
 
     it { expect(path.dimensions).to eq('150x150') }
 
-    it { expect(path.prefix).to eq('150x150_crop') }
+    it { expect(path.prefix).to eq('150x150_crop_convert') }
   end
 
   context 'wrong path methods' do

data/spec/unit/middleware_resizer_spec.rb

@@ -3,30 +3,30 @@ require 'spec_helper'
 describe LightResizer::Middleware::Resizer do
 
   let(:resizer) { described_class.new }
-  let(:image_path) { File.join(ROOT, 'fixtures', 'avatar.png') }
+  let(:image_path) { File.join(ROOT, 'fixtures', 'sample') }
   let(:resize_image_path) { File.join(ROOT, 'fixtures', 'light_resize', image_name) }
 
   context 'resize' do
 
     after do
-      File.delete( resize_image_path )
+      File.delete( resize_image_path + '.png' )
     end
 
     context 'without crop' do
-      let(:image_name) { '50x50_avatar.png' }
+      let(:image_name) { '50x50_sample' }
 
       it 'should create resized image file' do
-        resizer.resize('50x50', image_path, resize_image_path, false)
-        expect(File.exist?(resize_image_path)).to eq(true)
+        resizer.resize('50x50', image_path, resize_image_path, false, '.png', true)
+        expect(File.exist?(resize_image_path+'.png')).to eq(true)
       end
     end
 
     context 'with crop' do
-      let(:image_name) { '50x50_crop_avatar.png' }
-      
+      let(:image_name) { '50x50_crop_convert_sample' }
+
       it 'should create resized image file' do
-        resizer.resize('50x50', image_path, resize_image_path, true)
-        expect(File.exist?(resize_image_path)).to eq(true)
+        resizer.resize('50x50', image_path, resize_image_path, true, '.png', true)
+        expect(File.exist?(resize_image_path+'.png')).to eq(true)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: light_resizer
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Denis Sergienko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - olol.toor@gmail.com
@@ -121,7 +135,7 @@ files:
 - lib/light_resizer/middleware/resizer.rb
 - lib/light_resizer/version.rb
 - light_resizer.gemspec
-- spec/fixtures/avatar.png
+- spec/fixtures/sample.jpg
 - spec/integration/middleware_spec.rb
 - spec/spec_helper.rb
 - spec/unit/image_loader_original_spec.rb
@@ -154,7 +168,7 @@ signing_key:
 specification_version: 4
 summary: Tiny rack middleware for image resizing.
 test_files:
-- spec/fixtures/avatar.png
+- spec/fixtures/sample.jpg
 - spec/integration/middleware_spec.rb
 - spec/spec_helper.rb
 - spec/unit/image_loader_original_spec.rb