muri 1.1.1 → 1.1.2

data/VERSION.yml

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

data/lib/muri/base.rb

@@ -13,15 +13,21 @@ class Muri
 
   PARSERS = { }
   
-  # Defines is_#{service}? and is_#{service type}? methods, and sets service name constnat
+  # Defines #{service}? and #{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 }
+    service = "#{parser.downcase}?"
+    define_method(service) { self.media_service == parser }    
+    define_method(is_service) { puts "This method will be deprecated, use #{service} instead"; self.instance_eval(service) }
     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)
+      define_method("#{exp.downcase}?") do
+        self.media_api_type == eval(exp) && self.instance_eval(service)
       end
+      define_method("is_#{exp.downcase}?") do
+        puts "This method will be deprecated, use #{exp.downcase}? instead"
+        self.instance_eval("#{exp.downcase}?")
+      end    
     end
     const_set "#{parser.upcase}_SERVICE_NAME", "#{parser}"
   end

data/lib/muri/filters/flickr.rb

@@ -44,9 +44,9 @@ class Muri
         end
 
         self.media_api_id = self.media_id
-        if self.is_flickr_photo?
+        if self.flickr_photo?
           self.media_website = "http://flic.kr/p/" + Filter::Flickr.encode58(self.media_id.to_i)
-        elsif self.is_flickr_set?
+        elsif self.flickr_set?
           self.media_website = "http://www.flickr.com/photos/#{media_creator}/sets/#{self.media_id}" # appending /show takes direct to image through redirect
         end
       end

data/lib/muri/filters/photobucket.rb

@@ -69,7 +69,7 @@ class Muri
           raise UnsupportedURI
         end
 
-        self.media_api_id = self.is_photobucket_media? ? self.media_url : self.media_id
+        self.media_api_id = self.photobucket_media? ? self.media_url : self.media_id
       end
 
       def photobucket_set_image_common(pb_id, album)

data/lib/muri/filters/vimeo.rb

@@ -39,7 +39,7 @@ class Muri
 
         self.media_api_id = self.media_id
         self.media_website = Filter::Vimeo.vimeo_media_website self #:api_type => self.media_api_type, :id => self.media_id
-        if self.is_vimeo_video?
+        if self.vimeo_video?
           self.media_url = Filter::Vimeo.vimeo_media_url self #:id => self.media_id
         end
       end

data/lib/muri/filters/youtube.rb

@@ -44,11 +44,11 @@ class Muri
         end
 
         self.media_api_id = self.media_id
-        if self.is_youtube_video?
+        if self.youtube_video?
           self.media_website = "#{url_common}/watch?v=#{self.media_id}"
           self.media_url = "#{url_common}/v/#{self.media_id}"
           self.media_thumbnail = "http://i.ytimg.com/vi/#{self.media_id}/default.jpg"
