amazon_seller_central 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70be9ababfe212aee8304c2191a19a72ffe601ba
-  data.tar.gz: 19bf6ce4c79d617b79d9d977114d587806202532
+  metadata.gz: 098fcab6a60c2000d071edc90ce8de132815908e
+  data.tar.gz: b3654010b6785c88c7406b766011448dfc63084c
 SHA512:
-  metadata.gz: 8f8ac03ee16070fb4e5d2f43b52d3530f23bd2526011f5f8075fb84e511a7237ad130756145c52b256188a153dfe28d32764fe0f4670d4599c4d959defaec660
-  data.tar.gz: 30ec3b637afdea372c765e90a2205281f3701ad2f1316450bb2e8b84e7526351e65d95bb3366000461b6fb68bc53e81e61932933aaecbbcfde2ecc9da6400541
+  metadata.gz: e53d1647571bd4d3a75619d6df28f6ed954af99c6a01f80e379a504d975c50a7102449932927c152d41da5b2dece950a03090973bd7d19235ed239f8ce0acf21
+  data.tar.gz: e807a0a37fd1309c864e8ad0229843b7f23c44a998a48ededf066d0eb214a61679a3f15a7faa756b7293609f55086232e13773973bef77eaa1b4c3f2e315972c

data/Gemfile

@@ -11,14 +11,12 @@ group :development do
   gem "rspec", "~> 2.3.0"
   gem "bundler"
   gem "jeweler"
-  gem "rcov", ">= 0"
+  gem "simplecov"
   gem 'yard'
   gem 'guard'
   gem 'guard-rspec'
-  gem 'rb-inotify', '>= 0.8.5'
-  gem 'libnotify'
   gem 'ffi'
   gem 'faker'
   gem 'fakeweb'
-  gem 'ruby-debug19'
+  gem 'pry'
 end

data/Gemfile.lock

@@ -1,32 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.5)
+    addressable (2.3.6)
+    builder (3.2.2)
+    coderay (1.1.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.2)
+    docile (1.1.5)
     domain_name (0.5.13)
       unf (>= 0.0.5, < 1.0.0)
     faker (0.9.5)
       i18n (~> 0.4)
     fakeweb (1.3.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.0.9)
-    git (1.2.6)
+    git (1.2.8)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
     guard (0.5.0)
       thor (~> 0.14.6)
     guard-rspec (0.4.0)
       guard (>= 0.4.0)
+    hashie (3.3.1)
+    highline (1.6.21)
     http-cookie (1.0.1)
       domain_name (~> 0.5)
     i18n (0.6.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
     json (1.8.1)
-    libnotify (0.5.6)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
+    jwt (1.0.0)
     mechanize (2.7.2)
       domain_name (~> 0.5, >= 0.5.1)
       http-cookie (~> 1.0.0)
@@ -36,18 +54,30 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
+    method_source (0.8.2)
     mime-types (1.25)
     mini_portile (0.5.1)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     net-http-digest_auth (1.4)
     net-http-persistent (2.9)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     ntlm-http (0.1.1)
-    rake (10.1.0)
-    rb-inotify (0.8.5)
-      ffi (>= 0.5.0)
-    rcov (0.9.9)
-    rdoc (4.0.1)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rake (10.3.2)
+    rdoc (4.1.2)
       json (~> 1.4)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -57,17 +87,14 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.6.0)
     thor (0.14.6)
+    thread_safe (0.3.4)
     unf (0.1.2)
       unf_ext
     unf_ext (0.0.6)
@@ -85,10 +112,8 @@ DEPENDENCIES
   guard
   guard-rspec
   jeweler
-  libnotify
   mechanize (>= 2.0.0)
-  rb-inotify (>= 0.8.5)
-  rcov
+  pry
   rspec (~> 2.3.0)
