amazon_auth 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb189eb92ba2db5dcf11bc40d40bda8bc490ea2
-  data.tar.gz: 2498a86f72cabefebef0682de2debe8697cf841d
+  metadata.gz: bef1e0c0082271554c7f432b4f47c3393185a8c7
+  data.tar.gz: 35b752aa09e5afc2e6e80430340709898e29da5b
 SHA512:
-  metadata.gz: df882ca03728ed34c328f76cb4607836e1dda1185093fd7af1df4e40080ef746fbb72a5377a4dee5f1a3cc5d941c7f1060c75e69562a26e911578910c1f97da1
-  data.tar.gz: 2af1a90785ec4f78770feb83e90b141de50a1d155697c7dd213137ce03c5f7c3431bc66dee6c49b4d3e7293a17f9e6f87f2611ebe9d1127eb8c4ecb42bddec48
+  metadata.gz: 4b7a75614c9de5ee2b874cddfdadfcf3f3af0da4749f79b7b0ecccd39fac63bf2b6756908f0554f6c7db1a16a07b6368a80dd1579cea67b3ef7f0db2be710857
+  data.tar.gz: ee61dd83b8f73127a0cb8053ef4b340e67027d8e6b6c5bfb000a170b542ba251e4a6ebd09ae7ee95e3770d07292d2f8a1d5515fa1b4380a7ff1a966727592c9c

data/.gitignore

@@ -11,3 +11,4 @@
 /.env.development
 /.byebug_history
 /.ruby-version
+/.rspec_status

data/README.md

@@ -5,6 +5,9 @@
 
 Sign In Amazon using Capybara and Selenium
 
+![amazon_auth_login](https://cloud.githubusercontent.com/assets/275284/25064724/7f5faae4-223b-11e7-9fc6-4a82d1d727ab.gif)
+Recorded with [Recordit](http://recordit.co/)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -64,10 +67,8 @@ client = AmazonAuth::Client.new
 client.sign_in
 
 # Continue to the page for Kindle
-client.session.all('a').find{|e| e['href'] =~ %r{/gp/digital/fiona/manage/} }.click
-
-# Close browser
-client.driver.quit
+link = client.links_for('#navFooter a').find{|link| link =~ %r{/gp/digital/fiona/manage/} }
+client.session.visit link
 ```
 
 ### Use amazon site in different domain

data/lib/amazon_auth/client.rb

@@ -21,24 +21,42 @@ module AmazonAuth
       @driver = options.fetch(:driver, :selenium)
     end
 
+    def links_for(selector, options = {})
+      wait_for_selector(selector, options)
+      doc.css(selector).map{|e| e['href'] }
+    end
+
+    def wait_for_selector(selector, options = {})
+      options.fetch(:wait_time, 3).times do
+        if session.first(selector)
+          break
+        else
+          sleep(1)
+        end
+      end
+    end
+
     def sign_in
       session.visit initial_url
-      session.first('#a-autoid-0-announce').click
+      link = links_for('#nav-signin-tooltip a').find{|link| link =~ %r{\A/gp/navigation/redirector.html} }
+      session.visit(link) if link
+      submit_signin_form
+    end
 
-      sleep_s
+    def submit_signin_form
+      return true unless session.has_selector?('#signInSubmit')
       session.fill_in 'ap_email', with: @login
       session.fill_in 'ap_password', with: @password
       session.click_on('signInSubmit')
 
-      while alert_displayed? do
-        retry_sign_in
+      raise('Failed on signin') if alert_displayed?
+      while image_recognition_displayed? do
+        retry_signin_form_with_image_recognition
       end
-
-      session.first('.nav-line-2').click
-      session
+      true
     end
 
-    def retry_sign_in
+    def retry_signin_form_with_image_recognition
       session.fill_in 'ap_password', with: @password
       if image_recognition_displayed?
         input = ask "Got the prompt. Read characters from the image: "
@@ -48,7 +66,7 @@ module AmazonAuth
     end
 
     def alert_displayed?
-      session.has_selector?('.a-alert-container')
+      session.has_selector?('.a-alert-error')
     end
 
     def image_recognition_displayed?
@@ -59,12 +77,8 @@ module AmazonAuth
       @session ||= Capybara::Session.new(@driver)
     end
 
-    def driver
-      session.driver
-    end
-
-    def sleep_s(sec = 2)
-      sleep sec
+    def doc
+      Nokogiri.HTML(session.html)
     end
 
     # Hide instance variables of credentials on console

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara