light_resizer 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc5c78b129e5231781ba262d6dac0f7752edd977
-  data.tar.gz: 838eb313c7c7cc204308ae399ab14ed2442df8c7
+  metadata.gz: b7392c4235044044545b0f61bfa4a6e74c1c23b2
+  data.tar.gz: d1105fc9f115d319c809c7a07093e9aa19cf3b41
 SHA512:
-  metadata.gz: 1a146c0e1021f487ae735be544bee6bd1191bd2e83a1a6ab4b339fa5dc288a2268dd813b33c5d4a4176060ae5f36e964e113a2b58610fbcc3a12f7a98b6e742e
-  data.tar.gz: 69c813f29b65347c5c73e309a7617e2db3b747d000f785d54bfffbb35dd3a80d4d882f737e6df409f3ef2faada0e0e51c58ac29ce5d200b6ba0e2d4f3caa5fc1
+  metadata.gz: d224b64e7325571e306e8c264589d5d372a9a72e84035b25d8c636e05784020660a147594f2f10e747b97d7f9a6bf0bce96200f06b271a4b75a71a6df45e4c37
+  data.tar.gz: fe2a98b18901abe8ba8e6a39d1c4a43cab003152ade0102bd8e77c8e13d142de962a9e827f60558e032450c064e3dd2c103e02e1a0e4016086b3730d8c0d873a

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 /.idea/
+/vendor/

data/lib/light_resizer.rb

@@ -1,8 +1,8 @@
 require 'light_resizer/version'
 require 'light_resizer/middleware'
 require 'light_resizer/carrierwave_resize'
-require 'mini_magick'
+require 'RMagick'
 
 module LightResizer
-  # Your code goes here...
+
 end

data/lib/light_resizer/carrierwave_resize.rb

@@ -1,5 +1,6 @@
 module LightResizer
   module CarrierWaveResize
+
     def resize_without_crop(width, height)
       filename_prefix = "#{width}x#{height}_"
       resized_image_path(filename_prefix, 'png')
@@ -12,15 +13,22 @@ module LightResizer
       resized_image_path(filename_prefix)
     end
 
+    def crop(image_path, x, y, width, height)
+      image = ::Magick::Image.read(image_path).first
+      image.crop!(x.to_i, y.to_i, width.to_i, height.to_i)
+      image.write("#{Rails.root}/tmp/cache/#{x}_#{y}_#{width}_#{height}_#{/([^\/]*)$/.match(image_path)[1]}")
+      File.open(image.filename)
+    end
+
     private
-      def resized_image_path(prefix, extension = nil)
-        if url
-          path        = File.dirname(url)
-          filename    = File.basename(url, '.*')
-          new_filname = prefix + filename + '.png'
 
-          File.join(path, 'light_resize', new_filname)
-        end
+    def resized_image_path(prefix, extension = 'png')
+      if url
+        filename = File.basename(url, '.*')
+        new_filename = "#{prefix}#{filename}.#{extension}"
+        File.join(File.dirname(url), 'light_resize', new_filename)
       end
+    end
+
   end
 end

data/lib/light_resizer/image_loader/resize_image.rb

@@ -18,7 +18,7 @@ module LightResizer
 
       # Resized file name '150x150_image.png'
       def filename
-        resize_prefix + '_' + original_filename
+        "#{resize_prefix}_#{original_filename}"
       end
 
       # Relative resize image path '/some_dir/resize/150x150_image.png'

data/lib/light_resizer/middleware.rb

@@ -6,7 +6,7 @@ require 'light_resizer/middleware/resizer'
 module LightResizer
   class Middleware
 
-    def initialize(app, root, folder='public')
+    def initialize(app, root, folder = 'public')
       @app           = app
       @image_loader  = LightResizer::ImageLoader.new File.join(root, folder)
       @path          = LightResizer::Middleware::Path.new
@@ -15,12 +15,11 @@ module LightResizer
 
     def call(env)
       @path.request_path = env['PATH_INFO']
-
-      if (@path.image_path? and resize_request?)
-				resize
-	      Rack::File.new(@image_loader.resized.root_dir).call(env) #todo check
+      if @path.image_path? and resize_request?
+      	resize
+      	Rack::File.new(@image_loader.resized.root_dir).call(env) #todo check
       else
-				@app.call(env)
+      	@app.call(env)
       end
 
     end
@@ -28,17 +27,21 @@ module LightResizer
     def resize_request?
         @image_loader.original_image_path = @path.image_path
         @image_loader.resize_prefix = @path.prefix
-
         @image_loader.original_image_exist?
     end
 
     private
 
     def resize
-      unless @image_loader.resized_image_exist?
-        @resizer.resize(@path.dimensions, @image_loader.original_path, @image_loader.resize_path, @path.crop_path?, @path.image_extension, @path.convert_path?)
-      end
+      @resizer.resize(
+        @path.dimensions,
+        @image_loader.original_path,
+        @image_loader.resize_path,
+        @path.crop_path?,
+        @path.image_extension,
+        @path.convert_path?
+      ) unless @image_loader.resized_image_exist?
     end
 
   end
