birdsong 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e225de345219a482d98dc634601169cb2ab42c78cc9105574fb426f34d334980
-  data.tar.gz: 39f26a882f4e5939012fef4f64b30dabe5b28983a8d21fee6723b75a7342f889
+  metadata.gz: ebf200672c8ac8965aa8e61af1346f32724a1b5244cebda6dff9e74efbdaea50
+  data.tar.gz: b73a8da99d9fdf61ccb62e2ddd474e2267ca4e5057a29f642d36d8a9e4f8837c
 SHA512:
-  metadata.gz: cac7812476ce19901ac91d1701bf8d01772156d1cf1e9e64d4cd17e9a47d1e8cf60e5f8c05b97c387576f0a910a89aeba1aaca9753764107b4cda6f11de97efe
-  data.tar.gz: c50a4320302b0f87ae09be8b445faa52b7935e4177ffa3804de1ade10faad1c4377590750ef3c369d57d977f0e45022db6898dd7a3901426f0cadcfd0007a4e4
+  metadata.gz: 686cf3df6f5dfac9fbe71de0c599b5581057ef8f5e63c93dfda4c6ab58e5b775a475dda944b41f2d0fee2a97acb1e478b301969c9af3ee4c9540636bee86f851
+  data.tar.gz: 556899f220a43bd05e3fed8b214c77312d48f33cc4d029c8d21c9a919cf2d21f046821d9b883014fa1f966353b926bb2f9510a0dc55f850c9f293fb42c0e0a45

data/lib/birdsong/monkeypatch.rb

@@ -41,7 +41,7 @@ module SeleniumMonkeypatch
       data[:sessionId] = @session_id if @session_id
       message = @ws.send_cmd(**data)
       if message.nil? == false && message["error"] && (method != "Fetch.continueRequest")
-        raise Birdsong::Error::WebDriverError, error_message(message["error"])
+        raise Birdsong::WebDriverError, error_message(message["error"])
       end
 
       message

data/lib/birdsong/scrapers/scraper.rb

@@ -94,6 +94,7 @@ module Birdsong
         end
       rescue Selenium::WebDriver::Error::WebDriverError
         # Eat them
+      rescue Birdsong::WebDriverError
       end
 
       # Now that the intercept is set up, we visit the page we want
@@ -108,8 +109,10 @@ module Birdsong
       end
 
       page.driver.execute_script("window.stop();")
+
       raise Birdsong::NoTweetFoundError if response_body.nil?
       Oj.load(response_body)
+    rescue Birdsong::WebDriverError
     end
 
   private
@@ -140,49 +143,49 @@ module Birdsong
       Capybara.current_driver = :selenium
     end
 
-    def login
-      # Reset the sessions so that there's nothing laying around
-      page.quit
-
-      # Check if we're on a Instagram page already, if not visit it.
-      unless page.driver.browser.current_url.include? "instagram.com"
-        # There seems to be a bug in the Linux ARM64 version of chromedriver where this will properly
-        # navigate but then timeout, crashing it all up. So instead we check and raise the error when
-        # that then fails again.
-        page.driver.browser.navigate.to("https://instagram.com")
-      end
-
-      # We don't have to login if we already are
-      begin
-        return if find_field("Search", wait: 10).present?
-      rescue Capybara::ElementNotFound; end
-
-      # Check if we're redirected to a login page, if we aren't we're already logged in
-      return unless page.has_xpath?('//*[@id="loginForm"]/div/div[3]/button')
-
-      # Try to log in
-      loop_count = 0
-      while loop_count < 5 do
-        fill_in("username", with: ENV["INSTAGRAM_USER_NAME"])
-        fill_in("password", with: ENV["INSTAGRAM_PASSWORD"])
-
-        begin
-          click_button("Log in", exact_text: true) # Note: "Log in" (lowercase `in`) instead redirects to Facebook's login page
-        rescue Capybara::ElementNotFound; end # If we can't find it don't break horribly, just keep waiting
-
-        break unless has_css?('p[data-testid="login-error-message"', wait: 10)
-        loop_count += 1
-        sleep(rand * 10.3)
-      end
-
-      # Sometimes Instagram just... doesn't let you log in
-      raise "Instagram not accessible" if loop_count == 5
-
-      # No we don't want to save our login credentials
-      begin
-        click_on("Save Info")
-      rescue Capybara::ElementNotFound; end
-    end
+    # def login
+    #   # Reset the sessions so that there's nothing laying around
+    #   page.quit
+
+    #   # Check if we're on a Instagram page already, if not visit it.
+    #   unless page.driver.browser.current_url.include? "twitter.com"
+    #     # There seems to be a bug in the Linux ARM64 version of chromedriver where this will properly
+    #     # navigate but then timeout, crashing it all up. So instead we check and raise the error when
+    #     # that then fails again.
+    #     page.driver.browser.navigate.to("https://twitter.com")
+    #   end
+
+      # # We don't have to login if we already are
+      # begin
+      #   return if find_field("Search", wait: 10).present?
+      # rescue Capybara::ElementNotFound; end
+
+      # # Check if we're redirected to a login page, if we aren't we're already logged in
+      # return unless page.has_xpath?('//*[@id="loginForm"]/div/div[3]/button')
+
+      # # Try to log in
+      # loop_count = 0
+      # while loop_count < 5 do
+      #   fill_in("username", with: ENV["TWITTER_USER_NAME"])
+      #   fill_in("password", with: ENV["TWITTER_PASSWORD"])
+
+      #   begin
+      #     click_button("Log in", exact_text: true) # Note: "Log in" (lowercase `in`) instead redirects to Facebook's login page
+      #   rescue Capybara::ElementNotFound; end # If we can't find it don't break horribly, just keep waiting
+
+      #   break unless has_css?('p[data-testid="login-error-message"', wait: 10)
+      #   loop_count += 1
+      #   sleep(rand * 10.3)
+      # end
+
+      # # Sometimes Instagram just... doesn't let you log in
+      # raise "Instagram not accessible" if loop_count == 5
+
+      # # No we don't want to save our login credentials
+      # begin
+      #   click_on("Save Info")
+      # rescue Capybara::ElementNotFound; end
+    # end
 
     def fetch_image(url)
       request = Typhoeus::Request.new(url, followlocation: true)

data/lib/birdsong/user.rb

@@ -30,7 +30,7 @@ module Birdsong
     def parse(user_object)
       @id = user_object[:id]
       @name = user_object[:name]
-      @username = user_object[:screen_name]
+      @username = user_object[:username]
       @created_at = DateTime.parse(user_object[:sign_up_date])
       @location = user_object[:location]
 
@@ -42,8 +42,8 @@ module Birdsong
       @url = "https://www.twitter.com/#{@username}" if @url.nil?
 
       @followers_count = user_object[:followers_count]
-      @following_count = user_object[:friends_count]
-      @tweet_count = user_object[:statuses_count]
+      @following_count = user_object[:following_count]
+      @tweet_count = user_object[:tweet_count]
       @listed_count = user_object[:listed_count]
       @verified = user_object[:verified] # this will always be `false` but we're keeping it here for compatibility
       @profile_image_file_name = Birdsong.retrieve_media(@profile_image_url)

data/lib/birdsong/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Birdsong
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/lib/birdsong.rb

@@ -23,6 +23,7 @@ module Birdsong
   class InvalidIdError < Error; end
   class InvalidMediaTypeError < Error; end
   class NoTweetFoundError < Error; end
+  class WebDriverError < Error; end
   class RateLimitExceeded < Error
     attr_reader :rate_limit
     attr_reader :rate_remaining

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: birdsong
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Christopher Guess
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A gem to interface with Twitter's API V2