ruby-imagespec 0.3.1 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5b959efb6a395dbe1ba3d6ffc3716ebb40489839
+  data.tar.gz: 6c556dded2c7788fe947855eec6afc736c5f4008
+SHA512:
+  metadata.gz: 21ae732a659fb3b433d84e466a3ce83cc565798251216363384f7ff61a43b17e8968fa9ccc59c39bf731c609ca0a9398e706c3c83e468dec25e6bcf787221e1d
+  data.tar.gz: 2add58ef7912adefbc39edbf06dc6b4b17628af5d00548e141f8f7fbf8aa4e8b8c71fc484fb17934b83542411a6b941fadec71c129803c152e924e58be7e960c

data/lib/image_spec.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
-require File.join(File.dirname(__FILE__), 'parser')
 
 class ImageSpec
+  Error = Class.new(StandardError)
 
   def initialize(file)
     @attributes = Parser.parse(stream_for(file))
@@ -28,3 +28,7 @@ class ImageSpec
   end
 
 end
+
+%w|parser|.each do |name|
+  require "image_spec/#{name}"
+end

data/lib/image_spec/parser.rb

@@ -0,0 +1,18 @@
+module ImageSpec::Parser
+
+  def self.formats
+    @@formats ||= constants.collect { |format| const_get(format) }
+  end
+
+  def self.parse(stream)
+    formats.each do |format|
+      return format.attributes(stream) if format.detected?(stream)
+    end
+    raise ImageSpec::Error, "#{stream.inspect} is not a supported image format. Sorry bub :("
+  end
+
+end
+
+%w|gif jpeg png swf bmp|.each do |name|
+  require "image_spec/parser/#{name}"
+end

data/lib/image_spec/parser/bmp.rb

@@ -0,0 +1,24 @@
+# encoding: ascii-8bit
+class ImageSpec::Parser::BMP
+  CONTENT_TYPE = 'image/bmp'
+
+  def self.attributes(stream)
+    width, height = dimensions(stream)
+    {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
+  end
+
+  def self.detected?(stream)
+    stream.rewind
+    stream.read(2) == 'BM'
+  end
+
+  def self.dimensions(stream)
+    stream.seek(18)
+    stream.read(8).unpack('LL')
+  end
+
+  def self.size(stream)
+    stream.size
+  end
+
+end

data/lib/image_spec/parser/gif.rb

@@ -0,0 +1,24 @@
+# encoding: ascii-8bit
+class ImageSpec::Parser::GIF
+  CONTENT_TYPE = 'image/gif'
+
+  def self.attributes(stream)
+    width, height = dimensions(stream)
+    {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
+  end
+
+  def self.detected?(stream)
+    stream.rewind
+    stream.read(4) == 'GIF8'
+  end
+
+  def self.dimensions(stream)
+    stream.seek(6)
+    stream.read(4).unpack('SS')
+  end
+
+  def self.size(stream)
+    stream.size
+  end
+
+end

data/lib/image_spec/parser/jpeg.rb

@@ -0,0 +1,65 @@
+# encoding: ascii-8bit
+class ImageSpec::Parser::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)
+    {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
+  end
+
+  def self.detected?(stream)
+    stream.rewind
+    case stream.read(10)
+    when TYPE_JFIF, TYPE_EXIF then true
+    else false
+    end
+  end
+
+  def self.dimensions(stream)
+    stream.rewind
+    raise ImageSpec::Error, 'malformed JPEG' unless stream.readbyte.chr == "\xFF" && stream.readbyte.chr == "\xD8" # SOI
+
+    class << stream
+      def readint
+        (readbyte.ord << 8) + readbyte.ord
+      end
+
+      def readframe
+        read(readint - 2)
+      end
+
+      def readsof
+        [readint, readbyte.chr, readint, readint, readbyte.chr]
+      end
+
+      def next
+        c = readbyte.chr while c != "\xFF"
+        c = readbyte.chr while c == "\xFF"
+        c
+      end
+    end
+
+    while marker = stream.next
+      case marker
+      when "\xC0".."\xC3", "\xC5".."\xC7", "\xC9".."\xCB", "\xCD".."\xCF"
+        length, bits, height, width, components = stream.readsof
+        raise ImageSpec::Error, 'malformed JPEG' unless length == 8 + components[0].ord * 3
+        return [width, height]
+      when "\xD9", "\xDA"
+        break
+      when "\xFE"
+        @comment = stream.readframe
+      else
+        stream.readframe
+      end
+    end
+  end
+
+  def self.size(stream)
+    stream.size
+  end
+
+end

data/lib/image_spec/parser/png.rb

@@ -0,0 +1,24 @@
+# encoding: ascii-8bit
+class ImageSpec::Parser::PNG
+  CONTENT_TYPE = 'image/png'
+
+  def self.attributes(stream)
+    width, height = dimensions(stream)
+    {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
+  end
+
+  def self.detected?(stream)
+    stream.rewind
+    stream.read(4) == "\x89PNG"
+  end
+
+  def self.dimensions(stream)
+    stream.seek(0x10)
+    stream.read(8).unpack('NN')
+  end
+
+  def self.size(stream)
+    stream.size
+  end
+
+end

data/lib/image_spec/parser/swf.rb

@@ -0,0 +1,76 @@
+# encoding: ascii-8bit
+require 'zlib'
+
+class ImageSpec::Parser::SWF
+  CONTENT_TYPE = 'application/x-shockwave-flash'
+
+  def self.attributes(stream)
+    width, height, version = dimensions(stream)
+    {:width => width, :height => height, :content_type => CONTENT_TYPE, :version => version, :dimensions => [width, height], :file_size => size(stream)}
+  end
+
+  def self.detected?(stream)
+    stream.rewind
+    stream.read(3) =~ /(F|C)WS/ ? true : false
+  end
+
+  def self.dimensions(stream)
+    # Read the entire stream into memory because the
+    # dimensions aren't stored in a standard location
+    stream.rewind
+    contents = stream.read.force_encoding("ASCII-8BIT")
+
+    # Our 'signature' is the first 3 bytes
+    # Either FWS or CWS.  CWS indicates compression
+    signature = contents[0..2]
+
+    # SWF version
+    version = contents[3].unpack('C').join.to_i
+
+    # 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
+    end
+
+    # Determine the nbits of our dimensions rectangle
+    nbits = contents.unpack('C'*contents.length)[8] >> 3
+
+    # Determine how many bits long this entire RECT structure is
+    rectbits = 5 + nbits * 4    # 5 bits for nbits, as well as nbits * number of fields (4)
+
+    # Determine how many bytes rectbits composes (ceil(rectbits/8))
+    rectbytes = (rectbits.to_f / 8).ceil
+
+    # Unpack the RECT structure from the stream in little-endian bit order, then join it into a string
+    rect = contents[8..(8 + rectbytes)].unpack("#{'B8' * rectbytes}").join()
+
+    # Read in nbits incremenets starting from 5
+    dimensions = Array.new
+    4.times do |n|
+      s = 5 + (n * nbits)     # Calculate our start index
+      e = s + (nbits - 1)     # Calculate our end index
+      dimensions[n] = rect[s..e].to_i(2)    # Read that range (binary) and convert it to an integer
+    end
+
+    # The values we have here are in "twips"
+    # 20 twips to a pixel (that's why SWFs are fuzzy sometimes!)
+    width   = (dimensions[1] - dimensions[0]) / 20
+    height  = (dimensions[3] - dimensions[2]) / 20
+
+    # If you can't figure this one out, you probably shouldn't have read this far
+    return [width, height, version]
+  end
+
+  def self.size(stream)
+    stream.size
+  end
+
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-imagespec
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - Brandon Anderson
@@ -12,22 +11,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -38,35 +63,35 @@ extra_rdoc_files: []
 files:
 - README
 - init.rb
-- lib/parser/gif.rb
-- lib/parser/png.rb
-- lib/parser/swf.rb
-- lib/parser/jpeg.rb
 - lib/image_spec.rb
-- lib/parser.rb
+- lib/image_spec/parser.rb
+- lib/image_spec/parser/bmp.rb
+- lib/image_spec/parser/gif.rb
+- lib/image_spec/parser/jpeg.rb
+- lib/image_spec/parser/png.rb
+- lib/image_spec/parser/swf.rb
 homepage: http://github.com/dim/ruby-imagespec
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Image/Flash extract width/height dimensions extractor
 test_files: []
 has_rdoc: 

data/lib/parser.rb

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

data/lib/parser/gif.rb

@@ -1,29 +0,0 @@
-# encoding: ascii-8bit
-class ImageSpec
-  module Parser
-    class GIF
-
-      CONTENT_TYPE = 'image/gif'
-
-      def self.attributes(stream)
-        width, height = dimensions(stream)
-        {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
-      end
-
-      def self.detected?(stream)
-        stream.rewind
-        stream.read(4) == 'GIF8'
-      end
-
-      def self.dimensions(stream)
-        stream.seek(6)
-        stream.read(4).unpack('SS')
-      end
-
-      def self.size(stream)
-        stream.size
-      end
-
-    end
-  end
-end

data/lib/parser/jpeg.rb

@@ -1,69 +0,0 @@
-# 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)
-        {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
-      end
-
-      def self.detected?(stream)
-        stream.rewind
-        case stream.read(10)
-        when TYPE_JFIF, TYPE_EXIF then true
-        else false
-        end
-      end
-
-      def self.dimensions(stream)
-        stream.rewind
-        raise ImageSpec::Error, 'malformed JPEG' unless stream.readbyte.chr == "\xFF" && stream.readbyte.chr == "\xD8" # SOI
-
-        class << stream
-          def readint
-            (readbyte.ord << 8) + readbyte.ord
-          end
-
-          def readframe
-            read(readint - 2)
-          end
-
-          def readsof
-            [readint, readbyte.chr, readint, readint, readbyte.chr]
-          end
-
-          def next
-            c = readbyte.chr while c != "\xFF"
-            c = readbyte.chr while c == "\xFF"
-            c
-          end
-        end
-
-        while marker = stream.next
-          case marker
-          when "\xC0".."\xC3", "\xC5".."\xC7", "\xC9".."\xCB", "\xCD".."\xCF"
-            length, bits, height, width, components = stream.readsof
-            raise ImageSpec::Error, 'malformed JPEG' unless length == 8 + components[0].ord * 3
-            return [width, height]
-          when "\xD9", "\xDA"
-            break
-          when "\xFE"
-            @comment = stream.readframe
-          else
-            stream.readframe
-          end
-        end
-      end
-
-      def self.size(stream)
-        stream.size
-      end
-
-    end
-  end
-end

data/lib/parser/png.rb

@@ -1,29 +0,0 @@
-# encoding: ascii-8bit
-class ImageSpec
-  module Parser
-    class PNG
-
-      CONTENT_TYPE = 'image/png'
-
-      def self.attributes(stream)
-        width, height = dimensions(stream)
-        {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
-      end
-
-      def self.detected?(stream)
-        stream.rewind
-        stream.read(4) == "\x89PNG"
-      end
-
-      def self.dimensions(stream)
-        stream.seek(0x10)
-        stream.read(8).unpack('NN')
-      end
-
-      def self.size(stream)
-        stream.size
-      end
-
-    end
-  end
-end

data/lib/parser/swf.rb

@@ -1,78 +0,0 @@
-# encoding: ascii-8bit
-require 'zlib'
-
-class ImageSpec
-  module Parser
-    class SWF
-
-      CONTENT_TYPE = 'application/x-shockwave-flash'
-
-      def self.attributes(stream)
-        width, height = dimensions(stream)
-        {:width => width, :height => height, :content_type => CONTENT_TYPE, :dimensions => [width, height], :file_size => size(stream)}
-      end
-
-      def self.detected?(stream)
-        stream.rewind
-        stream.read(3) =~ /(F|C)WS/ ? true : false
-      end
-
-      def self.dimensions(stream)
-        # Read the entire stream into memory because the
-        # dimensions aren't stored in a standard location
-        stream.rewind
-        contents = stream.read.force_encoding("ASCII-8BIT")
-
-        # Our 'signature' is the first 3 bytes
-        # Either FWS or CWS.  CWS indicates compression
-        signature = contents[0..2]
-
-        # 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
-        end
-
-        # Determine the nbits of our dimensions rectangle
-        nbits =contents.unpack('c'*contents.length)[8] >> 3
-
-        # Determine how many bits long this entire RECT structure is
-        rectbits = 5 + nbits * 4    # 5 bits for nbits, as well as nbits * number of fields (4)
-
-        # Determine how many bytes rectbits composes (ceil(rectbits/8))
-        rectbytes = (rectbits.to_f / 8).ceil
-
-        # Unpack the RECT structure from the stream in little-endian bit order, then join it into a string
-        rect = contents[8..(8 + rectbytes)].unpack("#{'B8' * rectbytes}").join()
-
-        # Read in nbits incremenets starting from 5
-        dimensions = Array.new
-        4.times do |n|
-          s = 5 + (n * nbits)     # Calculate our start index
-          e = s + (nbits - 1)     # Calculate our end index
-          dimensions[n] = rect[s..e].to_i(2)    # Read that range (binary) and convert it to an integer
-        end
-
-        # The values we have here are in "twips"
-        # 20 twips to a pixel (that's why SWFs are fuzzy sometimes!)
-        width   = (dimensions[1] - dimensions[0]) / 20
-        height  = (dimensions[3] - dimensions[2]) / 20
-
-        # If you can't figure this one out, you probably shouldn't have read this far
-        return [width, height]
-      end
-
-      def self.size(stream)
-        stream.size
-      end
-
-    end
-  end
-end