tweetlr 0.1.4pre → 0.1.4pre2

data/lib/tweetlr.rb

@@ -1,3 +1,4 @@
+# encode: UTF-8
 require 'logger'
 require 'yaml'
 require 'curb'
@@ -5,7 +6,7 @@ require 'json'
 
 class Tweetlr
 
-  VERSION = '0.1.4pre'
+  VERSION = '0.1.4pre2'
   GENERATOR = %{tweetlr - http://github.com/5v3n/tweetlr}
   USER_AGENT = %{Mozilla/5.0 (compatible; tweetlr/#{VERSION}; +http://github.com/5v3n/tweetlr/wiki)}
   LOCATION_START_INDICATOR = 'Location: '
@@ -248,8 +249,12 @@ class Tweetlr
       begin
         JSON.parse curl.body_str
       rescue JSON::ParserError => err
-        @log.warn "#{err}: Could not parse response for #{request} - this is probably not a json response: #{curl.body_str}"
-        return nil
+        begin
+          @log.warn "#{err}: Could not parse response for #{request} - this is probably not a json response: #{curl.body_str}"
+          return nil
+        rescue Encoding::CompatibilityError => err
+          @log.error "Trying to rescue a JSON::ParserError for '#{requet}' we got stuck in a Encoding::CompatibilityError."
+        end
       end
     rescue Curl::Err::ConnectionFailedError => err
       @log.error "Connection failed: #{err}"

data/spec/tweetlr_spec.rb

@@ -73,6 +73,9 @@ describe Tweetlr do
     it "should not crash if embedly fallback won't find a link" do
       url = @tweetlr.find_image_url "http://mopskopf"     
     end
+    it "should not crash with an encoding error when instagram says 'No URL Match'" do
+      url = @tweetlr.find_image_url "http://api.instagram.com/oembed?url=http://instagr.am/p/Gx%E2%80%946/"
+    end
   end
   describe "tweet api response processing" do
     it "should extract links" do
@@ -83,6 +86,7 @@ describe Tweetlr do
       link.should == @links[:instagram].chop
     end
   end
+  
   def check_pic_url_extraction(service)
     tweetlr = @tweetlr
     image_url = tweetlr.send "image_url_#{service}".to_sym, @links[service]

data/tweetlr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "tweetlr"
-  s.version     = "0.1.4pre"
+  s.version     = "0.1.4pre2"
   s.author      = "Sven Kraeuter"
   s.email       = "mail@svenkraeuter.com"
   s.homepage    = "http://github.com/5v3n/#{s.name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetlr
 version: !ruby/object:Gem::Version
-  version: 0.1.4pre
+  version: 0.1.4pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-20 00:00:00.000000000 +02:00
+date: 2011-07-16 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2153442240 !ruby/object:Gem::Requirement
+  requirement: &2153676500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153442240
+  version_requirements: *2153676500
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2153441740 !ruby/object:Gem::Requirement
+  requirement: &2153676000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2153441740
+  version_requirements: *2153676000
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2153441280 !ruby/object:Gem::Requirement
+  requirement: &2153675540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.7.15
   type: :runtime
   prerelease: false
-  version_requirements: *2153441280
+  version_requirements: *2153675540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153440820 !ruby/object:Gem::Requirement
+  requirement: &2153675080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153440820
+  version_requirements: *2153675080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153440360 !ruby/object:Gem::Requirement
+  requirement: &2153674620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153440360
+  version_requirements: *2153674620
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2153439900 !ruby/object:Gem::Requirement
+  requirement: &2153674160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 4.4.6
   type: :development
   prerelease: false
-  version_requirements: *2153439900
+  version_requirements: *2153674160
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2153439440 !ruby/object:Gem::Requirement
+  requirement: &2153673700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.9
   type: :development
   prerelease: false
-  version_requirements: *2153439440
+  version_requirements: *2153673700
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &2153438980 !ruby/object:Gem::Requirement
+  requirement: &2153673240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.2.5
   type: :development
   prerelease: false
-  version_requirements: *2153438980
+  version_requirements: *2153673240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153461120 !ruby/object:Gem::Requirement
+  requirement: &2153672860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153461120
+  version_requirements: *2153672860
 description: tweetlr crawls twitter for a given term, extracts photos out of the collected
   tweets' short urls and posts the images to tumblr.
 email: mail@svenkraeuter.com