russian_post 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode

data/Gemfile.lock

@@ -4,21 +4,40 @@ PATH
     russian_post (0.1.0)
       chunky_png (~> 1.2)
       excon (~> 0.20)
+      mechanize (~> 2.6.0)
       nokogiri (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.4)
-    chunky_png (1.2.7)
+    chunky_png (1.2.8)
     crack (0.3.2)
+    domain_name (0.5.11)
+      unf (>= 0.0.5, < 1.0.0)
     excon (0.20.1)
+    mechanize (2.6.0)
+      domain_name (~> 0.5, >= 0.5.1)
+      mime-types (~> 1.17, >= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (~> 2.5, >= 2.5.2)
+      nokogiri (~> 1.4)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (>= 0.0.9, < 0.2)
+    mime-types (1.23)
+    net-http-digest_auth (1.3)
+    net-http-persistent (2.8)
     nokogiri (1.5.9)
+    ntlm-http (0.1.1)
     rake (10.0.3)
+    unf (0.1.1)
+      unf_ext
+    unf_ext (0.0.6)
     vcr (2.4.0)
     webmock (1.11.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
+    webrobots (0.1.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,8 @@
 # Russian Post Tools
 
 [![Code Climate](https://codeclimate.com/github/t3hk0d3/russian_post.png)](https://codeclimate.com/github/t3hk0d3/russian_post)
+[![Build Status](https://travis-ci.org/t3hk0d3/russian_post.png?branch=master)](https://travis-ci.org/t3hk0d3/russian_post)
+[![Dependency Status](https://gemnasium.com/t3hk0d3/russian_post.png)](https://gemnasium.com/t3hk0d3/russian_post)
 
 ## Installation
 

data/lib/russian_post/captcha.rb

@@ -38,7 +38,6 @@ module RussianPost
     end
 
     def recognize!
-
       captcha_image = grayscale(image)
 
       results = {}
@@ -63,7 +62,8 @@ module RussianPost
     end
 
     def prepare_text(results)
-      results.map(&:character).join('')
+      captcha_text = results.map(&:character).join('')
+      captcha_text.size == 5 ? captcha_text : raise("Unable to recognize captcha")
     end
 
     def grayscale(captcha_image)
@@ -96,4 +96,4 @@ module RussianPost
 
   end
 
-end
+end

data/lib/russian_post/tracking.rb

@@ -1,114 +1,77 @@
-require 'excon'
-require 'nokogiri'
+require 'mechanize'
 
 require 'time'
-require 'cgi'
 
 module RussianPost
 
   class Tracking
 
-    TRACKING_PAGE = 'http://www.russianpost.ru/rp/servise/ru/home/postuslug/trackingpo'
+    attr_reader :barcode, :agent
 
+    TRACKING_PAGE = 'http://www.russianpost.ru/rp/servise/ru/home/postuslug/trackingpo'
+    COLUMNS = [:type, :date, :zip_code, :location, :message, :weight, :declared_cost,
+      :delivery_cash, :destination_zip_code, :destination_location]
+    
     def initialize(tracking_code)
-      @code = tracking_code.strip
+      @barcode = tracking_code.strip.upcase
+      @agent   = Mechanize.new
     end
 
     def track
-      # fetch form
-      response = fetch(TRACKING_PAGE)
-
-      tracking_form = response.body
-
-      tracking_params = {}
-
-      tracking_form.scan(/\<input ([^\>]+)\>/) do |result|
-        param = Hash[result.first.scan(/(name|value)=(?:"|')([^\"\']+)(?:"|')/)]
-
-        tracking_params[param['name']] = param['value']
-      end
-
-      action_path = if tracking_form =~ /\<form .* action=\"([^\"]+)\"/
-        $1
-      else
-        raise "Unable to extract form path"
-      end
-
-      captcha_url = if tracking_form =~ /<img id='captchaImage' src='([^\']+)'/
-        $1
-      else
-        raise "Unable to extract captcha image url"
-      end
-
-      captcha =  RussianPost::Captcha.for_url(captcha_url)
-
-      raise "Unable to recognize captcha" unless captcha.valid?
-
-      tracking_params['BarCode'] = @code
-      tracking_params['InputedCaptchaCode'] = captcha.text
-      tracking_params['searchsign'] = '1' 
-
-      cookies = Hash[response.headers['Set-Cookie'].scan(/([^\=\;]+)=([^\;]+)[^\,]*,*/).map { |name, value| [name.strip, value.strip] }]
-      cookies.delete("path")
-      cookies = cookies.map { |name, value| "#{name}=#{value}"}.join("; ")
-
-      request_data = encode_params(tracking_params)
-
-      response = Excon.post('http://www.russianpost.ru' + action_path, 
-        :headers => {'Cookie' => cookies,
-          'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',
-          'Referer' => 'http://www.russianpost.ru/resp_engine.aspx?Path=rp/servise/ru/home/postuslug/trackingpo',\
-          'Origin' => 'http://www.russianpost.ru',
-          'Content-Type' => 'application/x-www-form-urlencoded',
-          'Content-Length' => request_data.size
-        },
-        :body => request_data)
+      initial_page = fetch_initial_page
+      tracking_page = fetch_tracking_data(initial_page)
+      parse_tracking_table(tracking_table(tracking_page))
+    end
 
-      if response.body =~ /<table class="pagetext">(.+)<\/table>/
-        doc = Nokogiri::HTML::Document.parse(response.body)
+    private
 
-        columns = [:type, :date, :zip_code, :location, :message, :weight, :declared_cost, :delivery_cash, :destination_zip_code, :destination_location]
+    def solve_captcha(page)
+      RussianPost::Captcha.for_url(get_captcha_url(page)).text
+    end
 
-        rows = []
-        doc.css('table.pagetext tr').each do |row|
-          data = row.css('td').map(&:text).map { |text| !['-', ''].include?(text) ? text : nil }
+    def get_captcha_url(page)
+      page.images.last.src
+    end
 
-          next if data.empty?
+    def tracking_table(page)
+      table = page.search(".pagetext tbody tr")
+      table ? table : raise("No tracking table found")
+    end
 
-          hash = Hash[columns.zip(data)]
-          hash[:date] = Time.parse(hash[:date])
+    def parse_tracking_table(table)
+      table.map { |e| parse_row(e) }
+    end
 
-          rows << hash
-        end
+    def parse_row(row)
+      data = get_row_data(row)
+      data[1] = Time.parse("#{data[1]} +04:00")
 
-        return rows
-      else
-        raise "No tracks table in response"
-      end
+      Hash[COLUMNS.zip(data)]
     end
 
-    private
-
-    def encode_params(params)
-      params.map do |name, value|
-        "#{CGI.escape(name.to_s)}=#{CGI.escape(value.to_s)}"
-      end.join('&')
+    def get_row_data(row)
+      row.css('td').map { |td| td.text unless ['-', ''].include?(td.text) }
     end
 
-    def fetch(url)
-      response = Excon.get(url)
-      if response.body =~ /<input id=\"key\" name=\"key\" value=\"([0-9]+)\"\/>/ # tough security huh
-        response = Excon.post(url, body: "key=#{$1}")
-      end
+    def fetch_initial_page
+      page = agent.get(TRACKING_PAGE)
+      bypass_security(page) or page
+    end
 
-      if response.body.include?("window.location.replace(window.location.toString())") # hehe
-        puts "foo"
-        response = fetch(url)
+    def bypass_security(page)
+      if page.form.has_field?("key")
+        page.form.submit
+      elsif page.body.include?("window.location.replace(window.location.toString())")
+        fetch_initial_page
       end
-
-      response
     end
 
+    def fetch_tracking_data(page)
+      page.form.set_fields(
+        'BarCode'            => barcode,
+        'InputedCaptchaCode' => solve_captcha(page),
+        'searchsign'         => '1')
+      page.form.submit
+    end
   end
-
-end
+end

data/lib/russian_post/version.rb

@@ -1,3 +1,3 @@
 module RussianPost
-  VERSION = "0.1.0"
-end
+  VERSION = "0.1.1"
+end

data/russian_post.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "excon", "~> 0.20"
   spec.add_dependency "chunky_png", "~> 1.2"
   spec.add_dependency "nokogiri", "~> 1.5"
+  spec.add_dependency "mechanize", "~> 2.6.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: russian_post
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,6 +148,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md