image_resizer 0.1.4 → 0.2.0

data/README.md

@@ -17,19 +17,19 @@ Example:
     processor = ImageResizer::Processor.new
 
     # resize to fit the specified width, maintaining the original ratio
-    resized_file = processor.resize(temp_object, :width => 320)
+    tempfile = processor.resize(temp_object, :width => 320)
 
     # resize to fit the specified height, maintaining the original ratio
-    resized_file = processor.resize(temp_object, :height => 240)
+    tempfile = processor.resize(temp_object, :height => 240)
 
     # resize to the specified dimensions, cropping around the center to avoid stretching
-    resized_file = processor.resize(temp_object, :width => 320, :height => 240)
+    tempfile = processor.resize(temp_object, :width => 320, :height => 240)
 
     # crop the original image to a frame and resize the result
     upper_left = [0.25, 0.15] # 25% from the left, 15% from the top 
     lower_right = [0.75, 0.95] # 75% from the left, 95% from the top
     width = 320
-    resized_file = processor.crop_to_frame_and_resize(temp_object,
+    tempfile = processor.crop_to_frame_and_resize(temp_object,
                                       :upper_left => upper_left,
                                       :lower_right => lower_right,
                                       :width => width
@@ -39,14 +39,18 @@ Example:
     point = [0.8, 0.3] # 80% from the left, 30% from the top
     width = 320
     height = 400
-    resized_file = processor.resize_and_crop_around_point(temp_object,
+    tempfile = processor.resize_and_crop_around_point(temp_object,
                                       :point => point,
                                       :width => width,
                                       :height => height
                                       )
-    File.open(output_file, 'wb') { |f| f.write(File.read(processed)) }
+    File.open(path_to_output_file, 'wb') { |f| f.write(File.read(tempfile)) }
 
 
+    # generate a .ico file with 16, 32, 64, 128, and 256 pixel square sizes
+    tempfile = processor.generate_icon(temp_object)
+    File.open(path_to_output_file, 'wb') { |f| f.write(File.read(tempfile)) }
+
 Credits
 =======
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/image_resizer.gemspec

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

data/lib/image_resizer/processor.rb

@@ -216,5 +216,14 @@ module ImageResizer
       format ? [super, {:format => format.to_sym}] : super
     end
 
+    def generate_icon(temp_object)
+      two_fifty_six_png = convert(temp_object, '-resize 256x256! -transparent white', :png).first
+      sixteen_png = convert(two_fifty_six_png, '-resize 16x16! -transparent white')
+      thirty_two_png = convert(two_fifty_six_png, '-resize 32x32! -transparent white')
+      sixty_four_png = convert(two_fifty_six_png, '-resize 64x64! -transparent white')
+      one_twenty_eight_png = convert(two_fifty_six_png, '-resize 128x128! -transparent white')
+      convert([sixteen_png, thirty_two_png, sixty_four_png, one_twenty_eight_png, two_fifty_six_png],
+               '', :ico).first
+    end
   end
 end

data/lib/image_resizer/utils.rb

@@ -13,7 +13,13 @@ module ImageResizer
 
     def convert(temp_object=nil, args='', format=nil)
       tempfile = new_tempfile(format)
-      run convert_command, %(#{quote(temp_object.path) if temp_object} #{args} #{quote(tempfile.path)})
+      if temp_object.is_a?(Array)
+        paths = temp_object.map { |obj| quote(obj.path) }.join(' ')
+        run convert_command, %(#{paths} #{args} #{quote(tempfile.path)})
+      else
+        run convert_command, %(#{quote(temp_object.path) if temp_object} #{args} #{quote(tempfile.path)})
+      end
+
       tempfile
     end
 

data/spec/image_resizer/processor_spec.rb

@@ -585,6 +585,39 @@ describe ImageResizer::Processor do
       image = ImageResizer::TempObject.new(SAMPLES_DIR.join('white pixel.png'))
       @processor.convert(image, "-resize 2x2!").should have_width(2)
     end
+
+    it "should allow an array of image files as the first parameter" do
+      image1 = double('image1')
+      image2 = double('image2')
+      tempfile = double('tempfile')
+
+      image1.stub(:path).and_return('hello world')
+      image2.stub(:path).and_return('goodbye')
+      tempfile.stub(:path).and_return('output path')
+
+      @processor.stub(:new_tempfile).and_return(tempfile)
+      @processor.should_receive(:run).with('convert', "'hello world' 'goodbye'  'output path'")
+      image = @processor.convert([image1, image2])
+    end
   end
 
+
+  describe "#generate_icon" do
+    it "it should create a multi-sized ico file from the source file" 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)
+      sixty_four_png = double('64')
+      @processor.should_receive(:convert).with(two_fifty_six_png, '-resize 64x64! -transparent white').and_return(sixty_four_png)
+      one_twenty_eight_png = double('128')
+      @processor.should_receive(:convert).with(two_fifty_six_png, '-resize 128x128! -transparent white').and_return(one_twenty_eight_png)
+      ico = double('ico')
+      @processor.should_receive(:convert).with([sixteen_png, thirty_two_png, sixty_four_png, one_twenty_eight_png, two_fifty_six_png],
+                                                '', :ico).and_return([ico, :format => :ico])
+      @processor.generate_icon(@image)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: image_resizer
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153615040 !ruby/object:Gem::Requirement
+  requirement: &2152250060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153615040
+  version_requirements: *2152250060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153613480 !ruby/object:Gem::Requirement
+  requirement: &2152248560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153613480
+  version_requirements: *2152248560
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2153639960 !ruby/object:Gem::Requirement
+  requirement: &2152487300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153639960
+  version_requirements: *2152487300
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2153639400 !ruby/object:Gem::Requirement
+  requirement: &2152486740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153639400
+  version_requirements: *2152486740
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
-  requirement: &2153638580 !ruby/object:Gem::Requirement
+  requirement: &2152485860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153638580
+  version_requirements: *2152485860
 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: -4439322556749363730
+      hash: 857189311652511831
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: