muri 1.1.8 → 1.1.9

data/CHANGELOG

@@ -1,5 +1,7 @@
 Muri Changelog
 ===================================
+Version 1.1.9
+  * Updated flickr static url's to use & recognize new http://farm{farm-id}.staticflickr.com/ scheme
 
 Version 1.1.8
   * Fix to allow youtube short URL's to properly work (youtu.be/blah style)

data/README.textile

@@ -37,7 +37,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" (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.
+If @a.valid?@ is true, 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:
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 8
+:patch: 9
 :build: 

data/lib/muri/filters/flickr.rb

@@ -7,7 +7,7 @@ class Muri
       FLICKR_SET = "set"
 
       REGEX_FLICKR_MEDIA_OR_SET = /^\/photos\/([a-z0-9\-\_\@]+?)\/(sets\/)?([0-9]+)/i
-      REGEX_FLICKR_STATIC_MEDIA = /^farm([1-3])\.static.flickr.com\/([0-9]+?)\/([0-9]+?)\_([a-z0-9]+?)((?:\_[a-z]){1,2}){0,1}\.([a-z]+)/i
+      REGEX_FLICKR_STATIC_MEDIA = /^farm([1-3])\.static.?flickr.com\/([0-9]+?)\/([0-9]+?)\_([a-z0-9]+?)((?:\_[a-z]){1,2}){0,1}\.([a-z]+)/i
       REGEX_FLICKR_SHORTURL = /^flic\.kr\/p\/([a-z0-9]+)/i
 
       def self.included(base)
@@ -17,7 +17,7 @@ class Muri
       end
 
       def self.parsable?(uri)
-        uri.host =~ /^(www\.)?(flic\.kr|(farm[0-9]\.static\.|)(flickr)\.com)/i
+        uri.host =~ /^(www\.)?(flic\.kr|(farm[0-9]\.static\.?|)(flickr)\.com)/i
       end
 
       def flickr_parse
@@ -33,7 +33,7 @@ class Muri
           self.media_id = $3
           self.media_api_type = FLICKR_MEDIA
           media_secret = $4
-          url_prefix = "http://farm#{farm}.static.flickr.com/#{server_id}/#{self.media_id}_#{media_secret}"
+          url_prefix = "http://farm#{farm}.staticflickr.com/#{server_id}/#{self.media_id}_#{media_secret}"
           self.media_url = "#{url_prefix}.jpg"
           self.media_thumbnail = "#{url_prefix}_t.jpg"
         elsif (self.uri.host + self.uri.path) =~ REGEX_FLICKR_SHORTURL
@@ -82,24 +82,3 @@ class Muri
     end
   end
 end
-#           if !$5.nil?
-#             @info[:media_size] = case $5.downcase
-#               when '_s' then 'square'
-#               when '_t' then 'thumbnail'
-#               when '_m' then 'small'
-#               when '_b' then 'large'
-#               when '_o' then 'original'
-#               else 'medium'
-#             end
-#           end
-#           @info[:content_type] = $6
-# 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
-#   secret: ee07b4474e
-#   size: m
-# * add _d before .jpg in url to create a download URL
-# http://www.flickr.com/photos/bananastalktome/sets/72157623467777820/ (set preview)

data/muri.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muri}
-  s.version = "1.1.8"
+  s.version = "1.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Schneider"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2012-02-17}
   s.description = %q{Automatically get media information from the URL.}
   s.email = %q{bananastalktome@gmail.com}
   s.extra_rdoc_files = [
@@ -49,15 +49,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Media URI Parser}
   s.test_files = [
-    "spec/vimeo_spec.rb",
+    "spec/error_spec.rb",
+     "spec/picasa_spec.rb",
      "spec/flickr_spec.rb",
      "spec/twitpic_spec.rb",
-     "spec/picasa_spec.rb",
      "spec/photobucket_spec.rb",
-     "spec/facebook_spec.rb",
      "spec/youtube_spec.rb",
-     "spec/error_spec.rb",
-     "spec/imageshack_spec.rb"
+     "spec/facebook_spec.rb",
+     "spec/imageshack_spec.rb",
+     "spec/vimeo_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/flickr_spec.rb

@@ -54,7 +54,14 @@ end
     :media_id => '2088436532',
     :media_website => 'http://flic.kr/p/4bxMqq',
     :media_api_id => '2088436532',
-    :media_thumbnail => 'http://farm3.static.flickr.com/2178/2088436532_ee07b4474e_t.jpg'
+    :media_thumbnail => 'http://farm3.staticflickr.com/2178/2088436532_ee07b4474e_t.jpg'
+  },
+  'http://farm3.staticflickr.com/2178/2088436532_ee07b4474e_b.jpg' =>
+  { :type => :photo,
+    :media_id => '2088436532',
+    :media_website => 'http://flic.kr/p/4bxMqq',
+    :media_api_id => '2088436532',
+    :media_thumbnail => 'http://farm3.staticflickr.com/2178/2088436532_ee07b4474e_t.jpg'
   },
   'http://www.flickr.com/photos/bananastalktome/sets/72157623467777820/' =>
   { :type => :set,

data/spec/youtube_spec.rb

@@ -89,7 +89,12 @@ end
   { :type => :video,
     :media_id => "ZL1Jta1j42c",
     :media_api_id => "ZL1Jta1j42c"
-  }  
+  },
+  "http://youtu.be/QH2-TGUlwu4" =>
+  { :type => :video,
+    :media_id => "QH2-TGUlwu4",
+    :media_api_id => "QH2-TGUlwu4"
+  }
 }.each do |url, values|
   describe "Youtube parse #{values[:type]} #{url}" do
     before(:all) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muri
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 1
-  - 8
-  version: 1.1.8
+  - 9
+  version: 1.1.9
 platform: ruby
 authors: 
 - William Schneider
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 -04:00
+date: 2012-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -89,12 +89,12 @@ signing_key:
 specification_version: 3
 summary: Media URI Parser
 test_files: 
-- spec/vimeo_spec.rb
+- spec/error_spec.rb
+- spec/picasa_spec.rb
 - spec/flickr_spec.rb
 - spec/twitpic_spec.rb
-- spec/picasa_spec.rb
 - spec/photobucket_spec.rb
-- spec/facebook_spec.rb
 - spec/youtube_spec.rb
-- spec/error_spec.rb
+- spec/facebook_spec.rb
 - spec/imageshack_spec.rb
+- spec/vimeo_spec.rb