RubyGems - validocno - Versions diffs - 0.2.4 → 0.2.8 - Mend

validocno 0.2.4 → 0.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml +5 -5
data/lib/validocno/validator.rb +7 -30
data/lib/validocno/version.rb +1 -1
data/spec/fixtures/post_response.html +5 -40
data/spec/validator_spec.rb +34 -37
data/spec/validocno_spec.rb +0 -3
data/validocno.gemspec +2 -2
metadata +5 -7
data/spec/fixtures/get_response.html +0 -40

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 380d922205596061a1387b8ec72a756e6f43195b
-  data.tar.gz: 306ad9a51282c97db14d928a9bae1e33f623d1b2
+SHA256:
+  metadata.gz: c701049917e6c1837b7287afb9dd1785e456abf8806bc67bb652e21ba216c274
+  data.tar.gz: 618f7406a626e04d14fc488f932981578e7ad9958d2bafcab1c1ec628c74b13e
 SHA512:
-  metadata.gz: f440a4ac776d95c5fbb993e01a93730c26486e5e39d7fbd2c05fed68a53f589df985fbc9c2ec4c18de9c72a3339b2b89792afa0d951b43bde40b9d003855c27a
-  data.tar.gz: 00ca58b680f733117dd27fadf303bd40ded6ffe497bb7bf07ebb58af65676006481dc81771dc2474819b0f00eb480a1152081b80072c0f57e060a1e7971f6f53
+  metadata.gz: df99b223597f87c56825aec964c84638f319c2e6636985529fbe86d017b86ecc1610e896b1f86188530f254947cc5781b67eeeac8e7097a5b5c5e5934eac92cf
+  data.tar.gz: 9e987fe47109b3a743188b1962d5422d354d27d0f0624cf5f4e8841a654fc06f66c03e163fddfcf24e18d7aaac496234c60467bbf3337df2b686f790dc4df97e

data/lib/validocno/validator.rb CHANGED Viewed

@@ -1,57 +1,34 @@
 module Validocno
   class Validator
-    # Set strings to UTF-8 mode
-    $KCODE = 'UTF-8'
-    CONTROL_URI = 'https://politsei.ee/et/teenused/e-paringud/dokumendi-kehtivuse-kontroll/'
+    CONTROL_URI = "https://www2.politsei.ee/qr/".freeze
     def initialize(doc_number)
       @doc_number = doc_number
-      @csrf_token = csrf_token
-    end
-    def csrf_token
-      response = RestClient.get(CONTROL_URI)
-      check_response(response)
-      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'
-      else
-        node['value']
-      end
     end
     def response_string
-      options = {
-        :cmd => 'request',
-        :csrf => @csrf_token,
-        :docNumber => @doc_number
-      }
-      response = RestClient.post(CONTROL_URI, options)
+      response = RestClient.get(CONTROL_URI, :params => { :qr => @doc_number })
       check_response(response)
       document = Nokogiri::HTML(response)
-      node = document.at_css('#content1left')
+      node = document.at_css(".qrWidgetDocumentCheckResult")
       if node.nil? || node.children.empty?
         fail StandardError, 'Cannot parse document status string.'
       else
-        node.children.last.text.strip
+        node.children.at_css("div").text.strip
       end
     end
     def validate
-      is_valid = response_string == response_strings[:valid]
+      response_string_result = response_string
+      is_valid = response_string_result == response_strings[:valid]
       {
         :valid => is_valid,
-        :message => response_string
+        :message => response_string_result
       }
     end

data/lib/validocno/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Validocno
-  VERSION = '0.2.4'
+  VERSION = "0.2.8".freeze
 end

data/spec/fixtures/post_response.html CHANGED Viewed

@@ -1,41 +1,6 @@
 <div id="content1left" class="content" style="min-height: 500px;">
-  <br>
-  <p>
-    Teil on võimalus kontrollida isikut tõendavate dokumentide kehtivust,
-    kui sisestate dokumendi numbri. <b>NB!</b> Dokumendi numbris olevad tähed palume sisestada läbivalt suurte tähtedega.
-  </p>
-  <br>
-  <form name="reqForm" method="post" action="">
-    <input type="hidden" name="cmd" value="request">
-    <input type="hidden" name="csrf" value="iiGifsNdIY/OVVbEXnh3hMLtJgXsKomOlWKClE2DozCAo/KdBk0N7g==">
-    <table class="form">
-      <tbody>
-        <tr>
-          <td class="label">Dokumendi number:</td>
-          <td>
-            <input class="basicInputText" type="text"
-                   name="docNumber" size="20" maxlength="20" value="">
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-          </td>
-        </tr>
-        <tr>
-          <td>
-          </td>
-          <td>
-            <input class="basicInputButton button100px" type="submit"
-                   name="subButton" value="Esita päring">
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </form>
-  <br>
-  Dokument A1234567 on kehtiv.
-</div>
+  <div class="qrWidgetDocumentCheckResult">
+    <div class="qrDocumentValid">Dokument A1234567 on kehtiv.</div>
+    <div class="qrDocumentValid">The document A1234567 is valid.</div>
+  </div>
+</div>

data/spec/validator_spec.rb CHANGED Viewed

@@ -1,43 +1,39 @@
 require 'spec_helper'
 describe Validocno::Validator do
-  let(:doc_number) { 'A1234567' }
+  let(:doc_number) { "A1234567" }
   let(:validator) { Validocno::Validator.new(doc_number) }
-  let(:get_response) do
-    body = File.new('spec/fixtures/get_response.html').read
-    Nokogiri::HTML(body)
-  end
+  let(:invalid_post_validator) { Validocno::Validator.new("00000000") }
   let(:valid_nr_response) do
     body = File.new('spec/fixtures/post_response.html').read
-    Nokogiri::HTML(body)
+    { :body => body, :document_number => doc_number }
   end
   let(:expired_nr_response) do
     body = File.new('spec/fixtures/post_response.html').read
-    body = body.gsub('A1234567', 'A0111856')
-    body = body.gsub('kehtiv', 'kehtetu')
-    Nokogiri::HTML(body)
+    body = body.gsub(doc_number, "A0111856")
+    body = body.gsub("kehtiv", "kehtetu")
+    { :body => body, :document_number => "A0111856" }
   end
   let(:invalid_nr_response) do
     body = File.new('spec/fixtures/post_response.html').read
-    body = body.gsub('A1234567', 'A1234567890')
+    body = body.gsub(doc_number, "A1234567890")
     body = body.gsub(
-      'Dokument A1234567890 on kehtiv.',
-      'Dokumenti A1234567890 ei ole välja antud.'
+      "Dokument A1234567890 on kehtiv.",
+      "Dokumenti A1234567890 ei ole välja antud."
     )
-    Nokogiri::HTML(body)
+    { :body => body, :document_number => "A1234567890" }
   end
   let(:invalid_post_response) do
     body = File.new('spec/fixtures/invalid_post_response.html').read
-    Nokogiri::HTML(body)
+    { :body => body, :document_number => "00000000" }
   end
   describe '.new' do
     it 'initializes with a document number' do
-      mock_response_with :get, :get
       expect(validator).to be
       expect { validator }.to_not raise_error
     end
@@ -45,16 +41,11 @@ describe Validocno::Validator do
     it 'raises an error without a document number' do
       expect { Validocno::Validator.new }.to raise_error(ArgumentError)
     end
-    it 'sets csrf_token instance variable' do
-      mock_response_with :get, :get
-      expect(validator.csrf_token).to_not be_nil
-    end
   end
   describe '#validate' do
-    let(:invalid_doc_number) { 'A1234567890' }
-    let(:expired_doc_number) { 'A0111856' }
+    let(:invalid_doc_number) { "A1234567890" }
+    let(:expired_doc_number) { "A0111856" }
     let(:validator_with_invalid) do
       Validocno::Validator.new(invalid_doc_number)
     end
@@ -64,15 +55,14 @@ describe Validocno::Validator do
     end
     it 'returns hash with :valid and :message keys' do
-      mock_response_with :get, :get
-      mock_response_with :post, :valid_nr
+      mock_response_with :valid_nr
       expect(validator.validate).to have_key(:valid)
       expect(validator.validate).to have_key(:message)
     end
     it 'validates document with valid number' do
-      mock_response_with :get, :get
-      mock_response_with :post, :valid_nr
+      mock_response_with :valid_nr
       expect(validator.validate).to include(
         :valid => true,
         :message => "Dokument #{doc_number} on kehtiv."
@@ -80,8 +70,7 @@ describe Validocno::Validator do
     end
     it 'validates expired document' do
-      mock_response_with :get, :get
-      mock_response_with :post, :expired_nr
+      mock_response_with :expired_nr
       expect(validator_with_expired.validate).to include(
         :valid => false,
         :message => "Dokument #{expired_doc_number} on kehtetu."
@@ -89,8 +78,7 @@ describe Validocno::Validator do
     end
     it 'validates document with invalid number' do
-      mock_response_with :get, :get
-      mock_response_with :post, :invalid_nr
+      mock_response_with :invalid_nr
       expect(validator_with_invalid.validate).to include(
         :valid => false,
         :message => "Dokumenti #{invalid_doc_number} ei ole välja antud."
@@ -98,17 +86,26 @@ describe Validocno::Validator do
     end
     it 'fails if node not found' do
-      mock_response_with :get, :get
-      mock_response_with :post, :invalid_post
-      expect { validator.validate }.to raise_error(StandardError)
+      mock_response_with :invalid_post
+      expect { invalid_post_validator.validate }.to raise_error(StandardError)
     end
   end
   private
-  def mock_response_with(type, response)
-    allow(RestClient).to receive(type) { send("#{response}_response") }
-    allow_any_instance_of(Validocno::Validator).
-      to receive(:check_response) { true }
+  def mock_response_with(response)
+    response_result = send("#{response}_response")
+    stub_request(:get, "https://www.politsei.ee/qr/?qr=#{response_result[:document_number]}").
+      with(:headers => {
+        "Accept" => "*/*",
+        "Accept-Encoding" => "gzip, deflate",
+        "Host" => "www.politsei.ee",
+        "User-Agent" => "rest-client/2.0.2 (darwin17.2.0 x86_64) ruby/2.1.10p492"
+      }).to_return(
+        :status => 200,
+        :body => response_result[:body],
+        :headers => {}
+      )
   end
 end

data/spec/validocno_spec.rb CHANGED Viewed

@@ -5,9 +5,6 @@ describe Validocno do
     let(:number) { 'A1234567' }
     it 'calls Validocno::Validator#validate' do
-      allow_any_instance_of(Validocno::Validator).to receive(:csrf_token) {
-        'iiGifsNdIY/OVVbEXnh3hMLtJgXsKomOlWKClE2DozCAo/KdBk0N7g=='
-      }
       expect_any_instance_of(Validocno::Validator).to receive(:validate)
       Validocno.validate(number)
     end

data/validocno.gemspec CHANGED Viewed

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Validocno::VERSION
   spec.authors       = ['Artem Pakk']
   spec.email         = ['artem.pakk@deskrock.ee']
-  spec.summary       = 'Estonian ID card validator'
-  spec.description   = 'Ruby gem to check validity of Estonian ID card'
+  spec.summary       = 'Estonian ID validator'
+  spec.description   = 'Ruby gem to check validity of Estonian ID card or Estonian Passport'
   spec.homepage      = 'https://github.com/deskrock/validocno'
   spec.license       = 'MIT'

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validocno
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.8
 platform: ruby
 authors:
 - Artem Pakk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -94,7 +94,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.20.0
-description: Ruby gem to check validity of Estonian ID card
+description: Ruby gem to check validity of Estonian ID card or Estonian Passport
 email:
 - artem.pakk@deskrock.ee
 executables: []
@@ -111,7 +111,6 @@ files:
 - lib/validocno/validator.rb
 - lib/validocno/version.rb
 - rubocop.yml
-- spec/fixtures/get_response.html
 - spec/fixtures/invalid_post_response.html
 - spec/fixtures/post_response.html
 - spec/spec_helper.rb
@@ -138,12 +137,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key:
 specification_version: 4
-summary: Estonian ID card validator
+summary: Estonian ID validator
 test_files:
-- spec/fixtures/get_response.html
 - spec/fixtures/invalid_post_response.html
 - spec/fixtures/post_response.html
 - spec/spec_helper.rb

data/spec/fixtures/get_response.html DELETED Viewed

@@ -1,40 +0,0 @@
-<div id="content1left" class="content" style="min-height: 500px;">
-  <br>
-  <p>
-  Teil on võimalus kontrollida isikut tõendavate dokumentide kehtivust,
-  kui sisestate dokumendi numbri. <b>NB!</b> Dokumendi numbris olevad tähed palume sisestada läbivalt suurte tähtedega.
-  </p>
-  <br>
-  <form name="reqForm" method="post" action="">
-    <input type="hidden" name="cmd" value="request">
-    <input type="hidden" name="csrf" value="iiGifsNdIY/OVVbEXnh3hMLtJgXsKomOlWKClE2DozCAo/KdBk0N7g==">
-    <table class="form">
-      <tbody>
-        <tr>
-          <td class="label">Dokumendi number:</td>
-          <td>
-            <input class="basicInputText" type="text"
-                   name="docNumber" size="20" maxlength="20" value="">
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-          </td>
-        </tr>
-        <tr>
-          <td>
-          </td>
-          <td>
-            <input class="basicInputButton button100px" type="submit"
-                   name="subButton" value="Esita päring">
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </form>
-  <br>
-</div>