muri 0.0.7 → 0.0.8

data/README.textile

@@ -35,7 +35,7 @@ Using muri is just as easy!
 </code>
 </pre>
 
-If @a.valid?@ you are good to go. If not, either the URI host was not recognized, or the path/parameters provided along with a known URI host were not recognized. When these two types of errors are encountered, an exception is caught and returned in @a.errors@ as either "Muri::NoParser" or "Muri::UnrecognizedURI". If you don't care about the type of error, just that the URI was not parsed, @a.valid?@ will give you a boolean answer.
+If @a.valid?@ you are good to go. If not, either the URI host was not recognized, or the path/parameters provided along with a known URI host were not recognized. When these two types of errors are encountered, an exception is caught and returned in @a.errors@ as either "Muri::NoParser" or "Muri::UnrecognizedURI" (or potentially "URI::BadURIError" or "URI::InvalidURIError" if the URI passed is bad). If you don't care about the type of error, just whether the URI was parsed, @a.valid?@ will give you a boolean answer.
 
 Assuming the URI was successfully parsed (thus @a.valid? == true@), all media types share several common attributes:
 
@@ -62,7 +62,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 
 * Services with a @media_api_id@ also have a @media_api_type@, which indicates what sort of API call should be made (be it 'photo', 'video', 'media', 'set', 'album', or 'playlist', depending on URI type)
 
-* A direct media url for Youtube, Photobucket, Twitpic, and Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format)
+* A direct media url for Youtube, Photobucket, Twitpic, Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format) and flickr (@http://farm#{num}.static.flickr.com/@ format)
 
 <pre>
 <code>
@@ -70,7 +70,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* A media landing website url for Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr media_url's provide the @http://flic.kr/p/#{ID}@ short url)
+* A media landing website url for Facebook (images, not video), Youtube, Photobucket, Imageshack, Vimeo, Twitpic, and Flickr (flickr returns the @http://flic.kr/p/#{ID}@ short url)
 
 <pre>
 <code>
@@ -78,7 +78,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* Content type for Imageshack, Photobucket and Flickr URI's (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+* Content type for Imageshack, Photobucket and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
 
 <pre>
 <code>
@@ -86,7 +86,7 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 </code>
 </pre>
 
-* Thumbnails URL for Youtube Photobucket, Twitpic, and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
+* Thumbnails URL for Youtube, Photobucket, Twitpic, and Flickr (flickr in the @http://farm#{num}.static.flickr.com/@ format)
 
 <pre>
 <code>

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 7
+:patch: 8

data/lib/muri/base.rb

@@ -66,7 +66,7 @@ class Muri
         raise NoParser
       end
     rescue NoParser, UnsupportedURI, URI::BadURIError, URI::InvalidURIError => e
-      @info[:errors] = "#{e}"
+      @info[:errors] = "#{e.class}"
     end
   end
   

data/lib/muri/filters/facebook.rb

@@ -34,7 +34,7 @@ class Muri
             @info[:website] = "#{url_common}/photo.php?pid=#{@info[:media_id]}&l=#{share_key}&id=#{media_creator}"
 
             # The media_api_id is the PID which can be searched for in the facebook photos table
-            @info[:media_api_id] = (media_creator << 32) + @info[:media_id]
+            @info[:media_api_id] = (media_creator.to_i << 32) + @info[:media_id].to_i
           end
         end
         

data/lib/muri/filters/flickr.rb

@@ -34,7 +34,9 @@ class Muri
 #             end
 #           end
 #           @info[:content_type] = $6
-            @info[:media_thumbnail] = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}_t.jpg"
+            url_prefix = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}"
+            @info[:media_url] = "#{url_prefix}.jpg"
+            @info[:media_thumbnail] = "#{url_prefix}_t.jpg"
         elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-z0-9]*)/i
           @info[:media_id] = self.class.decode58($1)
           @info[:media_api_type] = FLICKR_PHOTO

data/muri.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
@@ -46,13 +46,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "test/error_test.rb",
-     "test/facebook_test.rb",
-     "test/flickr_test.rb",
-     "test/imageshack_test.rb",
-     "test/photobucket_test.rb",
+    "test/facebook_test.rb",
      "test/twitpic_test.rb",
+     "test/photobucket_test.rb",
      "test/vimeo_test.rb",
+     "test/imageshack_test.rb",
+     "test/error_test.rb",
+     "test/flickr_test.rb",
      "test/youtube_test.rb"
   ]
 

data/test/error_test.rb

@@ -30,4 +30,8 @@ describe "Parse Errors" do
     end
   end
   
+  it "should not bomb if no URI is provided" do
+    lambda { Muri.parse '' }.should_not raise_exception()
+  end
+  
 end

data/test/facebook_test.rb

@@ -57,6 +57,6 @@ describe "Facebook parse second" do
   end
    
   it "should have media api id" do
-    @a.media_api_id == 65288068484364750
+    @a.media_api_id == '65288068484364750'
   end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - William Schneider
@@ -74,11 +74,11 @@ signing_key:
 specification_version: 3
 summary: Media URI Parser
 test_files: 
-- test/error_test.rb
 - test/facebook_test.rb
-- test/flickr_test.rb
-- test/imageshack_test.rb
-- test/photobucket_test.rb
 - test/twitpic_test.rb
+- test/photobucket_test.rb
 - test/vimeo_test.rb
+- test/imageshack_test.rb
+- test/error_test.rb
+- test/flickr_test.rb
 - test/youtube_test.rb