Merge branch 'master' of github.com:embedly/embedly-ruby

Author: Bob Corsaro

ChangeLog

@@ -1,3 +1,7 @@
+*embedly-0.3.3 (20 Feb 2011)
+	20 Feb 2011: Bob Corsaro <[email protected]>
+	Fixes namespace issue
+
 *embedly-0.3.0 (04 Feb 2011)
 
 	04 Feb 2011: Bob Corsaro <[email protected]>

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
 

VERSION

@@ -1 +1 @@
-0.3.0
+0.3.3

features/objectify.feature

@@ -4,16 +4,6 @@ Feature: Objectify
     I want to call the the embedly api
     Because I want to objectify a url
 
-    Scenario Outline: Get the meta description
-        Given an embedly endpoint
-        When objectify is called with the <url> URL
-        Then the meta.description should start with <metadesc>
-        And objectify api_version is 1
-
-        Examples:
-            | url                            | metadesc                 |
-            | http://tweetphoto.com/14784358 | Plixi allows user to ins |
-
     Scenario Outline: Get the meta description with pro
         Given an embedly endpoint with key
         When objectify is called with the <url> URL

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

lib/embedly/api.rb

@@ -4,7 +4,6 @@
 require 'embedly/model'
 require 'querystring'
 
-include ::Embedly
 
 # Performs api calls to embedly.
 #
@@ -37,6 +36,10 @@
 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.
@@ -45,10 +48,10 @@ class Embedly::API
   def initialize opts={}
     @key = opts[:key]
     @api_version = Hash.new('1')
+    @api_version.merge!({:objectify => '2'})
     if @key
       logger.debug('using pro')
       @endpoint = opts[:endpoint] || 'pro.embed.ly'
-      @api_version.merge!({:objectify => '2'})
     else
       @endpoint = opts[:endpoint] || 'api.embed.ly'
     end
@@ -81,7 +84,7 @@ def apicall opts
       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'
@@ -109,7 +112,9 @@ def apicall opts
       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'

lib/embedly/model.rb

@@ -22,7 +22,7 @@ def type
   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