fastimage 1.6.8 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e50479e458978b758e62aaeea44345c05a27ea
-  data.tar.gz: ee7b1918db731c9bee8c1f08bd0cc3515ec6c348
+  metadata.gz: b171e7bf1f4fd89ec28ce3b4f3ddfb3686a71d00
+  data.tar.gz: a851e15026cdd61e9e13923b73c73b0a004a4f13
 SHA512:
-  metadata.gz: 590b19d10a62e9c34cd7777f10999498e787acd5b09ce103578f9d777fdb73e670a78cebafc6ad61a80c1ac08947a5dbff96d4a8e1589982fa6abe065592f4a9
-  data.tar.gz: 41f069d44b395574c5c5c60b10bde728d5cae4d9d6e7fee195ebef5c541476efeb102830dea89a6b09c64ce87b349cd05758792166ee81b5a435d32890b831ef
+  metadata.gz: 6f0891068f233455992127dedeea3e11c69cf17c292c08b8ce18aad3e20582921f1f3d7b109c35ad2b70e64b082157525546f3326c7592d6fef5012d75199a94
+  data.tar.gz: a28dae9ccdd8aa0741e8fb45dc9f8078c10ca3ebecaa872a234e0a7f5c79c2428622e0077d6e9667eb0d39d46b5e79757ee46a230b4c126a61815176ece50cf7

data/README.textile

@@ -12,7 +12,7 @@ But the image is not locally stored - it's on another asset server, or in the cl
 
 You don't want to download the entire image to your app server - it could be many tens of kilobytes, or even megabytes just to get this information.  For most common image types (GIF, PNG, BMP etc.), the size of the image is simply stored at the start of the file.  For JPEG files it's a little bit more complex, but even so you do not need to fetch much of the image to find the size.
 
-FastImage does this minimal fetch for image types GIF, JPEG, PNG, TIFF, BMP, ICO, CUR, PSD and WEBP.  And it doesn't rely on installing external libraries such as RMagick (which relies on ImageMagick or GraphicsMagick) or ImageScience (which relies on FreeImage).
+FastImage does this minimal fetch for image types GIF, JPEG, PNG, TIFF, BMP, ICO, CUR, PSD, SVG and WEBP.  And it doesn't rely on installing external libraries such as RMagick (which relies on ImageMagick or GraphicsMagick) or ImageScience (which relies on FreeImage).
 
 You only need supply the uri, and FastImage will do the rest.
 
@@ -32,6 +32,8 @@ You can add a timeout to the request which will limit the request time by passin
 
 FastImage normally replies will nil if it encounters an error, but you can pass :raise_on_failure => true to get an exception.
 
+FastImage also provides a reader for the content length header provided in HTTP. This may be useful to assess the file size of an image, but do not rely on it exclusively - it will not be present in chunked responses for instance.
+
 h2. Security
 
 As of v1.6.7 FastImage no longer uses openuri to open files, but directly calls File.open. But take care to sanitise the strings passed to FastImage; it will try to read from whatever is passed.
@@ -51,6 +53,8 @@ FastImage.size("http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_135066
 => FastImage::ImageFetchFailure: FastImage::ImageFetchFailure
 FastImage.size("http://upload.wikimedia.org/wikipedia/commons/b/b4/Mardin_1350660_1350692_33_images.jpg", :raise_on_failure=>true, :timeout=>2.0)
 => [9545, 6623]
+FastImage.new("http://stephensykes.com/images/pngimage").content_length
+=> 432
 </code></pre>
 
 h2. Installation
@@ -126,6 +130,7 @@ h2. FastImage in other languages
 * "Python by bmuller":https://github.com/bmuller/fastimage
 * "Swift by kaishin":https://github.com/kaishin/ImageScout
 * "Go by rubenfonseca":https://github.com/rubenfonseca/fastimage
+* "PHP by tommoor":https://github.com/tommoor/fastimage
 
 h2. Licence
 
@@ -143,4 +148,5 @@ Pull requests and suggestions are always welcome. Thanks to all the contributors
 * @marcandre
 * @apanzerj
 * @forresty
-
+* kikihakiem
+* lulalalalistia

data/lib/fastimage.rb

@@ -8,7 +8,7 @@
 # No external libraries such as ImageMagick are used here, this is a very lightweight solution to
 # finding image information.
 #
-# FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD and WEBP files.
+# FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD, SVG and WEBP files.
 #
 # FastImage can also read files from the local filesystem by supplying the path instead of a uri.
 # In this case FastImage reads the file in chunks of 256 bytes until
@@ -20,6 +20,10 @@
 #
 # FastImage will follow up to 4 HTTP redirects to get the image.
 #
+# FastImage also provides a reader for the content length header provided in HTTP.
+# This may be useful to assess the file size of an image, but do not rely on it exclusively -
+# it will not be present in chunked responses for instance.
+#
 # === Examples
 #   require 'fastimage'
 #
@@ -48,7 +52,7 @@ require 'pathname'
 require 'zlib'
 
 class FastImage
-  attr_reader :size, :type
+  attr_reader :size, :type, :content_length
 
   attr_reader :bytes_read
 
@@ -76,7 +80,7 @@ class FastImage
   # If you wish FastImage to raise if it cannot size the image for any reason, then pass
   # :raise_on_failure => true in the options.
   #
-  # FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD and WEBP files.
+  # FastImage knows about GIF, JPEG, BMP, TIFF, ICO, CUR, PNG, PSD, SVG and WEBP files.
   #
   # === Example
   #
@@ -231,6 +235,8 @@ class FastImage
 
       raise ImageFetchFailure unless res.is_a?(Net::HTTPSuccess)
 
+      @content_length = res.content_length
+
       read_fiber = Fiber.new do
         res.read_body do |str|
           Fiber.yield str
@@ -343,6 +349,14 @@ class FastImage
     def read_int
       read(2).unpack('n')[0]
     end
+
+    def read_string_int
+      value = []
+      while read(1) =~ /(\d)/
+        value << $1
+      end
+      value.join.to_i
+    end
   end
 
   class FiberStream # :nodoc:
@@ -410,6 +424,8 @@ class FastImage
       else
         raise UnknownImageType
       end
+    when "<?", "<s"
+      :svg
     else
       raise UnknownImageType
     end
@@ -596,4 +612,68 @@ class FastImage
   def parse_size_for_psd
     @stream.read(26).unpack("x14NN").reverse
   end
+
+  class Svg # :nodoc:
+    def initialize(stream)
+      @stream = stream
+      parse_svg
+    end
+
+    def width_and_height
+      if @width && @height
+        [@width, @height]
+      elsif @width && @ratio
+        [@width, @width / @ratio]
+      elsif @height && @ratio
+        [@height * @ratio, @height]
+      end
+    end
+
+    private
+
+    def parse_svg
+      attr_name = []
+      state = nil
+
+      while (char = @stream.read(1)) && state != :stop do
+        case char
+        when "="
+          if attr_name.join =~ /width/i
+            @stream.read(1)
+            @width = @stream.read_string_int
+            return if @height
+          elsif attr_name.join =~ /height/i
+            @stream.read(1)
+            @height = @stream.read_string_int
+            return if @width
+          elsif attr_name.join =~ /viewbox/i
+            values = attr_value.split(/\s/)
+            @ratio = values[2].to_f / values[3].to_f
+          end
+        when /\w/
+          attr_name << char
+        when ">"
+          state = :stop if state == :started
+        else
+          state = :started if attr_name.join == "svg"
+          attr_name.clear
+        end
+      end
+    end
+
+    def attr_value
+      @stream.read(1)
+
+      value = []
+      while @stream.read(1) =~ /([^"])/
+        value << $1
+      end
+      value.join
+    end
+  end
+
+  def parse_size_for_svg
+    svg = Svg.new(@stream)
+    svg.width_and_height
+  end
 end

data/test/fixtures/test.svg

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<svg version="1.1" 
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="200" height="300"
+     style="background-color: #D2B48C;"
+     onload="loaded()">
+  <script type="text/javascript"><![CDATA[
+      function loaded() {
+        // change onloadFunc to point to your real onload function that you
+        // want called when the page is truly ready
+        var onloadFunc = doload;
+        
+        if (top.svgweb) {
+          top.svgweb.addOnLoad(onloadFunc, true, window);
+        } else {
+          onloadFunc();
+        }
+      }   
+      
+     function doload() {
+        // developers original onload handler
+        
+        // add an event listener to our circle; on* style events added right
+        // to the markup are not yet supported
+        var circle = document.getElementById('myCircle');
+        circle.addEventListener('mousedown', function(evt) {
+          alert('You pressed the mouse button on our circle: ' + evt.target.id);
+        }, false);
+     }
+  ]]></script>
+  <g id="myGroup" 
+     fill="blue" 
+     style="font-size: 18px; text-anchor: middle; font-family: serif;">
+    <circle id="myCircle"
+            cx="100" cy="75" r="50"
+            stroke="firebrick"
+            stroke-width="3" />
+    <text x="100" y="155">Hello World</text>
+    <text x="100" y="175">From An SVG File!</text>
+  </g>
+</svg>

data/test/fixtures/test_partial_viewport.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="860" viewBox="0 0 215 100">
+<path d="M4.8 72.6C8.4 77.2 40.3 78.8 48 73.8 64.9 77.7 98.6 75.9 97.7 69.2 97 63.2 -16.4 46.1 4.8 72.6zM114.8 69.3C130.6 78.8 162 75.7 167.9 73.8 173.6 80.6 209.4 79.6 211.3 74.3 213.2 68.8 90.7 18.1 114.8 69.3z" style="fill:#cfcfcf"/>
+<path d="M67.9 31.1C42.1 30.4 27.6 58.1 34.8 66.4 44.4 77.6 89.3 73.7 95.7 67.1 105.3 57.4 93.5 31.7 67.9 31.1z" style="fill:#cca776;stroke:#715835"/>
+<path d="M25.7 43.9C2.8 43.8 -0.2 64.2 4.5 71.6 7.4 76.3 42.2 76.8 47.1 70.9 52.5 64.4 49 44 25.7 43.9z" style="fill:#ffe2af;stroke:#daa240"/>
+<path d="M141.8 33.1C108.7 32.1 105.2 59.2 112.9 67.3 121.1 76 163.9 75.9 170.9 67.9 177.5 60.2 175.1 34.2 141.8 33.1z" style="fill:#a7dcc1;stroke:#5ba67e"/>
+<path d="M188.8 43.6C166.1 43.1 160 64.7 165.9 71.8 171.6 78.6 203.4 78 209.3 72.3 215.6 66.1 211 44.1 188.8 43.6z" style="fill:#ffd1ba;stroke:#cc7f58"/>
+<path d="M141.6 2.5C118.4 2 105.7 25 115 34.5 120.9 40.5 160.2 41.3 166.4 34.3 174.1 25.6 164.6 3 141.6 2.5z" style="fill:#fbf499;stroke:#cbc238"/>
+<path d="M31.3 54.6C32.6 56.7 32.6 58.1 33 60.9M37.4 60.2C37.5 57.4 37 56.4 36 54.5M84.1 56.3C83.8 53.4 83.3 50.4 81.7 47.5M90.5 56.3C90.3 53.3 89.9 50.2 88.4 47.2M121.5 53C121.1 50.2 121.7 47.3 123 44.4M127.3 53.5C126.8 50.7 127.7 47.8 129.3 44.9M125.1 15.9C125.1 13.3 125.9 11.4 126.9 8.8M132.8 8.6C131.9 11 131 13.5 131.1 15.9M174.8 53.3C173.5 55.9 172.5 58.6 172.6 61.6M181.4 53.5C180 55.4 178.6 60.4 179.7 62.1" style="fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:round"/>
+</svg>

data/test/test.rb

@@ -30,7 +30,9 @@ GoodFixtures = {
   "test.cur" => [:cur, [32, 32]],
   "webp_vp8x.webp" => [:webp, [386, 395]],
   "webp_vp8l.webp" => [:webp, [386, 395]],
-  "webp_vp8.webp" => [:webp, [550, 368]]
+  "webp_vp8.webp" => [:webp, [550, 368]],
+  "test.svg" => [:svg, [200, 300]],
+  "test_partial_viewport.svg" => [:svg, [860, 400]]
 }
 
 BadFixtures = [
@@ -297,4 +299,18 @@ class FastImageTest < Test::Unit::TestCase
   ensure
     %x{rm -f shell_test}
   end
+
+  def test_content_length
+    url = "#{TestUrl}with_content_length.gif"
+    FakeWeb.register_uri(:get, url, :body => File.join(FixturePath, "test.jpg"), :content_length => 52)
+
+    assert_equal 52, FastImage.new(url).content_length
+  end
+
+  def test_content_length_not_provided
+    url = "#{TestUrl}without_content_length.gif"
+    FakeWeb.register_uri(:get, url, :body => File.join(FixturePath, "test.jpg"))
+
+    assert_equal nil, FastImage.new(url).content_length
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastimage
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.0
 platform: ruby
 authors:
 - Stephen Sykes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -112,12 +112,14 @@ files:
 - test/fixtures/test.jpg
 - test/fixtures/test.png
 - test/fixtures/test.psd
+- test/fixtures/test.svg
 - test/fixtures/test.tiff
 - test/fixtures/test2.bmp
 - test/fixtures/test2.jpg
 - test/fixtures/test2.tiff
 - test/fixtures/test3.jpg
 - test/fixtures/test4.jpg
+- test/fixtures/test_partial_viewport.svg
 - test/fixtures/truncated_gzipped.jpg
 - test/fixtures/webp_vp8.webp
 - test/fixtures/webp_vp8l.webp