imgry 0.1.3 → 0.1.4

data/lib/imgry/geometry.rb

@@ -4,13 +4,12 @@ module Imgry
 
     def scale(orig_width, orig_height, geometry)
       # TODO: basic verification of geometry syntax
-
-      op = geometry[-1] # Expecting !, >, <, or nothing
       new_width, new_height = nil, nil
-      ask_width, ask_height = geometry.split('x').map {|x| x.to_i }
+      ask_width, ask_height, _, _, op = from_s(geometry)
+
       ask_height ||= 0
       aspect_ratio = orig_width.to_f / orig_height.to_f
-      
+
       scale = Proc.new do
         if ask_width == 0 || ask_width < ask_height
           new_width, new_height = scale_by_height(ask_height, aspect_ratio)
@@ -41,5 +40,26 @@ module Imgry
       [(new_height * aspect_ratio).to_i, new_height.to_i]
     end
 
+    # borrowed from RMagick
+    W = /(\d+\.\d+%?)|(\d*%?)/
+    H = W
+    X = /(?:([-+]\d+))?/
+    Y = X
+    REGEXP = /\A#{W}x?#{H}#{X}#{Y}([!<>@\^]?)\Z/
+
+    def from_s(str)
+      m = REGEXP.match(str)
+      if m
+          width  = (m[1] || m[2]).to_f
+          height = (m[3] || m[4]).to_f
+          x      = m[5].to_i
+          y      = m[6].to_i
+          flag   = m[7]
+      else
+          raise ArgumentError, "invalid geometry format"
+      end
+      [width, height, x, y, flag]
+    end
+    
   end
 end

data/lib/imgry/processor/image_voodoo.rb

@@ -4,7 +4,9 @@ module Imgry
     class ImageVoodoo < JavaAdapter
       def load_image!
         begin
-          @img = ::ImageVoodoo.new(ImageIO.read(@img_blob))
+          input_stream = ImageIO.create_image_input_stream(ByteArrayInputStream.new(@img_blob))
+          detect_image_format!(input_stream)
+          @img = ::ImageVoodoo.new(ImageIO.read(input_stream))
         rescue => ex
           raise InvalidImageError, ex.message
         end
@@ -15,12 +17,14 @@ module Imgry
       end
 
       def resize!(geometry)
-        return if geometry.nil?        
+        return if geometry.nil?
         @img = @img.resize(*Geometry.scale(width, height, geometry))
       end
 
-      def crop!
-        # TODO
+      def crop!(geometry)
+        width, height, offset_x, offset_y, flag = crop_geometry(geometry)
+
+        @img = @img.with_crop(offset_x, offset_y, offset_x + width, offset_y + height)
       end
 
     end

data/lib/imgry/processor/img_scalr.rb

@@ -7,7 +7,9 @@ module Imgry
 
       def load_image!
         begin
-          @img = ImageIO.read(@img_blob)
+          input_stream = ImageIO.create_image_input_stream(ByteArrayInputStream.new(@img_blob))
+          detect_image_format!(input_stream)
+          @img = ImageIO.read(input_stream)
         rescue => ex
           raise InvalidImageError, ex.message
         end
@@ -28,124 +30,13 @@ module Imgry
                             Scalr::OP_ANTIALIAS)
       end
 
-      def crop!
-        # TODO
+      def crop!(geometry)
+        width, height, offset_x, offset_y, flag = crop_geometry(geometry)
+
+        @img = Scalr.crop(@img, offset_x, offset_y, width, height)
       end
 
     end
 
   end
 end