-  ruby-debug19
+  simplecov
   yard

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/amazon_seller_central.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: amazon_seller_central 0.3.1 ruby lib
+# stub: amazon_seller_central 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "amazon_seller_central"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["optoro"]
-  s.date = "2013-12-02"
+  s.date = "2014-10-07"
   s.description = "This gem is intended to wrap Amazon's SellerCentral pages with a Ruby API. Currently this gem supports accessing buyer feedback only."
   s.email = "dev@optoro.com"
   s.extra_rdoc_files = [
@@ -79,8 +80,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/optoro/amazon_seller_central"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.10"
+  s.rubygems_version = "2.2.2"
   s.summary = "Ruby API to access Amazon's SellerCentral"
 
   if s.respond_to? :specification_version then
@@ -91,47 +91,41 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_development_dependency(%q<rb-inotify>, [">= 0.8.5"])
-      s.add_development_dependency(%q<libnotify>, [">= 0"])
       s.add_development_dependency(%q<ffi>, [">= 0"])
       s.add_development_dependency(%q<faker>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<mechanize>, [">= 2.0.0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<rb-inotify>, [">= 0.8.5"])
-      s.add_dependency(%q<libnotify>, [">= 0"])
       s.add_dependency(%q<ffi>, [">= 0"])
       s.add_dependency(%q<faker>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<mechanize>, [">= 2.0.0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<rb-inotify>, [">= 0.8.5"])
-    s.add_dependency(%q<libnotify>, [">= 0"])
     s.add_dependency(%q<ffi>, [">= 0"])
     s.add_dependency(%q<faker>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/lib/amazon_seller_central/mechanizer.rb

@@ -3,6 +3,12 @@ module AmazonSellerCentral
   class Mechanizer
     MASQUERADE_AGENTS = ['Mac Safari', 'Mac FireFox', 'Linux Firefox', 'Windows IE 9']
 
+    # constants for the verification page if logged in from a new device
+    VERIF_PAGE_PATTERN      = /What is the ZIP Code/
+    VERIF_PAGE_FORM_NAME    = 'ap_dcq_form'
+    VERIF_PAGE_FIELD_NAME   = 'dcq_question_subjective_1'
+    VERIF_PAGE_ZIP_CODE     = '20706'
+
     attr_reader :agent
 
     def initialize
@@ -27,25 +33,59 @@ module AmazonSellerCentral
 
     def login_to_seller_central
       return true if @logged_in
+      tries = 3
+      begin
+        tries -= 1
+        page = agent.get('https://sellercentral.amazon.com/gp/homepage.html')
+        form = page.form_with(:name => 'signinWidget')
 
-      page = agent.get('https://sellercentral.amazon.com/gp/homepage.html')
-      form = page.form_with(:name => 'signinWidget')
+        raise FormNotFoundError unless form
 
-      begin
-        form['username']    = login_email
-        form['password'] = login_password
-        p = form.submit
-        if p =~ /better protect/ # capcha!
-          raise CapchaPresentError.new("Holy CAPCHA Batman!")
+        begin
+          form['username']    = login_email
+          form['password']    = login_password
+          p = form.submit
+
+          if p =~ /better protect/ # capcha!
+            raise CapchaPresentError.new("Holy CAPCHA Batman!")
+          end
+
+          @logged_in = !!( p.body =~ /Logout/ )
+
+          unless p.body =~ /Manage Inventory/
+            marketplace_id = Mechanize::Form::SelectList.new((p / '#sc-mkt-switcher-select').first)
+                               .options
+                               .select { |option| option.text == 'www.amazon.com' }
+                               .first
+                               .value
+
+            # The dropdown that selects the subsite uses javascript to change the page location,
+            # so we need to query the url directly.
+            p = agent.get('https://sellercentral.amazon.com/gp/utilities/set-rainier-prefs.html?ie=UTF8&url=&marketplaceID=' + marketplace_id)
+          end
+
+        rescue StandardError => e
+          File.open("/tmp/seller_central_#{Time.now.to_i}.html","wb") do |f|
+            f.write page.body
+          end
+          raise e
+        end
+
+        # New device verification
+        if p.body =~ VERIF_PAGE_PATTERN
+          form = p.form_with(:name => VERIF_PAGE_FORM_NAME)
+          form[VERIF_PAGE_FIELD_NAME] = VERIF_PAGE_ZIP_CODE
+          p = form.submit # This raises a response code error, :-(
         end
-        @logged_in = !!( p.body =~ /Logout/ && p.body =~ /Manage Inventory/ )
 
-      rescue StandardError => e
-        File.open("/tmp/seller_central_#{Time.now.to_i}.html","wb") do |f|
-          f.write page.body
+      rescue Mechanize::ResponseCodeError, FormNotFoundError
+        if tries > 0
+          sleep 10
+          retry if tries > 0
         end
-        raise e
+        raise
       end
+      true
     end
 
     def follow_link_with(options)
@@ -62,6 +102,7 @@ module AmazonSellerCentral
     end
 
     class LinkNotFoundError < StandardError; end
+    class FormNotFoundError < StandardError; end
     class AgentResetError < StandardError; end
     class CapchaPresentError < StandardError; end
 

data/lib/amazon_seller_central/orders_page.rb

@@ -1,7 +1,12 @@
 module AmazonSellerCentral
   class OrdersPage < Page
+
+    DATE_CELL_INDEX = 1
+    ORDER_CELL_INDEX = 2
+    STATUS_CELL_INDEX = 8
+
     attr_accessor :body
-    
+
     def initialize
       @page_no = 0
     end
@@ -20,7 +25,7 @@ module AmazonSellerCentral
 
     def self.pending_orders
       uri_base = 'https://sellercentral.amazon.com/gp/orders-v2/list/ref=ag_myo_dos4_home?ie=UTF8&showCancelled=0&searchType=OrderStatus&ignoreSearchType=1&statusFilter=Pending&searchFulfillers=mfn&preSelectedRange=30&searchDateOption=preSelected&sortBy=OrderStatusDescending&itemsPerPage=100'
-      
+
       mech = AmazonSellerCentral.mechanizer
       mech.login_to_seller_central
       page = mech.agent.get(uri_base)
@@ -44,11 +49,11 @@ module AmazonSellerCentral
       row.css('td').each_with_index do |td, i|
         txt = td.text.strip
         case i
-        when 1
+        when DATE_CELL_INDEX
           o.date = Time.parse(txt)
-        when 4
+        when ORDER_CELL_INDEX
           o.order_id = txt.match(/^(\d{3}-\d+-\d+)\s/)[1]
-        when 12
+        when STATUS_CELL_INDEX
           o.status = txt
         end
       end

data/spec/lib/payments_page_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "PaymentsPage" do
   describe "available_report_ids" do
-    it "should return an array of report ids that are available for you to download from seeler central" do
+    it "should return an array of report ids that are available for you to download from seller central" do
       pending "Needs FakeWeb updates."
       report_ids = AmazonSellerCentral::PaymentsPage.available_report_ids
       report_ids.class.should == Array

data/spec/spec_helper.rb

@@ -3,12 +3,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'faker'
 require 'amazon_seller_central'
-require 'ruby-debug'
-
-if Debugger.respond_to?(:settings)
-  Debugger.settings[:autoeval] = true
-  Debugger.settings[:autolist] = 1
-end
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,209 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: amazon_seller_central
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - optoro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.5
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is intended to wrap Amazon's SellerCentral pages with a Ruby
@@ -215,9 +187,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
-- .rvmrc
+- ".document"
+- ".rspec"
+- ".rvmrc"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -283,17 +255,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby API to access Amazon's SellerCentral