opengraph_parser 0.1.3 → 0.2.0

data/lib/open_graph.rb

@@ -3,7 +3,7 @@ require 'redirect_follower'
 require "addressable/uri"
 
 class OpenGraph
-  attr_accessor :src, :url, :type, :title, :description, :images, :metadata, :response
+  attr_accessor :src, :url, :type, :title, :description, :images, :metadata, :response, :original_images
 
   def initialize(src, fallback = true)
     @src = src
@@ -29,13 +29,13 @@ class OpenGraph
       doc.css('meta').each do |m|
         if m.attribute('property') && m.attribute('property').to_s.match(/^og:(.+)$/i)
           m_content = m.attribute('content').to_s.strip
-          case metadata_name = m.attribute('property').to_s.gsub("og:", "")
+          metadata_name = m.attribute('property').to_s.gsub("og:", "")
+          @metadata = add_metadata(@metadata, metadata_name, m_content)
+          case metadata_name
             when *attrs_list
               self.instance_variable_set("@#{metadata_name}", m_content) unless m_content.empty?
             when "image"
               add_image(m_content)
-            else
-              @metadata[m.attribute('property').to_s] = m_content
           end
         end
       end
@@ -62,12 +62,13 @@ class OpenGraph
   end
 
   def check_images_path
+    @original_images = @images.dup
     uri = Addressable::URI.parse(@src)
     imgs = @images.dup
     @images = []
     imgs.each do |img|
       if Addressable::URI.parse(img).host.nil?
-        full_path = generate_path(img, uri)
+        full_path = uri.join(img).to_s
         add_image(full_path)
       else
         add_image(img)
@@ -85,14 +86,25 @@ class OpenGraph
     end
   end
 
-  def generate_path(relative_path, uri)
-    host = "#{uri.scheme}://#{uri.host}#{':' + uri.port.to_s if uri.port}"
-    if relative_path.start_with?('/')
-      "#{host}#{relative_path}"
-    elsif uri.path.to_s.end_with?('/')
-      "#{host}#{uri.path}#{relative_path}"
+  def add_metadata(metadata_container, path, content)
+    path_elements = path.split(':')
+    if path_elements.size > 1
+      current_element = path_elements.delete_at(0)
+      path = path_elements.join(':')
+      if metadata_container[current_element.to_sym]
+        path_pointer = metadata_container[current_element.to_sym].last
+        index_count = metadata_container[current_element.to_sym].size
+        metadata_container[current_element.to_sym][index_count - 1] = add_metadata(path_pointer, path, content)
+        metadata_container
+      else
+        metadata_container[current_element.to_sym] = []
+        metadata_container[current_element.to_sym] << add_metadata({}, path, content)
+        metadata_container
+      end
     else
-      "#{host}#{uri.path}/#{relative_path}"
+      metadata_container[path.to_sym] ||= []
+      metadata_container[path.to_sym] << {'_value'.to_sym => content}
+      metadata_container
     end
   end
 end

data/lib/redirect_follower.rb

@@ -1,4 +1,4 @@
-require 'net/http'
+require 'net/https'
 
 class RedirectFollower
   class TooManyRedirects < StandardError; end
@@ -12,7 +12,15 @@ class RedirectFollower
   def resolve
     raise TooManyRedirects if redirect_limit < 0
 
-    self.response = Net::HTTP.get_response(URI.parse(URI.escape(url)))
+    uri = URI.parse(URI.escape(url))
+    if uri.scheme == 'https'
+      https = Net::HTTP.new(uri.host, 443)
+      https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      self.response = https.request_get(uri.request_uri)
+    else
+      self.response = Net::HTTP.get_response(uri)
+    end
 
     if response.kind_of?(Net::HTTPRedirection)
       self.url = redirect_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opengraph_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70151413283600 !ruby/object:Gem::Requirement
+  requirement: &70256296829180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151413283600
+  version_requirements: *70256296829180
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70151413282820 !ruby/object:Gem::Requirement
+  requirement: &70256296828540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70151413282820
+  version_requirements: *70256296828540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151413298400 !ruby/object:Gem::Requirement
+  requirement: &70256296827720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151413298400
+  version_requirements: *70256296827720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70151413297900 !ruby/object:Gem::Requirement
+  requirement: &70256296826860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151413297900
+  version_requirements: *70256296826860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70151413297400 !ruby/object:Gem::Requirement
+  requirement: &70256296825620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151413297400
+  version_requirements: *70256296825620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70151413296900 !ruby/object:Gem::Requirement
+  requirement: &70256296818460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151413296900
+  version_requirements: *70256296818460
 description: A simple Ruby library for parsing Open Graph Protocol information from
   a website. It also includes a fallback solution when the website has no Open Graph
   information.
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 611332841386034428
+      hash: -777082750492777387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: