social_net 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d501f1bc53f1dcdee920829ddb5070d891bb1c74
-  data.tar.gz: a475f8ccd93d602887ec8affca0f6489f9cc5cf8
+  metadata.gz: fd4101beba6793ca6dde37ce03672a04a77f66c7
+  data.tar.gz: fe7e39fad2cce5e6f899d27e4f0f7e09dfa22757
 SHA512:
-  metadata.gz: 7e3f919d2d081c21c68194f3aaa13d9e4493d4ba618b516ea0b9854cdc43f464b581b7c417a17738cc4a901e9f9683ece6f67dfb6adfb1c664e15f2d51fcfce5
-  data.tar.gz: 10f6239c2dff174385f827b2b416206f0ef7fd461624c373373712e9c400e71b5cc18bae981bca192e0e32a77da3dabbf065f67ed4c7eca489beaa23df391929
+  metadata.gz: af977dafd9b9f9ead3e393dfda24057b2fdbaa202829493fb582b70700652baed86eecd326b7f34a7ce6588e56f5b46bfe04d14b9eca015f2f6cf1903d808c68
+  data.tar.gz: 20f61722e84829b115bad08ad32d8cdca896a92124c091d4ea97e6b22d56f86442fc3d967695f696aeb610a8e9926163924d0b0d48f003a87858a7ea0d77ef11

data/CHANGELOG.md

@@ -50,3 +50,7 @@ For more information about changelogs, check
 ## 0.2.12 - 2018-06-04
 
 * [BUGFIX] Update deprecated `user.videos` method and add scraping support.
+
+## 0.2.13 - 2018-06-05
+
+* [BUGFIX] Improve scraping for `user.videos` method.

data/README.md

@@ -12,19 +12,20 @@ user = SocialNet::Twitter::User.find_by screen_name: 'collab'
 user.screen_name #=> "Collab"
 user.follower_count #=> 48_200
 ```
-After [configuring your Instagram app](#configuring-your-instagram-app), you can run commands like:
+
+For Instagram, you can run commands like:
 
 ```ruby
-user = SocialNet::Instagram::User.find_by username: 'Collab'
-user.username #=> "Collab"
-user.follower_count #=> 7025
+user = SocialNet::Instagram::User.new username: 'Collab'
 user.videos #=>
-  # [SocialNet::Instagram::Models::Video
-  #   @caption='Diet starts Monday... 😂🍩',
-  #   @file='https://scontent.cdninstagram.com/t50.2886-16/17192719_791273527696774_5253726776697290752_n.mp4',
-  #   @id='1464710084172115373_487786346',
-  #   @likes=127,
-  #   @thumbnail='https://scontent.cdninstagram.com/t51.2885-15/e15/17076697_308353549580106_8220285822193106944_n.jpg']"
+  # @caption=
+  #  "30 Likes, 3 Comments - Collab (@collab) on Instagram: “@dribble2much’s ‘Ankle Bully’ ft. @lianev and @globalhooper is out now. Hit our Stories for the…”",
+  # @id="BjGBDnMA7tk",
+  # @link="https://www.instagram.com/p/BjGBDnMA7tk/",
+  # @thumbnail_url=
+  #  "https://scontent-lax3-2.cdninstagram.com/vp/b022f60aa0dca66bf69b42ef120bebaa/5B196165/t51.2885-15/e15/32276184_235590730544586_2982097953704902656_n.jpg",
+  # @video_url=
+  #  "https://scontent-lax3-2.cdninstagram.com/vp/dca9fd7707b3e00d5efd18c98c54e6ba/5B19755C/t50.2886-16/32028990_233788607376727_7097250491033190400_n.mp4">
 ```
 
 After [configuring your Facebook app](#configuring-your-facebook-app), you can run commands like:

data/lib/social_net/instagram/api/scrape_request.rb

@@ -10,6 +10,7 @@ module SocialNet
       class ScrapeRequest
         def initialize(attrs = {})
           @host = 'www.instagram.com'
+          @shortcode = attrs[:shortcode]
           @path = attrs.fetch :path, "/p/#{attrs[:shortcode]}/"
           @method = attrs.fetch :method, :get
         end
@@ -42,20 +43,13 @@ module SocialNet
         end
 
         def parse_video_data(data)
-          script_with_data = data.search("script").detect {|script| script.children[0].content.include? "window._sharedData"}
-          data_string = script_with_data.children[0].content
-          ig_data = eval data_string.gsub(/window\._sharedData = /,"").gsub(/null/,'nil').gsub(/\\/,'')
-          video_data = ig_data[:entry_data][:PostPage][0][:graphql][:shortcode_media]
-          raise Errors::UnknownVideo unless video_data[:is_video]
+          raise Errors::UnknownVideo unless data.at("meta[property='og:type']")['content'] == 'video'
           {}.tap do |video|
-            video['id'] = video_data[:shortcode]
-            video['likes'] = {'count' => video_data[:edge_media_preview_like][:count]}
-            video['videos'] = {'standard_resolution' => {'url' => video_data[:video_url]}}
-            video['images'] = {'standard_resolution' => {'url' => video_data[:display_url]}}
-            video['link'] = "https://www.instagram.com/p/#{video_data[:shortcode]}/"
-            if video_data[:edge_media_to_caption][:edges].present?
-              video['caption'] = {'text' => video_data[:edge_media_to_caption][:edges][0][:node][:text]}
-            end
+            video['id'] = @shortcode
+            video['video_url'] = data.at("meta[property='og:video']")['content']
+            video['thumbnail_url'] = data.at("meta[property='og:image']")['content']
+            video['link'] = data.at("meta[property='og:url']")['content']
+            video['caption'] = data.at("meta[property='og:description']")['content']
           end
         end
 

data/lib/social_net/instagram/api/scrape_user_videos_request.rb

@@ -43,16 +43,13 @@ module SocialNet
 
         def parse_video_data(data)
           data_string = data.search("script")[3].children.first
-          ig_data = eval data_string.content.gsub(/window\._sharedData = /,"").gsub(/null/,'nil').gsub(/\\/,'')
-          user_data = ig_data[:entry_data][:ProfilePage][0][:graphql][:user][:edge_owner_to_timeline_media][:edges]
-          vs = [].tap do |videos|
-            user_data.each do |data|
-              if data[:node][:__typename] == "GraphVideo"
-                video = Models::Video.find_by shortcode: data[:node][:shortcode]
-                videos << video
-              end
+          shortcodes = data_string.content.gsub(/window\._sharedData = /,"").gsub(/\\/,'').delete('\\"').scan(/shortcode:([\w_-]{10,39})/).flatten
+          [].tap do |videos|
+            shortcodes.each do |shortcode|
+              video = Models::Video.find_by shortcode: shortcode
+              videos << video
             end
-          end
+          end.compact
         end
 
         def as_curl

data/lib/social_net/instagram/models/video.rb

@@ -10,11 +10,10 @@ module SocialNet
 
         def initialize(attrs = {})
           @id = attrs['id']
-          @caption = attrs['caption']['text'] if attrs['caption']
-          @likes = attrs['likes']['count']
-          @file = attrs['videos']['standard_resolution']['url']
-          @thumbnail = attrs['images']['standard_resolution']['url']
+          @video_url = attrs['video_url']
+          @thumbnail_url = attrs['thumbnail_url']
           @link = attrs['link']
+          @caption = attrs['caption'] if attrs['caption']
         end
 
         # Returns the existing Instagram video matching the provided attributes or

data/lib/social_net/version.rb

@@ -1,3 +1,3 @@
 module SocialNet
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 end