validocno 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7919a8b6bce8d27c2cc3553211579c42c9452efd
-  data.tar.gz: bb593d27e33787209ae1032c495d84f515622e85
+  metadata.gz: 380d922205596061a1387b8ec72a756e6f43195b
+  data.tar.gz: 306ad9a51282c97db14d928a9bae1e33f623d1b2
 SHA512:
-  metadata.gz: cde961cb705942ca1918003b0bb9f79530a2d196f18bc0c118b2928d0166cdae82e419b66b9faa828a20f255a63e510bf5d5c4ba30440e7927af7c34ce0a4ef4
-  data.tar.gz: ac855cb158fb0681bcde227d703152afe6bf4fd4a5c5cfffddf5759d5f5a839bc267a9260eaf94c34c39c769e7dadbe8deb1dda71dc3d0f19548400f41513b41
+  metadata.gz: f440a4ac776d95c5fbb993e01a93730c26486e5e39d7fbd2c05fed68a53f589df985fbc9c2ec4c18de9c72a3339b2b89792afa0d951b43bde40b9d003855c27a
+  data.tar.gz: 00ca58b680f733117dd27fadf303bd40ded6ffe497bb7bf07ebb58af65676006481dc81771dc2474819b0f00eb480a1152081b80072c0f57e060a1e7971f6f53

data/lib/validocno/validator.rb

@@ -3,7 +3,7 @@ module Validocno
     # Set strings to UTF-8 mode
     $KCODE = 'UTF-8'
 
-    CONTROL_URI = 'http://politsei.ee/et/teenused/e-paringud/dokumendi-kehtivuse-kontroll/'
+    CONTROL_URI = 'https://politsei.ee/et/teenused/e-paringud/dokumendi-kehtivuse-kontroll/'
 
     def initialize(doc_number)
       @doc_number = doc_number
@@ -11,10 +11,12 @@ module Validocno
     end
 
     def csrf_token
-      response = Validocno::Client.get(CONTROL_URI)
+      response = RestClient.get(CONTROL_URI)
       check_response(response)
 
-      node = response.at_css('form[name="reqForm"] input[name="csrf"]')
+      document = Nokogiri::HTML(response)
+
+      node = document.at_css('form[name="reqForm"] input[name="csrf"]')
 
       if node.nil? || node['value'].nil?
         fail StandardError, 'CSRF token was not found on page'
@@ -25,17 +27,17 @@ module Validocno
 
     def response_string
       options = {
-        :query => {
-          :cmd => 'request',
-          :csrf => @csrf_token,
-          :docNumber => @doc_number
-        }
+        :cmd => 'request',
+        :csrf => @csrf_token,
+        :docNumber => @doc_number
       }
 
-      response = Validocno::Client.post(CONTROL_URI, options)
+      response = RestClient.post(CONTROL_URI, options)
       check_response(response)
 
-      node = response.at_css('#content1left')
+      document = Nokogiri::HTML(response)
+
+      node = document.at_css('#content1left')
 
       if node.nil? || node.children.empty?
         fail StandardError, 'Cannot parse document status string.'

data/lib/validocno/version.rb

@@ -1,3 +1,3 @@
 module Validocno
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/lib/validocno.rb

@@ -3,12 +3,11 @@ $LOAD_PATH.unshift(File.dirname(__FILE__)) unless
   $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'rubygems'
-require 'httparty'
+require 'rest_client'
 require 'nokogiri'
 
 require 'validocno/validator'
 require 'validocno/version'
-require 'validocno/http_client'
 
 module Validocno
   def self.validate(doc_number)

data/spec/validator_spec.rb

@@ -107,7 +107,7 @@ describe Validocno::Validator do
   private
 
   def mock_response_with(type, response)
-    allow(Validocno::Client).to receive(type) { send("#{response}_response") }
+    allow(RestClient).to receive(type) { send("#{response}_response") }
     allow_any_instance_of(Validocno::Validator).
       to receive(:check_response) { true }
   end

data/validocno.gemspec

@@ -18,11 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 1.8.7'
-  if RUBY_VERSION > '1.8.7'
-    spec.add_dependency 'httparty'
-  else
-    spec.add_dependency 'httparty', '0.11.0'
-  end
+
+  spec.add_dependency 'rest-client'
   spec.add_dependency 'nokogiri'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: validocno
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Artem Pakk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +108,6 @@ files:
 - README.md
 - Rakefile
 - lib/validocno.rb
-- lib/validocno/http_client.rb
 - lib/validocno/validator.rb
 - lib/validocno/version.rb
 - rubocop.yml
@@ -139,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Estonian ID card validator

data/lib/validocno/http_client.rb

@@ -1,18 +0,0 @@
-class HtmlParserIncluded < HTTParty::Parser
-  SupportedFormats.merge!('text/html' => :html)
-
-  def html
-    Nokogiri::HTML(body)
-  end
-end
-
-module Validocno
-  class Client
-    include HTTParty
-    parser HtmlParserIncluded
-
-    USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.1.25 (KHTML, like Gecko) Version/8.0 Safari/600.1.25'
-
-    headers 'Accept-Language' => 'en-US,en;q=0.5', 'User-Agent' => USER_AGENT
-  end
-end