ruby-readability 0.5.5 → 0.5.6

data/CHANGES.markdown

@@ -1,3 +1,7 @@
 Oct 1, 2012:
 
 - Merged in austinrfnd's `author` handling code.
+
+Dec 13, 2012
+
+- Use fastimage instead of mini_magick for JRuby compat.

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in ruby-readability.gemspec
-gem 'mini_magick', '3.3'
+gem 'fastimage', '~> 1.2.13'
 
 group :test do
   gem "fakeweb",      "~> 1.3.0"

data/README.markdown

@@ -49,7 +49,7 @@ Readability comes with a command-line tool for experimentation in bin/readabilit
 
 ## Images
 
-You can get a list of images in the content area with `.images`.  This feature requires that the `mini_magick` gem be installed    
+You can get a list of images in the content area with `.images`.  This feature requires that the `fastimage` gem be installed    
 
     rbody = Readability::Document.new(body, :tags => %w[div p img a], :attributes => %w[src href], :remove_empty_nodes => false)
     rbody.images

data/lib/readability.rb

@@ -55,9 +55,9 @@ module Readability
 
     def images(content=nil, reload=false)
       begin
-        require 'mini_magick'
+        require 'fastimage'
       rescue LoadError
-        raise "Please install mini_magick in order to use the #images feature."
+        raise "Please install fastimage in order to use the #images feature."
       end
 
       @best_candidate_has_image = false if reload
@@ -76,12 +76,16 @@ module Readability
           url     = element["src"].value
           height  = element["height"].nil?  ? 0 : element["height"].value.to_i
           width   = element["width"].nil?   ? 0 : element["width"].value.to_i
-          format  = File.extname(url).gsub(".", "")
-          image   = {:width => width, :height => height, :format => format}
-          image   = load_image(url) if url =~ /\Ahttps?:\/\//i && (height.zero? || width.zero?)
-
-          next unless image
-
+          
+          if url =~ /\Ahttps?:\/\//i && (height.zero? || width.zero?)
+            image   = get_image_size(url) 
+            next unless image
+          else
+            image = {:width => width, :height => height}
+          end
+          
+          image[:format] = File.extname(url).gsub(".", "")
+          
           if tested_images.include?(url)
             debug("Image was tested: #{url}")
             next
@@ -98,9 +102,11 @@ module Readability
       (list_images.empty? and content != @html) ? images(@html, true) : list_images
     end
 
-    def load_image(url)
+    def get_image_size(url)
       begin
-        MiniMagick::Image.open(url)
+        w, h = FastImage.size(url)
+        raise "Couldn't get size." if w.nil? || h.nil?
+        {width: w, height: h}
       rescue => e
         debug("Image error: #{e}")
         nil

data/ruby-readability.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "ruby-readability"
-  s.version     = '0.5.5'
+  s.version     = '0.5.6'
   s.authors     = ["Andrew Cantino", "starrhorne", "libc", "Kyle Maxwell"]
   s.email       = ["andrew@iterationlabs.com"]
   s.homepage    = "http://github.com/iterationlabs/ruby-readability"

data/spec/readability_spec.rb

@@ -30,11 +30,17 @@ describe Readability do
       FakeWeb::Registry.instance.clean_registry
       FakeWeb.register_uri(:get, "http://img.thesun.co.uk/multimedia/archive/01416/dim_1416768a.jpg",
                            :body => File.read(File.dirname(__FILE__) + "/fixtures/images/dim_1416768a.jpg"))
+                           
+      FakeWeb.register_uri(:get, "http://img.thesun.co.uk/multimedia/archive/00703/sign_up_emails_682__703711a.gif",
+                           :body => File.read(File.dirname(__FILE__) + "/fixtures/images/sign_up_emails_682__703711a.gif"))
+                        
+      FakeWeb.register_uri(:get, "http://img.thesun.co.uk/multimedia/archive/00703/sign_up_emails_682__703712a.gif",                                            
+                           :body => File.read(File.dirname(__FILE__) + "/fixtures/images/sign_up_emails_682__703712a.gif"))
     end
 
     it "should show one image, but outside of the best candidate" do
       @doc = Readability::Document.new(@thesum)
-      @doc.images.should == ["http://img.thesun.co.uk/multimedia/archive/01416/dim_1416768a.jpg"]
+      @doc.images.should == ["http://img.thesun.co.uk/multimedia/archive/01416/dim_1416768a.jpg", "http://img.thesun.co.uk/multimedia/archive/00703/sign_up_emails_682__703711a.gif", "http://img.thesun.co.uk/multimedia/archive/00703/sign_up_emails_682__703712a.gif"]
       @doc.best_candidate_has_image.should == false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-readability
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,6 +116,8 @@ files:
 - spec/fixtures/bbc.html
 - spec/fixtures/cant_read.html
 - spec/fixtures/images/dim_1416768a.jpg
+- spec/fixtures/images/sign_up_emails_682__703711a.gif
+- spec/fixtures/images/sign_up_emails_682__703712a.gif
 - spec/fixtures/nytimes.html
 - spec/fixtures/sample.html
 - spec/fixtures/samples/blogpost_with_links-fragments.rb
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-readability
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Port of arc90's readability project to ruby
@@ -159,6 +161,8 @@ test_files:
 - spec/fixtures/bbc.html
 - spec/fixtures/cant_read.html
 - spec/fixtures/images/dim_1416768a.jpg
+- spec/fixtures/images/sign_up_emails_682__703711a.gif
+- spec/fixtures/images/sign_up_emails_682__703712a.gif
 - spec/fixtures/nytimes.html
 - spec/fixtures/sample.html
 - spec/fixtures/samples/blogpost_with_links-fragments.rb