carrierwave_imagevoodoo 0.0.3-java → 0.0.4-java

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rvmrc
+.ruby-version

data/README.md

@@ -6,6 +6,7 @@ CarrierWave support for ImageVoodoo
 
 Add this line to your application's Gemfile:
 
+    gem 'image_voodoo'
     gem 'carrierwave_imagevoodoo'
 
 And then execute:
@@ -14,7 +15,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install carrierwave_imagevoodoo
+    $ gem install image_voodoo carrierwave_imagevoodoo
 
 ## Usage
 

data/benchmarks/minimagick_vs_imagevoodoo.rb

@@ -0,0 +1,38 @@
+require "benchmark"
+require "carrierwave"
+
+class CatUploader < CarrierWave::Uploader::Base
+  storage :file
+
+  100.times do |i|
+    version "size#{i}" do
+      process resize_to_fit: [200, 200]
+    end
+  end
+end
+
+cat_file = File.new("images/cat.jpg")
+
+case RUBY_PLATFORM
+when "java"
+  require "../lib/carrierwave_imagevoodoo"
+  CatUploader.send :include, CarrierWave::ImageVoodoo
+else
+  CatUploader.send :include, CarrierWave::MiniMagick
+end
+
+instance = CatUploader.new
+
+if File.directory? "uploads"
+  FileUtils.rm_r "uploads"
+end
+
+puts "STARTED"
+3.times do
+  puts Benchmark.measure {
+    instance.store! cat_file
+  }
+
+  FileUtils.rm_r "uploads"
+end
+puts "ENDED"

data/carrierwave_imagevoodoo.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "carrierwave"
   gem.add_dependency "image_voodoo"
+  gem.add_dependency "activesupport", ">= 3.0.0"
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", ">= 2.12.0"
 end

data/lib/carrierwave_imagevoodoo/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module ImageVoodoo
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/carrierwave_imagevoodoo.rb

@@ -1,4 +1,6 @@
-require "carrierwave_imagevoodoo/version"
+require "carrierwave"
+require "image_voodoo"
+require "active_support/concern"
 
 module CarrierWave
   module ImageVoodoo
@@ -43,8 +45,8 @@ module CarrierWave
 
         if width != cols or height != rows
           scale = [width/cols.to_f, height/rows.to_f].min
-          cols = (scale * (cols + 0.5)).round
-          rows = (scale * (rows + 0.5)).round
+          cols = (scale * cols).round
+          rows = (scale * rows).round
           image.resize cols, rows do |img|
             yield(img) if block_given?
             img.save current_path
@@ -53,22 +55,63 @@ module CarrierWave
       end
     end
 
-    def resize_to_fill width, height
+    def resize_to_fill(new_width, new_height)
       manipulate! do |image|
         cols = image.width
         rows = image.height
+        width, height = extract_dimensions_for_crop(image.width, image.height, new_width, new_height)
+        x_offset, y_offset = extract_placement_for_crop(width, height, new_width, new_height)
 
-        if width != cols or height != rows
-          scale = [width/cols.to_f, height/rows.to_f].max
-          cols = (scale * (cols + 0.5)).round
-          rows = (scale * (rows + 0.5)).round
-          image.resize cols, rows do |img|
-            yield(img) if block_given?
-            img.save current_path
+        # check if if new dimensions are too small for the new image
+        if width < new_width
+          width = new_width
+          height = (new_width.to_f*(image.height.to_f/image.width.to_f)).round
+        elsif height < new_height
+          height = new_height
+          width = (new_height.to_f*(image.width.to_f/image.height.to_f)).round
+        end
+
+        image.resize( width, height ) do |i2|
+
+          # check to make sure offset is not negative
+          if x_offset < 0
+            x_offset = 0
+          end
+          if y_offset < 0
+            y_offset = 0
+          end
+
+          i2.with_crop( x_offset, y_offset, new_width + x_offset, new_height + y_offset) do |file|
+            file.save( self.current_path )
           end
         end
       end
     end
+    
+    private
+
+    def extract_dimensions(width, height, new_width, new_height, type = :resize)
+      aspect_ratio = width.to_f / height.to_f
+      new_aspect_ratio = new_width / new_height
+
+      if (new_aspect_ratio > aspect_ratio) ^ ( type == :crop ) # Image is too wide, the caret is the XOR operator
+        new_width, new_height = [ (new_height * aspect_ratio), new_height]
+      else #Image is too narrow
+        new_width, new_height = [ new_width, (new_width / aspect_ratio)]
+      end
+
+      [new_width, new_height].collect! { |v| v.round }
+    end
+
+    def extract_dimensions_for_crop(width, height, new_width, new_height)
+      extract_dimensions(width, height, new_width, new_height, :crop)
+    end 
+
+    def extract_placement_for_crop(width, height, new_width, new_height)
+      x_offset = (width / 2.0) - (new_width / 2.0)
+      y_offset = (height / 2.0) - (new_height / 2.0)
+      [x_offset, y_offset].collect! { |v| v.round }
+    end
 
     #def resize_and_pad width, height, background = :transparent
     #end
