embedly 1.0.0 → 1.1.0

data/Gemfile

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

data/README.rdoc

@@ -45,11 +45,11 @@ You can find rdocs at http://rubydoc.info/github/embedly/embedly-ruby/master/fra
   json_obj = JSON.pretty_generate(objs.collect{|o| o.marshal_dump})
   puts json_obj
 
-  # call pro with key (you'll need a real key)
-  embedly_pro = Embedly::API.new :key => 'xxxxxxxxxxxxxxxxxxxxxxxxxx',
+  # call api with key (you'll need a real key)
+  embedly_api = Embedly::API.new :key => 'xxxxxxxxxxxxxxxxxxxxxxxxxx',
           :user_agent => 'Mozilla/5.0 (compatible; mytestapp/1.0; my@email.com)'
   url = 'http://www.guardian.co.uk/media/2011/jan/21/andy-coulson-phone-hacking-statement'
-  obj = embedly_pro.preview :url => url
+  obj = embedly_api.preview :url => url
   puts JSON.pretty_generate(obj[0].marshal_dump)
 
 == Testing
@@ -58,7 +58,7 @@ You can find rdocs at http://rubydoc.info/github/embedly/embedly-ruby/master/fra
   rake rspec
   rake features # if it complains of missing deps install them
 
-Some tests will fail due to missing pro key.  Set the EMBEDLY_KEY environmental
+Some tests will fail due to missing api key.  Set the EMBEDLY_KEY environmental
 variable with your key to get them to pass.
 
   EMBEDLY_KEY=xxxxxxxxxxxxx rake features

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/bin/embedly_objectify

@@ -1,79 +1,12 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path('../../lib', __FILE__))
-%w{embedly json optparse ostruct}.each {|l| require l}
+%w{embedly embedly/command_line json optparse ostruct}.each {|l| require l}
 
-options = OpenStruct.new({
-  :hostname => nil,
-  :key => ENV['EMBEDLY_KEY'] == '' ? nil : ENV['EMBEDLY_KEY'],
-  :verbose => false,
-  :args => {},
-  :headers => {}
-})
+api = Embedly::CommandLine.run!(:objectify, ARGV)
 
-action = File.basename(__FILE__)[/embedly_(\w+)/, 1]
-
-opts = OptionParser.new do |opts|
-  opts.banner = <<-DOC
-Fetch JSON from the embedly #{action} service.
-Usage #{action} [OPTIONS] <url> [url] ..
-  DOC
-
-  opts.separator ""
-  opts.separator "Options:"
-
-  opts.on("-H", "--hostname ENDPOINT",
-          "Embedly host.  Default is api.embed.ly.") do |e|
-    options.hostname = e
-  end
-
-  opts.on("--header NAME=VALUE",
-          "HTTP header to send with requests.") do |header|
-    n,v = header.split '='
-    options.headers[n] = v
-  end
-
-  opts.on("-k", "--key KEY", "Embedly key [default: " +
-                             "EMBEDLY_KEY environmental variable]") do |k|
-    options.key = k
-  end
-
-  opts.on("-N", "--no-key", "Ignore EMBEDLY_KEY environmental variable") do
-    options.key = nil
-  end
-
-  opts.on("-o", "--option NAME=VALUE", "Set option to be passed as " +
-                                       "query param.") do |o|
-    k,v = o.split('=')
-    options.args[k] = v
-  end
-
-  opts.separator ""
-  opts.separator "Common Options:"
-
-  opts.on("-v", "--verbose", "Run verbosely") do
-    options.verbose = true
-  end
-
-  opts.on("-h", "--help", "Display this message") do
-    puts opts
-    exit
-  end
-
-  opts.separator ""
-  opts.separator "Bob Corsaro <bob@embed.ly>"
-end
-
-opts.parse!
-
-if ARGV.size < 1
-  $stderr.puts "ERROR: url required"
-  $stderr.puts opts
-  exit 1
+begin
+  data = api.flatten.collect { |o| o.marshal_dump }
+  puts JSON.pretty_generate(data)
+rescue Embedly::BadResponseException => e
+  puts "#{e.response.code} :: #{e.response.message}"
 end