-        elsif self.is_youtube_playlist?
+        elsif self.youtube_playlist?
           self.media_website = "#{url_common}/view_play_list?p=#{self.media_id}"
           self.media_url = "#{url_common}/p/#{self.media_id}"
         end

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-04-06}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [

data/test/facebook_test.rb

@@ -3,14 +3,14 @@ require 'lib/muri.rb'
 shared_examples_for "Facebook parse" do
   it "should be Facebook service" do
     #@a.media_service.should == 'Facebook'
-    @a.is_facebook?.should == true
+    @a.facebook?.should == true
   end
   
   it "should be not be other services" do
     #@a.media_service.should == 'Facebook'
-    @a.is_vimeo?.should == false
-    @a.is_flickr?.should == false
-    @a.is_youtube?.should == false
+    @a.vimeo?.should == false
+    @a.flickr?.should == false
+    @a.youtube?.should == false
   end
   
   it "should be valid" do
@@ -25,11 +25,11 @@ shared_examples_for "Facebook parse photo" do
   end
   
   it "should be facebook photo" do
-    @a.is_facebook_photo?.should == true
+    @a.facebook_photo?.should == true
   end
   
   it "should not be flickr photo" do
-    @a.is_flickr_photo?.should == false
+    @a.flickr_photo?.should == false
   end  
 end
 

data/test/flickr_test.rb

@@ -2,14 +2,14 @@ require 'lib/muri.rb'
 shared_examples_for "Flickr parse" do
   it "should be Flickr service" do
     # @a.media_service.should == 'Flickr'
-    @a.is_flickr?.should == true
+    @a.flickr?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_vimeo?.should == false
-    @a.is_youtube?.should == false
-    @a.is_facebook?.should == false
-    @a.is_photobucket?.should == false
+    @a.vimeo?.should == false
+    @a.youtube?.should == false
+    @a.facebook?.should == false
+    @a.photobucket?.should == false
   end
     
   it "should be valid" do
@@ -24,11 +24,11 @@ shared_examples_for "Flickr parse photo" do
   end
   
   it "should be flickr photo" do
-    @a.is_flickr_photo?.should == true
+    @a.flickr_photo?.should == true
   end 
   
   it "should not be facebook photo" do
-    @a.is_facebook_photo?.should == false
+    @a.facebook_photo?.should == false
   end      
 end
 
@@ -39,7 +39,7 @@ shared_examples_for "Flickr parse set" do
   end
 
   it "should be flickr set" do
-    @a.is_flickr_set?.should == true
+    @a.flickr_set?.should == true
   end    
 end
 

data/test/imageshack_test.rb

@@ -3,14 +3,14 @@ require 'lib/muri.rb'
 shared_examples_for "Imageshack parse" do
   it "should be Imageshack service" do
     #@a.media_service.should == 'Imageshack'
-    @a.is_imageshack?.should == true
+    @a.imageshack?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_vimeo?.should == false
-    @a.is_youtube?.should == false
-    @a.is_facebook?.should == false
-    @a.is_photobucket?.should == false
+    @a.vimeo?.should == false
+    @a.youtube?.should == false
+    @a.facebook?.should == false
+    @a.photobucket?.should == false
   end
     
   it "should be valid" do

data/test/photobucket_test.rb

@@ -3,14 +3,14 @@ require 'lib/muri.rb'
 shared_examples_for "Photobucket parse" do
   it "should be Photobucket service" do
     #@a.media_service.should == 'Photobucket'
-    @a.is_photobucket?.should == true
+    @a.photobucket?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_vimeo?.should == false
-    @a.is_youtube?.should == false
-    @a.is_facebook?.should == false
-    @a.is_flickr?.should == false
+    @a.vimeo?.should == false
+    @a.youtube?.should == false
+    @a.facebook?.should == false
+    @a.flickr?.should == false
   end
     
   it "should be valid" do
@@ -26,7 +26,7 @@ shared_examples_for "Photobucket parse photo" do
   end
   
   it "should be photobucket media" do
-    @a.is_photobucket_media?.should == true
+    @a.photobucket_media?.should == true
   end  
 end
 
@@ -38,11 +38,11 @@ shared_examples_for "Photobucket parse album" do
   end
 
   it "should be photobucket album" do
-    @a.is_photobucket_album?.should == true
+    @a.photobucket_album?.should == true
   end 
   
   it "should not be facebook album" do
-    @a.is_facebook_album?.should == false
+    @a.facebook_album?.should == false
   end    
 end
 shared_examples_for "Photobucket parse group album" do
@@ -53,7 +53,7 @@ shared_examples_for "Photobucket parse group album" do
   end
   
   it "should be group album" do
-    @a.is_photobucket_group_album?.should == true
+    @a.photobucket_group_album?.should == true
   end  
 end
 

data/test/picasa_test.rb

@@ -1,14 +1,14 @@
 require 'lib/muri.rb'
 shared_examples_for "Picasa parse" do
   it "should be Picasa service" do
-    @a.is_picasa?.should == true
+    @a.picasa?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_vimeo?.should == false
-    @a.is_youtube?.should == false
-    @a.is_facebook?.should == false
-    @a.is_photobucket?.should == false
+    @a.vimeo?.should == false
+    @a.youtube?.should == false
+    @a.facebook?.should == false
+    @a.photobucket?.should == false
   end
     
   it "should be valid" do
@@ -23,11 +23,11 @@ shared_examples_for "Picasa parse photo" do
   end
   
   it "should be picasa photo" do
-    @a.is_picasa_photo?.should == true
+    @a.picasa_photo?.should == true
   end 
   
   it "should not be facebook photo" do
-    @a.is_facebook_photo?.should == false
+    @a.facebook_photo?.should == false
   end      
 end
 

data/test/twitpic_test.rb

@@ -2,14 +2,14 @@ require 'lib/muri.rb'
 shared_examples_for "Twitpic parse" do
   it "should be Twitpic service" do
     #@a.media_service.should == 'Twitpic'
-    @a.is_twitpic?.should == true
+    @a.twitpic?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_vimeo?.should == false
-    @a.is_youtube?.should == false
-    @a.is_facebook?.should == false
-    @a.is_flickr?.should == false
+    @a.vimeo?.should == false
+    @a.youtube?.should == false
+    @a.facebook?.should == false
+    @a.flickr?.should == false
   end
     
   it "should be valid" do
@@ -24,11 +24,11 @@ shared_examples_for "Twitpic parse photo" do
   end
   
   it "should be twitpic photo" do
-    @a.is_twitpic_photo?.should == true
+    @a.twitpic_photo?.should == true
   end  
   
   it "should not be facebook photo" do
-    @a.is_facebook_photo?.should == false
+    @a.facebook_photo?.should == false
   end   
 end
 {'http://twitpic.com/17d7th' =>

data/test/vimeo_test.rb

@@ -3,14 +3,14 @@ require 'lib/muri.rb'
 shared_examples_for "Vimeo parse" do
   it "should be Vimeo service" do
     #@a.media_service.should == 'Vimeo'
-    @a.is_vimeo?.should == true
+    @a.vimeo?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_photobucket?.should == false
-    @a.is_youtube?.should == false
-    @a.is_facebook?.should == false
-    @a.is_flickr?.should == false
+    @a.photobucket?.should == false
+    @a.youtube?.should == false
+    @a.facebook?.should == false
+    @a.flickr?.should == false
   end
     
   it "should be valid" do
@@ -27,11 +27,11 @@ shared_examples_for "Vimeo parse video" do
   end   
   
   it "should be vimeo video" do
-    @a.is_vimeo_video?.should == true
+    @a.vimeo_video?.should == true
   end  
   
   it "should not be youtube video" do
-    @a.is_youtube_video?.should == false
+    @a.youtube_video?.should == false
   end   
 end
 shared_examples_for "Vimeo parse album" do
@@ -42,11 +42,11 @@ shared_examples_for "Vimeo parse album" do
   end   
   
   it "should be vimeo album" do
-    @a.is_vimeo_album?.should == true
+    @a.vimeo_album?.should == true
   end  
   
   it "should not be photobucket album" do
-    @a.is_photobucket_album?.should == false
+    @a.photobucket_album?.should == false
   end     
 end
 

data/test/youtube_test.rb

@@ -2,14 +2,14 @@ require 'lib/muri.rb'
 shared_examples_for "Youtube parse" do
   it "should be Youtube service" do
     #@a.media_service.should == 'Youtube'
-    @a.is_youtube?.should == true
+    @a.youtube?.should == true
   end
   
   it "should be not be other services" do
-    @a.is_photobucket?.should == false
-    @a.is_vimeo?.should == false
-    @a.is_facebook?.should == false
-    @a.is_flickr?.should == false
+    @a.photobucket?.should == false
+    @a.vimeo?.should == false
+    @a.facebook?.should == false
+    @a.flickr?.should == false
   end
     
   it "should be valid" do
@@ -25,11 +25,11 @@ shared_examples_for "Youtube parse single" do
   end
   
   it "should be youtube video" do
-    @a.is_youtube_video?.should == true
+    @a.youtube_video?.should == true
   end
   
   it "should not be vimeo video" do
-    @a.is_vimeo_video?.should == false
+    @a.vimeo_video?.should == false
   end
 end
 
@@ -41,7 +41,7 @@ shared_examples_for "Youtube parse playlist" do
   end
   
   it "should be youtube playlist" do
-    @a.is_youtube_playlist?.should == true
+    @a.youtube_playlist?.should == true
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - William Schneider
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: []