royal_mail_scraper 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f34da7f0b92b97623f600d4658ed8507f3b67c9
-  data.tar.gz: 0db41cda4ecd1213132d0ceb6611447859275d13
+  metadata.gz: cb796bcde1965a278940828e0fd113e880217a7f
+  data.tar.gz: c7103ee570b9fbbbe0fd5516ed0a145c6dbb4569
 SHA512:
-  metadata.gz: 3ef7758c075bc74a6b7ae8ccaba8138f7ce2c631f37b1f7ef91441494effe5eb2407a48b441130df69acbd694270bcc06a73f806f103446280e91a09a9b6c58f
-  data.tar.gz: a42572c88d4fc72279051e776ff278af118bb1a2f60ebd2b37eda1d90c7f5bcd728f374806c1b17ec814677af23347fd334a417f640c58d3ad236b0d9ba004c9
+  metadata.gz: d4dacd52507ff0604a7c369112ecbb846b187e29c47e80a67b7082f0d44247ab8534a0ccd8b85f1fc896e220e942299064dac9f917ecd2d0634b4692a707d271
+  data.tar.gz: 82cddd49ac3272d75b583f3b83a0f7b3be8ce11f5930e6db7a7ffaceaac40723a2454c0ad96d616bfd0f4d974e1ba0d7beb48903c2a3cb3a9de9020abae0905a

data/.travis.yml

@@ -2,7 +2,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
-  - rbx-2.2
   - jruby-19mode
 script: "bundle exec rake spec"
 

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in royal_mail.gemspec
 gemspec
 
-gem 'nokogiri', '~> 1.5'
+gem 'mechanize', '~> 2.7'
 
 group :test do
   gem 'rspec'

data/lib/royal_mail_scraper.rb

@@ -1,5 +1,6 @@
 require "royal_mail_scraper/version"
 require "royal_mail_scraper/tracker"
+require "royal_mail_scraper/tracker/errors"
 require "royal_mail_scraper/tracker/request"
 require "royal_mail_scraper/tracker/response"
 require "royal_mail_scraper/tracker/detail"

data/lib/royal_mail_scraper/tracker/errors.rb

@@ -0,0 +1,3 @@
+module RoyalMailScraper
+  class Error < StandardError; end
+end

data/lib/royal_mail_scraper/tracker/request.rb

@@ -1,23 +1,68 @@
-require 'net/http'
+require 'mechanize'
 
 module RoyalMailScraper
   class Tracker::Request < Struct.new(:tracking_number)
     REQUEST_URI = URI('http://www.royalmail.com/trackdetails')
     TIMEOUT = 10
+    RETRIES_ON_ERROR = 7
 
     def execute
-      params = { tracking_number: tracking_number }
+      Tracker::Response.new(fetch_details_page.body)
+    end
+
+    private
+
+    def fetch_details_page
+      form = with_retry(RETRIES_ON_ERROR, Error) { fetch_form }
+
+      form.tracking_number = tracking_number
 
-      req = Net::HTTP::Post.new(REQUEST_URI.request_uri)
-      req.form_data = params
+      result = with_retry(RETRIES_ON_ERROR, Error) { submit_form(form) }
+
+      result
+    end
+
+    def submit_form(form)
+      result = form.submit
+      find_form(result)
+      result
+    end
 
-      http = Net::HTTP.new(REQUEST_URI.host, REQUEST_URI.port)
-      http.open_timeout = TIMEOUT
-      http.read_timeout = TIMEOUT
+    def fetch_form
+      find_form(agent.get(REQUEST_URI))
+    end
+
+    def find_form(page)
+      page.form_with(id: 'bt-tracked-track-trace-form') ||
+        raise(Error, 'Tracking code form not found')
+    end
+
+    def agent
+      @agent ||= build_agent
+    end
+
+    def build_agent
+      agent = Mechanize.new
+      agent.open_timeout = TIMEOUT
+      agent.read_timeout = TIMEOUT
+      agent.user_agent_alias = 'Windows Chrome'
+      agent
+    end
 
-      res = http.request(req)
+    def with_retry(retries, exception_class, interval = 0.5)
+      attempt = 0
 
-      Tracker::Response.new(res.body)
+      begin
+        attempt += 1
+        yield
+      rescue *exception_class => e
+        if attempt == retries
+          raise e
+        else
+          sleep interval
+          retry
+        end
+      end
     end
   end
 end

data/lib/royal_mail_scraper/version.rb

@@ -1,3 +1,3 @@
 module RoyalMailScraper
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/royal_mail_scraper.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "nokogiri", "~> 1.5"
+  spec.add_dependency "mechanize", "~> 2.7"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/spec/tracker_spec.rb

@@ -29,9 +29,13 @@ describe RoyalMailScraper::Tracker do
     context 'with mocked response' do
       let(:tracking_number) { 'KF000000000GB' }
       let(:html) { File.binread(File.dirname(__FILE__) + '/assets/' + file) }
-      let(:http_response) { double(body: html) }
+      let(:page) { Mechanize::Page.new(URI('http://test'), nil, html) }
 
-      before { expect_any_instance_of(Net::HTTP).to receive(:request).and_return(http_response) }
+      before do
+        expect_any_instance_of(RoyalMailScraper::Tracker::Request).to(
+          receive(:fetch_details_page).and_return(page)
+        )
+      end
 
       context 'collected' do
         let(:file) { 'collected.html' }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: royal_mail_scraper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Laurynas Butkus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: A simple page scraper for Royal Mail Track and Trace
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -68,6 +68,7 @@ files:
 - lib/royal_mail_scraper.rb
 - lib/royal_mail_scraper/tracker.rb
 - lib/royal_mail_scraper/tracker/detail.rb
+- lib/royal_mail_scraper/tracker/errors.rb
 - lib/royal_mail_scraper/tracker/request.rb
 - lib/royal_mail_scraper/tracker/response.rb
 - lib/royal_mail_scraper/tracker/status_map.rb
@@ -90,12 +91,12 @@ 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: []