-
-__END__
-class ImgScalrVoodoo
-  include Java
-
-  require 'java/imgscalr-lib-4.2.jar'
-
-  java_import javax.imageio.ImageIO
-  java_import org.imgscalr.Scalr
-  java_import java.awt.image.BufferedImage
-
-  JFile = java.io.File
-
-  def initialize(src)
-    @src = src
-  end
-
-  def self.with_image(path)
-    raise ArgumentError, "file does not exist" unless File.file?(path)
-    image = guard do
-              buffered_image = ImageIO.read(JFile.new(path))
-              buffered_image ? ImgScalrVoodoo.new(buffered_image) : nil
-            end
-
-    image && block_given? ? yield(image) : image
-  end
-
-
-  def self.with_bytes(bytes)
-    bytes = bytes.to_java_bytes if String === bytes
-    image = guard do
-              ImgScalrVoodoo.new(ImageIO.read(ByteArrayInputStream.new(bytes)))
-            end
-
-    block_given? ? yield(image) : image
-  end
-
-  def img_scalr_resize(width, height, options={})
-    method = options[:method]? options[:method] : Scalr::Method::QUALITY
-    mode   = options[:mode]? options[:mode] : Scalr::Mode::FIT_EXACT
-    ops    = options[:ops]? options[:ops] : Scalr::OP_ANTIALIAS
-
-    target = guard { Scalr.resize(@src, method, mode, width, height, ops) }
-
-    image = ImgScalrVoodoo.new(target)
-
-    block_given? ? yield(image) : image
-  rescue NativeException => ne
-    raise ArgumentError, ne.message
-  end
-
-  def resize(width, height)
-    image = img_scalr_resize(width, height)
-    block_given? ? yield(image) : image
-  end
-
-  def cropped_thumbnail(size)
-    l, t, r, b, half = 0, 0, width, height, (width - height).abs / 2
-    l, r = half, half + height if width > height
-    t, b = half, half + width if height > width
-
-    target = with_crop(l, t, r, b).thumbnail(size)
-    block_given? ? yield(target) : target
-  end
-
-  def save(file)
-    format = File.extname(file)
-    return false if format == ""
-    format = format[1..-1].downcase
-    guard { ImageIO.write(@src, format, JFile.new(file)) }
-    true
-  end
-
-  def scale(ratio)
-    new_width, new_height = (width * ratio).to_i, (height * ratio).to_i
-    target = resize(new_width, new_height)
-    block_given? ? yield(target) : target
-  end
-
-  def thumbnail(size)
-    target = scale(size.to_f / (width > height ? width : height))
-    block_given? ? yield(target) : target
-  end
-
-  def with_crop(left, top, right, bottom)
-    image = guard { ImgScalrVoodoo.new(Scalr.crop(@src, left, top, right-left, bottom-top)) }
-    block_given? ? yield(image) : image
-  end
-
-  def self.guard(&block)
-    begin
-      return block.call
-    rescue NoMethodError => e
-      "Unimplemented Feature: #{e}"
-    end
-  end
-
-  def guard(&block)
-    ImgScalrVoodoo.guard(&block)
-  end
-
-  def height
-    @src.height
-  end
-
-  def width
-    @src.width
-  end
-
-  def to_java
-    @src
-  end
-end

data/lib/imgry/processor/java_adapter.rb

@@ -13,27 +13,31 @@ module Imgry
       # GPU performance is improved
       java.lang.System.setProperty('sun.java2d.opengl', 'true')
 
-      def self.with_bytes(img_blob, format=nil)
+      def self.with_bytes(img_blob)
         bytes = img_blob.to_java_bytes if img_blob.is_a?(String)
-        new(ByteArrayInputStream.new(bytes), format)
+        new(bytes)
       end
 
-      def self.from_file(path, format=nil)
+      def self.from_file(path)
         if !File.readable?(path)
           raise FileUnreadableError, path.to_s
         end
 
-        # Use the format based on the file's extension
-        ext = File.extname(path)
-        format = !ext.nil? ? ext[1..-1].downcase : nil
-
         img_blob = IO.read(path.to_s)
-        with_bytes(img_blob, format)
+        with_bytes(img_blob)
 
         # TODO: read the file using Java file io instead..?
         # input_stream = java.io.FileInputStream.new(java.io.File.new(path.to_s))
       end
 
+      def detect_image_format!(image_input_stream)
+        @format = nil # reset..
+        if (reader = ImageIO.get_image_readers(image_input_stream).first)
+          @format = reader.format_name.downcase
+          @format = 'jpg' if @format == 'jpeg' # prefer this way..
+        end
+      end
+
       def self.supported_formats
         @supported_formats ||= begin
           # NOTE: assuming read and write formats are the same..
@@ -42,6 +46,10 @@ module Imgry
         end
       end
 
+      def format
+        @format
+      end
+
       def width
         @img.width
       end
@@ -55,8 +63,21 @@ module Imgry
         @img_blob = nil
       end
 
+      def crop_geometry(geometry)
+        # no gravity support yet, so all offsets should be > 0
+        width, height, offset_x, offset_y, flag = Geometry.from_s(geometry)
+
+        offset_x = 0 if offset_x > self.width || offset_x < 0
+        offset_y = 0 if offset_y > self.height || offset_y < 0
+
+        width  = self.width - offset_x if width + offset_x > self.width
+        height = self.height - offset_y if height + offset_y > self.height
+
+        [width, height, offset_x, offset_y, flag]
+      end
+
       def to_blob(format=nil)
-        format ||= @format || DEFAULT_OUTPUT_FORMAT
+        format ||= @format
 
         if !self.class.supported_formats.include?(format.downcase)
           raise UnsupportedFormatError, format
@@ -73,8 +94,7 @@ module Imgry
         end
 
         ext = File.extname(path)
-        format = !ext.nil? ? ext[1..-1].downcase : nil
-        format ||= DEFAULT_OUTPUT_FORMAT
+        format = !ext.nil? ? ext[1..-1].downcase : @format
 
         if !self.class.supported_formats.include?(format)
           raise UnsupportedFormatError, format

data/lib/imgry/processor/mini_magick.rb

@@ -3,27 +3,21 @@ module Imgry
 
     class MiniMagick < Adapter
 
-      def self.with_bytes(img_blob, format=nil)
-        new(img_blob, format)
+      def self.with_bytes(img_blob)
+        new(img_blob)
       end
 
-      def self.from_file(path, format=nil)
+      def self.from_file(path)
         if !File.readable?(path)
           raise FileUnreadableError, path.to_s
         end
 
-        new(IO.read(path), format)
-      end
-
-      def self.supported_formats
-        # Hardcoded list of supported formats for validity checking..
-        # Image/GraphicsMagick have a much more extensive list.
-        # Submit an issue if this is a problem.
-        ['bmp', 'jpg', 'wbmp', 'jpeg', 'gif', 'png', 'png32', 'png24', 'png8', 'tiff']
+        new(IO.read(path))
       end
 
       def load_image!
         begin
+          @format = nil
           @img = ::MiniMagick::Image.read(@img_blob)
         rescue ::MiniMagick::Invalid => ex
           raise InvalidImageError, ex.message
@@ -36,6 +30,12 @@ module Imgry
         nil
       end
 
+      def crop!(geometry)
+        return if geometry.nil?
+        @img.crop(geometry)
+        nil
+      end
+
       def width
         @img['width']
       end
@@ -45,10 +45,18 @@ module Imgry
       end
 
       def format
-        @img['format']
+        @format ||= begin
+          format = @img['format']
+          if !format.nil?
+            # Normalize..
+            format.downcase!
+            format == 'jpeg' ? 'jpg' : format
+          end
+        end
       end
 
-      def to_blob
+      def to_blob(format=nil)
+        # TODO: support other output format
         @img.to_blob
       end
 
@@ -56,9 +64,7 @@ module Imgry
         if !File.writable?(File.dirname(path))
           raise FileUnwritableError, path.to_s
         end
-        if !self.class.supported_formats.include?(format.downcase)
-          raise UnsupportedFormatError, format
-        end
+        # TODO: error checking on write
         @img.write(path.to_s)
       end
 

data/lib/imgry/processor.rb

@@ -2,26 +2,34 @@ module Imgry
   module Processor
 
     class Adapter
-      DEFAULT_OUTPUT_FORMAT = 'jpg'
-
       def self.load_lib!
       end
 
-      def self.with_bytes(img_bytes, format=nil)
+      def self.with_bytes(img_bytes)
         # Abstract
       end
 
-      def self.from_file(path, format=nil)
+      def self.from_file(path)
         # Abstract
       end
 
-      def initialize(img_blob, format=nil)
+      attr_accessor :img, :img_blob, :format
+
+      def initialize(img_blob)
         @img_blob = img_blob
-        @format = format
+        @format = nil
         @img = nil
         load_image!
       end
 
+      def inspect
+        if @format
+          "#<#{self.class} format: #{@format}>"
+        else
+          "#<#{self.class}>"
+        end
+      end
+
       def load_image!
         # Abstract
       end
@@ -30,8 +38,6 @@ module Imgry
         width.to_f / height.to_f
       end
 
-      # TODO .. add abstract methods.. at least comments..
-
     end
 
   end

data/lib/imgry/version.rb

@@ -1,3 +1,3 @@
 module Imgry
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/imgry.rb

@@ -3,12 +3,12 @@ module Imgry
 
   attr_accessor :processor
 
-  def with_bytes(img_blob, format=nil)
-    processor_klass.with_bytes(img_blob, format)
+  def with_bytes(img_blob)
+    processor_klass.with_bytes(img_blob)
   end
 
-  def from_file(img_blob, format=nil)
-    processor_klass.from_file(img_blob, format)
+  def from_file(path)
+    processor_klass.from_file(path)
   end
 
   def processor_klass

data/spec/imgry/geometry_spec.rb

@@ -33,4 +33,71 @@ describe Imgry::Geometry do
     size.should == [600, 800]
   end
 
+  context "#from_s" do
+    it 'handles geometry format: WxH+X+Y>' do
+      geometry_str = "200x300+10+20!"
+      width, height, offset_x, offset_y, flag = Imgry::Geometry.from_s(geometry_str)
+
+      width.should    == 200
+      height.should   == 300
+      offset_x.should == 10
+      offset_y.should == 20
+      flag.should     == '!'
+    end
+
+    it 'handles geometry format: Wx>' do
+      geometry_str = "200x"
+      width, height, offset_x, offset_y, flag = Imgry::Geometry.from_s(geometry_str)
+
+      width.should    == 200
+      height.should   == 0
+      offset_x.should == 0
+      offset_y.should == 0
+      flag.should     == ''
+    end
+
+    it 'handles geometry format: WxH>' do
+      geometry_str = "200x300"
+      width, height, offset_x, offset_y, flag = Imgry::Geometry.from_s(geometry_str)
+
+      width.should    == 200
+      height.should   == 300
+      offset_x.should == 0
+      offset_y.should == 0
+      flag.should     == ''
+    end
+
+    it 'handles geometry format: WxH>' do
+      geometry_str = "200x300>"
+      width, height, offset_x, offset_y, flag = Imgry::Geometry.from_s(geometry_str)
+
+      width.should    == 200
+      height.should   == 300
+      offset_x.should == 0
+      offset_y.should == 0
+      flag.should     == '>'
+    end
+
+    it 'handles geometry format: WxH+X' do
+      geometry_str = "200x300+10"
+      width, height, offset_x, offset_y, flag = Imgry::Geometry.from_s(geometry_str)
+
+      width.should    == 200
+      height.should   == 300
+      offset_x.should == 10
+      offset_y.should == 0
+      flag.should     == ''
+    end
+
+    it 'handles geometry format: WxH+X>' do
+      geometry_str = "200x300+10>"
+      width, height, offset_x, offset_y, flag = Imgry::Geometry.from_s(geometry_str)
+
+      width.should    == 200
+      height.should   == 300
+      offset_x.should == 10
+      offset_y.should == 0
+      flag.should     == '>'
+    end
+  end
 end

data/spec/imgry/processor/image_voodoo_spec.rb

@@ -4,8 +4,9 @@ if RUBY_ENGINE == 'jruby'
   describe Imgry::Processor::ImageVoodoo do
 
     let (:img_data) { IO.read(SPEC_ROOT.join('support/335is.jpg')) }
+    let (:transparent_img_data) { IO.read(SPEC_ROOT.join('support/transparent_background.png')) }
 
-    context "a pretty picture" do    
+    context "a pretty picture" do
 
       it "basic loading and resizing of an image" do
         img = Imgry::Processor::ImageVoodoo.with_bytes(img_data)
@@ -22,7 +23,46 @@ if RUBY_ENGINE == 'jruby'
         new_img_blob.length.should == 32159
       end
 
+      it "crops an image" do
+        img = Imgry::Processor::ImageVoodoo.with_bytes(img_data)
+
+        img.width.should == 1024
+        img.height.should == 764
+
+        img.crop!("300x200+100+300")
+        img.width.should == 300
+        img.height.should == 200
+      end
+
+      it "handles offsets properly when cropping an image" do
+        img = Imgry::Processor::ImageVoodoo.with_bytes(img_data)
+
+        img.crop!("300x200+800+600")
+        img.width.should == 224
+        img.height.should == 164
+      end
+
     end
 
