url_scrubber 0.7.17 → 0.7.18

data/lib/url_scrubber/version.rb

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

data/lib/url_scrubber.rb

@@ -14,7 +14,9 @@ module UrlScrubber
     url = m[1]
     url.sub!(/^https/, 'http')
     url.sub!(/\/+$/, '')
+    url.sub!(/;+$/, '')
     url.sub!('#!/', '')
+    url.sub!('%27', '\'')
     url = downcase_domain(url)
     remove_www!(url)
     remove_html_tags!(url)
@@ -69,7 +71,7 @@ module UrlScrubber
     when :twitter
       !!url.match(%r{^http://twitter\.com/[\w_]+$})
     when :facebook
-      !!url.match(%r{^http://facebook\.com/(profile\.php?id=\d+|[\w_\.-]+)$})
+      !!url.match(%r{^http://facebook\.com/(profile\.php?id=\d+|[\w_\.-]+)$}) || !!url.match(%r{^http://facebook\.com/groups/[\w_\.-]+$})
     when :linkedin
       !!url.match(%r{^http://linkedin\.com/pub/[\w-]+/[\w]+/[\w]+/[\w]+$}) || !!url.match(%r{^http://linkedin\.com/in/[\w_-]+$}) || !!url.match(%r{^http://linkedin\.com/(company/[\w_-]+|profile/view\?id=\d+)$}) || !!url.match(%r{^http://linkedin\.com/(groups\?gid=[0-9]+)$}) || !!url.match(%r{^http://linkedin\.com/(groups/[\w_-]+)$})
     when :google
@@ -83,7 +85,7 @@ module UrlScrubber
     when :yelp
       !!url.match(%r{^http://yelp\.com/[\w_-]+$})
     when :vimeo
-      !!url.match(%r{^http://vimeo\.com/[\w_-]+$}) && !url.match(%r{/\d+$})
+      (!!url.match(%r{^http://vimeo\.com/[\w_-]+$}) && !url.match(%r{/\d+$})) || !!url.match(%r{^http://vimeo\.com/groups/[\w_\.-]+$})
     when :instagram
       !!url.match(%r{^http://instagram\.com/[\w_]+$})
     when :tumblr
@@ -156,6 +158,7 @@ module UrlScrubber
     when :google    then return sc_google_plus(url)
     when :flickr    then return sc_flickr(url)
     when :pinterest then return sc_pinterest(url)
+    when :vimeo      then return sc_vimeo(url)
     when :yelp      then return sc_yelp(url)
     end
 
@@ -193,6 +196,19 @@ module UrlScrubber
     url
   end
 
+  def self.sc_vimeo(url)
+    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, '')
+      end
+    end
+    url
+  end
+
   def self.sc_twitter(url)
     url.sub!('twitter.com/@', 'twitter.com/')
 
@@ -212,6 +228,8 @@ module UrlScrubber
   def self.sc_facebook(url)
     if url.match("/media/albums") || url.match("/media/set")
       url = url.match('\&') ? url.split('&',2)[0] : url
+    elsif url.include?('facebook.com/groups/')
+      url = drop_url_query!(url)
     elsif url.include?("facebook.com/profile.php?id=")
       # these were being truncated, they do redirect, but typically a 301 response is generated 
       # so the url is returned unchanged.  Better than truncation.

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: url_scrubber
 version: !ruby/object:Gem::Version
-  version: 0.7.17
+  version: 0.7.18
+  prerelease: 
 platform: ruby
 authors:
 - Colin Langton
@@ -11,11 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,6 +65,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,6 +73,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,6 +81,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,6 +89,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,26 +118,27 @@ files:
 - url_scrubber.gemspec
 homepage: http://brandle.net
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.21
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Clean up URLs.
 test_files:
 - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e190bb6babd544c3006ff9bee363274dea493f2d
-  data.tar.gz: 50ebc61fd01d8408814bafeeeea00731b1a1c29e
-SHA512:
-  metadata.gz: 01a0987592be80476d471f1d68a8eb2ae3aa04cc488419360f5391814b2bca8a7a8391538fb2f0d6eb06bd2174673f63e5daff1aedd2e945084f6026238bed5f
-  data.tar.gz: d7bd07dee54435ded935405975f88feeeaba2ea8f0590d20474da8f9c65c2a57015abe9b9ab832850bfa1c7b57721964395324096173570ada1936590c2c15c2