-end
+end

data/lib/light_resizer/middleware/resizer.rb

@@ -9,6 +9,7 @@ module LightResizer
       end
 
       private
+      
       def check_resized_dir(resize_path)
         dir_name = File.dirname resize_path
         Dir.mkdir dir_name unless Dir.exist? dir_name
@@ -17,37 +18,28 @@ module LightResizer
 
       def store_image(dimensions, original_path, resize_path, crop, extension)
         original_path += '.*'
-        @image = MiniMagick::Image.open Dir[original_path].first
+        width, height = dimensions.split('x').map &:to_i
 
-        @extension = extension[1..-1]
+        @image = Magick::Image.read(Dir[original_path].first).first
+        @image.format = 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)
+        # really, don't do this
+        crop ? crop_image(width, height) : resize_image(width, height)
 
-        @image.write (resize_path + extension)
+        @image.write(resize_path + extension)
       end
-
-      def set_options(dimensions)
-        @image.combine_options do |c|
-          c.adaptive_resize dimensions
-          c.add_command 'quality', '0'
-          c.add_command 'extent', dimensions
-          c.gravity 'center'
-          c.background 'transparent'
-        end
+      
+      def resize_image(width, height)
+        @image.resize_to_fit!(width, height)
+        @image.background_color = 'Transparent'
+        @image = @image.extent(width, height, (@image.columns - width) / 2, (@image.rows - height) / 2) # does not work with simple gravity
       end
-
-      def set_crop_options(dimensions)
-        @image.combine_options do |c|
-          c.adaptive_resize dimensions+'^'
-          c.add_command 'quality', '0'
-          c.add_command 'extent', dimensions
-          c.gravity 'center'
-        end
+      
+      def crop_image(width, height)
+        @image.resize_to_fill!(width, height)
       end
 
     end
   end
-end
+end

data/lib/light_resizer/version.rb

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

data/light_resizer.gemspec

@@ -4,26 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'light_resizer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "light_resizer"
+  spec.name          = 'light_resizer'
   spec.version       = LightResizer::VERSION
-  spec.authors       = ["Denis Sergienko", "Vladislav Melanitskiy"]
-  spec.email         = ["olol.toor@gmail.com", "co@rademade.com"]
+  spec.authors       = ['Denis Sergienko', 'Vladislav Melanitskiy']
+  spec.email         = %w(olol.toor@gmail.com co@rademade.com)
   spec.summary       = %q{Tiny rack middleware for image resizing.}
   spec.description   = %q{}
-  spec.homepage      = "http://github.com/Rademade/light_resizer"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/Rademade/light_resizer'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "mini_magick", "~> 3.7.0"
-  spec.add_dependency "rack", "~> 1.5.2"
+  spec.add_dependency 'rmagick', '>= 2.13'
+  spec.add_dependency 'rack', '>= 1.5'
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'bundler', '>= 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry'
 end

data/spec/integration/middleware_spec.rb

@@ -16,13 +16,13 @@ describe LightResizer::Middleware do
     it 'should approve resize request' do
       resizer.call(env)
 
-      expect(resizer.resize_request?).to be_true
+      expect(resizer.resize_request?).to be_truthy
     end
 
     it 'should create resized image' do
-      expect(File.exist?(resize_full_path)).to be_false
+      expect(File.exist?(resize_full_path)).to be_falsey
       resizer.call(env)
-      expect(File.exist?(resize_full_path)).to be_true
+      expect(File.exist?(resize_full_path)).to be_truthy
     end
   end
 

data/spec/unit/middleware_path_spec.rb

@@ -10,7 +10,7 @@ describe LightResizer::Middleware::Path do
       path.request_path = '/some_dir/light_resize/150x150_image.png'
     end
 
-    it { expect(path.image_path?).to be_true }
+    it { expect(path.image_path?).to be_truthy }
 
     it { expect(path.image_path).to eq('/some_dir/image') }
 
@@ -27,9 +27,9 @@ describe LightResizer::Middleware::Path do
       path.request_path = '/some_dir/light_resize/150x150_crop_convert_image.png'
     end
 
-    it { expect(path.crop_path?).to be_true }
+    it { expect(path.crop_path?).to be_truthy }
 
-    it { expect(path.convert_path?).to be_true }
+    it { expect(path.convert_path?).to be_truthy }
 
     it { expect(path.image_path).to eq('/some_dir/image') }
 
@@ -46,7 +46,7 @@ describe LightResizer::Middleware::Path do
       path.request_path = '/asdada/123acad/some_dir/imdage.png'
     end
 
-    it { expect(path.image_path?).to be_false }
+    it { expect(path.image_path?).to be_falsey }
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: light_resizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Denis Sergienko
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
@@ -71,16 +71,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement