funky 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb6573c5c4307f5428f7f8d49bc59d61725e580
-  data.tar.gz: 93da0ce27c0889babb4223e6556ea0fcb0339ebe
+  metadata.gz: 5b9e7b186a308ef63690c433f2ddb60bbcb8fa27
+  data.tar.gz: eedf7241ecaab8a243db77a2fbeceaaf7820049d
 SHA512:
-  metadata.gz: 1a8f7d9df7a690ab1023d9d9fdd716d163d56bd08df5d1fa58f0088cb26ca96c8963e690f178032ad67dee51e517c0d373c33a34b76043a30f22fe934d317842
-  data.tar.gz: 94e59a9cc3537e5521782033bb3f38b395911daa2fe397747cfa9bf3e787e775fe7d459fe018134233011e7719923c23c96337c03479815065e63a7ea1ceb758
+  metadata.gz: 21ee4481dd2049a91ea7a18c6e86ca1d5e0c840dfb93e00522b30e3661145aebff2970276a7e1b3011daec293eef47cb97e61888b30bb3b570a97b0cfe33dc58
+  data.tar.gz: 493e943f7097cfbb4d955a8317add67ce3540351485354d5b28fca529847fd918f993541ad069a2b7858b8bffb3bf7a1e4b2e73b132d9ce4251dd7cfd4b80651

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
+## 0.2.12 - 2017/01/19
+
+* [ENHANCEMENT] Parse new format of share & comment count in Facebook HTML
+* [BUGFIX] Fix regular expression for likecount
+
 ## 0.2.11 - 2017/01/19
 
 * [ENHANCEMENT] Follow redirects when Facebook responds with 302

data/lib/funky/html/parser.rb

@@ -2,34 +2,40 @@ module Funky
   # @api private
   module HTML
     class Parser
-      def parse(html:)
+      def parse(html:, video_id:)
         {
           view_count: extract_views_from(html),
-          share_count: extract_shares_from(html),
+          share_count: extract_shares_from(html, video_id),
           like_count: extract_likes_from(html),
-          comment_count: extract_comments_from(html)
+          comment_count: extract_comments_from(html, video_id)
         }
       end
 
-      def extract_shares_from(html)
+      def extract_shares_from(html, video_id)
         html.match(/"sharecount":(.*?),/)
+        html.match(/sharecount:(\d+),sharecountreduced/) if $1.nil?
+        html.match(/sharecount:(\d+),.*sharefbid:"#{video_id}"/) if $1.nil?
         matched_count $1
       end
 
       def extract_views_from(html)
         html.match(/<div><\/div><span class="fcg">\D*([\d,.]+)/)
         html.match %r{([\d,.]*?) views from this post} if $1.nil?
-        html.match /<div class=\"_1vx9\"><span>([\d,.]*?) Views<\/span><\/div>/ if $1.nil?
+        html.match /<div class=\"_1vx9\"><span>([\d,.]*?) .*?<\/span><\/div>/ if $1.nil?
+        html.match(/postViewCount:"([\d,.]*?)",/) if $1.nil?
         matched_count $1
       end
 
       def extract_likes_from(html)
         html.match(/"likecount":(\d+),"likecountreduced"/)
+        html.match(/likecount:(\d+),likecountreduced/) if $1.nil?
         matched_count $1
       end
 
-      def extract_comments_from(html)
+      def extract_comments_from(html, video_id)
         html.match /"commentcount":(.*?),/
+        html.match(/commentcount:(\d+),commentcountreduced/) if $1.nil?
+        html.match /commentcount:(\d+),.*commentstargetfbid:"#{video_id}"/ if $1.nil?
         matched_count $1
       end
 

data/lib/funky/version.rb

@@ -1,3 +1,3 @@
 module Funky
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

data/lib/funky/video.rb

@@ -101,7 +101,7 @@ module Funky
     # @return [Funky::Video] the data scraped from Facebook's HTML
     #   and encapsulated into a Funky::Video object.
     def self.find(video_id)
-      counters = @@html_parser.parse html: @@html_page.get(video_id: video_id)
+      counters = @@html_parser.parse html: @@html_page.get(video_id: video_id), video_id: video_id
       new counters.merge(id: video_id)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funky
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Philip Nguyen