@@ -77,4 +120,4 @@ module CarrierWave
       yield ::ImageVoodoo.with_bytes file.read
     end
   end
-end
+end

data/spec/carrierwave_imagevoodoo_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe CarrierWave::ImageVoodoo do
+  let :klass do
+    Class.new do
+      include CarrierWave::ImageVoodoo
+    end
+  end
+
+  let :instance do
+    klass.new
+  end
+
+  before do
+    FileUtils.cp(file_path('cat.jpg'), file_path('cat_copy.jpg'))
+    instance.stub(:file).and_return(File.new(file_path('cat_copy.jpg')))
+    instance.stub(:current_path).and_return(file_path('cat_copy.jpg'))
+    instance.stub(:cached?).and_return true
+  end
+
+  after do
+    FileUtils.rm(file_path('cat_copy.jpg'))
+  end
+
+  describe '#resize_to_fit' do
+    it "should resize the image to fit within the given dimensions" do
+      instance.resize_to_fit(200, 200)
+      instance.should have_dimensions(127, 200)
+    end
+
+    it "should not resize an image whose largest side matchesthe given dimensions" do
+      instance.resize_to_fit(1000, 1000)
+      instance.should have_dimensions(635, 1000)
+    end
+
+    it "should scale the image up if smaller than given dimensions" do
+      instance.resize_to_fit(2000, 2000)
+      instance.should have_dimensions(1270, 2000)
+    end
+  end
+
+  describe '#resize_to_fill' do
+    it "should resize the image to exactly the given dimensions" do
+      instance.resize_to_fill(200, 200)
+      instance.should have_dimensions(200, 200)
+    end
+
+    it "should scale the image up if smaller than given dimensions" do
+      instance.resize_to_fill(1000, 1000)
+      instance.should have_dimensions(1000, 1000)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,36 @@
+require "carrierwave_imagevoodoo"
+
+def file_path( *paths )
+  File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', *paths))
+end
+
+class HaveDimensions
+  def initialize(width, height)
+    @width, @height = width, height
+  end
+
+  def matches?(actual)
+    @actual = actual
+    # Satisfy expectation here. Return false or raise an error if it's not met.
+    image = ::ImageVoodoo.with_bytes File.new(@actual.current_path).read
+    @actual_width = image.width
+    @actual_height = image.height
+    @actual_width == @width && @actual_height == @height
+  end
+
+  def failure_message
+    "expected #{@actual.current_path.inspect} to have an exact size of #{@width} by #{@height}, but it was #{@actual_width} by #{@actual_height}."
+  end
+
+  def negative_failure_message
+    "expected #{@actual.current_path.inspect} not to have an exact size of #{@width} by #{@height}, but it did."
+  end
+
+  def description
+    "have an exact size of #{@width} by #{@height}"
+  end
+end
+
+def have_dimensions(width, height)
+  HaveDimensions.new(width, height)
+end

metadata

@@ -1,64 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_imagevoodoo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
+  prerelease:
 platform: java
 authors:
 - Tasveer Singh
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: image_voodoo
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.12.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
+    none: false
+  prerelease: false
+  type: :development
 description: CarrierWave support for ImageVoodoo
 email:
 - taz@zenapsis.com
@@ -66,36 +104,52 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- benchmarks/images/cat.jpg
+- benchmarks/minimagick_vs_imagevoodoo.rb
 - carrierwave_imagevoodoo.gemspec
 - lib/carrierwave_imagevoodoo.rb
 - lib/carrierwave_imagevoodoo/version.rb
+- spec/carrierwave_imagevoodoo_spec.rb
+- spec/fixtures/cat.jpg
+- spec/spec_helper.rb
 homepage: https://github.com/zenapsis/carrierwave_imagevoodoo
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      segments:
+      - 0
+      version: !binary |-
+        MA==
+      hash: 2
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.21
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A simple CarrierWave processor utilizing ImageVoodoo for processing
-test_files: []
+test_files:
+- spec/carrierwave_imagevoodoo_spec.rb
+- spec/fixtures/cat.jpg
+- spec/spec_helper.rb