url_scrubber 0.7.18 → 0.7.19

data/lib/url_scrubber/version.rb

@@ -1,3 +1,3 @@
 module UrlScrubber
-  VERSION = "0.7.18"
+  VERSION = "0.7.19"
 end

data/lib/url_scrubber.rb

@@ -79,7 +79,7 @@ module UrlScrubber
     when :slideshare
       !!url.match(%r{^http://slideshare\.net/[\w_-]+$})
     when :flickr
-      !!url.match(%r{^http://flickr\.com/[\w_-]+$})
+      !!url.match(%r{^http://flickr\.com/[\w_\@-]+$}) || !!url.match(%r{^http://flickr\.com/groups/[\w_\@\.-]+$})
     when :pinterest
       !!url.match(%r{^http://pinterest\.com/[\w_-]+$})
     when :yelp
@@ -197,13 +197,14 @@ module UrlScrubber
   end
 
   def self.sc_vimeo(url)
-    if url.include?('vimeo.com/groups/')    
+    if url.include?('vimeo.com/groups/') 
       groups_partition = url.partition('vimeo.com/groups/')
-      slash_partition = groups_partition[2].partition('/') if groups_partition[2] && groups_partition[2] != ""  
-      if slash_partition[2] && slash_partition[2] != ""
-        # need to trim off the sub page stuff
-        garbage = slash_partition[1] + slash_partition[2]
-        url.gsub!(garbage, '')
+      if !groups_partition.nil? && !groups_partition[2].nil? && groups_partition[2] != ""
+        extraneous_slash_partition = groups_partition[2].partition('/')   
+        if !extraneous_slash_partition.nil? && !extraneous_slash_partition[1].nil? && extraneous_slash_partition[1] != ""
+          # need to trim off the sub page stuff
+          return "http://vimeo.com/groups/" + extraneous_slash_partition[0]
+        end
       end
     end
     url
@@ -280,6 +281,18 @@ module UrlScrubber
   end
 
   def self.sc_flickr(url)
+    if url.include?('flickr.com/groups/') 
+      groups_partition = url.partition('flickr.com/groups/')
+      if !groups_partition.nil? && !groups_partition[2].nil? && groups_partition[2] != ""
+        extraneous_slash_partition = groups_partition[2].partition('/')   
+        if !extraneous_slash_partition.nil? && !extraneous_slash_partition[1].nil? && extraneous_slash_partition[1] != ""
+          # need to trim off the sub page stuff
+          return "http://flickr.com/groups/" + extraneous_slash_partition[0]
+        else
+          return url
+        end
+      end
+    end
     user_match = url.match(%r{flickr\.com/(photos/|people/)?([^/]+)})
     return url unless user_match
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url_scrubber
 version: !ruby/object:Gem::Version
-  version: 0.7.18
+  version: 0.7.19
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec