g1nn13-image_science 1.2.6 → 1.2.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.7 / 2010-05-26
+
+* removed redundant method cropped_to_fit
+* added image files for tests
+
 === 1.2.6 / 2010-05-26
 
 * Now based on ImageScience 1.2.1

data/Manifest.txt

@@ -5,5 +5,10 @@ Rakefile
 bench.rb
 bin/image_science_thumb
 lib/image_science.rb
+test/bearry.png
+test/biggie.png
+test/godzilla.png
+test/landscape.png
 test/pix.png
+test/portrait.png
 test/test_image_science.rb

data/lib/image_science.rb

@@ -13,7 +13,7 @@ require 'inline'
 # Based on ImageScience 1.2.1
 
 class ImageScience
-  VERSION = '1.2.6'
+  VERSION = '1.2.7'
 
   ##
   # The top-level image loader opens +path+ and then yields the image.
@@ -57,79 +57,6 @@ class ImageScience
   def buffer(extension) # :yields: image
   end
 
-
-  ##
-  # Resizes an image to the specified size without stretching or
-  # compressing the original. If the aspect ratio of the new height/width
-  # does not match the aspect ratio of the original (as when converting
-  # portrait to landscape or landscape to portrait), the resulting
-  # image will be cropped. Cropping preserves the center of the image,
-  # with content trimmed evenly from the top and bottom and/or left and
-  # right edges of the image. This can cause some less than ideal 
-  # conversions. For example, converting a portrait to a landscape can
-  # result in the portrait's head being cut off.
-  
-  def resize_with_crop(width, height, &block)
-
-    # ---------------------------------------------------------------
-    # We want to adjust both height and width by the same ratio,
-    # so the image is not stretched. Adjust everything by the
-    # larger ratio, so that portrait to landscape and landscape
-    # to portrait transformations come out right.
-    # ---------------------------------------------------------------
-    src2target_height_ratio = height.to_f / self.height
-    src2target_width_ratio = width.to_f / self.width
-    height_ratio_is_larger = src2target_height_ratio > src2target_width_ratio
-    if height_ratio_is_larger
-      target_height = (self.height * src2target_height_ratio).round
-      target_width = (self.width * src2target_height_ratio).round
-    else
-      target_height = (self.height * src2target_width_ratio).round
-      target_width = (self.width * src2target_width_ratio).round
-    end
-    
-    # ---------------------------------------------------------------
-    # Create a version of this image whose longest
-    # side is equal to max_dimension. We'll add two
-    # to this value, since floating point arithmetic 
-    # often produces values 1-2 pixels short of what we want.
-    # ---------------------------------------------------------------
-    max_dimension = (target_height > target_width ? 
-                     target_height : target_width)
-    
-    self.thumbnail(max_dimension + 2) do |img1|
-      top, left = 0, 0      
-      top = (img1.height - height) / 2 unless img1.height < height      
-      left = (img1.width - width) / 2 unless img1.width < width
-      right = width + left
-      bottom = height + top
-
-      # ---------------------------------------------------------------
-      # Crop the resized image evenly at top/bottom, left/right,
-      # so that we preserve the center.
-      # ---------------------------------------------------------------
-      result = img1.with_crop(left, top, right, bottom) do |img2|
-        if block_given?
-          yield img2 
-        else
-          return img2
-        end
-      end      
-
-      if result.nil?
-        message = "Crop/resize failed... is some dimension is out of bounds?"
-        message += "Original Height = #{self.height}, Width = #{self.width}"
-        message += "Target Height   = #{height}, Width = #{width}"
-        message += "Actual Height   = #{self.height}, Width = #{self.width}"
-        message += "Left=#{left}, Top=#{top}, Right=#{right}, Bottom=#{bottom}"
-        raise message
-      end
-
-
-    end
-  end
-
-
   ##
   # Resizes the image to +width+ and +height+ using a cubic-bspline
   # filter and yields the new image.
@@ -197,20 +124,71 @@ class ImageScience
   end
 
   ##
-  # Creates a square thumbnail of the image cropping the longest edge
-  # to match the shortest edge, resizes to +size+, and yields the new
-  # image.
+  # Resizes an image to the specified size without stretching or
+  # compressing the original. If the aspect ratio of the new height/width
+  # does not match the aspect ratio of the original (as when converting
+  # portrait to landscape or landscape to portrait), the resulting
+  # image will be cropped. Cropping preserves the center of the image,
+  # with content trimmed evenly from the top and bottom and/or left and
+  # right edges of the image. This can cause some less than ideal
+  # conversions. For example, converting a portrait to a landscape can
+  # result in the portrait's head being cut off.
 
-  def cropped_to_fit(width, height) # :yields: image
-    w, h = width, height
-    l, t, r, b, half = 0, 0, w, h, (w - h).abs / 2
+  def resize_with_crop(width, height, &block)
 
-    l, r = half, half + h if w > h
-    t, b = half, half + w if h > w
+    # ---------------------------------------------------------------
+    # We want to adjust both height and width by the same ratio,
+    # so the image is not stretched. Adjust everything by the
+    # larger ratio, so that portrait to landscape and landscape
+    # to portrait transformations come out right.
+    # ---------------------------------------------------------------
+    src2target_height_ratio = height.to_f / self.height
+    src2target_width_ratio = width.to_f / self.width
+    height_ratio_is_larger = src2target_height_ratio > src2target_width_ratio
+    
+    if height_ratio_is_larger
+      target_height = (self.height * src2target_height_ratio).round
+      target_width = (self.width * src2target_height_ratio).round
+    else
+      target_height = (self.height * src2target_width_ratio).round
+      target_width = (self.width * src2target_width_ratio).round
+    end
 
-    with_crop(l, t, r, b) do |img|
-      img.thumbnail(size) do |thumb|
-        yield thumb
+    # ---------------------------------------------------------------
+    # Create a version of this image whose longest
+    # side is equal to max_dimension. We'll add two
+    # to this value, since floating point arithmetic
+    # often produces values 1-2 pixels short of what we want.
+    # ---------------------------------------------------------------
+    max_dimension = (target_height > target_width ?
+                     target_height : target_width)
+
+    self.thumbnail(max_dimension + 2) do |img1|
+      top, left = 0, 0
+      top = (img1.height - height) / 2 unless img1.height < height
+      left = (img1.width - width) / 2 unless img1.width < width
+      right = width + left
+      bottom = height + top
+
+      # ---------------------------------------------------------------
+      # Crop the resized image evenly at top/bottom, left/right,
+      # so that we preserve the center.
+      # ---------------------------------------------------------------
+      result = img1.with_crop(left, top, right, bottom) do |img2|
+        if block_given?
+          yield img2
+        else
+          return img2
+        end
+      end
+
+      if result.nil?
+        message = "Crop/resize failed... is some dimension is out of bounds?"
+        message += "Original Height = #{self.height}, Width = #{self.width}"
+        message += "Target Height   = #{height}, Width = #{width}"
+        message += "Actual Height   = #{self.height}, Width = #{self.width}"
+        message += "Left=#{left}, Top=#{top}, Right=#{right}, Bottom=#{bottom}"
+        raise message
       end
     end
   end

metadata

@@ -1,141 +1,87 @@
 --- !ruby/object:Gem::Specification 
 name: g1nn13-image_science
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 6
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors: 
 - jim nist
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQwwCgYDVQQDDANqaW0x
-  HDAaBgoJkiaJk/IsZAEZFgxob3RlbGljb3B0ZXIxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMTAwNTI2MTYwNTM5WhcNMTEwNTI2MTYwNTM5WjBBMQwwCgYDVQQDDANq
-  aW0xHDAaBgoJkiaJk/IsZAEZFgxob3RlbGljb3B0ZXIxEzARBgoJkiaJk/IsZAEZ
-  FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzbudw4TyxDTEj
-  /UMsEt2LFWmDiEKmyKHnHiPdjINn/wY8yYw1oujRj2c2iXlaon68u8G+1qacfyd0
-  gpHPFQfqBFKLDtPgPffzAkY8fvW4MgjRYFcymdpiVGpHCoTgvhO9Efsrd/d8Ja4n
-  oeEPNHdXr/bHwLhgIAup6JYQAZSL1DY77co3rbvY1xqovbc6tg/M7cbXPp1lmONS
-  XwIHPWjsl3mL1IWEQPt2dmPy6ZLYliKowdGlDUblupXuVlO9cS67yf3MlJp874mY
-  yH1qAwSK/Toe2L39TTi/Hyx6HMFECTmkLUT/4X2z6zWUlK0e5Hr8ViBCzh2BTOyO
-  jojoYo7tAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBQ1LMdE7DCtf+7x6tJAqGRMKMtVXDANBgkqhkiG9w0BAQUFAAOCAQEAIu7ygDoV
-  g5wdi3wWR//1yK86vQe36luyolo3GL+Z0FmIIA+tdAPZtMAlnFasOSfLVDdkxb3O
-  J2MLyH5KHY5asc27J+Y/zUofGWj5JgQZIg+gAGcDuq94kr4NXgFTL4khE3zhI4uH
-  65+zkHrnetmZPilpTbFjzvM1SfuzrU9t+ugEu7R1vmAQdhdcgSwXr0MYPy5oZWgQ
-  eayeSBRjd6tzceXRmaZYWDH2wra509l63UgJw6dsNgWzQH1XQ1XzqJXX/J8FRgDI
-  n3ugwImcS/YB+ZQ3TQ3uKX8E5Ikos7YH0Pc/WRQnMzcjBmNtx7GsV9MC9Qx/i+YC
-  UHHftgnvI+YPGw==
-  -----END CERTIFICATE-----
+cert_chain: []
 
 date: 2010-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe-doofus
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe-git
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
-  type: :development
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe-telicopter
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: minitest
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
-  type: :development
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 6
-        - 0
         version: 2.6.0
-  type: :development
-  version_requirements: *id007
+    version: 
 description: |-
   g1nn13 fork changes:
   
@@ -171,7 +117,12 @@ files:
 - bench.rb
 - bin/image_science_thumb
 - lib/image_science.rb
+- test/bearry.png
+- test/biggie.png
+- test/godzilla.png
+- test/landscape.png
 - test/pix.png
+- test/portrait.png
 - test/test_image_science.rb
 has_rdoc: true
 homepage: http://github.com/g1nn13/image_science
@@ -187,20 +138,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: g1nn13-image_science
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "g1nn13 fork changes:  * added buffer() method to get image buffer for writing (to Amazon S3) * added fit_within() method to resize an image to fit within a specified height and width without changing the image's aspect ratio * added resize_with_crop() to resize and crop images where the target aspect ratio differs from the original aspect ratio"

metadata.gz.sig

@@ -1,5 +0,0 @@
-Pl\3N��>KA���C��y{�[ZT��}��ͻC�ه?��M��ƅs�#�):��
-C����B�du�9��
-xܩ�DH�@e��P8���X��e<mm��-�m��N�b��4�Î`b�]����
-�WZ�rO�.!�~2nB
-�!;w(t}�e�0Fh#[��t�͎
7(�ő�?�*!�ӛ^�Q��j��s���Q��8�O���; �+gg��v��%�u�t}����Ǧ]��E�ʞ]�&����_