embedify 0.3.0 → 0.3.1

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3@embedify
+rvm 1.9.3@embedify --create

data/Gemfile

@@ -9,9 +9,12 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.8.3"
+  gem "jeweler"
   gem 'rspec'
 end
 
 gem 'nokogiri', '~> 1.5.0'
+gem 'hashie'
 gem 'faraday'
+gem 'faraday_middleware'
+gem 'hashie'

data/Gemfile.lock

@@ -7,7 +7,10 @@ GEM
       addressable (~> 2.2)
       multipart-post (~> 1.1)
       rack (~> 1.1)
+    faraday_middleware (0.8.4)
+      faraday (>= 0.7.4, < 0.9)
     git (1.2.5)
+    hashie (1.2.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -15,7 +18,7 @@ GEM
       rdoc
     json (1.6.5)
     multipart-post (1.1.5)
-    nokogiri (1.5.0)
+    nokogiri (1.5.2)
     rack (1.4.1)
     rake (0.9.2.2)
     rdoc (3.12)
@@ -28,7 +31,11 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    shoulda (2.11.3)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
 
 PLATFORMS
   ruby
@@ -36,7 +43,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   faraday
-  jeweler (~> 1.8.3)
+  faraday_middleware
+  hashie
+  jeweler
   nokogiri (~> 1.5.0)
   rdoc (~> 3.12)
   rspec

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/embedify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "embedify"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tristan Gomez"]
-  s.date = "2012-03-09"
+  s.date = "2012-04-18"
   s.description = "Embedify is a ruby gem that parses and returns an\n    embeddable version of a page, similar to how Facebook fetches and retrieves\n    page data when posting a link."
   s.email = "tristan.gomez+embedify@gmail.com"
   s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/parasquid/embedify"
   s.licenses = ["LGPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.22"
   s.summary = "parses and returns an embeddable version of a page"
 
   if s.respond_to? :specification_version then
@@ -47,28 +47,37 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.5.0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_runtime_dependency(%q<faraday>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday_middleware>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<faraday>, [">= 0"])
+      s.add_dependency(%q<faraday_middleware>, [">= 0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<nokogiri>, ["~> 1.5.0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<faraday>, [">= 0"])
+    s.add_dependency(%q<faraday_middleware>, [">= 0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end

data/examples/embedify_server/Gemfile

@@ -1,7 +1,10 @@
 source "http://rubygems.org"
 
 gem 'sinatra'
-gem 'embedify', git: 'git://github.com/parasquid/embedify.git'
+gem 'embedify', path: '../../'
 gem 'shotgun'
 gem 'thin'
 gem 'sinatra-jsonp', :require => 'sinatra/jsonp'
+gem 'em-synchrony'
+gem 'em-http-request'
+gem 'sinatra-synchrony'

data/examples/embedify_server/Gemfile.lock

@@ -1,37 +1,35 @@
-GIT
-  remote: git://github.com/parasquid/embedify.git
-  revision: 419b8f4d84975bfcb69e7b3804ab8135e8a585e7
+PATH
+  remote: ../../
   specs:
-    embedify (0.2.0)
-      httparty
-      nokogiri
-      opengraph
-
-GIT
-  remote: git://github.com/parasquid/opengraph.git
-  revision: dbcfc27a40be6b4681bfd55c31b767ecf685ff96
-  specs:
-    opengraph (0.0.4)
-      hashie
-      httparty
-      httparty (~> 0.8.1)
-      nokogiri
+    embedify (0.3.0)
+      faraday
       nokogiri (~> 1.5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.7)
+    async-rack (0.5.1)
+      rack (~> 1.1)
     daemons (1.1.8)
+    em-http-request (0.3.0)
+      addressable (>= 2.0.0)
+      escape_utils
+      eventmachine (>= 0.12.9)
+    em-resolv-replace (1.1.2)
+    em-synchrony (0.2.0)
+      eventmachine (>= 0.12.9)
+    escape_utils (0.2.4)
     eventmachine (0.12.10)
-    hashie (1.2.0)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     json_pure (1.6.5)
-    multi_json (1.1.0)
-    multi_xml (0.4.1)
-    nokogiri (1.5.0)
+    multipart-post (1.1.5)
+    nokogiri (1.5.2)
     rack (1.4.1)
+    rack-fiber_pool (0.9.1)
     rack-protection (1.2.0)
       rack
     shotgun (0.9)
@@ -43,6 +41,13 @@ GEM
     sinatra-jsonp (0.3.2)
       json_pure (~> 1.4)
       sinatra (~> 1.0)
+    sinatra-synchrony (0.1.1)
+      async-rack
+      em-http-request (= 0.3.0)
+      em-resolv-replace
+      em-synchrony (= 0.2.0)
+      rack-fiber_pool (= 0.9.1)
+      sinatra (>= 1.0)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -53,9 +58,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  em-http-request
+  em-synchrony
   embedify!
-  opengraph!
   shotgun
   sinatra
   sinatra-jsonp
+  sinatra-synchrony
   thin

data/examples/embedify_server/lib/embedify_server.rb

@@ -1,14 +1,20 @@
+$LOAD_PATH << File.expand_path('../../lib')
+
 require 'sinatra/base'
+require 'sinatra/synchrony'
 require "sinatra/jsonp"
 require 'json'
 require 'cgi'
-
-$LOAD_PATH << File.expand_path('../../lib')
-
+require 'em-synchrony'
+require 'em-synchrony/em-http'
 require 'embedify'
-require 'sinatra/jsonp'
+
+Faraday.default_adapter = :em_synchrony
 
 class EmbedifyServer < Sinatra::Base
+
+  register Sinatra::Synchrony
+
   helpers Sinatra::Jsonp
   enable :sessions
   set :session_secret, "My session secret"

data/lib/embedify.rb

@@ -1,68 +1,18 @@
-$:.unshift(File.expand_path(File.dirname(__FILE__))) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'nokogiri'
 require 'faraday'
 require 'hashie'
 
 module Embedify
 
-  TYPES = {
-    'activity' => %w(activity sport),
-    'business' => %w(bar company cafe hotel restaurant),
-    'group' => %w(cause sports_league sports_team),
-    'organization' => %w(band government non_profit school university),
-    'person' => %w(actor athlete author director musician politician public_figure),
-    'place' => %w(city country landmark state_province),
-    'product' => %w(album book drink food game movie product song tv_show),
-    'website' => %w(blog website)
-  }
-
-  # The OpenGraph::Object is a Hash with method accessors for
-  # all detected Open Graph attributes.
-  class Object < Hashie::Mash
-    MANDATORY_ATTRIBUTES = %w(title type image url)
-
-    # The object type.
-    def type
-      self['type']
-    end
-
-    # The schema under which this particular object lies. May be any of
-    # the keys of the TYPES constant.
-    def schema
-      Embedify::TYPES.each_pair do |schema, types|
-        return schema if types.include?(self.type)
-      end
-      nil
-    end
-
-    Embedify::TYPES.values.flatten.each do |type|
-      define_method "#{type}?" do
-        self.type == type
-      end
-    end
-
-    Embedify::TYPES.keys.each do |scheme|
-      define_method "#{scheme}?" do
-        self.type == scheme || OpenGraph::TYPES[scheme].include?(self.type)
-      end
-    end
-
-    # If the Open Graph information for this object doesn't contain
-    # the mandatory attributes, this will be <tt>false</tt>.
-    def valid?
-      MANDATORY_ATTRIBUTES.each{|a| return false unless (self[a] && !self[a].empty?)}
-      true
-    end
-  end
-
+  # Fetch Open Graph data from the specified URI. Makes an
+  # HTTP GET request and returns an OpenGraph::Object
   def self.fetch(uri, options = {})
     opengraph = begin
-      html = Faraday.get(uri)
-      page = parse(html.body, false)
-      page['url'] = html.request.last_uri.to_s unless page.include? 'url'
+      html = get_with_redirects(uri)
+      page = parse(html.body)
+      page['url'] = html.env[:url].to_s unless page.include? 'url'
       page
-    rescue SocketError => e
+    rescue Exception => e
       raise e
     end
 
@@ -85,7 +35,19 @@ module Embedify
 
   private
 
-  def self.parse(html, strict = true)
+  def self.get_with_redirects(uri, iterations = 0)
+    html = Faraday.get(uri)
+    #raise html.env[:response_headers]['Location']
+    puts "#{iterations.inspect} #{html.env[:response_headers]['Location']}"
+    case html.status
+    when  301..307
+      html = get_with_redirects(html.env[:response_headers]['Location'], iterations + 1)
+    else
+      html
+    end
+  end
+
+  def self.parse(html)
     doc = Nokogiri::HTML.parse(html)
     page = Embedify::Object.new
     doc.css('meta').each do |m|
@@ -98,7 +60,14 @@ module Embedify
   end
 
   def self.title(document)
-    document['title'] ||= document[:nokogiri_parsed_document].css('title').first.inner_text
+    unless document['title']
+      title_tags = document[:nokogiri_parsed_document].css('title')
+      if title_tags.count > 0
+        document['title'] = title_tags.first.inner_text
+      else
+        document.delete 'title'
+      end
+    end
   end
 
   def self.type(document)
@@ -120,25 +89,64 @@ module Embedify
       end
     end
 
-    # TODO: make the description be the first few words of the first <p></p>
-    document['description'] = ''
+    p_tags = document[:nokogiri_parsed_document].css('p')
+    if p_tags.count > 0
+      document['description'] = p_tags.first.inner_text.to_s
+    else
+      document.delete 'description'
+    end
   end
 
-end
 
 
+  TYPES = {
+    'activity' => %w(activity sport),
+    'business' => %w(bar company cafe hotel restaurant),
+    'group' => %w(cause sports_league sports_team),
+    'organization' => %w(band government non_profit school university),
+    'person' => %w(actor athlete author director musician politician public_figure),
+    'place' => %w(city country landmark state_province),
+    'product' => %w(album book drink food game movie product song tv_show),
+    'website' => %w(blog website)
+  }
 
+  # The OpenGraph::Object is a Hash with method accessors for
+  # all detected Open Graph attributes.
+  class Object < Hashie::Mash
+    MANDATORY_ATTRIBUTES = %w(title type image url)
 
-require 'nokogiri'
-require 'faraday'
+    # The object type.
+    def type
+      self['type']
+    end
 
-module OpenGraph
-  # Fetch Open Graph data from the specified URI. Makes an
-  # HTTP GET request and returns an OpenGraph::Object if there
-  # is data to be found or <tt>false</tt> if there isn't.
-  #
-  # Pass <tt>false</tt> for the second argument if you want to
-  # see invalid (i.e. missing a required attribute) data.
+    # The schema under which this particular object lies. May be any of
+    # the keys of the TYPES constant.
+    def schema
+      Embedify::TYPES.each_pair do |schema, types|
+        return schema if types.include?(self.type)
+      end
+      nil
+    end
+
+    Embedify::TYPES.values.flatten.each do |type|
+      define_method "#{type}?" do
+        self.type == type
+      end
+    end
 
+    Embedify::TYPES.keys.each do |scheme|
+      define_method "#{scheme}?" do
+        self.type == scheme || Embedify::TYPES[scheme].include?(self.type)
+      end
+    end
+
+    # If the Open Graph information for this object doesn't contain
+    # the mandatory attributes, this will be <tt>false</tt>.
+    def valid?
+      MANDATORY_ATTRIBUTES.each{|a| return false unless (self[a] && !self[a].empty?)}
+      true
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedify
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-09 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &71264200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,31 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *71264200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &71262990 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71262990
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &71259700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71259700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71258770 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +117,15 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *71258770
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &71257430 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +133,31 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *71257430
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &71295870 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71295870
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71293630 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71293630
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "Embedify is a ruby gem that parses and returns an\n    embeddable
   version of a page, similar to how Facebook fetches and retrieves\n    page data
   when posting a link."
@@ -131,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -523818223
+      hash: -400433983158747791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: parses and returns an embeddable version of a page