-
-Embedly::Config.logging = true if options.verbose
-
-options.args[:urls] = ARGV
-api = Embedly::API.new options.marshal_dump
-objs = [api.send(action.to_sym, options.args)].flatten.collect{|o| o.marshal_dump}
-puts JSON.pretty_generate(objs)

data/bin/embedly_oembed

@@ -1,79 +1,12 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path('../../lib', __FILE__))
-%w{embedly json optparse ostruct}.each {|l| require l}
+%w{embedly embedly/command_line json optparse ostruct}.each {|l| require l}
 
-options = OpenStruct.new({
-  :hostname => nil,
-  :key => ENV['EMBEDLY_KEY'] == '' ? nil : ENV['EMBEDLY_KEY'],
-  :verbose => false,
-  :args => {},
-  :headers => {}
-})
+api = Embedly::CommandLine.run!(:oembed, ARGV)
 
-action = File.basename(__FILE__)[/embedly_(\w+)/, 1]
-
-opts = OptionParser.new do |opts|
-  opts.banner = <<-DOC
-Fetch JSON from the embedly #{action} service.
-Usage #{action} [OPTIONS] <url> [url] ..
-  DOC
-
-  opts.separator ""
-  opts.separator "Options:"
-
-  opts.on("-H", "--hostname ENDPOINT",
-          "Embedly host.  Default is api.embed.ly.") do |e|
-    options.hostname = e
-  end
-
-  opts.on("--header NAME=VALUE",
-          "HTTP header to send with requests.") do |header|
-    n,v = header.split '='
-    options.headers[n] = v
-  end
-
-  opts.on("-k", "--key KEY", "Embedly key [default: " +
-                             "EMBEDLY_KEY environmental variable]") do |k|
-    options.key = k
-  end
-
-  opts.on("-N", "--no-key", "Ignore EMBEDLY_KEY environmental variable") do
-    options.key = nil
-  end
-
-  opts.on("-o", "--option NAME=VALUE", "Set option to be passed as " +
-                                       "query param.") do |o|
-    k,v = o.split('=')
-    options.args[k] = v
-  end
-
-  opts.separator ""
-  opts.separator "Common Options:"
-
-  opts.on("-v", "--verbose", "Run verbosely") do
-    options.verbose = true
-  end
-
-  opts.on("-h", "--help", "Display this message") do
-    puts opts
-    exit
-  end
-
-  opts.separator ""
-  opts.separator "Bob Corsaro <bob@embed.ly>"
-end
-
-opts.parse!
-
-if ARGV.size < 1
-  $stderr.puts "ERROR: url required"
-  $stderr.puts opts
-  exit 1
+begin
+  data = api.flatten.collect { |o| o.marshal_dump }
+  puts JSON.pretty_generate(data)
+rescue Embedly::BadResponseException => e
+  puts "#{e.response.code} :: #{e.response.message}"
 end
-
-Embedly::Config.logging = true if options.verbose
-
-options.args[:urls] = ARGV
-api = Embedly::API.new options.marshal_dump
-objs = [api.send(action.to_sym, options.args)].flatten.collect{|o| o.marshal_dump}
-puts JSON.pretty_generate(objs)

data/bin/embedly_preview

@@ -1,79 +1,12 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path('../../lib', __FILE__))
-%w{embedly json optparse ostruct}.each {|l| require l}
+%w{embedly embedly/command_line json optparse ostruct}.each {|l| require l}
 
-options = OpenStruct.new({
-  :hostname => nil,
-  :key => ENV['EMBEDLY_KEY'] == '' ? nil : ENV['EMBEDLY_KEY'],
-  :verbose => false,
-  :args => {},
-  :headers => {}
-})
+api = Embedly::CommandLine.run!(:preview, ARGV)
 
-action = File.basename(__FILE__)[/embedly_(\w+)/, 1]
-
-opts = OptionParser.new do |opts|
-  opts.banner = <<-DOC
-Fetch JSON from the embedly #{action} service.
-Usage #{action} [OPTIONS] <url> [url] ..
-  DOC
-
-  opts.separator ""
-  opts.separator "Options:"
-
-  opts.on("-H", "--hostname ENDPOINT",
-          "Embedly host.  Default is api.embed.ly.") do |e|
-    options.hostname = e
-  end
-
-  opts.on("--header NAME=VALUE",
-          "HTTP header to send with requests.") do |header|
-    n,v = header.split '='
-    options.headers[n] = v
-  end
-
-  opts.on("-k", "--key KEY", "Embedly key [default: " +
-                             "EMBEDLY_KEY environmental variable]") do |k|
-    options.key = k
-  end
-
-  opts.on("-N", "--no-key", "Ignore EMBEDLY_KEY environmental variable") do
-    options.key = nil
-  end
-
-  opts.on("-o", "--option NAME=VALUE", "Set option to be passed as " +
-                                       "query param.") do |o|
-    k,v = o.split('=')
-    options.args[k] = v
-  end
-
-  opts.separator ""
-  opts.separator "Common Options:"
-
-  opts.on("-v", "--verbose", "Run verbosely") do
-    options.verbose = true
-  end
-
-  opts.on("-h", "--help", "Display this message") do
-    puts opts
-    exit
-  end
-
-  opts.separator ""
-  opts.separator "Bob Corsaro <bob@embed.ly>"
-end
-
-opts.parse!
-
-if ARGV.size < 1
-  $stderr.puts "ERROR: url required"
-  $stderr.puts opts
-  exit 1
+begin
+  data = api.flatten.collect { |o| o.marshal_dump }
+  puts JSON.pretty_generate(data)
+rescue Embedly::BadResponseException => e
+  puts "#{e.response.code} :: #{e.response.message}"
 end
-
-Embedly::Config.logging = true if options.verbose
-
-options.args[:urls] = ARGV
-api = Embedly::API.new options.marshal_dump
-objs = [api.send(action.to_sym, options.args)].flatten.collect{|o| o.marshal_dump}
-puts JSON.pretty_generate(objs)

data/features/objectify.feature

@@ -11,5 +11,5 @@ Feature: Objectify
         And objectify api_version is 2
 
         Examples:
-            | url                            | metadesc                |
-            | http://tweetphoto.com/14784358 | Earn PTZ when you watch |
+            | url                            | metadesc                                  |
+            | http://lockerz.com/s/136425091 | Quentin Richardson's Photo on Lockerz.com |

data/features/oembed.feature

@@ -5,20 +5,23 @@ Feature: OEmbed
     Because I want and oembed for a specific url
 
     Scenario Outline: Get the provider_url
-        Given an embedly api
+        Given an embedly api with key
         When oembed is called with the <url> URL
         Then the provider_url should be <provider_url>
 
         Examples:
-            | url                                                          | provider_url            |
-            | http://www.scribd.com/doc/13994900/Easter                    | http://www.scribd.com/  |
-            | http://www.scribd.com/doc/28452730/Easter-Cards              | http://www.scribd.com/  |
-            | http://www.youtube.com/watch?v=Zk7dDekYej0                   | http://www.youtube.com/ |
-            | http://yfrog.com/h7qqespj                                    | http://yfrog.com        |
+            | url                                                                              | provider_url               |
+            | http://www.scribd.com/doc/13994900/Easter                                        | http://www.scribd.com/     |
+            | http://www.scribd.com/doc/28452730/Easter-Cards                                  | http://www.scribd.com/     |
+            | http://www.youtube.com/watch?v=Zk7dDekYej0                                       | http://www.youtube.com/    |
+            | http://yfrog.com/h7qqespj                                                        | http://yfrog.com           |
+            | http://blog.embed.ly/bob                                                         | http://posterous.com       |
+            | http://blog.doki-pen.org/cassandra-rules                                         | http://posterous.com       |
+            | http://www.guardian.co.uk/media/2011/jan/21/andy-coulson-phone-hacking-statement | http://www.guardian.co.uk/ |
 
 
     Scenario Outline: Get the types
-        Given an embedly api
+        Given an embedly api with key
         When oembed is called with the <url> URL
         Then the type should be <type>
 
@@ -31,7 +34,7 @@ Feature: OEmbed
 
 
     Scenario Outline: Get the provider_url with force flag
-        Given an embedly api
+        Given an embedly api with key
         When oembed is called with the <url> URL and force flag
         Then the provider_url should be <provider_url>
 
@@ -41,7 +44,7 @@ Feature: OEmbed
 
 
     Scenario Outline: Get multiple provider_urls
-        Given an embedly api
+        Given an embedly api with key
         When oembed is called with the <urls> URLs
         Then provider_url should be <provider_urls>
 
@@ -51,20 +54,8 @@ Feature: OEmbed
             | http://www.youtube.com/watch?v=Zk7dDekYej0,http://yfrog.com/h7qqespj                      | http://www.youtube.com/,http://yfrog.com      |
 
 
-    Scenario Outline: Get the provider_url with pro
-        Given an embedly api with key
-        When oembed is called with the <url> URL
-        Then the provider_url should be <provider_url>
-
-        Examples:
-            | url                                                                              | provider_url               |
-            | http://blog.embed.ly/bob                                                         | http://posterous.com       |
-            | http://blog.doki-pen.org/cassandra-rules                                         | http://posterous.com       |
-            | http://www.guardian.co.uk/media/2011/jan/21/andy-coulson-phone-hacking-statement | http://www.guardian.co.uk/ |
-
-
     Scenario Outline: Attempt to get 404 URL
-        Given an embedly api
+        Given an embedly api with key
         When oembed is called with the <url> URL
         Then type should be error
         And error_code should be 404
@@ -73,12 +64,11 @@ Feature: OEmbed
         Examples:
             | url                                                              |
             | http://www.youtube.com/watch/is/a/bad/url                        |
-            | http://www.scribd.com/doc/zfldsf/asdfkljlas/klajsdlfkasdf        |
             | http://fav.me/alsfsdf                                            |
         
 
     Scenario Outline: Attempt multi get 404 URLs
-        Given an embedly api
+        Given an embedly api with key
         When oembed is called with the <urls> URLs
         Then error_code should be <errcode>
         And type should be <types>
@@ -86,21 +76,5 @@ Feature: OEmbed
         Examples:
             | urls                                                                             | errcode | types       |
             | http://www.youtube.com/watch/a/bassd/url,http://www.youtube.com/watch/ldf/asdlfj | 404,404 | error,error |
-            | http://www.scribd.com/doc/lsbsdlfldsf/kl,http://www.scribd.com/doc/zasdf/asdfl   | 404,404 | error,error |
             | http://www.youtube.com/watch/zzzzasdf/kl,http://yfrog.com/h7qqespj               | 404,    | error,photo |
-            | http://yfrog.com/h7qqespj,http://www.scribd.com/doc/asdfasdfasdf                 | ,404    | photo,error |
-        
-    Scenario Outline: Attempt at non-api service without key
-        Given an embedly api
-        When oembed is called with the <url> URL
-        Then error_code should be 401
-        And error_message should be Embedly api key is required.
-        And type should be error
-
-        Examples:
-            | urls                                                                             | 
-            | http://hn.embed.ly/                                                              | 
-            | http://bit.ly/enZRxO                                                             | 
-            | http://techcrunch.com/2011/02/03/linkedins-next-data-dive-professional-skills/   | 
-            | http://teachertube.com/rssPhoto.php                                              | 
-            | http://goo.gl/y1i9p                                                              | 
+            | http://yfrog.com/h7qqespj,http://www.youtube.com/watch/asdfasdfasdf              | ,404    | photo,error |

data/features/steps/api_steps.rb

@@ -9,6 +9,7 @@ Given /an embedly api( with key)?$/ do |key_enabled|
   if key_enabled
     raise 'Please set env variable $EMBEDLY_KEY' unless ENV['EMBEDLY_KEY']
     opts[:key] = ENV["EMBEDLY_KEY"] 
+    opts[:secret] = ENV["EMBEDLY_SECRET"] 
   end
   if not HOSTNAMES[opts]
     HOSTNAMES[opts] = Embedly::API.new opts

data/lib/embedly/api.rb

@@ -1,8 +1,11 @@
 require 'net/http'
+require 'net/https'
 require 'json'
 require 'ostruct'
 require 'embedly/model'
+require 'embedly/exceptions'
 require 'querystring'
+require 'oauth'
 
 
 # Performs api calls to embedly.
@@ -34,7 +37,7 @@ require 'querystring'
 #   api.new_method :arg1 => '1', :arg2 => '2'
 #
 class Embedly::API
-  attr_reader :key, :hostname, :api_version, :headers
+  attr_reader :key, :hostname, :api_version, :headers, :secret
 
   def logger *args
     Embedly.logger *args
@@ -44,16 +47,48 @@ class Embedly::API
   #
   # [:+hostname+] Hostname of embedly server.  Defaults to api.embed.ly.
   # [:+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;)
   # [:+headers+] Additional headers to send with requests.
   def initialize opts={}
     @endpoints = [:oembed, :objectify, :preview]
     @key = opts[:key]
+    @secret = opts[:secret] == "" ? nil : opts[:secret]
     @api_version = Hash.new('1')
     @api_version.merge!({:objectify => '2'})
     @hostname = opts[:hostname] || 'api.embed.ly'
-    @headers = opts[:headers] || {}
-    @headers['User-Agent'] = opts[:user_agent] || "Mozilla/5.0 (compatible; embedly-ruby/#{Embedly::VERSION};)"
+    @headers = {
+      'User-Agent' => opts[:user_agent] || "Mozilla/5.0 (compatible; embedly-ruby/#{Embedly::VERSION};)"
+    }.merge(opts[:headers]||{})
+  end
+
+  def _do_basic_call path
+    scheme, host, port = uri_parse hostname
+    logger.debug { "calling #{site}#{path} with headers #{headers}" }
+    Net::HTTP.start(host, port, :use_ssl => scheme == 'https') do |http|
+      http.get(path, headers)
+    end
+  end
+
+  def _do_oauth_call path
+    consumer = OAuth::Consumer.new(key, secret,
+      :site => site, 
+      :http_method => :get,
+      :scheme => :query_string)
+    # our implementation is broken for header authorization, thus the 
+    # query_string
+
+    access_token = OAuth::AccessToken.new consumer
+    logger.debug { "calling #{site}#{path} with headers #{headers} via OAuth" }
+    access_token.get path, headers
+  end
+
+  def _do_call path
+    if key and secret
+      _do_oauth_call path
+    else
+      _do_basic_call path
+    end
   end
 
   # <b>Use methods oembed, objectify, preview in favor of this method.</b>
@@ -93,19 +128,14 @@ class Embedly::API
     end
 
     if params[:urls].size > 0
-      params[:key] = key if key
+      params[:key] = key if key and not secret
       params.merge!Hash[
         opts.select{|k,_| not [:url, :urls, :action, :version].index k}
       ]
 
       path = "/#{opts[:version]}/#{opts[:action]}?#{QueryString.stringify(params)}"
 
-      logger.debug { "calling #{hostname}#{path} with headers #{headers}" }
-
-      host, port = uri_parse(hostname)
-      response = Net::HTTP.start(host, port) do |http|
-        http.get(path, headers)
-      end
+      response = _do_call path
 
       if response.code.to_i == 200
         logger.debug { response.body }
@@ -114,8 +144,8 @@ class Embedly::API
           Embedly::EmbedlyObject.new(o)
         end
       else
-        logger.error { response.inspect }
-        raise 'An unexpected error occurred'
+        logger.debug { response }
+        raise Embedly::BadResponseException.new response
       end
 
       # re-insert rejects into response
@@ -137,10 +167,7 @@ class Embedly::API
   # see http://api.embed.ly/docs/service for a description of the response.
   def services
     if not @services
-      host, port = uri_parse(hostname)
-      response = Net::HTTP.start(host, port) do |http|
-        http.get('/1/services/ruby', headers)
-      end
+      response = _do_call '/1/services/ruby'
       raise 'services call failed', response if response.code.to_i != 200
       @services = JSON.parse(response.body)
     end
@@ -174,10 +201,20 @@ class Embedly::API
 
   private
   def uri_parse uri
-    uri =~ %r{^(http(s?)://)?([^:/]+)(:([\d]+))?(/.*)?$}
-    host = $3
-    port = $5 ? $5 : ( $2 ? 443 : 80)
-    [host, port.to_i]
+    uri =~ %r{^((http(s?))://)?([^:/]+)(:([\d]+))?(/.*)?$}
+    scheme = $2 || 'http'
+    host = $4
+    port = $6 ? $6 : ( scheme == 'https' ? 443 : 80)
+    [scheme, host, port.to_i]
+  end
+
+  def site
+    scheme, host, port = uri_parse hostname
+    if (scheme == 'http' and port == 80) or (scheme == 'https' and port == 443)
+      "#{scheme}://#{host}"
+    else
+      "#{scheme}://#{host}:#{port}"
+    end
   end
 
   def logger

data/lib/embedly/command_line.rb

@@ -0,0 +1,126 @@
+require "optparse"
+
+module Embedly
+  class CommandLine
+
+    class Parser
+      attr_accessor :options
+
+      def initialize(args)
+        @options, @args = default, args
+      end
+
+      def parse!
+        parser.parse!(@args)
+        set_urls!
+        reject_nil!
+        options
+      rescue OptionParser::InvalidOption => error
+        puts "ERROR: #{error.message}"
+        puts parser.on_tail
+        exit
+      end
+
+      def self.parse!(args)
+        new(args).parse!
+      end
+
+      private
+
+      def default
+        {
+          :key => ENV['EMBEDLY_KEY'],
+          :secret => ENV['EMBEDLY_SECRET'],
+          :headers => {},
+          :query => {}
+        }
+      end
+
+      def reject_nil!
+        options.reject! { |_, opt| opt.nil? }
+      end
+
+      def set_urls!
+        raise(OptionParser::InvalidOption, "url required") if @args.empty?
+        options[:query][:urls] = @args
+      end
+
+      def parser
+        OptionParser.new do |parser|
+          parser.banner = %{
+Fetch JSON from the embedly service.
+Usage [OPTIONS] <url> [url] ..
+}
+
+          parser.separator ""
+          parser.separator "Options:"
+
+          parser.on('-H', '--hostname ENDPOINT', 'Embedly host. Default is api.embed.ly.') do |hostname|
+            options[:hostname] = hostname
+          end
+
+          parser.on("--header NAME=VALUE", "HTTP header to send with requests.") do |hash|
+            header, value = hash.split '='
+            options[:headers][header] = value
+          end
+
+          parser.on("-k", "--key KEY", "Embedly key [default: EMBEDLY_KEY environmental variable]") do |key|
+            options[:key] = key
+          end
+
+          parser.on("-N", "--no-key", "Ignore EMBEDLY_KEY environmental variable") do |key|
+            options[:key] = nil
+          end
+
+          parser.on("-s", "--secret SECRET", "Embedly secret [default: EMBEDLY_SECRET environmental variable]") do |secret|
+            options[:secret] = secret
+          end
+
+          parser.on("--no-secret", "Ignore EMBEDLY_SECRET environmental variable") do
+            options[:secret] = nil
+          end
+
+          parser.on("-o", "--option NAME=VALUE", "Set option to be passed as query param.") do |option|
+            key, value = option.split('=')
+            options[:query][key.to_sym] = value
+          end
+
+          parser.separator ""
+          parser.separator "Common Options:"
+
+          parser.on("-v", "--[no-]verbose", "Run verbosely") do |verbose|
+            Embedly::Config.logging = verbose
+          end
+
+          parser.on("-h", "--help", "Display this message") do
+            puts parser
+            exit
+          end
+
+          parser.separator ""
+          parser.separator "Bob Corsaro <bob@embed.ly>"
+        end
+      end
+    end
+
+    class << self
+      def run!(endpoint, args = [])
+        new(args).run(endpoint)
+      end
+    end
+
+    def initialize(args)
+      @options, @args = {}, args
+    end
+
+    def run(endpoint = :oembed)
+      api_options = options.dup
+      query = api_options.delete(:query)
+      Embedly::API.new(api_options).send(endpoint, query)
+    end
+
+    def options
+      @options = Parser.parse!(@args.dup)
+    end
+  end
+end

data/lib/embedly/exceptions.rb

@@ -0,0 +1,7 @@
+class Embedly::BadResponseException < RuntimeError
+  attr_accessor :response
+
+  def initialize response
+    @response ||= response
+  end
+end

data/spec/embedly/command_line_spec.rb

@@ -0,0 +1,118 @@
+require "spec_helper"
+require "embedly/command_line"
+
+module Embedly
+  describe CommandLine do
+    after do
+      ENV['EMBEDLY_KEY'] = nil
+      ENV['EMBEDLY_SECRET'] = nil
+    end
+
+    describe "::run!" do
+      let(:arguments) { ['-k', 'MY_KEY', 'http://yfrog.com/h7qqespj', '-o', 'maxwidth=10'] }
+      let(:api) { mock(API) }
+
+      it "calls api with options" do
+        API.should_receive(:new).with(:key => 'MY_KEY', :headers => {}) { api }
+        api.should_receive(:oembed).with(:urls => ['http://yfrog.com/h7qqespj'], :maxwidth => '10')
+        CommandLine.run!(:oembed, arguments)
+      end
+
+      it "raises an error if the arguments are empty" do
+        $stdout = StringIO.new
+        expect {
+          CommandLine.run!(:oembed, [])
+        }.to raise_error(SystemExit)
+      end
+    end
+
+    describe "#run" do
+      before do
+        API.any_instance.stub(:oembed)
+      end
+
+      describe "with option --hostname" do
+        %w[-H --hostname].each do |option|
+          it "sets the hostname using #{option}" do
+            command([option, "sth.embed.ly"])[:hostname].should == 'sth.embed.ly'
+          end
+        end
+      end
+
+      describe "with --header" do
+        it "sets the header" do
+          command(%w[--header Header=value])[:headers].should == { 'Header' => 'value' }
+        end
+      end
+
+      describe "with --key" do
+        %w[-k --key].each do |option|
+          it "sets the key using #{option}" do
+            command([option, "SOME_KEY"])[:key].should == 'SOME_KEY'
+          end
+        end
+
+        it "gets the key from environment variables if no key was set" do
+          ENV['EMBEDLY_KEY'] = 'ENVIRONMENT_KEY'
+
+          command([])[:key].should == 'ENVIRONMENT_KEY'
+        end
+      end
+
+      describe "with --secret" do
+        %w[-s --secret].each do |option|
+          it "sets the secret using #{option}" do
+            command([option, "SECRET"])[:secret].should == 'SECRET'
+          end
+        end
+
+        it "gets the secret from environment variables if no secret was set" do
+          ENV['EMBEDLY_SECRET'] = 'ENVIRONMENT_SECRET'
+
+          command([])[:secret].should == 'ENVIRONMENT_SECRET'
+        end
+      end
+
+      describe "with --no-key" do
+        %w[-N --no-key].each do |option|
+          it "unsets the key using #{option}" do
+            command([option])[:key].should be_nil
+          end
+        end
+      end
+
+      describe "with --no-secret" do
+        it "unsets the secret" do
+          command(['--no-secret'])[:secret].should be_nil
+        end
+      end
+
+      describe "with --option" do
+        %w[-o --option].each do |option|
+          it "sets custom option with #{option}" do
+            command([option, "maxwidth=100"])[:query][:maxwidth].should == '100'
+          end
+        end
+      end
+
+      describe "with --verbose" do
+        it "enables logging" do
+          command(["--verbose"])
+          Embedly::Config.logging.should be_true
+        end
+
+        it "disables logging" do
+          command(["--no-verbose"])
+          Embedly::Config.logging.should be_false
+        end
+      end
+    end
+
+    def command(arguments)
+      arguments << 'testurl.com'
+      command = CommandLine.new(arguments)
+      command.run
+      command.options
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require "embedly"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-22 00:00:00.000000000 -04:00
+date: 2011-09-06 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: querystring
-  requirement: &72141180 !ruby/object:Gem::Requirement
+  requirement: &72100880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *72141180
+  version_requirements: *72100880
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: &72100640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *72100640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &72195490 !ruby/object:Gem::Requirement
+  requirement: &72100400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72195490
+  version_requirements: *72100400
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &72195250 !ruby/object:Gem::Requirement
+  requirement: &72100160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72195250
+  version_requirements: *72100160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &72195010 !ruby/object:Gem::Requirement
+  requirement: &72099920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72195010
+  version_requirements: *72099920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &72194770 !ruby/object:Gem::Requirement
+  requirement: &72099680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72194770
+  version_requirements: *72099680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &72194530 !ruby/object:Gem::Requirement
+  requirement: &72099440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72194530
+  version_requirements: *72099440
 description: Ruby Embedly client library
 email: bob@embed.ly
 executables:
@@ -106,7 +117,11 @@ files:
 - features/steps/env.rb
 - lib/embedly.rb
 - lib/embedly/api.rb
+- lib/embedly/command_line.rb
+- lib/embedly/exceptions.rb
 - lib/embedly/model.rb
+- spec/embedly/command_line_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/embedly/embedly-ruby
 licenses:
@@ -123,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 44977427
+      hash: 930401473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: