light_resizer 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5e96f10cbc75a2c4f51fe257b25a9b33285d79a
-  data.tar.gz: 5bcdb15b74a9af11c1b3f7ef8df6dff97ec7c177
+  metadata.gz: 48f8da7f8cc63574dad6a1a0a3ef30299f576535
+  data.tar.gz: 293fef11bdb1a33eb4e3b808a7155e3fb1d779af
 SHA512:
-  metadata.gz: 6e0565d872d65fe21da6fbaab44208d9b5c347f64c58250acdc8a6a70fa264d1bd00606da62dac1fb763c9010be3b181e4c75f816bea22e5e4c6c9c21b267876
-  data.tar.gz: 22bf31bc915d97b05fde9db94fa5d903860fbba7b95b2e931190be791d74787d9fd96e5f400a7f50c680b869892241f3621bcbaaea72df8007972daf8c8556dc
+  metadata.gz: 33743ca407ad1198d4ac922543778f8579c0559c2169cf81f14d63820900a4b57530fcf1c661a071b92831b45d19534e23eea5a8da8c2fa43cdd8464f9bda442
+  data.tar.gz: 2806c2280ec857358c7899f056442a5863385a1c2d5f1c5a8454a0dd19688443b806c4877310e0f1435910b27e2702b46fa5f86e91e79af0f0cb5d9576505f59

data/lib/light_resizer/carrierwave_resize.rb

@@ -1,13 +1,24 @@
 module LightResizer
   module CarrierWaveResize
     def resize(width, height)
-      start = "/resize_image/#{width}x#{height}"
-      File.join(start, url)
+      filename_prefix = "#{width}x#{height}_"
+      resized_image_path(filename_prefix)
     end
 
     def resize_crop(width, height)
-      start = "/resize_image_crop/#{width}x#{height}"
-      File.join(start, url)
+      filename_prefix = "#{width}x#{height}_crop_"
+      resized_image_path(filename_prefix)
     end
+
+    private
+      def resized_image_path(prefix)
+        if url
+          path        = File.dirname(url)
+          filename    = File.basename(url)
+          new_filname = prefix + filename
+          
+          File.join(path, 'light_resize', new_filname)
+        end
+      end
   end
 end

data/lib/light_resizer/image_loader/resize_image.rb

@@ -3,9 +3,10 @@ module LightResizer
   class ImageLoader
     class ResizeImage
 
-      STORE_RESIZE_DIR = 'resize' #todo move to config option
+      STORE_RESIZE_DIR = 'light_resize' #todo move to config option
 
       attr_accessor :original_filename, :original_relative_dir, :resize_prefix
+      attr_reader :root_dir
 
       def initialize(root_dir)
         @root_dir = root_dir

data/lib/light_resizer/middleware.rb

@@ -16,9 +16,9 @@ module LightResizer
     def call(env)
       @path.request_path = env['PATH_INFO']
 
-      env['PATH_INFO'] = resize_image_path if @path.image_path? and resize_request?
+      resize if (@path.image_path? and resize_request?)
 
-      @app.call( env )
+      Rack::File.new(@image_loader.resized.root_dir).call(env)
     end
 
     def resize_request?
@@ -30,11 +30,10 @@ module LightResizer
 
     private
 
-    def resize_image_path
+    def resize
       unless @image_loader.resized_image_exist?
         @resizer.resize(@path.dimensions, @image_loader.original_path, @image_loader.resize_path, @path.crop_path?)
       end
-      @image_loader.resized_image_relative_path
     end
 
   end

data/lib/light_resizer/middleware/path.rb

@@ -3,6 +3,8 @@ module LightResizer
   class Middleware
     class Path
 
+      PREFIX_REGEXP = /^[0-9]+x[0-9]+(_crop)?_/
+
       attr_reader :request_path
 
       def request_path=(path)
@@ -12,35 +14,47 @@ module LightResizer
 
       # {Bool} returns true if request path begins with 'image'
       def image_path?
-        segments[1].start_with?('resize_image')
+        request_dir.end_with?('light_resize')
       end
 
 
       # {Bool} returns true if image should be croped on resize
       def crop_path?
-        segments[1].end_with?('crop')
+        prefix.end_with?('crop')
       end
 
       # {String} last part of request – relative path
       def image_path
-        '/' + segments[3..-1].join('/')
+        dir = File.expand_path('..', request_dir)
+        File.join(dir, original_filename)
       end
 
-      # {Array} returns required dimensions of image. Like a 200x200
-      def dimensions
-        #todo validate params!
-        segments[2]
-      end
 
       # {String} returns prefix of resized image name
-      # image.png => 200x200_crop_image.png
+      # 200x200_crop_image.png => 200x200_crop
       def prefix
-        crop_prefix = crop_path? ? '_crop' : ''
+        filename[PREFIX_REGEXP].chop if image_path?
+      end
+
+      def dimensions
+        prefix.split('_').first
+      end
+
+      private
+
+      def request_dir
+        File.dirname(request_path)
+      end
+
+      def original_filename
+        filename.gsub(PREFIX_REGEXP, '')
+      end
 
-        dimensions + crop_prefix
+      def filename
+        File.basename(request_path)
       end
 
-      def segments
+      def name_segments
         @segments ||= request_path.split('/')
       end
 

data/lib/light_resizer/version.rb

@@ -1,3 +1,3 @@
 module LightResizer
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/spec/integration/middleware_spec.rb

@@ -3,25 +3,25 @@ require 'spec_helper'
 describe LightResizer::Middleware do
   let(:app) { AppEmulator.new }
   let(:resizer) { described_class.new(app, ROOT, 'fixtures') }
-  let(:env) { { 'PATH_INFO' => '/resize_image/100x160/avatar.png' } }
+  let(:env) { { 'PATH_INFO' =>  resize_relative_path} }
 
-  let(:resize_relative_path) { '/resize/100x160_avatar.png' } #todo depends for many constant
+  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 do
-    File.delete resize_full_path
+  after(:each) do
+    File.delete(resize_full_path)
   end
 
-  it 'should create resized image' do
+  it 'should approve resize request' do
     resizer.call(env)
 
-    expect(resizer.resize_request?).to eq(true)
+    expect(resizer.resize_request?).to be_true
   end
 
-  it 'should return right path' do
+  it 'should create resized image' do
+    expect(File.exist?(resize_full_path)).to be_false
     resizer.call(env)
-
-    expect(app.env['PATH_INFO']).to eq( resize_relative_path )
+    expect(File.exist?(resize_full_path)).to be_true
   end
 
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'coveralls'
 Coveralls.wear!
 
+require 'rack'
 require 'light_resizer'
 ROOT = File.dirname(__FILE__)
 

data/spec/unit/image_loader_resized_spec.rb

@@ -22,7 +22,7 @@ describe LightResizer::ImageLoader::ResizeImage do
     }
 
     it {
-      expected_path = File.join(store_dir, resized_image.resize_prefix_dir, resized_image.filename)
+      expected_path = File.join(store_dir, 'light_resize', resized_image.filename)
       expect(resized_image.send(:relative_path)).to eq( expected_path )
     }
 
@@ -32,7 +32,7 @@ describe LightResizer::ImageLoader::ResizeImage do
     }
 
     it {
-      expected_path = File.join(root_dir, store_dir, resized_image.resize_prefix_dir )
+      expected_path = File.join(root_dir, store_dir, 'light_resize' )
       expect(resized_image.send(:dir_path)).to eq( expected_path )
     }
 

data/spec/unit/image_loader_spec.rb

@@ -14,7 +14,7 @@ describe LightResizer::ImageLoader do
 
     it { expect(image_loader.send(:original_image_exist?)).to eq(false) }
 
-    it { expect(image_loader.send(:resized_image_relative_path)).to eq('/some/dir/resize/20x20_image.png') }
+    it { expect(image_loader.send(:resized_image_relative_path)).to eq('/some/dir/light_resize/20x20_image.png') }
 
     it { expect(image_loader.send(:resized_image_exist?)).to eq(false) }
 

data/spec/unit/middleware_path_spec.rb

@@ -7,10 +7,10 @@ describe LightResizer::Middleware::Path do
   context 'valid path methods' do
 
     before(:each) do
-      path.request_path = '/resize_image/150x150/some_dir/image.png'
+      path.request_path = '/some_dir/light_resize/150x150_image.png'
     end
 
-    it { expect(path.image_path?).to eq(true) }
+    it { expect(path.image_path?).to be_true }
 
     it { expect(path.image_path).to eq('/some_dir/image.png') }
 
@@ -22,11 +22,13 @@ describe LightResizer::Middleware::Path do
 
   context 'resize with crop' do
     before(:each) do
-      path.request_path = '/resize_image_crop/150x150/some_dir/image.png'
+      path.request_path = '/some_dir/light_resize/150x150_crop_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.dimensions).to eq('150x150') }
 
     it { expect(path.prefix).to eq('150x150_crop') }
@@ -38,7 +40,7 @@ describe LightResizer::Middleware::Path do
       path.request_path = '/asdada/123acad/some_dir/imdage.png'
     end
 
-    it { expect(path.image_path?).to eq(false) }
+    it { expect(path.image_path?).to be_false }
 
   end
 

data/spec/unit/middleware_resizer_spec.rb

@@ -4,7 +4,7 @@ describe LightResizer::Middleware::Resizer do
 
   let(:resizer) { described_class.new }
   let(:image_path) { File.join(ROOT, 'fixtures', 'avatar.png') }
-  let(:resize_image_path) { File.join(ROOT, 'fixtures', 'resize', image_name) }
+  let(:resize_image_path) { File.join(ROOT, 'fixtures', 'light_resize', image_name) }
 
   context 'resize' do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: light_resizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Denis Sergienko