instagram_user 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd1fb801da58a3fa43d84feca7a3bcd5b4d0b713ccd5f2c1bb0899a1d5589be
-  data.tar.gz: 25b98881499d8f7d85ed72bc7f5bff8f410cf9eb53c031f5dc1b7bc9aa24fea2
+  metadata.gz: 98097b96666004c41115ff4cc58e524d53d4f853f006c4bb3bafc29ff11814ef
+  data.tar.gz: 032d757f8c4e5af72719c18f22f7cc866a8117e16bfef5650c7144eb0d6632b8
 SHA512:
-  metadata.gz: 91c9dbe134413dc9fcc0a151e75de90bd0cc35bade7410cee8573b03131ae0a27f3926c5c0e373269fcefb29ed97a60352f6e3504ab52d93d9b78042ced6c9bd
-  data.tar.gz: 98e037164f0b8b8ba691b48562d0772343cd3b351226d85a275169aa71829c9982b71049535d93569b7282b90be2dfd7bb0618f9d471bb819e8065180d9b2d07
+  metadata.gz: f1bc2c73b89ba027a02613f3a68f3fa9f64127683ac79a582083f3bc93ed114fd2a7bae667b02b44beac4e7cdbd08dd14d0e1e0820a7c71118b908707abf3744
+  data.tar.gz: 388155aa42ec3fb769ebd9f5c5aa5fc4d4caaf4ad02aebd1747aa8aa2d571da3de6d6004705e7c39c6fbb7c2a2124490c30a077d8c764f74b9bad94af16c7681

data/.travis.yml

@@ -9,10 +9,4 @@ rvm:
   - 2.5.0
 before_install:
  - gem install bundler -v 1.15.4
- - sudo apt-get update
- - sudo apt-get install chromium-chromedriver
-before_script:
-  - "export PATH=$PATH:/usr/lib/chromium-browser/"
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-- sleep 3 # give xvfb some time to start
+ - sudo apt-get update

data/Rakefile

@@ -1,15 +1,12 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
-require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:rspec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rspec_opts = ['-cfd --backtrace']
 end
 
-RuboCop::RakeTask.new(:style)
-
 Coveralls::RakeTask.new
 
 task :default => ["rspec", "style"]

data/instagram_user.gemspec

@@ -33,10 +33,11 @@ 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 "guard-rspec"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "guard"
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency "terminal-notifier"
+  spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'ffi', '1.9.18'
 end

data/lib/instagram_user/client.rb

@@ -34,7 +34,7 @@ module InstagramUser
       @session       = Mechanize.new
       @user_ids      = {}
       logined_session
-      selenium_setting
+      selenium_setting unless options[:selenium] == false
     end
 
     def get_follows(user_name)
@@ -48,55 +48,41 @@ module InstagramUser
     end
 
     def create_follow(user_name)
-      @driver.get "https://www.instagram.com/#{user_name}"
-      begin
-        @wait.until { !@driver.find_elements(:xpath, '//article//button').empty? }
-      rescue => e
-        return false
-      end
+      color = get_follow_btn_color(user_name)
 
-      color = @driver.find_element(:xpath, '//article//button').css_value("color")
-      return false if color != "rgba(255, 255, 255, 1)"
+      return false if color == false || color != "rgba(255, 255, 255, 1)"
 
       @driver.find_element(:xpath, '//article//button').click
       sleep(2)
 
-      @driver.get "https://www.instagram.com/#{user_name}"
-      @wait.until { !@driver.find_elements(:xpath, '//article//button').empty? }
-      color = @driver.find_element(:xpath, '//article//button').css_value("color")
-      (color == "rgba(255, 255, 255, 1)") ? false : true
+      color = get_follow_btn_color(user_name)
+      (color == false || color == "rgba(255, 255, 255, 1)") ? false : true
     end
 
     def delete_follow(user_name)
-      @driver.get "https://www.instagram.com/#{user_name}"
-      begin
-        @wait.until { !@driver.find_elements(:xpath, '//article//button').empty? }
-      rescue => e
-        return false
-      end
+      color = get_follow_btn_color(user_name)
 
-      color = @driver.find_element(:xpath, '//article//button').css_value("color")
-      return false if color == "rgba(255, 255, 255, 1)"
+      return false if color == false || color == "rgba(255, 255, 255, 1)"
 
       @driver.find_element(:xpath, '//article//button').click
       sleep(2)
 
-      @driver.get "https://www.instagram.com/#{user_name}"
-      @wait.until { !@driver.find_elements(:xpath, '//article//button').empty? }
-      color = @driver.find_element(:xpath, '//article//button').css_value("color")
-      (color != "rgba(255, 255, 255, 1)") ? false : true
+      color = get_follow_btn_color(user_name)
+      (color == false || color != "rgba(255, 255, 255, 1)") ? false : true
     end
 
-    def get_cookies_d
-      @driver.manage.all_cookies
-    end
+    private
 
-    def get_cookies_s
-      @session.cookie_jar.cookies
+    def get_follow_btn_color(user_name)
+      @driver.get "https://www.instagram.com/#{user_name}"
+      begin
+        @wait.until { !@driver.find_elements(:xpath, '//article//button').empty? }
+      rescue => e
+        return false
+      end
+      @driver.find_element(:xpath, '//article//button').css_value("color")
     end
 
-    private
-
     def selenium_setting
       options = Selenium::WebDriver::Chrome::Options.new
       options.add_argument("--user-agent=#{@user_agent}")

data/lib/instagram_user/version.rb

@@ -1,3 +1,3 @@
 module InstagramUser
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instagram_user
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Yuzuru Suzuki
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.18
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.18
 description: Client for the Instagram Web Service without Instagram API. Implemented
   in Ruby using the Selenium and Mechanize module.
 email:
@@ -158,11 +172,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile

data/.coveralls.yml

@@ -1,2 +0,0 @@
-service_name: travis-ci
-repo_token: NNw89hx1lshdkrnkvBTOo3oI3LlZ8pkDB

data/.rubocop.yml

@@ -1,15 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-Metrics/AbcSize:
-  Enabled: false
-# "Missing top-level class documentation comment."を無効
-Style/Documentation:
-  Enabled: false
-
-# "Prefer single-quoted strings when you don't need string interpolation or special symbols."を無効
-Style/StringLiterals:
-  Enabled: false
-
-# "Line is too long"を無効
-Metrics/LineLength:
-  Enabled: false

data/.rubocop_todo.yml

@@ -1,131 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2018-01-29 23:22:25 +0900 using RuboCop version 0.52.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'instagram_user.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'instagram_user.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'lib/instagram_user/client.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/IndentHash:
-  Exclude:
-    - 'lib/instagram_user/client.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceBeforeBlockBraces:
-  Exclude:
-    - 'lib/instagram_user/client.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Exclude:
-    - 'Rakefile'
-    - 'lib/instagram_user/client.rb'
-    - 'spec/instagram_user_spec.rb'
-
-# Offense count: 1
-Metrics/CyclomaticComplexity:
-  Max: 9
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 15
-
-# Offense count: 1
-Metrics/PerceivedComplexity:
-  Max: 9
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Encoding:
-  Exclude:
-    - 'instagram_user.gemspec'
-    - 'lib/instagram_user/client.rb'
-
-# Offense count: 2
-# Configuration parameters: .
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  EnforcedStyle: unannotated
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-Style/HashSyntax:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'instagram_user.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantFreeze:
-  Exclude:
-    - 'lib/instagram_user/client.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Exclude:
-    - 'instagram_user.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MinSize, WordRegex.
-# SupportedStyles: percent, brackets
-Style/WordArray:
-  EnforcedStyle: brackets
-
-# Offense count: 10
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 157