compactor 0.1.2 → 0.1.6

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
+  - ree
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compactor (0.1.2)
+    compactor (0.1.6)
       mechanize (= 2.4)
 
 GEM

data/README.md

@@ -1,6 +1,6 @@
 # Compactor
 
-[![Build Status](https://secure.travis-ci.org/julio/caterpillar.png)](http://travis-ci.org/julio/caterpillar)
+[![Build Status](https://secure.travis-ci.org/julio/compactor.png)](http://travis-ci.org/julio/compactor)
 
 Scrape Amazon Seller Central
 

data/lib/compactor/scraper.rb

@@ -13,9 +13,7 @@ module Compactor
     AMAZON_COM_MARKETPLACE_ID = 'ATVPDKIKX0DER'
 
     class ReportScraper
-      def initialize(email, password, merchant_id)
-        @merchant_id = merchant_id
-
+      def initialize(user_credentials={})
         @mechanize = Mechanize.new
         @mechanize.max_file_buffer               = 4 * 1024 * 1024
         @mechanize.max_history                   = 2
@@ -23,49 +21,7 @@ module Compactor
         @mechanize.agent.http.reuse_ssl_sessions = false
 
         randomize_user_agent!
-        login_to_seller_central email, password
-      end
-
-      def self.submit_form!(form)
-        form.submit
-      rescue Mechanize::ResponseCodeError => e
-        raise ::Compactor::Amazon::NotProAccountError if e.message.include?("403 => Net::HTTPForbidden")
-        raise # any other error just re-raise it
-      end
-
-      def self.authorized_user?
-        message_box_error.empty? ||
-        !message_box_error.text.include?('There was an error with your email/password combination.')
-      end
-
-      def self.merchant_identification(credentials={})
-        @agent = Mechanize.new
-        @agent.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        @agent.agent.http.reuse_ssl_sessions = false
-        @agent.get 'https://sellercentral.amazon.com/gp/mws/registration/register.html'
-        form = @agent.page.forms.first
-        form.email    = credentials[:email]
-        form.password = credentials[:password]
-        submit_form! form
-
-        raise Compactor::Amazon::AuthenticationError unless authorized_user?
-
-        form = @agent.page.forms.first
-        form.developerName   = credentials[:developer_name]
-        form.devMWSAccountId = credentials[:dev_account_id]
-        form.radiobutton_with(:value => 'devAuthorization').checked=true
-        form.submit
-
-        form = @agent.page.forms.first
-        form.checkbox_with(:name => 'agreeCheckBox').checked=true
-        form.checkbox_with(:name => 'understandCheckBox').checked=true
-        form.submit
-
-        @agent.page.forms.first.submit
-        merchant_id    = @agent.page.parser.xpath('//table[@class="registration-key-table"]/tr[2]/td[1]').text
-        marketplace_id = @agent.page.parser.xpath('//table[@class="registration-key-table"]/tr[3]/td[1]').text
-
-        [merchant_id, marketplace_id]
+        login_to_seller_central user_credentials[:email], user_credentials[:password]
       end
 
       def marketplaces
@@ -146,10 +102,6 @@ module Compactor
 
       private
 
-      def self.message_box_error
-        @agent.page.parser.css(".messageboxerror")
-      end
-
       def slowdown_like_a_human(count)
         sleep count ** 2
       end
@@ -208,8 +160,10 @@ module Compactor
       def go_to_past_settlements(from, to)
         from = CGI.escape(from)
         to   = CGI.escape(to)
-
         @mechanize.get "https://sellercentral.amazon.com/gp/payments-account/past-settlements.html?endDate=#{to}&startDate=#{from}&pageSize=Ten"
+      rescue Mechanize::ResponseCodeError => e
+        raise ::Compactor::Amazon::NotProAccountError if e.message["403 => Net::HTTPForbidden"]
+        raise # any other error just re-raise it as is
       end
 
       def get_reports

data/lib/compactor/version.rb

@@ -1,3 +1,3 @@
 module Compactor
-  VERSION = "0.1.2"
+  VERSION = "0.1.6"
 end

data/test/scraper_test.rb

@@ -3,12 +3,9 @@ require File.dirname(__FILE__) + '/../lib/compactor'
 
 class ScraperTest < Test::Unit::TestCase
   def test_should_raise_error_with_bad_login
-    email = "bad@email.here"
-    password = "invalid"
-
     VCR.use_cassette("AmazonReportScraper/with_bad_login/raise_error") do
       assert_raises Compactor::Amazon::AuthenticationError do
-        Compactor::Amazon::ReportScraper.new(email, password, "123")
+        Compactor::Amazon::ReportScraper.new(:email => "bad@email.here", :password => "invalid")
       end
     end
   end
@@ -33,7 +30,7 @@ class ScraperTest < Test::Unit::TestCase
  
   def test_should_be_able_to_get_buyer_name_and_shipping_address_for_orders
     VCR.use_cassette("AmazonReportScraper/with_good_login/get_orders") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "test", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       orders = scraper.get_orders(["103-4328675-4697061"])
 
       assert_equal({
@@ -52,7 +49,7 @@ class ScraperTest < Test::Unit::TestCase
  
   def test_should_support_addresses_where_the_street_address_line_does_not_start_with_a_number
     VCR.use_cassette("AmazonReportScraper/with_good_login/shipping_address_not_starting_with_number") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "test", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       orders = scraper.get_orders(["105-1753716-0471420"])
 
       assert_equal({
@@ -71,7 +68,7 @@ class ScraperTest < Test::Unit::TestCase
  
   def test_should_handle_large_reports
     VCR.use_cassette("AmazonReportScraper/with_good_login/get_orders_big") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "test", "FOO")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       scraper.select_marketplace("ATVPDKIKX0DER")
       assert_nothing_raised do
         scraper.reports('2012-05-01', '2012-05-08')
@@ -81,7 +78,7 @@ class ScraperTest < Test::Unit::TestCase
 
   def test_should_find_no_reports_if_none_exist
     VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/no_reports_to_request") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password17", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       reports = scraper.reports("1/1/2012", "3/20/2012")
 
       assert_equal( true, reports.any? { |type, reports| !reports.empty? } )
@@ -90,7 +87,7 @@ class ScraperTest < Test::Unit::TestCase
 
   def test_should_find_reports_with_good_login
     VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/reports_to_request") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       reports = scraper.reports("12/28/2011", "12/30/2011")
 
       assert_equal( true, reports.any? { |type, reports| !reports.empty? } )
@@ -99,7 +96,7 @@ class ScraperTest < Test::Unit::TestCase
  
   def test_should_find_reports_in_more_than_on_page
     VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/multiple_pages") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       reports = scraper.reports("3/1/2012", "3/21/2012")
 
       assert_equal( true, reports.any? { |type, reports| !reports.empty? } )
@@ -108,7 +105,7 @@ class ScraperTest < Test::Unit::TestCase
   
   def test_should_find_no_reports_if_not_in_date_range
     VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/no_reports") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password17", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       reports = scraper.reports("1/1/2011", "1/8/2011")
 
       assert_equal( true, reports.all? { |type, reports| reports.empty? } )
@@ -117,7 +114,7 @@ class ScraperTest < Test::Unit::TestCase
 
   def test_should_raise_error_if_nothing_to_request
     VCR.use_cassette("AmazonReportScraper/with_good_login/find_reports/no_reports_to_request") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password17", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       Compactor::Amazon::ReportScraper.stubs(:report_type).raises(Compactor::Amazon::UnknownReportType)
 
       assert_raises Compactor::Amazon::UnknownReportType do
@@ -127,15 +124,15 @@ class ScraperTest < Test::Unit::TestCase
   end
 
   def test_should_return_balance
-    VCR.use_cassette("AmazonReportScraper/with_good_login/get_balance", :record => :once) do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password", "FOO")
+    VCR.use_cassette("AmazonReportScraper/with_good_login/get_balance") do
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       assert_equal(26.14, scraper.get_balance)
     end
   end
 
   def test_should_list_marketplaces_if_single
     VCR.use_cassette("AmazonReportScraper/with_good_login/with_single_marketplaces/get_marketplaces") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password", "FOO")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       expected_marketplaces = [["www.amazon.com", nil]]
       assert_equal expected_marketplaces, scraper.get_marketplaces.sort
     end
@@ -143,7 +140,7 @@ class ScraperTest < Test::Unit::TestCase
 
   def test_should_list_marketplaces_if_several
     VCR.use_cassette("AmazonReportScraper/with_good_login/with_multiple_marketplaces/get_marketplaces") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password", "FOO")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       expected_marketplaces = [["Your Checkout Website", "AZ4B0ZS3LGLX"], ["Your Checkout Website (Sandbox)", "A2SMC08ZTYKXKX"], ["www.amazon.com", "ATVPDKIKX0DER"]]
       assert_equal expected_marketplaces, scraper.get_marketplaces.sort
     end
@@ -151,7 +148,7 @@ class ScraperTest < Test::Unit::TestCase
 
   def test_should_find_reports_for_current_marketplace
     VCR.use_cassette("AmazonReportScraper/with_good_login/with_multiple_marketplaces/find_reports/reports_to_request") do
-      scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "password", "123")
+      scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       scraper.select_marketplace("AZ4B0ZS3LGLX")
       reports_1 = scraper.reports("4/1/2012", "4/5/2012")
       assert_equal(719, ( reports_1[:xml].first =~ /<AmazonOrderID>.*<\/AmazonOrderID>/ ) )
@@ -166,7 +163,7 @@ class ScraperTest < Test::Unit::TestCase
   def test_should_raise_error_with_bad_login
     VCR.use_cassette("AmazonReportScraper/with_bad_login/raise_error") do
       assert_raises Compactor::Amazon::AuthenticationError do
-        scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "invalid", "123")
+        scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       end
     end
   end
@@ -174,15 +171,15 @@ class ScraperTest < Test::Unit::TestCase
   def test_should_raise_error_with_no_email_or_password
     VCR.use_cassette("AmazonReportScraper/with_bad_login/raise_error") do
       assert_raises Compactor::Amazon::AuthenticationError do
-        scraper = Compactor::Amazon::ReportScraper.new(nil, nil, "123")
+        scraper = Compactor::Amazon::ReportScraper.new({})
       end
     end
   end
 
   def test_should_raise_error_with_locked_account
-    VCR.use_cassette("AmazonReportScraper/with_locked_account/raise_error", :record => :once) do
+    VCR.use_cassette("AmazonReportScraper/with_locked_account/raise_error") do
       assert_raises Compactor::Amazon::LockedAccountError do
-        scraper = Compactor::Amazon::ReportScraper.new("far@far.away", "test", "123")
+        scraper = Compactor::Amazon::ReportScraper.new(:email => "far@far.away", :password => "test")
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: compactor
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Julio Santos
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-03 00:00:00 Z
+date: 2012-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
@@ -125,6 +125,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- compactor-0.1.2.gem
 - compactor.gemspec
 - lib/compactor.rb
 - lib/compactor/extensions.rb