social_net 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c595acb37240609b604367e1b3a18872d17bee32
-  data.tar.gz: 37f644b4172d3980ac04d4204e5728cc47fd04b7
+  metadata.gz: d501f1bc53f1dcdee920829ddb5070d891bb1c74
+  data.tar.gz: a475f8ccd93d602887ec8affca0f6489f9cc5cf8
 SHA512:
-  metadata.gz: 4e4a09391cf7f48d851f825a98ca7605a714ca0421996c506eeecacda9308d62888fb69119c322c953415e88f98788d4b967a72a3573ea4722099ac499cd6087
-  data.tar.gz: '09dfd1b0302b74729b1f98a879d81fbdb75a0d89582a86505cec6b05453b278309d46773b4fea1ae1e6dc0b24a86dfc3d543d429001c21d96a3251b18578fb33'
+  metadata.gz: 7e3f919d2d081c21c68194f3aaa13d9e4493d4ba618b516ea0b9854cdc43f464b581b7c417a17738cc4a901e9f9683ece6f67dfb6adfb1c664e15f2d51fcfce5
+  data.tar.gz: 10f6239c2dff174385f827b2b416206f0ef7fd461624c373373712e9c400e71b5cc18bae981bca192e0e32a77da3dabbf065f67ed4c7eca489beaa23df391929

data/CHANGELOG.md

@@ -46,3 +46,7 @@ For more information about changelogs, check
 
 * [BUGFIX] Remove deprecated `find_by media_id` endpoint.
 * [IMPROVEMENT] Remove `find_by private_shortcode`.
+
+## 0.2.12 - 2018-06-04
+
+* [BUGFIX] Update deprecated `user.videos` method and add scraping support.

data/README.md

@@ -114,8 +114,6 @@ video.link #=> 'https://www.instagram.com/p/BW-nC7xg8ZX/'
 video.file #=> 'https://scontent.cdninstagram.com/t50.2886-16/20372137_156190564936990_2601958215176421376_n.mp4'
 ```
 
-*The methods above require a configured Instagram app (see below).*
-
 SocialNet::Facebook::Page
 --------------------
 

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

@@ -42,8 +42,9 @@ module SocialNet
         end
 
         def parse_video_data(data)
-          data_string = data.search("script")[2].children.first
-          ig_data = eval data_string.content.gsub(/window\._sharedData = /,"").gsub(/null/,'nil')
+          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]
           {}.tap do |video|

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

@@ -0,0 +1,71 @@
+require 'social_net/instagram/errors/response_error'
+require 'social_net/instagram/errors/unknown_user'
+require 'active_support'
+require 'active_support/core_ext'
+require 'nokogiri'
+
+module SocialNet
+  module Instagram
+    module Api
+      class ScrapeUserVideosRequest
+        def initialize(attrs = {})
+          @host = 'www.instagram.com'
+          @path = attrs.fetch :path, "/#{attrs[:username]}/"
+          @method = attrs.fetch :method, :get
+        end
+
+        def run
+          print "#{as_curl}\n"
+          case response = run_http_request
+          when Net::HTTPOK
+            data_string = Nokogiri::HTML response.body
+            parse_video_data data_string
+          else
+            raise Errors::ResponseError, response
+          end
+        end
+
+      private
+        def run_http_request
+          Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+            http.request http_request
+          end
+        end
+
+        def http_request
+          http_class = "Net::HTTP::#{@method.capitalize}".constantize
+          @http_request ||= http_class.new(uri.request_uri)
+        end
+
+        def uri
+          @uri ||= URI::HTTPS.build host: @host, path: @path
+        end
+
+        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
+            end
+          end
+        end
+
+        def as_curl
+          'curl'.tap do |curl|
+            curl <<  " -X #{http_request.method}"
+            http_request.each_header do |name, value|
+              curl << %Q{ -H "#{name}: #{value}"}
+            end
+            curl << %Q{ -d '#{http_request.body}'} if http_request.body
+            curl << %Q{ "#{@uri.to_s}"}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 require 'social_net/instagram/api/request'
+require 'social_net/instagram/api/scrape_user_videos_request'
 require 'social_net/instagram/errors'
 
 module SocialNet
@@ -9,17 +10,16 @@ module SocialNet
 
         def initialize(attrs = {})
           @id = attrs['id']
-          @username = attrs['username']
-          @follower_count = attrs['counts']['followed_by']
+          @username = attrs[:username]
+          @follower_count = attrs['counts']['followed_by'] if attrs['counts']
         end
 
         # Returns the existing Instagram user's most recent videos
         #
         # @return [SocialNet::Instagram::Models::Video] when the videos are found.
         def videos
-          request = Api::Request.new endpoint: "users/#{id}/media/recent"
-          videos = request.run.select {|p| p['type'] == 'video'}
-          videos.map {|r| SocialNet::Instagram::Video.new r }
+          request = Api::ScrapeUserVideosRequest.new username: @username
+          request.run
         rescue Errors::ResponseError => error
           case error.response
             when Net::HTTPBadRequest then raise Errors::UnknownUser

data/lib/social_net/version.rb

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

data/social_net.gemspec

@@ -20,12 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'nokogiri'
-
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.3"
   spec.add_development_dependency "rspec", "~> 3.1"
   spec.add_development_dependency "yard", "~> 0.8.7"
   spec.add_development_dependency "coveralls", "~> 0.7.1"
   spec.add_development_dependency "vcr", "~> 2.9"
-  spec.add_development_dependency "webmock", "~> 1.19"
+  spec.add_development_dependency "webmock", "~> 3.4.1"
 end

data/spec/social_net/instagram/models/user_spec.rb

@@ -56,7 +56,7 @@ describe SocialNet::Instagram::User, :vcr do
   end
 
   describe '.videos' do
-    subject(:user) { SocialNet::Instagram::User.find_by! username: username }
+    subject(:user) { SocialNet::Instagram::User.new username: username }
     context 'given an existing user' do
       let(:username) { existing_username }
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'simplecov'
 require 'coveralls'
+require 'webmock/rspec'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
  SimpleCov::Formatter::HTMLFormatter,