+    context "image format" do
+
+      it "corrects passed in format" do
+        img = Imgry::Processor::ImageVoodoo.with_bytes(img_data)
+        img.format.should == 'jpg'
+      end
+
+      it "knows how to detect jpg files" do
+        img = Imgry::Processor::ImageVoodoo.with_bytes(img_data)
+        img.format.should == 'jpg'
+      end
+
+      it "knows how to detect png files" do
+        img = Imgry::Processor::ImageVoodoo.with_bytes(transparent_img_data)
+        img.format.should == 'png'
+      end
+
+    end
+
+
   end
 end

data/spec/imgry/processor/img_scalr_spec.rb

@@ -4,8 +4,9 @@ if RUBY_ENGINE == 'jruby'
   describe Imgry::Processor::ImgScalr do
 
     let (:img_data) { IO.read(SPEC_ROOT.join('support/335is.jpg')) }
+    let (:transparent_img_data) { IO.read(SPEC_ROOT.join('support/transparent_background.png')) }
 
-    context "a pretty picture" do    
+    context "a pretty picture" do
 
       it "basic loading and resizing of an image" do
         img = Imgry::Processor::ImgScalr.with_bytes(img_data)
@@ -22,6 +23,45 @@ if RUBY_ENGINE == 'jruby'
         new_img_blob.length.should == 30319
       end
 
+      it "crops an image" do
+        img = Imgry::Processor::ImgScalr.with_bytes(img_data)
+
+        img.width.should == 1024
+        img.height.should == 764
+
+        img.crop!("300x200+100+300")
+        img.width.should == 300
+        img.height.should == 200
+      end
+
+      it "handles offsets properly when cropping an image" do
+        img = Imgry::Processor::ImgScalr.with_bytes(img_data)
+
+        img.crop!("300x200+800+600")
+        img.width.should == 224
+        img.height.should == 164
+      end
+
+    end
+
+    context "image format" do
+
+      it "corrects passed in format" do
+        img = Imgry::Processor::ImgScalr.with_bytes(img_data)
+        img.format.should == 'jpg'
+      end
+
+      it "knows how to detect jpg files" do
+        img = Imgry::Processor::ImgScalr.with_bytes(img_data)
+        img.format.should == 'jpg'
+      end
+
+      it "knows how to detect png files" do
+        img = Imgry::Processor::ImgScalr.with_bytes(transparent_img_data)
+        img.format.should == 'png'
+        img.save SPEC_ROOT.join('support/transparent_background_saved.png')
+      end
+
     end
 
   end

data/spec/imgry/processor/mini_magick_spec.rb

@@ -4,8 +4,7 @@ describe Imgry::Processor::MiniMagick do
 
   let (:img_data) { IO.read(SPEC_ROOT.join('support/335is.jpg')) }
 
-  context "a pretty picture" do    
-
+  context "a pretty picture" do
     it "basic loading and resizing of an image" do
       img = Imgry::Processor::MiniMagick.with_bytes(img_data)
 
@@ -21,6 +20,33 @@ describe Imgry::Processor::MiniMagick do
       new_img_blob.length.should == 32671
     end
 
+    it "crops an image" do
+      img = Imgry::Processor::MiniMagick.with_bytes(img_data)
+
+      img.width.should == 1024
+      img.height.should == 764
+
+      img.crop!("300x200+100+300")
+      img.width.should == 300
+      img.height.should == 200
+
+      img.save(SPEC_ROOT.join('support/335is_3.jpg'))
+    end
+
+    it "handles offsets properly when cropping an image" do
+      img = Imgry::Processor::MiniMagick.with_bytes(img_data)
+
+      img.crop!("300x200+800+600")
+      img.width.should == 224
+      img.height.should == 164
+    end
+  end
+
+  context "image format" do
+    it "corrects passed in format" do
+      img = Imgry::Processor::MiniMagick.with_bytes(img_data)
+      img.format.should == 'jpg'
+    end
   end
 
 end

data/spec/imgry_spec.rb

@@ -6,13 +6,31 @@ describe Imgry do
 
   context "a pretty picture" do    
 
-    it "should do stuff..." do
+    it "resizes an image from memory through high level interface" do
       img = Imgry.with_bytes(img_data)
 
       img.resize!("300x")
       img.width.should == 300
     end
 
+    it "loads from a file and resizes an image" do
+      img = Imgry.from_file(SPEC_ROOT.join('support/335is.png'))
+      img.resize!("400x")
+      img.width.should == 400
+    end
+
+    it "raises error if file is bogus" do
+      expect { Imgry.from_file('hi') }.to raise_error(Imgry::FileUnreadableError)
+    end
+
+    it "writes to a file" do
+      img = Imgry.with_bytes(img_data)
+      tmpfile = Dir.tmpdir+'/imgry.jpg'
+      img.save(tmpfile)
+      File.exists?(tmpfile).should == true
+      File.unlink(tmpfile)
+    end
+    
   end
 
 end

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: imgry
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4
+  prerelease:
 platform: ruby
 authors:
 - Pressly
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+    none: false
+  prerelease: false
+  type: :development
 description: Fast image resizing/cropping designed for JRuby with MRI support
 email:
 - info@pressly.com
@@ -34,59 +34,67 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/imgry.rb
 - lib/imgry/geometry.rb
+- lib/imgry/processor.rb
+- lib/imgry/version.rb
 - lib/imgry/processor/image_voodoo.rb
 - lib/imgry/processor/img_scalr.rb
 - lib/imgry/processor/java_adapter.rb
 - lib/imgry/processor/mini_magick.rb
-- lib/imgry/processor.rb
-- lib/imgry/version.rb
-- lib/imgry.rb
 - lib/java/imgscalr-lib-4.2.jar
 - README.md
+- spec/imgry_spec.rb
+- spec/spec_helper.rb
 - spec/imgry/geometry_spec.rb
-- spec/imgry/imgry_spec.rb
 - spec/imgry/processor/image_voodoo_spec.rb
 - spec/imgry/processor/img_scalr_spec.rb
 - spec/imgry/processor/mini_magick_spec.rb
-- spec/imgry_spec.rb
-- spec/spec_helper.rb
 - spec/support/335is.gif
 - spec/support/335is.jpg
 - spec/support/335is.png
+- spec/support/335is_3.jpg
+- spec/support/cmyk.jpg
+- spec/support/mexico-cmyk.jpg
+- spec/support/transparent_background.png
+- spec/support/transparent_background_saved.png
 homepage: http://github.com/nulayer/imgry
 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
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Fast image resizing/cropping designed for JRuby with MRI support
 test_files:
+- spec/imgry_spec.rb
+- spec/spec_helper.rb
 - spec/imgry/geometry_spec.rb
-- spec/imgry/imgry_spec.rb
 - spec/imgry/processor/image_voodoo_spec.rb
 - spec/imgry/processor/img_scalr_spec.rb
 - spec/imgry/processor/mini_magick_spec.rb
-- spec/imgry_spec.rb
-- spec/spec_helper.rb
 - spec/support/335is.gif
 - spec/support/335is.jpg
 - spec/support/335is.png
-has_rdoc: 
+- spec/support/335is_3.jpg
+- spec/support/cmyk.jpg
+- spec/support/mexico-cmyk.jpg
+- spec/support/transparent_background.png
+- spec/support/transparent_background_saved.png

data/spec/imgry/imgry_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-describe Imgry do
-
-  let (:img_data) { IO.read(SPEC_ROOT.join('support/335is.jpg')) }
-
-  context "a pretty picture" do    
-
-    it "resizes an image from memory through high level interface" do
-      img = Imgry.with_bytes(img_data)
-
-      img.resize!("300x")
-      img.width.should == 300
-    end
-
-    it "loads from a file and resizes an image" do
-      img = Imgry.from_file(SPEC_ROOT.join('support/335is.png'))
-      img.resize!("400x")
-      img.width.should == 400
-    end
-
-    it "raises error if file is bogus" do
-      expect { Imgry.from_file('hi') }.to raise_error(Imgry::FileUnreadableError)
-    end
-
-    it "writes to a file" do
-      img = Imgry.with_bytes(img_data)
-      tmpfile = Dir.tmpdir+'/imgry.jpg'
-      img.save(tmpfile)
-      File.exists?(tmpfile).should == true
-      File.unlink(tmpfile)
-    end
-
-  end
-
-end