image_resizer 0.2.1 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/image_resizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "image_resizer"
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Nelson"]
-  s.date = "2012-04-28"
+  s.date = "2012-04-29"
   s.description = "Image resizing gem (requires ImageMagick)"
   s.email = "daniel@populr.me"
   s.extra_rdoc_files = [

data/lib/image_resizer/processor.rb

@@ -217,15 +217,15 @@ module ImageResizer
     end
 
     def generate_icon(temp_object, options={})
-      two_fifty_six_png = convert(temp_object, '-resize 256x256! -transparent white', :png).first
+      max_resolution = [options[:max_resolution] || 256, 256].min
+      largest_png = convert(temp_object, "-resize #{max_resolution}x#{max_resolution}! -transparent white", :png).first
       formats = []
       current = 16
-      max_resolution = options[:max_resolution] || 256
-      while current <= max_resolution && current < 256
-        formats << convert(two_fifty_six_png, "-resize #{current}x#{current}! -transparent white")
+      while current < max_resolution
+        formats << convert(largest_png, "-resize #{current}x#{current}! -transparent white")
         current *= 2
       end
-      formats << two_fifty_six_png if max_resolution >= 256
+      formats << largest_png
       convert(formats, '', :ico).first
     end
   end

data/spec/image_resizer/processor_spec.rb

@@ -621,14 +621,10 @@ describe ImageResizer::Processor do
     end
 
     it "it should accept a :max_resolution option to limit the number of formats" do
-      two_fifty_six_png = double('256')
-      @processor.should_receive(:convert).with(@image, '-resize 256x256! -transparent white', :png).and_return([two_fifty_six_png, :format => :png])
-      sixteen_png = double('16')
-      @processor.should_receive(:convert).with(two_fifty_six_png, '-resize 16x16! -transparent white').and_return(sixteen_png)
       thirty_two_png = double('32')
-      @processor.should_receive(:convert).with(two_fifty_six_png, '-resize 32x32! -transparent white').and_return(thirty_two_png)
-
-      @processor.should_not_receive(:convert).with(two_fifty_six_png, '-resize 64x64! -transparent white')
+      @processor.should_receive(:convert).with(@image, '-resize 32x32! -transparent white', :png).and_return([thirty_two_png, :format => :png])
+      sixteen_png = double('16')
+      @processor.should_receive(:convert).with(thirty_two_png, '-resize 16x16! -transparent white').and_return(sixteen_png)
 
       ico = double('ico')
       @processor.should_receive(:convert).with([sixteen_png, thirty_two_png],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_resizer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161681640 !ruby/object:Gem::Requirement
+  requirement: &2153615980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161681640
+  version_requirements: *2153615980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161680200 !ruby/object:Gem::Requirement
+  requirement: &2153614640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161680200
+  version_requirements: *2153614640
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2161706960 !ruby/object:Gem::Requirement
+  requirement: &2153640760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161706960
+  version_requirements: *2153640760
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2161706340 !ruby/object:Gem::Requirement
+  requirement: &2153640120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161706340
+  version_requirements: *2153640120
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
-  requirement: &2161705480 !ruby/object:Gem::Requirement
+  requirement: &2153639380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161705480
+  version_requirements: *2153639380
 description: Image resizing gem (requires ImageMagick)
 email: daniel@populr.me
 executables: []
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3887465785139415928
+      hash: 2737060154479348159
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: