instagram_user 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b0c5d18f6e2c75704487190bf077a0fbafb7d02e5d469c0a7810c7d48b760b6
-  data.tar.gz: 871f5271736f3b240a9cd607162e8a9ccd42676162dd6f6b5a4dd0b8e1803eea
+  metadata.gz: 674bceac91ab64010c5a06a357c05a73760e6a4fe863e6c89def4b58fd8b18fa
+  data.tar.gz: afd2d5751f66300b54ee91094993b1a27282577a014ad5884f0af6a050a6c699
 SHA512:
-  metadata.gz: 1ac47a227f1730288f4fc122510437fec2641e875b0fdd1e51b6476f7d8865ae601f7da04f66a2976112c384e82da7432cacdb342ac4013ab4c42400c45631d4
-  data.tar.gz: 5b3e0c9e45c8fdc8f05fbfe04e7836a2e95c728f82f97062dc777fc003444c042db341f0f21b191f52cec8c46e241af86a41455e0f5efbc8acab069b478745e1
+  metadata.gz: d58053555b985c76b71507d7cad0b38f4997e466ebfde814ebe883e4196cb460e1bedb0c0dd2523865ebee936226e6a7685500b6309d705c6e706470d2da3166
+  data.tar.gz: 826420c446d6c05ce3cae5c362b6c943489c6c4a2ae0f90a8d4e671c811923a4f543485cc561d292053ff0b94cf4029320d242d8b6e67e8edf8c7c6a9199aa55

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://img.shields.io/gem/v/instagram_user.svg?style=flat)](http://badge.fury.io/rb/instagram_user)
 [![Coverage Status](https://img.shields.io/coveralls/YuzuruS/instagram_user.svg?style=flat)](https://coveralls.io/r/YuzuruS/instagram_user?branch=master)
-[![Code Climate](https://img.shields.io/codeclimate/github/YuzuruS/instagram_user.svg?style=flat)](https://codeclimate.com/github/YuzuruS/instagram_user)
+[![Maintainability](https://api.codeclimate.com/v1/badges/4aca4672a1a60538eef9/maintainability)](https://codeclimate.com/github/YuzuruS/instagram_user/maintainability)
 
 Client for the Instagram Web Service without Instagram API.  
 Implemented in Ruby using the Selenium and Mechanize module.
@@ -42,6 +42,10 @@ res = cli.create_follow('yuzuru_dev')
 # Unfollow the specified user
 res = cli.delete_follow('yuzuru_dev')
 # => true or false
+
+# get media for the specified tag
+res = cli.get_medias_by_tag('japanesefood')
+# => {"recent" => [...], "popularity" => [...]}
 ```
 
 ## Contributing

data/instagram_user.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'selenium-webdriver'
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "terminal-notifier"

data/lib/instagram_user/client.rb

@@ -2,7 +2,6 @@ require 'mechanize'
 require 'selenium-webdriver'
 require 'json'
 require 'instagram_user/version'
-require 'pry'
 
 module InstagramUser
   class Client
@@ -10,8 +9,8 @@ module InstagramUser
     BASE_URL              = 'https://www.instagram.com/graphql/query/?query_hash=%s&variables=%s'.freeze
     LOGIN_URL             = 'https://www.instagram.com/accounts/login/ajax/'.freeze
     USER_INFO_URL         = 'https://www.instagram.com/%s/?__a=1'.freeze
+    MEDIA_JSON_BY_TAG_URL = 'https://www.instagram.com/explore/tags/%s/?__a=1&max_id=%s'.freeze
     DEFAULT_USER_AGENT    = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.84 Safari/537.36'.freeze
-    DEFAULT_MAX_NUM_USERS = 3000
     DEFAULT_REFERER       = 'https://www.instagram.com/'.freeze
 
     USER_MAP = {
@@ -30,21 +29,22 @@ module InstagramUser
       @password      = (ENV['INSTAGRAM_PASSWORD']   || options[:password])
       @user_agent    = (ENV['INSTAGRAM_USER_AGENT'] || options[:user_agent] || DEFAULT_USER_AGENT)
       @referer       = (ENV['INSTAGRAM_REFERER']    || options[:referer]    || DEFAULT_REFERER)
-      @num_users     = (ENV['INSTAGRAM_NUM_USERS']  || options[:num_users]  || DEFAULT_MAX_NUM_USERS)
       @session       = Mechanize.new
       @user_ids      = {}
-      logined_session
-      selenium_setting unless options[:selenium] == false
+
+      return if @user_name.nil? || @password.nil?
+      mechanize_login_setting
+      selenium_login_setting unless options[:selenium] == false
     end
 
-    def get_follows(user_name)
+    def get_follows(user_name, num_users = 3000)
       user_id = @user_ids[user_name].nil? ? get_user_id(user_name) : @user_ids[user_name]
-      fetch_all_user_names(user_id, USER_MAP[:follow])
+      fetch_all_user_names(user_id, USER_MAP[:follow], num_users)
     end
 
-    def get_followers(user_name)
+    def get_followers(user_name, num_users = 3000)
       user_id = @user_ids[user_name].nil? ? get_user_id(user_name) : @user_ids[user_name]
-      fetch_all_user_names(user_id, USER_MAP[:follower])
+      fetch_all_user_names(user_id, USER_MAP[:follower], num_users)
     end
 
     def create_follow(user_name)
@@ -71,6 +71,23 @@ module InstagramUser
       (color == false || color != "rgba(255, 255, 255, 1)") ? false : true
     end
 
+    def get_medias_by_tag(tag_name, req_num = 1)
+      max_id = nil
+      tags   = {"recent" => [], "popularity" => []}
+
+      req_num.times do
+        url = format MEDIA_JSON_BY_TAG_URL, tag_name, max_id
+        page = @session.get(url)
+        json = JSON.parse(page.body)
+        hastags = json["graphql"]["hashtag"]
+        tags["recent"]    += hastags["edge_hashtag_to_media"]["edges"]
+        tags["popularity"] = hastags["edge_hashtag_to_top_posts"]["edges"] if max_id.nil?
+        break unless hastags["edge_hashtag_to_media"]["page_info"]["has_next_page"]
+        max_id = hastags["edge_hashtag_to_media"]["page_info"]["end_cursor"]
+      end
+      tags
+    end
+
     private
 
     def get_follow_btn_color(user_name)
@@ -83,7 +100,7 @@ module InstagramUser
       @driver.find_element(:xpath, '//article//button').css_value("color")
     end
 
-    def selenium_setting
+    def selenium_login_setting
       options = Selenium::WebDriver::Chrome::Options.new
       options.add_argument("--user-agent=#{@user_agent}")
       options.add_argument('--headless')
@@ -117,7 +134,7 @@ module InstagramUser
       @user_ids[user_name]
     end
 
-    def logined_session
+    def mechanize_login_setting
       @session.request_headers = login_http_headers
       @session.post(LOGIN_URL, user_info)
     end
@@ -143,12 +160,12 @@ module InstagramUser
       }
     end
 
-    def fetch_all_user_names(user_id, request_params)
+    def fetch_all_user_names(user_id, request_params, num_users)
       after      = nil
       user_names = []
 
       loop do
-        res = fetch_user_names(user_id, request_params, after)
+        res = fetch_user_names(user_id, request_params, num_users, after)
         user_names += res[:user_names]
         break unless res[:has_next]
         after = res[:after]
@@ -156,10 +173,10 @@ module InstagramUser
       user_names
     end
 
-    def fetch_user_names(user_id, request_params, after = nil)
+    def fetch_user_names(user_id, request_params, num_users, after)
       variables = {
         id:    user_id,
-        first: @num_users
+        first: num_users
       }
       variables[:after] = after unless after.nil?
       url = format BASE_URL, request_params[:query_hash], JSON.generate(variables)

data/lib/instagram_user/version.rb

@@ -1,3 +1,3 @@
 module InstagramUser
-  VERSION = "1.0.2".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instagram_user
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuzuru Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="