amazon_auth 0.4.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd3624417b3a13baad3a2812cf7bdc6f874966e69290b3e5dce2bfb748b4a9a
-  data.tar.gz: fff02f6937501b76a01d16a9de7b9ade90b02b2e4ac5de8448b58293a69b8579
+  metadata.gz: 2616112a7c77ce7a370145836360fc55df643716450e6222d95affa6c1b942ec
+  data.tar.gz: e96f0dad4d371aeaf0c6bd7dc325cd252fea806e992c322aceef88e01e5c7cc4
 SHA512:
-  metadata.gz: 3dfdb0bf93116a962ab13314f7342837bb920371d35f9e0cb1ab26754d9b65d23237b2de6263d6621b2eb1dc3631f6ebe262c457695192882edf41d304090060
-  data.tar.gz: 3a72e83fc180ee2028b5b4b0382f0b290d631a233eb9aae4a71827c9eae7d90f91701b672c16a98066dcf7567c70aa27539faf6ec2c3e7c6ef2249af7549667b
+  metadata.gz: a18f9d6ce597e2c12a96bdf6748bc8eda365533f8d5daebd968282a58dfb330cf12adfc7c057b529b1b5e20a05a9c61e9a41ba5cf8c0922b27db921f656f0f4a
+  data.tar.gz: 99b3832589d28b9e4eebf5bf4fc3fe590ecc5b57ec6031a5b5e4854d472add8d700b1abf118d10d9dfb441454d1ce2152c6d95220726b474e446f200b7d8b1db

data/.circleci/config.yml

@@ -0,0 +1,21 @@
+version: 2.1
+
+jobs:
+  test:
+    parameters:
+      ruby-version:
+        type: string
+    docker:
+      - image: cimg/ruby:<< parameters.ruby-version >>-browsers
+    steps:
+      - checkout
+      - run: bundle install
+      - run: bundle exec rspec
+
+workflows:
+  all-tests:
+    jobs:
+      - test:
+          matrix:
+            parameters:
+              ruby-version: ["2.7.5", "3.0.3"]

data/README.md

@@ -1,7 +1,7 @@
 # AmazonAuth
 
 [![Gem Version](https://badge.fury.io/rb/amazon_auth.svg)](https://badge.fury.io/rb/amazon_auth)
-[![Build Status](https://travis-ci.org/kyamaguchi/amazon_auth.svg?branch=master)](https://travis-ci.org/kyamaguchi/amazon_auth)
+[![CircleCI](https://circleci.com/gh/kyamaguchi/amazon_auth.svg?style=svg)](https://circleci.com/gh/kyamaguchi/amazon_auth)
 
 Sign In Amazon using Capybara and Selenium
 
@@ -31,7 +31,7 @@ Or install it yourself as:
 
 Before running, you need to **download chromedriver**.  
 And you may need to **update chromedriver regularly**.  
-Please download latest chromedriver_xxx.zip from http://chromedriver.storage.googleapis.com/index.html and place it somewhere on your PATH.
+Please download latest chromedriver_xxx.zip from https://chromedriver.storage.googleapis.com/index.html and place it somewhere on your PATH.
 
 ```
 mv ~/Downloads/chromedriver /usr/local/bin/
@@ -120,31 +120,12 @@ client = AmazonAuth::Client.new(debug: true)
 
 ### Use Firefox
 
-This gem may not work with newer versions of Firefox.  
-Check README of [capybara](https://github.com/teamcapybara/capybara).  
-
-Firefox (<= 47.0.2) may work better.  
-
-[Download Firefox](https://ftp.mozilla.org/pub/firefox/releases/)  
-Don't forget to disable automatic updates of Firefox.  
-
-You may also need geckodriver.  
-This may need to be older depending on the version of selenium-webdriver.  
-
-[Download geckodriver](https://github.com/mozilla/geckodriver/releases)  
-
-If the browser doesn't work, try selenium-webdriver version '~> 2.0' or different version of geckodriver/Firefox.
-
 In console,
 
 ```
 client = AmazonAuth::Client.new(driver: :firefox)
 ```
 
-## TODO
-
-- [Idea] Hook `submit_signin_form` after every `visit` and `click` action
-
 ## Development
 
 Use _.env.development_ instead of _.env_ in development.

data/lib/amazon_auth/extensions/session_extension.rb

@@ -29,7 +29,9 @@ module AmazonAuth
       session.visit url
       debug "Visiting #{url}"
       restore_cookies if keep_cookie?
-      if (link = links_for('a').find{|l| l =~ %r{\A/gp/navigation/redirector.html} })
+      if session.current_url.include?('/ap/signin')
+        debug "current_url: [#{session.current_url}]"
+      elsif (link = find_sign_in_link)
         debug "link: [#{link}]"
         session.visit(link)
       end
@@ -105,6 +107,24 @@ module AmazonAuth
       session.has_selector?('#auth-captcha-image-container')
     end
 
+    def find_sign_in_link
+      m1 = session.html.match(%r{(/ap/signin[^'"]+)['"]})
+      return CGI.unescapeHTML(m1[1]) if m1
+
+      # Maybe the following patterns are deprecated
+      link = links_for('a').find{|l| l =~ %r{\A/gp/navigation/redirector.html} }
+      if link
+        debug "Found a link [#{link}]"
+        return link
+      end
+      m2 = session.html.match(%r{'(/gp/navigation/redirector.html[^']+)'})
+      if m2
+        debug "Found a link (.html.match) [#{m2[1]}]"
+        return m2[1]
+      end
+      nil
+    end
+
     private
 
     def login

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.4.6"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Kazuho Yamaguchi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -158,9 +158,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -181,7 +181,7 @@ homepage: https://github.com/kyamaguchi/amazon_auth
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -196,8 +196,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Login amazon.
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-before_install: gem install bundler