muri 1.1.0 → 1.1.1

data/README.textile

@@ -8,7 +8,7 @@ MURI Currently supports:
 * Vimeo (single videos and albums)
 ** "API documentation":http://vimeo.com/api/docs/simple-api
 * Flickr (single images and sets)
-** "API documentation":http://www.flickr.com/services/api/ or "[2]":http://developer.yahoo.com/flickr/
+** "API documentation":http://www.flickr.com/services/api/ or "API Doc 2":http://developer.yahoo.com/flickr/
 * Imageshack
 * Photobucket
 ** "API documentation":http://photobucket.com/developer/documentation
@@ -68,7 +68,6 @@ Assuming the URI was successfully parsed (thus @a.valid? == true@), all media ty
 
 
 * A direct media url for Youtube, Photobucket (photos, not albums), Twitpic, Imageshack (@http://img#{num}.imageshack.us/img#{num}/#{NUMBER}/#{IMAGENAME}@ format) and flickr (@http://farm#{num}.static.flickr.com/@ format)
-d
 
 <pre>
 <code>

data/VERSION.yml

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

data/lib/muri/base.rb

@@ -9,19 +9,21 @@ class Muri
   #   match accepted formats
   class UnsupportedURI < ArgumentError; end
 
-  PARSERS = { }
+  AVAILABLE_PARSERS = %w[Youtube Flickr Vimeo Imageshack Photobucket Facebook Twitpic Picasa].freeze
 
-  # Defines is_#{service}? and is_#{service type constant}? methods, and sets service name constnat
-  ['Youtube', 'Flickr', 'Vimeo', 'Imageshack', 'Photobucket', 'Facebook', 'Twitpic', 'Picasa'].each do |filter|
-    eval "include Filter::#{filter}"    
-    is_service = "is_#{filter.downcase}?"
-    define_method(is_service) { self.media_service == filter }
-    self.constants.reject { |c| c !~ /^#{filter.upcase}/ }.each do |exp|
+  PARSERS = { }
+  
+  # Defines is_#{service}? and is_#{service type}? methods, and sets service name constnat
+  AVAILABLE_PARSERS.each do |parser|
+    eval "include Filter::#{parser}"    
+    is_service = "is_#{parser.downcase}?"
+    define_method(is_service) { self.media_service == parser }
+    self.constants.reject { |c| c !~ /^#{parser.upcase}/ }.each do |exp|
       define_method("is_#{exp.downcase}?") do
         self.media_api_type == eval(exp) && self.instance_eval(is_service)
       end
     end
-    const_set "#{filter.upcase}_SERVICE_NAME", "#{filter}"
+    const_set "#{parser.upcase}_SERVICE_NAME", "#{parser}"
   end
 
   def self.parse(url)
@@ -35,7 +37,7 @@ class Muri
   
   def initialize(url)
     @info = { }
-    _parse(url)
+    parse(url)
   end
   
   # Determine if Muri object is valid (errors mean not valid)
@@ -59,8 +61,9 @@ class Muri
     PARSERS.keys.detect {|klass| klass.parsable?(uri)}
   end
   
-  def _parse(raw_url)
+  def parse(raw_url)
     begin
+      raw_url = URI.encode(URI.decode(raw_url)) unless raw_url.nil?
       self.uri = URI.parse(raw_url)
       if self.uri.scheme.nil?
         raw_url = "http://#{raw_url}"

data/lib/muri/filters/facebook.rb

@@ -59,7 +59,7 @@ class Muri
         end
 
         # The media_api_id is the PID which can be searched for in the facebook photos/albums table
-        self.media_api_id = (media_creator.to_i << 32) +self.media_id.to_i
+        self.media_api_id = (media_creator.to_i << 32) + self.media_id.to_i
       end
     end
   end

data/lib/muri/filters/picasa.rb

@@ -18,13 +18,15 @@ class Muri
       def picasa_parse
         self.media_service = PICASA_SERVICE_NAME
         url_common = "http://picasaweb.google.com"
-        reencoded_url = URI.parse(URI.encode self.uri.to_s)
         
-        if reencoded_url.path =~ /^\/(.[^\/]+)\/(.+)/i
+        #I hate to have to do this, but it's the best way I can think of to get the hash symbol
+        #reencoded_url = URI.parse(URI.encode self.uri.to_s)
+        
+        if self.uri.path =~ /^\/(.[^\/]+)\/(.[^\/]+)/i
           username = $1
           album_photoid = $2.split("%23")
           photoid = album_photoid.last
-          album = album_photoid[0..-2].join("#")#in case other hash symbols exist
+          album = album_photoid[0..-2].join("#") #in case other hash symbols exist
           self.media_id = photoid
           self.media_website = "#{url_common}/#{username}/#{album}##{photoid}"
           self.media_api_type = PICASA_PHOTO

data/lib/muri/filters/youtube.rb

@@ -36,7 +36,7 @@ class Muri
         elsif (self.uri.path =~ REGEX_YOUTUBE_PLAYLIST_DIRECT)
           self.media_id = $1
           self.media_api_type = YOUTUBE_PLAYLIST
-        elsif (self.uri.path =~ REGEX_YOUTUBE_PLAYLIST_WATCH) && (params['p'])
+        elsif (self.uri.path =~ REGEX_YOUTUBE_PLAYLIST_WATCH) && params['p']
           self.media_id = params['p']
           self.media_api_type = YOUTUBE_PLAYLIST
         else

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-04-05}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -48,14 +48,14 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "test/facebook_test.rb",
-     "test/twitpic_test.rb",
+    "test/error_test.rb",
+     "test/facebook_test.rb",
+     "test/flickr_test.rb",
+     "test/imageshack_test.rb",
      "test/photobucket_test.rb",
-     "test/vimeo_test.rb",
      "test/picasa_test.rb",
-     "test/imageshack_test.rb",
-     "test/error_test.rb",
-     "test/flickr_test.rb",
+     "test/twitpic_test.rb",
+     "test/vimeo_test.rb",
      "test/youtube_test.rb"
   ]
 

data/test/error_test.rb

@@ -33,9 +33,16 @@ describe "Parse Errors" do
       m.errors.should == "Muri::UnsupportedURI"
     end
   end
-  
+
+  it "should parse URI with spaces" do
+    a = Muri.parse 'http://i105.photobucket.com/albums/m226/Mascutti/Vikas couches with%20paintings/v214.jpg'
+    lambda { a.uri.path }.should_not raise_exception()
+  end  
+
   it "should not bomb if no URI is provided" do
     lambda { Muri.parse nil }.should_not raise_exception()
   end
-  
 end
+
+
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - William Schneider
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -83,12 +83,12 @@ signing_key:
 specification_version: 3
 summary: Media URI Parser
 test_files: 
+- test/error_test.rb
 - test/facebook_test.rb
-- test/twitpic_test.rb
+- test/flickr_test.rb
+- test/imageshack_test.rb
 - test/photobucket_test.rb
-- test/vimeo_test.rb
 - test/picasa_test.rb
-- test/imageshack_test.rb
-- test/error_test.rb
-- test/flickr_test.rb
+- test/twitpic_test.rb
+- test/vimeo_test.rb
 - test/youtube_test.rb