embedly 0.3.0 → 0.3.1

data/ChangeLog

@@ -0,0 +1,7 @@
+*embedly-0.3.0 (04 Feb 2011)
+
+	04 Feb 2011: Bob Corsaro <bob@embed.ly>
+	Services methods always return an array, even for a single URL
+
+	04 Feb 2011: Bob Corsaro <bob@embed.ly>
+	URLs are checked against the services regex for non-Pro calls

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/embedly_objectify

@@ -4,7 +4,7 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 
 options = OpenStruct.new({
   :endpoint => nil,
-  :key => ENV['EMBEDLY_KEY'],
+  :key => ENV['EMBEDLY_KEY'] == '' ? nil : ENV['EMBEDLY_KEY'],
   :verbose => false,
   :args => {}
 })

data/bin/embedly_oembed

@@ -4,7 +4,7 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 
 options = OpenStruct.new({
   :endpoint => nil,
-  :key => ENV['EMBEDLY_KEY'],
+  :key => ENV['EMBEDLY_KEY'] == '' ? nil : ENV['EMBEDLY_KEY'],
   :verbose => false,
   :args => {}
 })

data/bin/embedly_preview

@@ -4,7 +4,7 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 
 options = OpenStruct.new({
   :endpoint => nil,
-  :key => ENV['EMBEDLY_KEY'],
+  :key => ENV['EMBEDLY_KEY'] == '' ? nil : ENV['EMBEDLY_KEY'],
   :verbose => false,
   :args => {}
 })

data/features/objectify.feature

@@ -8,6 +8,17 @@ Feature: Objectify
         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
+        Then the meta.description should start with <metadesc>
+        And objectify api_version is 2
 
         Examples:
             | url                            | metadesc                 |

data/features/steps/api_steps.rb

@@ -38,6 +38,10 @@ Then /an? (\w+) error should get thrown/ do |error|
   @error.class.to_s.should == error
 end
 
+Then /objectify api_version is (\d+)$/ do |version|
+  @api.api_version[:objectify].should == version
+end
+
 Then /([^\s]+) should be (.+)$/ do |key, value|
   raise @error if @error
   logger = Embedly.logger('api_steps')

data/lib/embedly/api.rb

@@ -30,7 +30,7 @@ include ::Embedly
 # api_version hash.  Here is an example.
 #
 #   api = Embedly::API.new
-#   api.api_version['new_method'] = 3
+#   api.api_version[:new_method] = 3
 #   api.new_method :arg1 => '1', :arg2 => '2'
 #
 class Embedly::API
@@ -43,13 +43,14 @@ class Embedly::API
   # [:+user_agent+] Your User-Agent header.  Defaults to Mozilla/5.0 (compatible; embedly-ruby/VERSION;)
   def initialize opts={}
     @key = opts[:key]
+    @api_version = Hash.new('1')
     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
-    @api_version = Hash.new('1').merge!({'objectify' => '2'})
     @user_agent = opts[:user_agent] || "Mozilla/5.0 (compatible; embedly-ruby/#{Embedly::VERSION};)"
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Bob Corsaro
@@ -65,9 +65,11 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- ChangeLog
 - README.rdoc
 files: 
 - .rvmrc
+- ChangeLog
 - MIT-LICENSE
 - README.rdoc
 - Rakefile