url_scrubber 0.8.8 → 0.8.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTg0Y2U4MGIxODA2ODYyNDYzMDUyMGZjYmY4MWYwNTlmNGI3YjI3Mg==
+    NTkxZGQ1NmRjZDMxMjNmOWViNzlhNzc3Yzg4N2Q1YjRmMmQzY2Y0Yg==
   data.tar.gz: !binary |-
-    NTM3YWVhMzFkMDc0ZDI0NTdlYjQyZmIyYmEwYWU5ZDI5YzQ3ZWY5Nw==
+    Mzc1NmFhOTMxZjg5YjdjZjc4OTRiMWEyYWU4OWEwNzVhYTIxZjZlYQ==
 SHA512:
   metadata.gz: !binary |-
-    NDVmZDhjYjllZTNkOWIyNjIyMTIxMWIyYjAyZjAzM2M4NTRlMTA1MDczM2M0
-    MjJkMjJiOTYyZmNkNmMxODE2YmIxYjVkYmFmY2QwZDgxZjgyNGMwZGVhNjRi
-    NzdkNGM3YmFmZjFhOTFjNTI0YjZiMjlmNTc4YzcxOWZjZmI3YTI=
+    YWRjNzU4YjM4OWE3NzE5MjIxOWNlMjMxMTg3YmY1OGM5NTlhMzdjMTUwN2Vl
+    MmNmZjk1ODMzZWY1MGJlYTYwNWEzZDVjZjAwMGFiZjIyY2I0ZWI0Y2VlYjc5
+    OTgyOGYzZmU0ZTEwNWY2YTFlYzQwN2IyZWQ2MDBkN2M0Y2NmOTI=
   data.tar.gz: !binary |-
-    YjczOTUwYjQyNzI3MDVjOTQxNTVmMjhlMTkyZjNjNjQzYzgwOTMxYTA2YzBk
-    MzY1ODgzYjE1ZDFmYmNhNWQ2OWNlODhhNDc4ZDIyMDI4MTA5NTdkYjRiM2Q1
-    MGRkZjA3MGY1ZmU0MDdiNjk1MDM2YWQxNTIwMWJjZDcxN2YxZDc=
+    NGY0ZDRiNGQ1NjM4ZTc5NmIxMTZkNWQyZmVkY2YyNTE0MWU4Y2VlZmQ2MmJj
+    MzY4ODYzM2I2MGE3ZjliZmY3ZGZiZGFlODE3Y2JhZjZlZTM3NDMwZTlkNTU3
+    ODg3MjczYmVjOWUxMDhiMWNlODJmMTRkZGM2NjQ4NWE4NWIyZDA=

data/lib/url_scrubber/version.rb

@@ -1,3 +1,3 @@
 module UrlScrubber
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

data/lib/url_scrubber.rb

@@ -280,10 +280,10 @@ module UrlScrubber
 
   def self.sc_facebook(url)
     #puts "sc_facebook: #{url}"
-    regex1 = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/(pages\/)*(?<uname>.*)[\/-](?<uid>[0-9]+))($|\/|\/(about|timeline|info|app_)?)/i
+    regex1 = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/((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\/(?<uname>[^\?\/]*))($|\/$|\/(about|timeline|info|app_.*)?)/i
+    regex3 = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/(pg\/)*(?<uname>[^\?\/]*))($|\/$|\/(about|timeline|info|app_.*)?)/i
     regex4 = /^(?<url>(https?:\/\/)((www|business)\.)?facebook\.com\/)(?<php>home.php\?([#!]+\/)*)(?<uname>.*)/i
     
     # If the user gives us a path to a Post, "http://facebook.com/LoansByJanet/posts/1691075027771418"
@@ -322,8 +322,9 @@ module UrlScrubber
     elsif mdata = url.match(regex3)
       # puts "regex3"
       # "http://facebook.com/TonyMollHomeLoans/timeline"
-      if mdata[:uname] != "pages"
-        url = mdata[:url]
+      # "http://facebook.com/pg/TonyMollHomeLoans/timeline"
+      if ["pages", "pg"].exclude?(mdata[:uname])
+        url = "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.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Colin Langton
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec