embedly 0.3.2 → 0.3.3

data/ChangeLog

@@ -1,3 +1,7 @@
+*embedly-0.3.3 (20 Feb 2011)
+	20 Feb 2011: Bob Corsaro <bob@embed.ly>
+	Fixes namespace issue
+
 *embedly-0.3.0 (04 Feb 2011)
 
 	04 Feb 2011: Bob Corsaro <bob@embed.ly>

data/README.rdoc

@@ -12,7 +12,7 @@ To install the official latest stable version, please use rubygems.
 
 If you would like cutting edge, then you can clone and install HEAD.
 
-  git clone git@github.com:embedly/embedly-ruby.git
+  git clone git://github.com/embedly/embedly-ruby.git
   cd embedly-ruby
   rake install
 
@@ -23,17 +23,17 @@ You can find rdocs at http://rubydoc.info/github/embedly/embedly-ruby/master/fra
   require 'embedly'
   require 'json'
 
-  embedly_api = Embedly::API.new
+  embedly_api = Embedly::API.new :user_agent => 'Mozilla/5.0 (compatible; mytestapp/1.0; my@email.com)'
 
   # single url
-  obj = embedly_api.oembed :url => 'http://blog.embed.ly'
+  obj = embedly_api.oembed :url => 'http://www.youtube.com/watch?v=sPbJ4Z5D-n4&feature=topvideos'
   puts obj[0].marshal_dump
   json_obj = JSON.pretty_generate(obj[0].marshal_dump)
   puts json_obj
 
   # multiple urls with opts
   objs = embedly_api.oembed(
-    :urls => ['http://blog.embed.ly', 'http://blog.doki-pen.org'],
+    :urls => ['http://www.youtube.com/watch?v=sPbJ4Z5D-n4&feature=topvideos', 'http://twitpic.com/3yr7hk'],
     :maxWidth => 450,
     :wmode => 'transparent',
     :method => 'after'
@@ -42,7 +42,8 @@ You can find rdocs at http://rubydoc.info/github/embedly/embedly-ruby/master/fra
   puts json_obj
 
   # call pro with key (you'll need a real key)
-  embedly_pro = Embedly::API.new :key => 'xxxxxxxxxxxxxxxxxxxxxxxxxx'
+  embedly_pro = 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
   puts JSON.pretty_generate(obj[0].marshal_dump)

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/features/oembed.feature

@@ -74,7 +74,7 @@ Feature: OEmbed
             | url                                                              |
             | http://www.youtube.com/watch/is/a/bad/url                        |
             | http://www.scribd.com/doc/zfldsf/asdfkljlas/klajsdlfkasdf        |
-            | http://tweetphoto.com/alsdfldsf/asdfkljlas/klajsdlfkasdf         |
+            | http://fav.me/alsfsdf                                            |
         
 
     Scenario Outline: Attempt multi get 404 URLs

data/lib/embedly/api.rb

@@ -3,7 +3,6 @@ require 'json'
 require 'ostruct'
 require 'embedly/model'
 
-include ::Embedly
 
 # Performs api calls to embedly.
 #
@@ -36,6 +35,10 @@ include ::Embedly
 class Embedly::API
   attr_reader :key, :endpoint, :api_version, :user_agent
 
+  def logger *args
+    Embedly.logger *args
+  end
+
   # === Options
   #
   # [:+endpoint+] Hostname of embedly server.  Defaults to api.embed.ly if no key is provided, pro.embed.ly if key is provided.
@@ -80,7 +83,7 @@ class Embedly::API
       params[:urls].reject!.with_index do |url, i| 
         if url !~ services_regex
           rejects << [i, 
-            EmbedlyObject.new(
+            Embedly::EmbedlyObject.new(
               :type => 'error', 
               :error_code => 401, 
               :error_message => 'This service requires an Embedly Pro account'
@@ -108,7 +111,9 @@ class Embedly::API
       if response.code.to_i == 200
         logger.debug { response.body }
         # [].flatten is to be sure we have an array
-        objs = [JSON.parse(response.body)].flatten.collect {|o| EmbedlyObject.new(o)}
+        objs = [JSON.parse(response.body)].flatten.collect do |o| 
+          Embedly::EmbedlyObject.new(o)
+        end
       else
         logger.error { response.inspect }
         raise 'An unexpected error occurred'

data/lib/embedly/model.rb

@@ -22,7 +22,7 @@ class Embedly::EmbedlyObject < OpenStruct
   def marshal_dump
     o = @table.clone
     o.each do |k,v|
-      if v.is_a?EmbedlyObject
+      if v.is_a?Embedly::EmbedlyObject
         o[k] = v.marshal_dump
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Bob Corsaro
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 -05:00
+date: 2011-02-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency