validocno 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 39e93c3f4784161ad642f67ef31d5c01097e42a8
-  data.tar.gz: b52f0bcc45b4ce28c05c2042d5b9fe1fb3ae5440
+  metadata.gz: 1c3dcc97a6fc2dbf8e31d24f40a1ccd292f3e006
+  data.tar.gz: 2d0e220cae2235931d5fe2f4ae1aeebef279b9bf
 SHA512: 
-  metadata.gz: 0248dd8e7065aa7d53787eef3007ad7fad74e85cd01fa348f37906b4acecfaabb9067fe6729d5f3439b2198d1a558cabd725f4f93127b534da592dea14180a92
-  data.tar.gz: fe920d230f9cb9383f7982a40a0846870d8f21ccd83c876a8aba1f8bd5124b7d9210ef57573e728290b967bc3533dea1121f487f21f4973a3c4dee5fa382a0c2
+  metadata.gz: ec4aa02e190faba1fce5ff17005633cd56cf7600b175110aad2fb44277584b9eb0beb5adf4e62a2a8ddd7b0862c3c01a1cff8281be9832cd0927d170d5a4da55
+  data.tar.gz: dd00d4950ad63e9b2db3b236b288982aec051b04b3ee739dad9838d5b693d0e7db53505b2e1e4b7053302acf25d8b2e50970294f8712fcefbe9aa7a557843c72

data/lib/validocno/validator.rb

@@ -1,5 +1,8 @@
 module Validocno
   class Validator
+    # Set strings to UTF-8 mode
+    $KCODE = 'UTF-8'
+
     CONTROL_URI = 'http://politsei.ee/et/teenused/e-paringud/dokumendi-kehtivuse-kontroll/'
 
     def initialize(doc_number)
@@ -9,7 +12,15 @@ module Validocno
 
     def csrf_token
       response = Validocno::Client.get(CONTROL_URI)
-      response.at_css('#content1left form input[name="csrf"]')['value']
+      check_response(response)
+
+      node = response.at_css('form[name="reqForm"] input[name="csrf"]')
+
+      if node.nil? || node['value'].nil?
+        fail StandardError, 'CSRF token was not found on page'
+      else
+        node['value']
+      end
     end
 
     def response_string
@@ -22,12 +33,33 @@ module Validocno
       }
 
       response = Validocno::Client.post(CONTROL_URI, options)
-      response.at_css('#content1left').children.last.text.strip.to_s
+      check_response(response)
+
+      node = response.at_css('#content1left')
+
+      if node.nil? || node.children.empty?
+        fail StandardError, 'Cannot parse document status string.'
+      else
+        node.children.last.text.strip
+      end
     end
 
     def valid?
-      return true if response_string.match(/on kehtiv/)
+      return true if response_string.match(response_strings[:valid])
       false
     end
+
+    def response_strings
+      {
+        :valid => "Dokument #{@doc_number} on kehtiv.",
+        :expired => "Dokument #{@doc_number} on kehtetu.",
+        :invalid => "Dokumenti #{@doc_number} ei ole välja antud."
+      }
+    end
+
+    def check_response(response)
+      return true if response.code == 200
+      fail StandardError, "#{response.code}: #{response.message}"
+    end
   end
 end

data/lib/validocno/version.rb

@@ -1,3 +1,3 @@
 module Validocno
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/validocno.rb

@@ -1,4 +1,3 @@
-
 $LOAD_PATH.unshift(File.dirname(__FILE__)) unless
   $LOAD_PATH.include?(File.dirname(__FILE__)) ||
   $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validocno
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Artem Pakk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-02 00:00:00 Z
+date: 2014-12-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement