sumitup 0.1.3 → 0.1.4

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem 'sanitize'
+gem 'dimensions'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -3,6 +3,7 @@ GEM
   specs:
     columnize (0.3.5)
     diff-lcs (1.1.3)
+    dimensions (1.0.0)
     ffi (1.0.11)
     git (1.2.5)
     growl (1.0.3)
@@ -50,6 +51,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  dimensions
   growl
   guard (>= 1.0.0)
   guard-bundler (>= 0.1.3)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sumitup.rb

@@ -1,6 +1,8 @@
 $LOAD_PATH << File.dirname(__FILE__) unless $LOAD_PATH.include?(File.dirname(__FILE__))
 
 require 'sanitize'
+require 'open-uri'
+require 'dimensions'
 
 # Get index status:
 # curl -XGET 'http://localhost:9200/_status'

data/lib/sumitup/parser.rb

@@ -48,6 +48,9 @@ module Sumitup
     end
 
     def summarize_fragment(node, max = nil)
+      # Always reset counts
+      self.word_count = 0
+      self.image_count = 0
       clean = Sanitize.clean_node!(node, 
         :elements => elements, 
         :attributes => attributes, 
@@ -95,6 +98,7 @@ module Sumitup
     def snippet(text, max)
       result = ''
       count = 0
+      # TODO figure out support for pre that contains code blocks..
       return [result, count] if is_blank?(text)
       text.split.each do |word|
         return [result.strip!, count] if count >= max
@@ -107,7 +111,24 @@ module Sumitup
     def is_blank?(text)
       text.nil? || text.empty?
     end
-
+    
+    def request_image_size(image_url)
+      width = nil
+      height = nil
+      open(image_url, 'rb') do |f|
+        img = Dimensions(f)
+        img.read
+        width = img.width
+        height = img.height
+      end
+      [width, height]
+    end
+    
+    def image_height(existing_height, existing_width, image_width_limit)
+      ratio = image_width_limit.to_f/existing_width.to_f
+      (existing_height.to_f * ratio).to_i
+    end
+        
     def word_transformer
       me = self
       lambda do |env|
@@ -141,21 +162,23 @@ module Sumitup
           node.remove
         else
           keep_it = false
-        
-          if node.attributes['width']
-            width = node.attributes['width'].value.to_i rescue 0
-            keep_it = true if width > me.min_image_size
-          else
-            width = nil
-            keep_it = true
-          end
 
+          existing_width = node.attributes['width'].value.to_i rescue nil if node.attributes['width']
+          existing_height = node.attributes['height'].value.to_i rescue nil if node.attributes['height']
+          
+          if !existing_width || !existing_height
+            image_url = node.attributes['src'] rescue nil
+            existing_width, existing_height = me.request_image_size(image_url) rescue [nil, nil] if image_url
+          end
+            
+          existing_width ||= 0
+          
+          keep_it = true if existing_width > me.min_image_size
+          
           if keep_it
             me.image_count += 1
-            if width == nil || width > me.image_width_limit
-              node['width'] = me.image_width_limit.to_s
-              node.attributes['height'].remove if node.attributes['height']
-            end
+            node['height'] = me.image_height(existing_height, existing_width, me.image_width_limit).to_s
+            node['width'] = me.image_width_limit.to_s
           else
             node.remove
           end

data/spec/sumitup/parser_spec.rb

@@ -7,6 +7,15 @@ describe Sumitup::Parser do
       @html = IO.read(File.join(File.dirname(__FILE__), '..', 'fixtures', 'basic.html'))
     end
     
+    it "should used the default max_words" do
+      content = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec est enim, accumsan sollicitudin convallis sed, tempor vel libero. Quisque nulla tortor, 
+        rhoncus sit amet fermentum ut, imperdiet iaculis risus. Nunc vulputate arcu non turpis consequat molestie. Vestibulum ante ipsum primis in faucibus orci luctus 
+        et ultrices posuere cubilia Curae; Nam blandit malesuada leo et posuere. Suspendisse potenti. '
+      parser = Sumitup::Parser.new(:max_words => 10)
+      result = parser.summarize(content)
+      result.should == 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec est'
+    end
+    
     it "should summarize the content by number of words" do
       parser = Sumitup::Parser.new(:max_words => 1000)
       result = parser.summarize(@html, 5)
@@ -29,6 +38,13 @@ describe Sumitup::Parser do
       result.should_not include('<span></span>')
     end
     
+    it "should be reusable" do
+      parser = Sumitup::Parser.new(:max_words => 5)
+      result = parser.summarize(@html)
+      result2 = parser.summarize(@html)
+      result.should == result2
+    end
+    
     describe "Sanitize options" do
       it "should remove html comments" do
         result = Sumitup::Parser.new.summarize(@html, 100000)
@@ -57,7 +73,7 @@ describe Sumitup::Parser do
       it "should set the width to 240 if width is greater than 240" do
         parser = Sumitup::Parser.new(:image_width_limit => 240)
         result = parser.summarize(@html, 10000)
-        result.should include(%Q{img src="http://www.example.com/big.jpg" width="240">})
+        result.should include(%Q{img src="http://www.example.com/big.jpg" width="240" height="240">})
       end
       
       it "should only allow 2 images" do
@@ -72,10 +88,10 @@ describe Sumitup::Parser do
         result.should_not include('http://www.example.com/small.jpg')
       end
       
-      it "should keep images as is that are not over the width limit" do
+      it "should enlarge images that are not over the width limit" do
         parser = Sumitup::Parser.new(:max_images => 1000, :image_width_limit => 200)
         result = parser.summarize(@html, 100000)
-        result.should include('<img src="http://www.example.com/photo.jpg" width="150" height="150" title="" alt="">')
+        result.should include('<img src="http://www.example.com/photo.jpg" width="200" height="200" title="" alt="">')
       end
     end
     
@@ -115,4 +131,43 @@ describe Sumitup::Parser do
     end
   end
   
+  describe "request_image_size" do
+    before do
+      @parser = Sumitup::Parser.new
+    end
+    it "should get width and height from the remote image" do
+      url = "http://upload.wikimedia.org/wikipedia/en/b/bc/Wiki.png"
+      width, height = @parser.request_image_size(url)
+      width.should == 135
+      height.should == 155
+    end
+  end
+  
+  describe "image_height" do
+    before do
+      @parser = Sumitup::Parser.new
+    end
+    it "should calculate a smaller height based on the width change" do
+      image_width_limit = 100
+      existing_height = 1000
+      existing_width = 1000
+      height = @parser.image_height(existing_height, existing_width, image_width_limit)
+      height.should == 100
+    end
+    it "should calculate a larger height based on the width change" do
+      image_width_limit = 100
+      existing_height = 10
+      existing_width = 50
+      height = @parser.image_height(existing_height, existing_width, image_width_limit)
+      height.should == 20
+    end
+    it "should calculate new height based on width" do
+      image_width_limit = 100
+      existing_height = 143
+      existing_width = 136
+      height = @parser.image_height(existing_height, existing_width, image_width_limit)
+      height.should == 105
+    end
+  end
+  
 end

data/sumitup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sumitup"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
-  s.date = "2012-03-07"
+  s.date = "2012-03-13"
   s.description = "Given an html document or fragment this gem will build a summary of the content."
   s.email = "justinball@gmail.com"
   s.extra_rdoc_files = [
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sanitize>, [">= 0"])
+      s.add_runtime_dependency(%q<dimensions>, [">= 0"])
       s.add_development_dependency(%q<growl>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<sanitize>, [">= 0"])
+      s.add_dependency(%q<dimensions>, [">= 0"])
       s.add_dependency(%q<growl>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -71,6 +73,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sanitize>, [">= 0"])
+    s.add_dependency(%q<dimensions>, [">= 0"])
     s.add_dependency(%q<growl>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sumitup
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Justin Ball
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-07 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -32,7 +32,7 @@ dependencies:
   name: sanitize
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +43,25 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id002
-  name: growl
+  name: dimensions
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: growl
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,12 +72,12 @@ dependencies:
         - 8
         - 0
         version: 2.8.0
-  version_requirements: *id003
+  version_requirements: *id004
   name: rspec
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +87,12 @@ dependencies:
         - 3
         - 12
         version: "3.12"
-  version_requirements: *id004
+  version_requirements: *id005
   name: rdoc
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -89,12 +103,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id005
+  version_requirements: *id006
   name: bundler
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,12 +119,12 @@ dependencies:
         - 8
         - 3
         version: 1.8.3
-  version_requirements: *id006
+  version_requirements: *id007
   name: jeweler
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,12 +133,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  version_requirements: *id008
   name: rcov
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -135,12 +149,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
+  version_requirements: *id009
   name: guard
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,12 +165,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  version_requirements: *id009
+  version_requirements: *id010
   name: guard-rspec
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -167,12 +181,12 @@ dependencies:
         - 1
         - 3
         version: 0.1.3
-  version_requirements: *id010
+  version_requirements: *id011
   name: guard-bundler
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -181,7 +195,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id011
+  version_requirements: *id012
   name: ruby-debug
   prerelease: false
 description: Given an html document or fragment this gem will build a summary of the content.