ruby-imagespec 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/parser.rb

@@ -1,6 +1,7 @@
 Dir[File.join(File.dirname(__FILE__), 'parser/*.rb')].each { |parser| require parser }
 
 class ImageSpec
+  Error = Class.new(StandardError)
 
   module Parser
 
@@ -12,7 +13,7 @@ class ImageSpec
       formats.each do |format|
         return format.attributes(stream) if format.detected?(stream)
       end
-      raise "#{stream.inspect} is not a supported image format. Sorry bub :("
+      raise Error, "#{stream.inspect} is not a supported image format. Sorry bub :("
     end
 
   end

data/lib/parser/gif.rb

@@ -1,7 +1,6 @@
+# encoding: ascii-8bit
 class ImageSpec
-
   module Parser
-
     class GIF
 
       CONTENT_TYPE = 'image/gif'
@@ -22,7 +21,5 @@ class ImageSpec
       end
 
     end
-
   end
-
 end

data/lib/parser/jpeg.rb

@@ -1,10 +1,11 @@
+# encoding: ascii-8bit
 class ImageSpec
-
   module Parser
-
     class JPEG
 
       CONTENT_TYPE = 'image/jpeg'
+      TYPE_JFIF    = Regexp.new '^\xff\xd8\xff\xe0\x00\x10JFIF', nil, 'n'
+      TYPE_EXIF    = Regexp.new '^\xff\xd8\xff\xe1(.*){2}Exif', nil, 'n'
 
       def self.attributes(stream)
         width, height = dimensions(stream)
@@ -14,19 +15,18 @@ class ImageSpec
       def self.detected?(stream)
         stream.rewind
         case stream.read(10)
-          when /^\xff\xd8\xff\xe0\x00\x10JFIF/ then true
-          when /^\xff\xd8\xff\xe1(.*){2}Exif/  then true
-          else false
+        when TYPE_JFIF, TYPE_EXIF then true
+        else false
         end
       end
 
       def self.dimensions(stream)
         stream.rewind
-        raise 'malformed JPEG' unless stream.getc == 0xFF && stream.getc == 0xD8 # SOI
+        raise ImageSpec::Error, 'malformed JPEG' unless stream.readbyte.chr == "\xFF" && stream.readbyte.chr == "\xD8" # SOI
 
         class << stream
           def readint
-            (readchar << 8) + readchar
+            (readbyte.ord << 8) + readbyte.ord
           end
 
           def readframe
@@ -34,28 +34,26 @@ class ImageSpec
           end
 
           def readsof
-            [readint, readchar, readint, readint, readchar]
+            [readint, readbyte.chr, readint, readint, readbyte.chr]
           end
 
           def next
-            c = readchar while c != 0xFF
-            c = readchar while c == 0xFF
+            c = readbyte.chr while c != "\xFF"
+            c = readbyte.chr while c == "\xFF"
             c
           end
         end
 
         while marker = stream.next
           case marker
-          when 0xC0..0xC3, 0xC5..0xC7, 0xC9..0xCB, 0xCD..0xCF
+          when "\xC0".."\xC3", "\xC5".."\xC7", "\xC9".."\xCB", "\xCD".."\xCF"
             length, bits, height, width, components = stream.readsof
-            raise 'malformed JPEG' unless length == 8 + components * 3
+            raise ImageSpec::Error, 'malformed JPEG' unless length == 8 + components[0].ord * 3
             return [width, height]
-          when 0xD9, 0xDA
+          when "\xD9", "\xDA"
             break
-          when 0xFE
+          when "\xFE"
             @comment = stream.readframe
-          when 0xE1
-            stream.readframe
           else
             stream.readframe
           end
@@ -63,7 +61,5 @@ class ImageSpec
       end
 
     end
-
   end
-
 end

data/lib/parser/png.rb

@@ -1,7 +1,6 @@
+# encoding: ascii-8bit
 class ImageSpec
-
   module Parser
-
     class PNG
 
       CONTENT_TYPE = 'image/png'
@@ -22,7 +21,5 @@ class ImageSpec
       end
 
     end
-
   end
-
 end

data/lib/parser/swf.rb

@@ -1,9 +1,8 @@
+# encoding: ascii-8bit
 require 'zlib'
 
 class ImageSpec
-
   module Parser
-
     class SWF
 
       CONTENT_TYPE = 'application/x-shockwave-flash'
@@ -30,12 +29,12 @@ class ImageSpec
 
         # Determine the length of the uncompressed stream
         length = contents[4..7].unpack('V').join.to_i
-        
+
         # If we do, in fact, have compression
         if signature == 'CWS'
           # Decompress the body of the SWF
           body = Zlib::Inflate.inflate( contents[8..length] )
-          
+
           # And reconstruct the stream contents to the first 8 bytes (header)
           # Plus our decompressed body
           contents = contents[0..7] + body
@@ -71,7 +70,5 @@ class ImageSpec
       end
 
     end
-
   end
-
 end

data/ruby-imagespec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-imagespec}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Anderson", "Michael Sheakoski", "Mike Boone", "Dimitrij Denissenko"]
-  s.date = %q{2010-08-16}
+  s.date = %q{2010-08-26}
   s.description = %q{A lightweight module designed to extract the width/height dimensions of various image types. Also supports SWFs.}
   s.email = %q{dimitrij@blacksquaremedia.com}
   s.extra_rdoc_files = [
@@ -31,6 +31,11 @@ Gem::Specification.new do |s|
      "lib/parser/swf.rb",
      "ruby-imagespec.gemspec",
      "tasks/image_spec_tasks.rake",
+     "test/fixtures/corrupt.jpg",
+     "test/fixtures/leaderboard.jpg",
+     "test/fixtures/leaderboard.swf",
+     "test/fixtures/skyscraper.gif",
+     "test/fixtures/skyscraper.png",
      "test/image_spec_test.rb"
   ]
   s.homepage = %q{http://github.com/dim/ruby-imagespec}

data/test/fixtures/corrupt.jpg

@@ -0,0 +1 @@
+ABCDEFGHIJKLMNOPQRSTUVWXYZ

data/test/image_spec_test.rb

@@ -1,8 +1,37 @@
+$: << File.join(File.dirname(__FILE__),'..', 'lib')
+
 require 'test/unit'
+require 'image_spec'
 
 class ImageSpecTest < Test::Unit::TestCase
   # Replace this with your real tests.
-  def test_this_plugin
-    flunk
+
+  def fixture(name)
+    File.open File.expand_path("../fixtures/#{name}", __FILE__), 'rb'
+  end
+
+  def assert_spec(values, spec)
+    assert_equal values, [spec.width, spec.height, spec.content_type]
+  end
+
+  def test_identifying_jpeg
+    assert_spec [728, 90, "image/jpeg"], ImageSpec.new(fixture('leaderboard.jpg'))
+  end
+
+  def test_identifying_gif
+    assert_spec [120, 600, "image/gif"], ImageSpec.new(fixture('skyscraper.gif'))
   end
+
+  def test_identifying_png
+    assert_spec [120, 600, "image/png"], ImageSpec.new(fixture('skyscraper.png'))
+  end
+
+  def test_identifying_swf
+    assert_spec [728, 90, "application/x-shockwave-flash"], ImageSpec.new(fixture('leaderboard.swf'))
+  end
+
+  def test_corrupted_files
+    assert_raises(ImageSpec::Error) { ImageSpec.new(fixture('corrupt.jpg')) }
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-imagespec
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brandon Anderson
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +01:00
+date: 2010-08-26 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -46,6 +46,11 @@ files:
 - lib/parser/swf.rb
 - ruby-imagespec.gemspec
 - tasks/image_spec_tasks.rake
+- test/fixtures/corrupt.jpg
+- test/fixtures/leaderboard.jpg
+- test/fixtures/leaderboard.swf
+- test/fixtures/skyscraper.gif
+- test/fixtures/skyscraper.png
 - test/image_spec_test.rb
 has_rdoc: true
 homepage: http://github.com/dim/ruby-imagespec