carrierwave_imagevoodoo 0.0.4-java → 0.0.5-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bc64ea96e349a3c9d0c3a44c93f51a9621a59814
+  data.tar.gz: c37b4ec04cc4a1868003e4ca524e0bb799ebac0e
+SHA512:
+  metadata.gz: e4a2ffa1946c626a846cc2d68dd80bdff9af58c81d4b629d1f93f4292f76ea4393632156f9e27edbbd8ef7b994607b542cda1fbf3c6db595a02fbaca66d6baa1
+  data.tar.gz: c11739bc5e3db2d1925512b548f50db325c7ceea4304d6b4dcab6625f2f241a64bd5dfdc121897e6d9698415a8dd49cda84451bd5ace06a68d1f516b708f2915

data/benchmarks/minimagick_vs_imagevoodoo.rb

@@ -4,10 +4,8 @@ require "carrierwave"
 class CatUploader < CarrierWave::Uploader::Base
   storage :file
 
-  100.times do |i|
-    version "size#{i}" do
-      process resize_to_fit: [200, 200]
-    end
+  version :thumbnail do
+    process resize_to_fit: [200, 200]
   end
 end
 
@@ -29,10 +27,12 @@ end
 
 puts "STARTED"
 3.times do
-  puts Benchmark.measure {
-    instance.store! cat_file
-  }
+  puts(Benchmark.measure do
+    10.times do
+      instance.store! cat_file
 
-  FileUtils.rm_r "uploads"
+      FileUtils.rm_r "uploads"
+    end
+  end)
 end
 puts "ENDED"

data/lib/carrierwave_imagevoodoo/version.rb

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

data/lib/carrierwave_imagevoodoo.rb

@@ -11,9 +11,9 @@ module CarrierWave
         process :convert => format
       end
 
-      #def resize_to_limit width, height
-      #  process :resize_to_limit => [width, height]
-      #end
+      def resize_to_limit width, height
+        process :resize_to_limit => [width, height]
+      end
 
       def resize_to_fit width, height
         process :resize_to_fit => [width, height]
@@ -35,22 +35,18 @@ module CarrierWave
       end
     end
 
-    #def resize_to_limit width, height
-    #end
+    def resize_to_limit width, height
+      manipulate! do |image|
+        if (width < image.width) || (height < image.height)
+          resize_to_fit!(image, width, height)
+        end
+      end
+    end
 
     def resize_to_fit width, height
       manipulate! do |image|
-        cols = image.width
-        rows = image.height
-
-        if width != cols or height != rows
-          scale = [width/cols.to_f, height/rows.to_f].min
-          cols = (scale * cols).round
-          rows = (scale * rows).round
-          image.resize cols, rows do |img|
-            yield(img) if block_given?
-            img.save current_path
-          end
+        if (width != image.width) || (height != image.height)
+          resize_to_fit!(image, width, height)
         end
       end
     end
@@ -87,7 +83,7 @@ module CarrierWave
         end
       end
     end
-    
+
     private
 
     def extract_dimensions(width, height, new_width, new_height, type = :resize)
@@ -105,7 +101,7 @@ module CarrierWave
 
     def extract_dimensions_for_crop(width, height, new_width, new_height)
       extract_dimensions(width, height, new_width, new_height, :crop)
-    end 
+    end
 
     def extract_placement_for_crop(width, height, new_width, new_height)
       x_offset = (width / 2.0) - (new_width / 2.0)
@@ -116,8 +112,30 @@ module CarrierWave
     #def resize_and_pad width, height, background = :transparent
     #end
 
+    def image_voodoo_image
+      @image_voodoo_image ||= ::ImageVoodoo.with_bytes(file.read)
+    end
+
     def manipulate!
-      yield ::ImageVoodoo.with_bytes file.read
+      yield image_voodoo_image
+    end
+
+    def resize_to_fit! image, width, height
+      w_ratio = width / image.width.to_f
+      h_ratio = height / image.height.to_f
+      ratio = [w_ratio, h_ratio].min
+
+      image.scale(ratio) do |img|
+        img.save current_path
+      end
+    end
+
+    def width
+      image_voodoo_image.width
+    end
+
+    def height
+      image_voodoo_image.height
     end
   end
 end

data/spec/carrierwave_imagevoodoo_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe CarrierWave::ImageVoodoo do
   let :klass do
@@ -7,47 +7,80 @@ describe CarrierWave::ImageVoodoo do
     end
   end
 
-  let :instance do
+  subject 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
+    FileUtils.cp(file_path("cat.jpg"), file_path("cat_copy.jpg"))
+    subject.stub(:file).and_return(File.new(file_path("cat_copy.jpg")))
+    subject.stub(:current_path).and_return(file_path("cat_copy.jpg"))
+    subject.stub(:cached?).and_return true
   end
 
   after do
-    FileUtils.rm(file_path('cat_copy.jpg'))
+    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)
+  describe "#resize_to_fit" do
+    context "image is larger than dimensions" do
+      before { subject.resize_to_fit(200, 200) }
+
+      it { 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)
+    context "image's largest side matches dimensions" do
+      before { subject.resize_to_fit(1000, 1000) }
+
+      it { 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)
+    context "image is upscaled if smaller than dimensions" do
+      before { subject.resize_to_fit(2000, 2000) }
+
+      it { 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)
+    context "image is exactly the same dimensions" do
+      before { subject.resize_to_fill(200, 200) }
+
+      it { should have_dimensions(200, 200) }
+    end
+
+    context "image is scaled up if smaller than dimensions" do
+      before { subject.resize_to_fill(1000, 1000) }
+
+      it { should have_dimensions(1000, 1000) }
     end
+  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)
+  describe '#resize_to_limit' do
+    context "image fits within height constraints" do
+      before { subject.resize_to_limit(700, 200) }
+
+      it { should have_dimensions(127, 200) }
     end
+
+    context "image fits within width constraints" do
+      before { subject.resize_to_limit(127, 2000) }
+
+      it { should have_dimensions(127, 200) }
+    end
+
+    context "image does not scale up if smaller than dimensions" do
+      before { subject.resize_to_limit(2000, 2000) }
+
+      it { should have_dimensions(635, 1000) }
+    end
+  end
+
+  describe "#width" do
+    its(:width) { should == 635 }
+  end
+
+  describe "#height" do
+    its(:height) { should == 1000 }
   end
 end

metadata

@@ -1,100 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_imagevoodoo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease:
+  version: 0.0.5
 platform: java
 authors:
 - Tasveer Singh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: image_voodoo
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   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: 3.0.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   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: 2.12.0
-    none: false
   prerelease: false
   type: :development
 description: CarrierWave support for ImageVoodoo
@@ -104,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE
 - README.md
@@ -119,35 +102,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/zenapsis/carrierwave_imagevoodoo
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: !binary |-
-        MA==
-      hash: 2
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: A simple CarrierWave processor utilizing ImageVoodoo for processing
 test_files:
 - spec/carrierwave_imagevoodoo_spec.rb