muri 0.0.3 → 0.0.4

data/README.rdoc

@@ -20,25 +20,32 @@ Using muri is just as easy!
   a = Muri.parse('http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM')
   a.service         # 'Youtube'
   a.media_id        # 'blahblahblah'
-  a.media_url       # 'http://www.youtube.com/watch?v=blahblahblah' (flickr media_url's provide the flic.kr/p/ID short url)
   a.original_url    # 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
   a.uri             # URI object for 'http://www.youtube.com/watch?v=blahblahblah&feature=rec-LGOUT-exp_fresh+div-1r-1-HM'
 
 Due to variations in information which can be gathered from a uri, some services provide more information than others. For example:
-  * All but Imageshack have a media_api_id, which is the ID which can be used in API calls to the related services. Typically the same as media_id.
-    a.media_api_id  # 'blahblahblah'
-
-  * A direct media url for Youtube, Photobucket, and Flickr (http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME} format)
-    a.website         # 'http://www.youtube.com/v/blahblahblah'
-  
-  * Content type for Imageshack, Photobucket and Flickr URI's (flickr in the http://farm#{num}.static.flickr.com/ format)
-    a.content_type    # 'jpg' (Content Type also for Imageshack and Photobucket)
-    
-  * Thumbnails URL for Youtube Photobucket, and Flickr (flickr in the http://farm#{num}.static.flickr.com/ format)
-    a.media_thumbnail
-    
-  * Some additional information may be provided, which can be determined by looking through each filters code.
+* All but Imageshack have a +media_api_id+, which is the ID which can be used in API calls to the related services. Typically the same as +media_id+.
   
+    a.media_api_id     # 'blahblahblah'
+
+* A direct media url for Youtube, Photobucket, and Imageshack (img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME} format)
+
+    a.media_url         # 'http://www.youtube.com/v/blahblahblah'
+
+* A media landing website url for Youtube, Photobucket, Imageshack, Vimeo, and Flickr (flickr media_url's provide the flic.kr/p/ID short url)
+
+    a.website           # 'http://www.youtube.com/watch?v=blahblahblah' 
+
+* Content type for Imageshack, Photobucket and Flickr URI's (flickr in the farm#{num}.static.flickr.com/ format)
+
+    a.content_type      # 'jpg' (Content Type also for Imageshack and Photobucket)
+
+* Thumbnails URL for Youtube Photobucket, and Flickr (flickr in the farm#{num}.static.flickr.com/ format)
+
+    a.media_thumbnail   # 'http://i.ytimg.com/vi/4CYDFoEz8rg/default.jpg'
+
+* Some additional information may be provided, which can be determined by looking through each filters code.
+
 
 If an attribute is not present, muri returns +nil+.
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 3
+:patch: 4

data/lib/muri/base.rb

@@ -1,6 +1,12 @@
 require 'uri'
 class Muri
+
+  # NoParser raised if no parser is found for URI
   class NoParser < StandardError; end
+  
+  # UnsupportedURI raised if parser is found, but URI path does not 
+  #   match accepted formats
+  class UnsupportedURI < ArgumentError; end
     
   PARSERS = {}
   
@@ -66,17 +72,17 @@ class Muri
   end
       
   def method_missing(func, args = nil)
-    if @info[func.to_sym] != nil
-      @info[func.to_sym]
-    else
-      nil #super(func,args)
-    end
+    #if @info[func.to_sym] != nil
+      @info[func.to_sym].nil? ? nil : @info[func.to_sym]
+    #else
+    #  nil #super(func,args)
+    #end
   end
   
   protected
   
   #used by flickr. Ported from PHP.
-  def decode58(str)
+  def self.decode58(str)
     decoded = 0
     multi = 1
     alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
@@ -91,15 +97,15 @@ class Muri
   end
   
   #used by flickr. Ported from PHP.
-  def encode58(str)
+  def self.encode58(str)
     alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
     base_count = alphabet.length
     encoded = ''
     while str >= base_count
       div = str / base_count
-      mod = (str-(base_count * div.to_i))
+      mod = (str-(base_count * div))
       encoded = alphabet[mod,1] + encoded
-      str = div.to_i
+      str = div
     end
     encoded = (alphabet[str,1] + encoded) if str
     encoded

data/lib/muri/filters/flickr.rb

@@ -31,12 +31,14 @@ class Muri
 #           @info[:content_type] = $6
             @info[:media_thumbnail] = "http://farm#{farm}.static.flickr.com/#{server_id}/#{@info[:media_id]}_#{media_secret}_t.jpg"
         elsif (@url.host + @url.path) =~ /^flic\.kr\/p\/([a-z0-9]*)/i
-          @info[:media_id] = self.decode58($1)
+          @info[:media_id] = self.class.decode58($1)
         end
         
         if self.parsed?
           @info[:media_api_id] = @info[:media_id]
-          @info[:media_url] = "http://flic.kr/p/" + self.encode58(@info[:media_id].to_i)
+          @info[:website] = "http://flic.kr/p/" + self.class.encode58(@info[:media_id].to_i)
+        else
+          raise UnsupportedURI          
         end
         
         self
@@ -50,8 +52,9 @@ class Muri
     end
   end
 end
-# http://www.flickr.com/photos/bananastalktome/2088436532/
-# http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_m.jpg
+# http://www.flickr.com/photos/bananastalktome/2088436532/ (preview)
+# http://flic.kr/p/4bxMqq (preview)
+# http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_m.jpg (direct)
 #   farm-id: 3
 #   server-id: 2178
 #   photo-id: 2088436532

data/lib/muri/filters/imageshack.rb

@@ -22,12 +22,14 @@ class Muri
           content_path_id = $2
           @info[:media_id] = $3
           @info[:content_type] = $4
-          @info[:website] = "#{url_common}/img#{server_id}/#{content_server_id}/#{@info[:media_id]}.#{@info[:content_type]}"
+          @info[:media_url] = "#{url_common}/img#{server_id}/#{content_server_id}/#{@info[:media_id]}.#{@info[:content_type]}"
         end
         
         # imageshack does not currently have API for retrieving individual video information
         if self.parsed?
-          @info[:media_url] = "#{url_common}/i/#{@info[:media_id]}.#{@info[:content_type]}/"
+          @info[:website] = "#{url_common}/i/#{@info[:media_id]}.#{@info[:content_type]}/"
+        else
+          raise UnsupportedURI          
         end
         
         self
@@ -40,8 +42,8 @@ class Muri
     end
   end
 end
-# http://img178.imageshack.us/i/dsc01576lo7.jpg/
-# http://img178.imageshack.us/img178/773/dsc01576lo7.jpg
+# http://img178.imageshack.us/i/dsc01576lo7.jpg/ (preview)
+# http://img178.imageshack.us/img178/773/dsc01576lo7.jpg (direct)
 # http://yfrog.com/4ydsc01576lo7j
 
 # http://img30.imageshack.us/img30/4184/rush02.mp4

data/lib/muri/filters/photobucket.rb

@@ -23,8 +23,8 @@ class Muri
           url_common = "#{server_id}.photobucket.com/albums/#{photobucket_id}/#{media_creator}/#{album}"
           direct_url_suffix = "#{url_common}#{@info[:media_id]}.#{@info[:content_type]}"
           
-          @info[:website] = "http://i#{direct_url_suffix}"
-          @info[:media_url] = "http://s#{url_common}?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
+          @info[:media_url] = "http://i#{direct_url_suffix}"
+          @info[:website] = "http://s#{url_common}?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
         elsif @url.path =~ /^\/groups\/(.*?)\/(.*?)\/(.*?)\.(.*)/i
           group = $1
           group_hash_value = $2
@@ -33,13 +33,15 @@ class Muri
           url_common = "#{server_id}.photobucket.com/groups/#{group}/#{group_hash_value}"
           direct_url_suffix = "#{url_common}/#{@info[:media_id]}.#{@info[:content_type]}"
           
-          @info[:website] = "http://gi#{direct_url_suffix}"
-          @info[:media_url] = "http://gs#{url_common}/?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
+          @info[:media_url] = "http://gi#{direct_url_suffix}"
+          @info[:website] = "http://gs#{url_common}/?action=view&current=#{@info[:media_id]}.#{@info[:content_type]}"
         end
         
         if self.parsed?
           @info[:media_api_id] = @info[:media_url]
           @info[:media_thumbnail] = "http://mobth#{direct_url_suffix}"
+        else
+          raise UnsupportedURI          
         end
         
         self

data/lib/muri/filters/vimeo.rb

@@ -11,19 +11,19 @@ class Muri
       
       def vimeo_parse
         @info[:service] = 'Vimeo'
+        params = CGI::parse(@url.query) if !@url.query.nil?
         
-        if @url.path =~ /^\/([0-9]*)/
+        if @url.path =~ /^\/([0-9]+)/
           @info[:media_id] = $1
-        elsif (@url.path =~ /^\/moogaloop\.swf/i)
-          params = CGI::parse(@url.query)
-          if params.include?("clip_id")
-            @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]*)/)
-          end
+        elsif ((@url.path =~ /^\/moogaloop\.swf/i) && (params.include?("clip_id")))
+          @info[:media_id] = params["clip_id"].first if (params["clip_id"].first =~ /([0-9]*)/)
         end
         
         if self.parsed?
           @info[:media_api_id] = @info[:media_id]
