embedly 1.2.0 → 1.3.0

data/Gemfile

@@ -2,6 +2,7 @@ source :rubygems
 
 gem "querystring"
 gem "oauth"
+gem "typhoeus"
 
 group :development do
   gem "jeweler"

data/README.rdoc

@@ -62,6 +62,9 @@ You can configure some parameters in the api:
 
    # use a custom logger
    config.logger = MyAwesomeLogger.new(STDERR)
+
+   # disable typhoeus and use Net::HTTP instead
+   config.typhoeus = false
  end
 
 == Testing

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/embedly/api.rb

@@ -7,6 +7,7 @@ require 'embedly/model'
 require 'embedly/exceptions'
 require 'querystring'
 require 'oauth'
+require 'typhoeus'
 
 # Performs api calls to embedly.
 #
@@ -45,6 +46,7 @@ class Embedly::API
   # [:+key+] Your api.embed.ly key.
   # [:+secret+] Your api.embed.ly secret if you are using oauth.
   # [:+user_agent+] Your User-Agent header.  Defaults to Mozilla/5.0 (compatible; embedly-ruby/VERSION;)
+  # [:+timeout+] Request timeout (in seconds).  Defaults to 180 seconds or 3 minutes
   # [:+headers+] Additional headers to send with requests.
   def initialize opts={}
     @endpoints = [:oembed, :objectify, :preview]
@@ -53,15 +55,24 @@ class Embedly::API
     @api_version = Hash.new('1')
     @api_version.merge!({:objectify => '2'})
     @hostname = opts[:hostname] || 'api.embed.ly'
+    @timeout = opts[:timeout] || 180
     @headers = {
       'User-Agent' => opts[:user_agent] || "Mozilla/5.0 (compatible; embedly-ruby/#{Embedly::VERSION};)"
     }.merge(opts[:headers]||{})
   end
 
+  def _do_typhoeus_call path
+    scheme, host, port = uri_parse hostname
+    url = "#{scheme}://#{hostname}:#{port}#{path}"
+    logger.debug { "calling #{site}#{path} with headers #{headers} using Typhoeus" }
+    Typhoeus::Request.get(url, {:headers => headers, :timeout => (@timeout*1000) })
+  end
+
   def _do_basic_call path
     scheme, host, port = uri_parse hostname
-    logger.debug { "calling #{site}#{path} with headers #{headers}" }
+    logger.debug { "calling #{site}#{path} with headers #{headers} using Net::HTTP" }
     Net::HTTP.start(host, port, :use_ssl => scheme == 'https') do |http|
+      http.read_timeout = @timeout
       http.get(path, headers)
     end
   end
@@ -83,7 +94,7 @@ class Embedly::API
     if key and secret
       _do_oauth_call path
     else
-      _do_basic_call path
+      configuration.typhoeus ? _do_typhoeus_call(path) : _do_basic_call(path)
     end
   end
 

data/lib/embedly/command_line.rb

@@ -32,7 +32,8 @@ module Embedly
           :key => ENV['EMBEDLY_KEY'],
           :secret => ENV['EMBEDLY_SECRET'],
           :headers => {},
-          :query => {}
+          :query => {},
+          :typhoeus => true
         }
       end
 
@@ -85,6 +86,10 @@ Usage [OPTIONS] <url> [url] ..
             options[:query][key.to_sym] = value
           end
 
+          parser.on("--no-typhoeus", "Don't use typhoeus.") do
+            Embedly.configuration.typhoeus = false
+          end
+
           parser.separator ""
           parser.separator "Common Options:"
 
@@ -121,6 +126,7 @@ Usage [OPTIONS] <url> [url] ..
 
     def options
       @options = Parser.parse!(@args.dup)
+      @options
     end
   end
 end

data/lib/embedly/configuration.rb

@@ -18,7 +18,7 @@ require 'logger'
 #   end
 #
 class Embedly::Configuration
-  attr_accessor :key # :nodoc:
+  attr_accessor :key, :typhoeus # :nodoc:
 
   def initialize # :nodoc:
     self.reset

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedly
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: querystring
-  requirement: &69757780 !ruby/object:Gem::Requirement
+  requirement: &71434060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69757780
+  version_requirements: *71434060
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &69752680 !ruby/object:Gem::Requirement
+  requirement: &71433770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69752680
+  version_requirements: *71433770
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: &71433500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *71433500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &69752030 !ruby/object:Gem::Requirement
+  requirement: &71433250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69752030
+  version_requirements: *71433250
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &69751240 !ruby/object:Gem::Requirement
+  requirement: &71432930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69751240
+  version_requirements: *71432930
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &69750240 !ruby/object:Gem::Requirement
+  requirement: &71432640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69750240
+  version_requirements: *71432640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &69749290 !ruby/object:Gem::Requirement
+  requirement: &71432350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69749290
+  version_requirements: *71432350
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &69748410 !ruby/object:Gem::Requirement
+  requirement: &71432060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69748410
+  version_requirements: *71432060
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &69747860 !ruby/object:Gem::Requirement
+  requirement: &71431780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69747860
+  version_requirements: *71431780
 description: Ruby Embedly client library
 email: bob@embed.ly
 executables:
@@ -153,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -397755075
+      hash: 990086959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: