embedly 0.3.3 → 0.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@embedly
+rvm 1.9.2@embedly-ruby

data/Gemfile

@@ -0,0 +1,12 @@
+source :rubygems
+
+gem "querystring"
+
+group :development do
+  gem "jeweler"
+  gem "cucumber"
+  gem "rake"
+  gem "rspec"
+  gem "yard"
+end
+

data/README.rdoc

@@ -16,6 +16,10 @@ If you would like cutting edge, then you can clone and install HEAD.
   cd embedly-ruby
   rake install
 
+== Requirements
+
+  * querystring <https://github/dokipen/querystring>
+
 == Getting Started
 
 You can find rdocs at http://rubydoc.info/github/embedly/embedly-ruby/master/frames

data/Rakefile

@@ -1,48 +1,37 @@
 require 'rubygems'
-require 'rake'
+require 'bundler'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "embedly"
-    gem.summary = %Q{Ruby Embedly client library}
-    gem.description = %Q{Ruby Embedly client library}
-    gem.email = "bob@embed.ly"
-    gem.homepage = "http://github.com/embedly/embedly-ruby"
-    gem.authors = ["Bob Corsaro"]
-    gem.add_development_dependency "cucumber", ">= 0"
-    gem.add_development_dependency "jeweler", ">= 0"
-    gem.add_development_dependency "rspec", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-rescue LoadError
-  task :features do
-    abort "Cucumber is not installed"
-  end
-end
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-      t.files = FileList['lib/**/*.rb'].exclude('lib/jeweler/templates/**/*.rb')
-  end
-rescue LoadError
-  task :yard do
-    abort "Yard is not installed"
-  end
+require 'rake'
+require 'jeweler'
+
+Jeweler::Tasks.new do |gem|
+  gem.name = "embedly"
+  gem.summary = %Q{Ruby Embedly client library}
+  gem.description = %Q{Ruby Embedly client library}
+  gem.email = "bob@embed.ly"
+  gem.homepage = "http://github.com/embedly/embedly-ruby"
+  gem.authors = ["Bob Corsaro"]
+  gem.license = "MIT"
+
+  # in Gemfile
 end
+Jeweler::GemcutterTasks.new
 
-task :features => :check_dependencies
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
 
-task :default => :features
+require 'yard'
+YARD::Rake::YardocTask.new do |t|
+    t.files = FileList['lib/**/*.rb'].exclude('lib/jeweler/templates/**/*.rb')
+end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -53,3 +42,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :default => :features

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/bin/embedly_objectify

@@ -65,5 +65,5 @@ Embedly::Config.logging = true if options.verbose
 
 options.args[:urls] = ARGV
 api = Embedly::API.new options.marshal_dump
-objs = [api.send(action, options.args)].flatten.collect{|o| o.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

@@ -65,5 +65,5 @@ Embedly::Config.logging = true if options.verbose
 
 options.args[:urls] = ARGV
 api = Embedly::API.new options.marshal_dump
-objs = [api.send(action, options.args)].flatten.collect{|o| o.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

@@ -65,5 +65,5 @@ Embedly::Config.logging = true if options.verbose
 
 options.args[:urls] = ARGV
 api = Embedly::API.new options.marshal_dump
-objs = [api.send(action, options.args)].flatten.collect{|o| o.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 | Plixi allows user to ins |
+            | url                            | metadesc                |
+            | http://tweetphoto.com/14784358 | Earn PTZ when you watch |

data/features/oembed.feature

@@ -14,7 +14,7 @@ Feature: OEmbed
             | 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://tweetphoto.com/14784358                               | http://plixi.com        |
+            | http://yfrog.com/h7qqespj                                    | http://yfrog.com        |
 
 
     Scenario Outline: Get the types
@@ -27,7 +27,7 @@ Feature: OEmbed
             | http://www.scribd.com/doc/13994900/Easter                    | rich  |
             | http://www.scribd.com/doc/28452730/Easter-Cards              | rich  |
             | http://www.youtube.com/watch?v=Zk7dDekYej0                   | video |
-            | http://tweetphoto.com/14784358                               | photo |
+            | http://yfrog.com/h7qqespj                                    | photo |
 
 
     Scenario Outline: Get the provider_url with force flag
@@ -48,7 +48,7 @@ Feature: OEmbed
         Examples:
             | urls                                                                                      | provider_urls                                 |
             | http://www.scribd.com/doc/13994900/Easter,http://www.scribd.com/doc/28452730/Easter-Cards | http://www.scribd.com/,http://www.scribd.com/ |
-            | http://www.youtube.com/watch?v=Zk7dDekYej0,http://plixi.com/p/16044847                    | http://www.youtube.com/,http://plixi.com      |
+            | 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
@@ -87,8 +87,8 @@ Feature: OEmbed
             | 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://tweetphoto.com/14784358          | 404,    | error,photo |
-            | http://tweetphoto.com/14784358,http://www.scribd.com/doc/asdfasdfasdf            | ,404    | photo,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 endpoint

data/lib/embedly/api.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'json'
 require 'ostruct'
 require 'embedly/model'
+require 'querystring'
 
 
 # Performs api calls to embedly.
@@ -45,6 +46,7 @@ class Embedly::API
   # [:+key+] Your pro.embed.ly api key.
   # [:+user_agent+] Your User-Agent header.  Defaults to Mozilla/5.0 (compatible; embedly-ruby/VERSION;)
   def initialize opts={}
+    @endpoints = [:oembed, :objectify, :preview]
     @key = opts[:key]
     @api_version = Hash.new('1')
     @api_version.merge!({:objectify => '2'})
@@ -99,12 +101,12 @@ class Embedly::API
         opts.select{|k,_| not [:url, :urls, :action, :version].index k}
       ]
 
-      path = "/#{opts[:version]}/#{opts[:action]}?#{q params}"
+      path = "/#{opts[:version]}/#{opts[:action]}?#{QueryString.stringify(params)}"
 
       logger.debug { "calling #{endpoint}#{path}" }
 
-      url = URI.parse(absurl(endpoint))
-      response = Net::HTTP.start(url.host, url.port) do |http|
+      host, port = uri_parse(endpoint)
+      response = Net::HTTP.start(host, port) do |http|
         http.get(path, {'User-Agent' => user_agent})
       end
 
@@ -133,14 +135,14 @@ class Embedly::API
 
   # Returns structured data from the services API method.
   #
-  # Response is cached per API object.  
+  # Response is cached per API object.
   #
   # see http://api.embed.ly/docs/service for a description of the response.
   def services
     logger.warn { "services isn't availble on the pro endpoint" } if key
     if not @services
-      url = URI.parse(absurl(endpoint))
-      response = Net::HTTP.start(url.host, url.port) do |http|
+      host, port = uri_parse(endpoint)
+      response = Net::HTTP.start(host, port) do |http|
         http.get('/1/services/ruby', {'User-Agent' => user_agent})
       end
       raise 'services call failed', response if response.code.to_i != 200
@@ -164,35 +166,22 @@ class Embedly::API
   # - +preview+ _pro-only_
   #
   def method_missing(name, *args, &block)
-    opts = args[0]
-    opts[:action] = name
-    opts[:version] = @api_version[name]
-    apicall opts
+    if @endpoints.include?name
+      opts = args[0]
+      opts[:action] = name
+      opts[:version] = @api_version[name]
+      apicall opts
+    else
+      super
+    end
   end
 
   private
-  def absurl uri
-    uri !~ %r{^https?://.*} ? "http://#{uri}" : uri
-  end
-  
-  # Escapes url parameters
-  # TODO: move to utils
-  def escape s
-    s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/u) do
-      '%'+$1.unpack('H2'*$1.bytesize).join('%').upcase
-    end.tr(' ', '+')
-  end
-
-  # Creates query string
-  # TODO: move to utils
-  def q params
-    params.collect do |k,v|
-      if v.is_a?Array
-        "#{k.to_s}=#{v.collect{|i|escape(i)}.join(',')}"
-      else
-        "#{k.to_s}=#{escape(v)}"
-      end
-    end.join('&')
+  def uri_parse uri
+    uri =~ %r{^(http(s?)://)?([^:/]+)(:([\d]+))?(/.*)?$}
+    host = $3
+    port = $5 ? $5 : ( $2 ? 443 : 80)
+    [host, port.to_i]
   end
 
   def logger

metadata

@@ -1,75 +1,97 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: embedly
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Bob Corsaro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-20 00:00:00 -05:00
+date: 2011-05-20 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: cucumber
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: querystring
+  requirement: &68358050 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *68358050
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &68355990 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *68355990
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &68353970 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *68353970
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &68353080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *68353080
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &68352090 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *68352090
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &68319420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *68319420
 description: Ruby Embedly client library
 email: bob@embed.ly
-executables: 
+executables:
 - embedly_objectify
 - embedly_oembed
 - embedly_preview
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - ChangeLog
 - README.rdoc
-files: 
+files:
 - .rvmrc
 - ChangeLog
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -87,35 +109,31 @@ files:
 - lib/embedly/model.rb
 has_rdoc: true
 homepage: http://github.com/embedly/embedly-ruby
-licenses: []
-
+licenses:
+- MIT
 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 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -471678371
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby Embedly client library
 test_files: []
-