linkser 0.0.3 → 0.0.4

data/lib/linkser/object.rb

@@ -1,10 +1,22 @@
 module Linkser
   class Object
+    extend ActiveSupport::Memoizable
+
     attr_reader :url, :head
     
     def initialize url, head, options={}
       @url = url
       @heade = head
     end
+
+    def body
+      open(url)
+    end
+
+    memoize :body
+
+
   end
 end
+
+require 'linkser/objects/html'

data/lib/linkser/objects/html.rb

@@ -7,92 +7,69 @@ require 'opengraph'
 module Linkser
   module Objects
     class HTML < Linkser::Object
-      attr_reader :body, :nokogiri
-      attr_reader :title, :description, :images, :ogp
-      def initialize url, head, options={}
-        super url, head, options
-      end
 
       def title
-        return @title unless @title.nil?
-        if ogp and ogp.title
-           @title = ogp.title
-        else
-          nokogiri.css('title').each do |title|
-            @title = title.text
-          end
-        end          
-        @title
-      end
-
-      def body
-        return @body unless @body.nil?
-        @body = open(url)
+        ogp && ogp.title ||
+          (e = nokogiri.css('title')).first && e.text
       end
 
       def description
-        return @description unless @description.nil?
-        if ogp and ogp.description
-           @description = ogp.description
-        else
-          nokogiri.css('meta').each do |meta|
-            if meta.get_attribute("name").eql? "description"
-              @description = meta.get_attribute("content")
-            end
-          end
-        end
-        @description
+        ogp && ogp.description ||
+          (e = nokogiri.css('meta').find { |meta|
+                 meta.get_attribute("name").eql? "description"
+               }) && e.get_attribute("content")
       end
 
       def images
-        return @images unless @images.nil?
-        @images = Array.new
-        if ogp and ogp.image
-          begin
-            img_spec = ImageSpec.new(ogp.image)
-            if valid_img? img_spec.width.to_f, img_spec.height.to_f
-              @images << {:img => ogp.image, :width => img_spec.width, :height => img_spec.height}
-            end
-          rescue
-          end
-        end        
-        nokogiri.css('img').each do |img|
-          img_src = img.get_attribute("src")
-          img_src = complete_url img_src, url
-          img_uri = URI.parse(img_src)
-          img_ext = File.extname(img_uri.path)
-          img_name = File.basename(img_uri.path,img_ext)
-          if [".jpg", ".jpeg", ".png"].include? img_ext
+        Array.new.tap do |images|
+          if ogp and ogp.image
             begin
-              img_spec = ImageSpec.new(img_src)
+              img_spec = ImageSpec.new(ogp.image)
               if valid_img? img_spec.width.to_f, img_spec.height.to_f
-                @images << {:img => img_src, :width => img_spec.width, :height => img_spec.height}
+                images << {:img => ogp.image, :width => img_spec.width, :height => img_spec.height}
               end
             rescue
             end
+          end        
+
+          nokogiri.css('img').each do |img|
+            img_src = img.get_attribute("src")
+            img_src = complete_url img_src, url
+            img_uri = URI.parse(img_src)
+            img_ext = File.extname(img_uri.path)
+            img_name = File.basename(img_uri.path,img_ext)
+
+            if [".jpg", ".jpeg", ".png"].include? img_ext
+              begin
+                img_spec = ImageSpec.new(img_src)
+                if valid_img? img_spec.width.to_f, img_spec.height.to_f
+                  images << {:img => img_src, :width => img_spec.width, :height => img_spec.height}
+                end
+              rescue
+              end
+            end
           end
-        end
-        @images
-      end      
+        end      
+      end
 
       def nokogiri
-        return @nokogiri unless @nokogiri.nil?
-        @nokogiri = Nokogiri::HTML(body)
+        Nokogiri::HTML(body)
       end
 
       def ogp
-        return @ogp unless @ogp.nil?
-        @ogp = OpenGraph::Object.new
+        ogp = OpenGraph::Object.new
         nokogiri.css('meta').each do |m|
           if m.attribute('property') && m.attribute('property').to_s.match(/^og:(.+)$/i)
-            @ogp[$1.gsub('-','_')] = m.attribute('content').to_s
+            ogp[$1.gsub('-','_')] = m.attribute('content').to_s
           end
         end
-        @ogp = false if @ogp.keys.empty?
-        @ogp = false unless @ogp.valid?  
-        @ogp 
+        ogp = false if ogp.keys.empty? || !ogp.valid?
+        ogp
       end
 
+      memoize :nokogiri, :ogp,
+              :title, :description, :images
+
       private
 
       def complete_url src, url

data/lib/linkser/parser.rb

@@ -2,23 +2,24 @@ require 'open-uri'
 require 'net/http'
 
 module Linkser
-  module Parser
-    def self.parse url, options={}
-      if !is_valid_url? url
-        raise "Invalid URL"
-      end
+  class Parser
+    attr_reader :object
+
+    def initialize url, options={}
       head = get_head url
-      case head.content_type
-      when "text/html"
-        Linkser::Objects::HTML.new url, head
-      else
-      raise "I have no idea on how to parse a '" + head.content_type + "'"
-      end
+
+      @object =
+        case head.content_type
+        when "text/html"
+          Linkser::Objects::HTML.new url, head
+        else
+          Linkser::Object.new url, head
+        end
     end
 
     private
 
-    def self.get_head url, limit = 10
+    def get_head url, limit = 10
       raise 'Too many HTTP redirects. URL was not reacheable within the HTTP redirects limit' if (limit==0)
       uri = URI.parse url
       http = Net::HTTP.start uri.host, uri.port
@@ -34,19 +35,6 @@ module Linkser
       raise 'The HTTP request has a ' + response.code + ' code'
       end
     end
-
-    def self.is_valid_url? url
-      begin
-        uri = URI.parse(url)
-        if [:scheme, :host].any? { |i| uri.send(i).blank? }
-        raise URI::InvalidURIError 
-        end
-        return true
-      rescue URI::InvalidURIError => e
-         warn e.to_s
-      return false
-      end
-    end
   end
 end
 

data/lib/linkser/version.rb

@@ -1,3 +1,3 @@
 module Linkser
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/linkser.rb

@@ -1,10 +1,13 @@
+require 'active_support'
 require 'linkser/version'
 
 module Linkser
-  autoload :Parser, 'linkser/parser'
-  autoload :Object, 'linkser/object'
-  module Objects
-    autoload :HTML, 'linkser/objects/html'
+  class << self
+    def parse(url, options = {})
+      Linkser::Parser.new(url, options).object
+    end
   end
 end
 
+require 'linkser/parser'
+require 'linkser/object'

data/linkser.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('rmagick', '~> 2.13.1')
   s.add_runtime_dependency('ruby-imagespec', "~> 0.2.0")  
   s.add_runtime_dependency('opengraph', "~> 0.0.4")
+  s.add_runtime_dependency('activesupport', "> 2.2.1")
   
   # Development Gem dependencies
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linkser
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Eduardo Casanova
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 Z
+date: 2011-11-21 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -96,9 +97,25 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: activesupport
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 2
+        - 1
+        version: 2.2.1
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,11 +127,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,7 +143,7 @@ dependencies:
         - 0
         version: 2.7.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: Linkser is a link parser for Ruby. It gets an URI, tries to dereference it and returns the relevant information about the resource.
 email: 
 - ecasanovac@gmail.com
@@ -152,6 +169,7 @@ files:
 - linkser.gemspec
 - spec/linkser_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/ging/linkser
 licenses: []
 
@@ -181,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A link parser for Ruby