compactor 0.3.5 → 0.3.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compactor (0.3.5)
+    compactor (0.3.8)
       jruby-openssl (= 0.7.3)
       mechanize (= 2.4)
       nokogiri (>= 1.5.0, < 1.5.3)

data/lib/compactor/scraper.rb

@@ -2,17 +2,18 @@
 
 module Compactor
   module Amazon
-    class AddressParseFailure  < StandardError; end
-    class AuthenticationError  < StandardError; end
-    class LockedAccountError   < StandardError; end
-    class MissingReportButtons < StandardError; end
-    class MissingRow           < StandardError; end
-    class MissingXmlReport     < StandardError; end
-    class NoMarketplacesError  < StandardError; end
-    class NotProAccountError   < StandardError; end
-    class ReportLoadingTimeout < StandardError; end
-    class ReportTotalsMismatch < StandardError; end
-    class UnknownReportType    < StandardError; end
+    class AddressParseFailure    < StandardError; end
+    class AuthenticationError    < StandardError; end
+    class LockedAccountError     < StandardError; end
+    class LoginFormNotFoundError < StandardError; end
+    class MissingReportButtons   < StandardError; end
+    class MissingRow             < StandardError; end
+    class MissingXmlReport       < StandardError; end
+    class NoMarketplacesError    < StandardError; end
+    class NotProAccountError     < StandardError; end
+    class ReportLoadingTimeout   < StandardError; end
+    class ReportTotalsMismatch   < StandardError; end
+    class UnknownReportType      < StandardError; end
 
     ATTEMPTS_BEFORE_GIVING_UP = 15 # give up after 20 minutes
     MARKETPLACE_HOMEPAGE      = "https://sellercentral.amazon.com/gp/homepage.html"
@@ -20,7 +21,7 @@ module Compactor
 
     class ReportScraper
       def initialize(user_credentials={})
-        @mechanize = Mechanize.new
+        @mechanize = agent
         @mechanize.max_file_buffer               = 4 * 1024 * 1024
         @mechanize.max_history                   = 2
         @mechanize.agent.http.verify_mode        = OpenSSL::SSL::VERIFY_NONE
@@ -103,11 +104,11 @@ module Compactor
       def payee_details(order_id)
         @mechanize.get order_detail_url(order_id)
         order = {}
-        order["BuyerName"] = buyer_name
+        order["BuyerName"]       = buyer_name
         order["ShippingAddress"] = shipping_address
-
         order
       rescue => e
+        nil
       end
 
       def get_orders(order_ids)
@@ -120,6 +121,10 @@ module Compactor
 
       private
 
+      def agent
+        Mechanize.new
+      end
+
       def slowdown_like_a_human(count)
         sleep count ** 2
       end
@@ -219,7 +224,7 @@ module Compactor
       end
 
       # 6 attempts make it wait at most a minute, or close enough to it
-      def wait_for_element(attempts=6, &block)
+      def wait_for_element(attempts=default_number_of_attempts, &block)
         attempts.times do |attempt|
           element = yield
           return element unless element.blank?
@@ -229,6 +234,10 @@ module Compactor
         nil # no element found
       end
 
+      def default_number_of_attempts
+        6
+      end
+
       def rescue_empty_results(&block)
         3.times do
           yield
@@ -285,8 +294,7 @@ module Compactor
       end
 
       def page_has_no_results?
-        data_display_element =
-          wait_for_element { @mechanize.page.search(".data-display") }
+        data_display_element = @mechanize.page.search(".data-display")
 
         fail ReportLoadingTimeout if data_display_element.blank?
 
@@ -319,8 +327,12 @@ module Compactor
       end
 
       def login_to_seller_central(email, password)
-        @mechanize.get MARKETPLACE_HOMEPAGE
-        form = @mechanize.page.forms.first
+        form = wait_for_element do
+          @mechanize.get MARKETPLACE_HOMEPAGE
+          @mechanize.page.forms.first
+        end
+        raise Compactor::Amazon::LoginFormNotFoundError if form.blank?
+
         form.email    = email
         form.password = password
         form.submit
@@ -340,4 +352,4 @@ module Compactor
       end
     end
   end
-end
+end

data/lib/compactor/version.rb

@@ -1,3 +1,3 @@
 module Compactor
-  VERSION = "0.3.5"
+  VERSION = "0.3.8"
 end

data/test/scraper_test.rb

@@ -5,7 +5,7 @@ class ScraperTest < Test::Unit::TestCase
   def setup
     Compactor::Amazon::XmlParser.any_instance.stubs(:valid?).returns(true)
   end
-  
+
   def test_should_not_find_elements_that_do_not_exist
     VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/reports_to_request") do
       scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
@@ -28,6 +28,28 @@ class ScraperTest < Test::Unit::TestCase
     end
   end
 
+  def test_should_raise_error_if_cannot_find_login_form
+    Mechanize::Page.any_instance.stubs(:forms).returns([])
+    Compactor::Amazon::ReportScraper.any_instance.stubs(:wait_for_element).returns(nil)
+    VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/reports_to_request") do
+      assert_raises Compactor::Amazon::LoginFormNotFoundError do
+        Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
+      end
+    end
+  end
+
+  def test_should_still_get_forms_if_first_time_fails
+    Compactor::Amazon::ReportScraper.any_instance.stubs(:agent).returns(MockMechanize.new)
+    Compactor::Amazon::ReportScraper.any_instance.stubs(:default_number_of_attempts).returns(2)
+    Compactor::Amazon::ReportScraper.any_instance.stubs(:bad_login?).returns(false)
+    Compactor::Amazon::ReportScraper.any_instance.stubs(:locked_account?).returns(false)
+    VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/reports_to_request") do
+       assert_nothing_raised do
+        Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
+      end
+    end
+  end
+
   def test_should_raise_error_with_bad_login
     VCR.use_cassette("AmazonReportScraper/with_bad_login/raise_error") do
       assert_raises Compactor::Amazon::AuthenticationError do
@@ -209,4 +231,29 @@ class ScraperTest < Test::Unit::TestCase
       end
     end
   end
+
+  class MockMechanize < Mechanize
+    def get(url)
+      def get(url)
+        @page = MockMechanizePageWithForms.new # other times
+      end
+      @page = MockMechanizePageWithNoForms.new # first time
+    end
+
+    def page
+      @page
+    end
+
+    class MockMechanizePageWithForms
+      def forms
+        [OpenStruct.new(:email => nil, :password => nil, :submit => nil), OpenStruct.new(:email => nil, :password => nil, :submit => nil)]
+      end
+    end
+
+    class MockMechanizePageWithNoForms
+      def forms
+        []
+      end
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 3
-    - 5
-  version: 0.3.5
+    - 8
+  version: 0.3.8
 platform: ruby
 authors: 
   - Julio Santos
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-07 00:00:00 -08:00
+date: 2013-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency