linkser 0.0.4 → 0.0.5

data/lib/linkser/object.rb

@@ -1,21 +1,40 @@
+require 'net/http'
+require 'net/https'
+
 module Linkser
   class Object
     extend ActiveSupport::Memoizable
 
-    attr_reader :url, :head
-    
-    def initialize url, head, options={}
+    attr_reader :url, :last_url, :head
+    def initialize url, last_url, head, options={}
       @url = url
-      @heade = head
+      @last_url = last_url
+      @head = head
+      @options = options
     end
 
     def body
-      open(url)
+      uri = URI.parse last_url
+      if uri.scheme and (uri.scheme.eql? "http" or uri.scheme.eql? "https")
+        http = Net::HTTP.new uri.host, uri.port
+        if uri.scheme.eql? "https"
+          unless @options[:ssl_verify]==true
+           http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+          http.use_ssl = true
+        end
+      else
+      raise 'URI ' + uri.to_s + ' is not supported by Linkser'
+      end
+      http.start do |agent|
+        request = Net::HTTP::Get.new uri.request_uri
+        response = http.request request
+        return response.body
+      end
     end
 
     memoize :body
 
-
   end
 end
 

data/lib/linkser/objects/html.rb

@@ -1,6 +1,4 @@
 require 'nokogiri'
-require 'open-uri'
-require 'net/http'
 require 'image_spec'
 require 'opengraph'
 
@@ -26,13 +24,14 @@ module Linkser
             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}
+                images << Linkser::Resource.new({:type => "image", :url => ogp.image, :width => img_spec.width, :height => img_spec.height})
               end
             rescue
             end
           end        
 
           nokogiri.css('img').each do |img|
+            break if images.length >= 5
             img_src = img.get_attribute("src")
             img_src = complete_url img_src, url
             img_uri = URI.parse(img_src)
@@ -43,7 +42,7 @@ module Linkser
               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}
+                  images << Linkser::Resource.new({:type => "image", :url => img_src, :width => img_spec.width, :height => img_spec.height})
                 end
               rescue
               end
@@ -66,9 +65,13 @@ module Linkser
         ogp = false if ogp.keys.empty? || !ogp.valid?
         ogp
       end
+      
+      def resource 
+        Linkser::Resource.new ogp
+      end
 
       memoize :nokogiri, :ogp,
-              :title, :description, :images
+              :title, :description, :images, :resource
 
       private
 
@@ -86,7 +89,7 @@ module Linkser
       end
 
       def valid_img? w, h
-        if w > 199 or w > 199
+        if w > 199 or h > 199
           if ((w > 0 and h > 0 and ((w / h) < 3) and ((w / h) > 0.2)) or (w > 0 and h == 0 and w < 700) or (w == 0 and h > 0 and h < 700))
           return true
           end

data/lib/linkser/parser.rb

@@ -1,38 +1,51 @@
-require 'open-uri'
 require 'net/http'
+require 'net/https'
 
 module Linkser
   class Parser
-    attr_reader :object
+    attr_reader :object, :last_url
 
     def initialize url, options={}
-      head = get_head url
+      head = get_head url, options
 
       @object =
         case head.content_type
         when "text/html"
-          Linkser::Objects::HTML.new url, head
+          Linkser::Objects::HTML.new url, last_url, head
         else
-          Linkser::Object.new url, head
+          Linkser::Object.new url, last_url, head
         end
     end
 
     private
 
-    def get_head url, limit = 10
+    def get_head url, options, limit = 10
       raise 'Too many HTTP redirects. URL was not reacheable within the HTTP redirects limit' if (limit==0)
+      @last_url = url
       uri = URI.parse url
-      http = Net::HTTP.start uri.host, uri.port
-      response = http.head uri.request_uri
-      case response
-      when Net::HTTPSuccess then
-        return response
-      when Net::HTTPRedirection then
-        location = response['location']
-        warn "Redirecting to #{location}"
-        return get_head location, limit - 1
+      if uri.scheme and (uri.scheme.eql? "http" or uri.scheme.eql? "https")
+        http = Net::HTTP.new uri.host, uri.port
+        if uri.scheme.eql? "https"
+          unless options[:ssl_verify]==true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+          http.use_ssl = true
+        end
       else
-      raise 'The HTTP request has a ' + response.code + ' code'
+      raise 'URI ' + uri.to_s + ' is not supported by Linkser'         
+      end
+      http.start do |agent|
+        response = agent.head uri.request_uri
+        case response
+        when Net::HTTPSuccess then
+          return response
+        when Net::HTTPRedirection then
+          location = response['location']
+          warn "Redirecting to #{location}"
+          return get_head location, options, limit - 1
+        else
+        raise 'The HTTP request has a ' + response.code + ' code'
+        end
       end
     end
   end

data/lib/linkser/resource.rb

@@ -0,0 +1,25 @@
+module Linkser
+  class Resource    
+    attr_accessor :type, :url, :width, :height
+    
+    def initialize obj
+      case obj       
+      when OpenGraph::Object
+        @type = obj["type"].split(".")[0] if obj["type"]
+        if @type
+          @url = obj[@type] if obj[@type]
+          @url = obj[@type + ":url"] if @url.nil? and obj[@type + ":url"]
+          @width = obj[@type + ":width"] if obj[@type + ":width"]
+          @height = obj[@type + ":height"] if obj[@type + ":height"]
+        end
+      when Hash
+        @type = obj[:type] if obj[:type]
+        @url = obj[:url] if obj[:url]
+        @width = obj[:width] if obj[:width]
+        @height = obj[:height] if obj[:height]
+      else
+        raise 'Error creating the Linkser::Resource. Expecting Hash or OpenGraph::Object but got ' + obj.class.to_s
+      end
+    end
+  end
+end

data/lib/linkser/version.rb

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

data/lib/linkser.rb

@@ -11,3 +11,4 @@ end
 
 require 'linkser/parser'
 require 'linkser/object'
+require 'linkser/resource'

metadata

@@ -1,159 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: linkser
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Eduardo Casanova
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &81316060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *81316060
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &81315670 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *81315670
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &81315340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 2
-        - 13
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.13.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ruby-imagespec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *81315340
+- !ruby/object:Gem::Dependency
+  name: ruby-imagespec
+  requirement: &81314800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: opengraph
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *81314800
+- !ruby/object:Gem::Dependency
+  name: opengraph
+  requirement: &81313800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 0
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *81313800
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &81313180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 10
-        - 3
-        version: 0.10.3
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *81313180
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &81312750 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
-  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: 
+  prerelease: false
+  version_requirements: *81312750
+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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -165,43 +107,33 @@ files:
 - lib/linkser/object.rb
 - lib/linkser/objects/html.rb
 - lib/linkser/parser.rb
+- lib/linkser/resource.rb
 - lib/linkser/version.rb
 - linkser.gemspec
 - spec/linkser_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/ging/linkser
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A link parser for Ruby
 test_files: []
-