url_scrubber 0.8.16 → 0.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 455a7dccc82ca65d302205f525100c2c59700cbf41950533cae59269e47355c0
-  data.tar.gz: 558a14779d4edcb5766896cab6ed21b1b7ad2f5cc924d30a007aa670d4fe7bd7
+  metadata.gz: 0ff75d42c034a2c7e8ac8bc09bcc8dc35ab42138cb81b4899137779a71da6d7f
+  data.tar.gz: 1f27e292990f3b2bbeb08aeaface0aa1b5a27adb04228d7c8a4dca20b9e22a8b
 SHA512:
-  metadata.gz: fba24e3059a04408972ef8fc52013b726aff9b2995adc1bf153bb9723673b65f9add9334a1c4fd2f93c7a92fa9db960b1e9469b81590f20a60a4c830e92632ea
-  data.tar.gz: 2d30bdcaf8d61e516cacc933dc2cfd2dd8010cea0edaab786a6d8b2c4a0f94c657d97c6b63ace038cc0f12a14e0ee0d2979e8bda43d9d814b74a56d0f7e3ae02
+  metadata.gz: da302452052addacc609a5e2a7459e809e328d40de859da654541ba470280dc4d541f3d15ed8512329c5e4fbf5b8b0995f3bb33c90054a593ed5e25681d31b88
+  data.tar.gz: 593d8c9861a6f5aa58bf57191e7fcc363510a4da68663e43212b08072a6d82eb0f6cb0fafb13f27cb07aa748399cd57a0145fbd426914bf76046c0f040cb02a0

data/lib/url_scrubber/version.rb

@@ -1,3 +1,3 @@
 module UrlScrubber
-  VERSION = "0.8.16"
+  VERSION = "0.8.17"
 end

data/lib/url_scrubber.rb

@@ -285,13 +285,15 @@ module UrlScrubber
 
   # TODO This needs to be rewritten to be independent of the Facebook domain and public suffix used: e.g. facebook.com vs fb.com vs. fb.me
   def self.sc_facebook(url)
-    #puts "sc_facebook: #{url}"
-    regex1  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/((pages?|pg)\/)*(?<uname>.*)[\/-](?<uid>[0-9]+))($|\/|\/(about|timeline|info|app_)?)/i
+
+    url = url.gsub(/(_rdr=.+&)|(&_rdr=.+$)/,"")
+
+    regex1  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/(((?<group>groups?)|pages?|pg)\/)*(?<uname>.*)[\/-](?<uid>[0-9]+))($|\/|\/(about|timeline|info|app_)?)/i
     regex2  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/profile.php\?id=(?<uid>[0-9]+))($|\/|\/.*|&.*)/i
-    regex2a = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/profile.php\?_rdr=p&id=(?<uid>[0-9]+))($|\/|\/.*|&.*)/i
-    regex3  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/((pages?|pg)\/)*(?<uname>[^\?\/]*))($|\/$|\/(about|timeline|info|app_.*)?)/i
+    regex3  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/(((?<group>groups?)|pages?|pg)\/)*(?<uname>[^\?\/]*))($|\/$|\/(about|timeline|info|app_.*)?)/i
     regex4  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/)(?<php>home.php\?([#!]+\/)*)(?<uname>.*)/i
     regex5  = /^(?<url>(https?:\/\/)((business|www)\.)?facebook\.com\/(?<uid>[0-9]+))($|\/|\/.*|&.*)/i
+    regex6  = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/home\/accounts\?business_id=(?<uid>[0-9]+))($|\/|\/.*|&.*)/i
 
     # If the user gives us a path to a Post, "http://facebook.com/LoansByJanet/posts/1691075027771418"
     # then drop the post part, "/posts/1691075027771418" to get the base url, "http://facebook.com/LoansByJanet/"
@@ -300,10 +302,7 @@ module UrlScrubber
     end
 
     if url.match("/media/albums") || url.match("/media/set")
-      # puts "media"
       url = url.match('\&') ? url.split('&',2)[0] : url
-    elsif url.include?('facebook.com/groups/')
-      url = drop_url_query!(url)
     elsif mdata = url.match(regex1)
       # "http://facebook.com/pages/Command-Canada/1434248516885065/timeline"
       url = mdata[:url]
@@ -313,11 +312,6 @@ module UrlScrubber
       # "https://www.facebook.com/profile.php?id=100009574328879"
       url, http_response = check_for_facebook_redirection(mdata[:url])
       uid = mdata[:uid]
-    elsif mdata = url.match(regex2a)
-      # "https://www.facebook.com/profile.php?_rdr=p&id=100009574328879"
-      url = "http://facebook.com/profile.php?id=" + mdata[:uid]
-      url, http_response = check_for_facebook_redirection(url)
-      uid = mdata[:uid]
     elsif mdata = url.match(regex4)
       # "http://facebook.com/home.php?#!/person.name"
         url = mdata[:url] + mdata[:uname]
@@ -326,11 +320,16 @@ module UrlScrubber
         # "https://www.facebook.com/100009574328879"
         url = "http://facebook.com/" + mdata[:uid]
         uid = mdata[:uid]
+      elsif mdata = url.match(regex6)
+        # "http://business.facebook.com/home/accounts?business_id=1145724702268347"
+        url = mdata[:url]
+        uid = mdata[:uid]
     elsif mdata = url.match(regex3)
       # "http://facebook.com/TonyMollHomeLoans/timeline"
       # "http://facebook.com/pg/TonyMollHomeLoans/timeline"
-      if ["page", "pages", "pg"].exclude?(mdata[:uname])
-        url = "http://facebook.com/" + mdata[:uname]
+      # "https://www.facebook.com/groups/practicewithclaritygroup"
+      if ["group", "groups", "page", "pages", "pg"].exclude?(mdata[:uname])
+        url = (mdata[:group] ? "http://facebook.com/groups/" : "http://facebook.com/") + mdata[:uname]
         uname = mdata[:uname]
       end
       url = drop_url_query!(url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url_scrubber
 version: !ruby/object:Gem::Version
-  version: 0.8.16
+  version: 0.8.17
 platform: ruby
 authors:
 - Colin Langton
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Clean up URLs.