-          @info[:media_url] = "http://vimeo.com/#{@info[:media_id]}"
+          @info[:website] = "http://vimeo.com/#{@info[:media_id]}"
+        else
+          raise UnsupportedURI
         end
         
         self

data/lib/muri/filters/youtube.rb

@@ -21,10 +21,12 @@ class Muri
         end
         
         if self.parsed?
-          @info[:media_url] = "#{url_common}/watch?v=#{@info[:media_id]}"
-          @info[:website] = "#{url_common}/v/#{@info[:media_id]}"
+          @info[:website] = "#{url_common}/watch?v=#{@info[:media_id]}"
+          @info[:media_url] = "#{url_common}/v/#{@info[:media_id]}"
           @info[:media_api_id] = @info[:media_id]
           @info[:media_thumbnail] = "http://i.ytimg.com/vi/#{@info[:media_id]}/default.jpg"
+        else
+          raise UnsupportedURI        
         end
         
         self
@@ -35,5 +37,5 @@ class Muri
     end
   end
 end
-# http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&
-# http://www.youtube.com/watch?v=l983Uob0Seo&feature=rec-LGOUT-exp_fresh+div-1r-1-HM
+# http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1& (direct)
+# http://www.youtube.com/watch?v=l983Uob0Seo&feature=rec-LGOUT-exp_fresh+div-1r-1-HM (preview)

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-03-01}
+  s.date = %q{2010-03-02}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/muri/filters/vimeo.rb",
      "lib/muri/filters/youtube.rb",
      "muri.gemspec",
+     "test/error_test.rb",
      "test/flickr_test.rb",
      "test/imageshack_test.rb",
      "test/photobucket_test.rb",
@@ -41,10 +42,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "test/flickr_test.rb",
-     "test/imageshack_test.rb",
-     "test/photobucket_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

@@ -0,0 +1,27 @@
+require 'lib/muri.rb'
+
+describe "Parse Errors" do
+  @no_parser = ["http://media.photobucket.com/image/searchterm/pbapi/file.jpg",
+        "http://pic.pbsrc.com/dev_help/WebHelpPublic/PhotobucketPublicHelp.htm"]
+  
+  @unsupported = ["http://gi0006.photobucket.com/groups/0006/",
+                  "http://www.flickr.com/photos",
+                  "http://img178.imageshack.us/img178/",
+                  "http://img178.imageshack.us/img178/773/",
+                  "http://vimeo.com/",
+                  "http://vimeo.com/moogaloop.swf?server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1",
+                 "http://vimeo.com/moogaloop.swf?server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1"]
+  
+  @no_parser.each do |a|
+    it "#{a} should raise NoParser" do
+      lambda { Muri.parse a }.should raise_exception(Muri::NoParser)
+    end
+  end
+  
+  @unsupported.each do |b|
+    it "#{b} should raise UnsupportedURI" do
+      lambda { Muri.parse b }.should raise_exception(Muri::UnsupportedURI)
+    end
+  end
+  
+end

data/test/flickr_test.rb

@@ -9,8 +9,8 @@ shared_examples_for "Flickr parse" do
     @a.media_id == '2088436532'
   end
   
-  it "should have media url" do
-    @a.media_url == 'http://flic.kr/p/4bxMqq'
+  it "should have a website" do
+    @a.website == 'http://flic.kr/p/4bxMqq'
   end
    
   it "should have media api id" do
@@ -18,13 +18,13 @@ shared_examples_for "Flickr parse" do
   end
 end
 describe "Flickr parse first" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://www.flickr.com/photos/bananastalktome/2088436532/'
   end
   it_should_behave_like "Flickr parse"
 end
 describe "Flickr parse second" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_m.jpg'
   end
   it_should_behave_like "Flickr parse"

data/test/imageshack_test.rb

@@ -10,7 +10,7 @@ shared_examples_for "Imageshack parse" do
   end
   
   it "should have media url" do
-    @a.media_url == 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
+    @a.website == 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
   end
    
   it "should have content_type" do
@@ -18,18 +18,18 @@ shared_examples_for "Imageshack parse" do
   end
 end
 describe "Imageshack parse first" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://img178.imageshack.us/i/dsc01576lo7.jpg/'
   end
   it_should_behave_like "Imageshack parse"
 end
 describe "Imageshack parse second" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://img178.imageshack.us/img178/773/dsc01576lo7.jpg'
   end
   it_should_behave_like "Imageshack parse"
   
   it "should have website" do
-    @a.website == 'http://img178.imageshack.us/img178/773/dsc01576lo7.jpg'
+    @a.media_url == 'http://img178.imageshack.us/img178/773/dsc01576lo7.jpg'
   end
 end

data/test/photobucket_test.rb

@@ -6,7 +6,7 @@ shared_examples_for "Photobucket parse" do
   end
 end
 describe "Photobucket parse first" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://i244.photobucket.com/albums/gg17/pbapi/file.jpg'
   end
   it_should_behave_like "Photobucket parse"
@@ -19,12 +19,12 @@ describe "Photobucket parse first" do
     @a.content_type == "jpg"
   end
   
-  it "should have media url" do
-    @a.media_url == "http://s244.photobucket.com/albums/gg17/pbapi/?action=view&current=file.jpg"
+  it "should have a website" do
+    @a.website == "http://s244.photobucket.com/albums/gg17/pbapi/?action=view&current=file.jpg"
   end
   
-  it "should have website" do
-    @a.website == "http://i244.photobucket.com/albums/gg17/pbapi/file.jpg"
+  it "should have media url" do
+    @a.media_url == "http://i244.photobucket.com/albums/gg17/pbapi/file.jpg"
   end
     
   it "should have media api id" do
@@ -36,7 +36,7 @@ describe "Photobucket parse first" do
   end
 end
 describe "Photobucket parse second" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg'
   end
   it_should_behave_like "Photobucket parse"
@@ -49,12 +49,12 @@ describe "Photobucket parse second" do
     @a.content_type == "jpg"
   end
   
-  it "should have media url" do
-    @a.media_url == "http://gs0006.photobucket.com/groups/0006/G5PAK3TBQS/?action=view&current=DSCF0015-1-1.jpg"
+  it "should have a website" do
+    @a.website == "http://gs0006.photobucket.com/groups/0006/G5PAK3TBQS/?action=view&current=DSCF0015-1-1.jpg"
   end
   
-  it "should have website" do
-    @a.website == "http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg"
+  it "should have media url" do
+    @a.media_url == "http://gi0006.photobucket.com/groups/0006/G5PAK3TBQS/DSCF0015-1-1.jpg"
   end
   
   it "should have media thumbnail" do
@@ -64,4 +64,4 @@ describe "Photobucket parse second" do
   it "should have media api id" do
     @a.media_api_id == "http://gs0006.photobucket.com/groups/0006/G5PAK3TBQS/?action=view&current=DSCF0015-1-1.jpg"
   end
-end
+end

data/test/vimeo_test.rb

@@ -9,8 +9,8 @@ shared_examples_for "Vimeo parse" do
     @a.media_id == '7312128'
   end
   
-  it "should have media url" do
-    @a.media_url == 'http://vimeo.com/7312128'
+  it "should have a website" do
+    @a.website == 'http://vimeo.com/7312128'
   end
    
   it "should have media api id" do
@@ -18,13 +18,13 @@ shared_examples_for "Vimeo parse" do
   end
 end
 describe "Vimeo parse first" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://vimeo.com/moogaloop.swf?clip_id=7312128&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=&fullscreen=1'
   end
   it_should_behave_like "Vimeo parse"
 end
 describe "Vimeo parse second" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://vimeo.com/7312128'
   end
   it_should_behave_like "Vimeo parse"

data/test/youtube_test.rb

@@ -14,11 +14,11 @@ shared_examples_for "Youtube parse" do
   end
   
   it "should have media url" do
-    @a.media_url == 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
+    @a.website == 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
   end
   
   it "should have website" do
-    @a.website == 'http://www.youtube.com/v/4CYDFoEz8rg'
+    @a.media_url == 'http://www.youtube.com/v/4CYDFoEz8rg'
   end
   
   it "should have thumbnail" do
@@ -26,13 +26,13 @@ shared_examples_for "Youtube parse" do
   end
 end
 describe "Youtube parse first" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://www.youtube.com/v/4CYDFoEz8rg&hl=en_US&fs=1&'
   end
   it_should_behave_like "Youtube parse"
 end
 describe "Youtube parse second" do
-  before (:all) do
+  before(:all) do
     @a = Muri.parse 'http://www.youtube.com/watch?v=4CYDFoEz8rg'
   end
   it_should_behave_like "Youtube parse"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - William Schneider
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -05:00
+date: 2010-03-02 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/muri/filters/vimeo.rb
 - lib/muri/filters/youtube.rb
 - muri.gemspec
+- test/error_test.rb
 - test/flickr_test.rb
 - test/imageshack_test.rb
 - test/photobucket_test.rb
@@ -69,8 +70,9 @@ signing_key:
 specification_version: 3
 summary: Media URI Parser
 test_files: 
-- test/flickr_test.rb
-- test/imageshack_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