cra.ge 0.1.1 → 0.2.0

data/.gitignore

@@ -16,4 +16,7 @@ test/tmp
 test/version_tmp
 tmp
 
-*.pem
+*.pfx
+*.exe
+spec/spec_helper_private.rb
+.DS_Store

data/bin/compile.sh

@@ -0,0 +1 @@
+gmcs bin/cra.cs -reference:System.Security

data/bin/cra.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Xml;
+using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography;
+
+using System.Security.Cryptography.Xml;
+using Mono.Security;
+
+class Program
+{
+	static void Main(string[] args) {
+		if (args.Length != 4) {
+			Console.WriteLine("Usage: cra.exe cert-file cert-password input-path output-path");
+			return;
+		}
+
+		String certFile = args[0];
+		String password = args[1];
+		String input    = args[2];
+		String output   = args[3];
+
+		X509Certificate2 cert = new X509Certificate2(certFile, password, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
+
+		XmlDocument xmlDoc = new XmlDocument();
+		xmlDoc.Load(input);
+
+		var XmlToSign = new XmlDocument();
+  	XmlToSign.LoadXml(xmlDoc.DocumentElement["Body"].OuterXml);
+
+		SignedXml signedXml = new SignedXml(XmlToSign);
+		signedXml.SigningKey = cert.PrivateKey;
+
+		Reference reference = new Reference();
+		reference.Uri = "";
+
+    XmlDsigEnvelopedSignatureTransform env = new XmlDsigEnvelopedSignatureTransform();
+    reference.AddTransform(env);
+
+		signedXml.AddReference(reference);
+		signedXml.ComputeSignature();
+		XmlElement xmlDigitalSignature = signedXml.GetXml();
+		xmlDoc.DocumentElement["Body"].AppendChild(xmlDoc.ImportNode(xmlDigitalSignature, true));
+		xmlDoc.Save(output);
+	}
+}

data/cra.gemspec

@@ -13,10 +13,14 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://github.com/dimakura/cra.ge"
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  # gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   << 'cra.exe'
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency 'rspec', '~> 2.11'
-  gem.add_runtime_dependency 'savon', '~> 1.2'
+  gem.add_runtime_dependency 'activesupport', '~> 3.2'
+  gem.add_runtime_dependency 'rest-client', '~> 1.6'
+  gem.add_runtime_dependency 'builder', '~> 3.0'
+  gem.add_runtime_dependency 'bundler', '~> 1.2'
 end

data/lib/cra/address.rb

@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+class CRA::Address
+  attr_accessor :id, :name, :old_name, :active
+
+  def self.list_from_hash(hash)
+    addresses = []
+    hash.each do |res|
+      address = CRA::Address.new
+      address.id = res['ID'].to_i
+      address.name = res['Name']
+      address.old_name = res['OldName']
+      address.active = res['Status'] == 'true'
+      addresses << address
+    end
+    addresses
+  end
+
+end

data/lib/cra/address_info.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+class CRA::AddressInfo
+  attr_accessor :id, :address, :path, :region_id, :region_name
+
+  def self.init_from_hash(hash)
+    address = CRA::AddressInfo.new
+    address.id = hash['ID'].to_i
+    address.address = hash['Name']
+    address.path = hash['Path'].split('|').map{ |p| p.to_i }
+    address.region_id = hash['RegionID'].to_i
+    address.region_name = hash['RegionName']
+    address
+  end
+
+end

data/lib/cra/address_node.rb

@@ -0,0 +1,26 @@
+# -*- encoding : utf-8 -*-
+class CRA::AddressNode
+  attr_accessor :id, :description, :description_full, :address
+  attr_accessor :identificator, :identificator_text
+  attr_accessor :identificator_type, :identificator_type_text
+  attr_accessor :active
+
+  def self.list_from_hash(hash)
+    nodes = []
+    hash.each do |res|
+      node = CRA::AddressNode.new
+      node.id = res['ID'].to_i
+      node.description = res['Description']
+      node.description_full = res['FullDescription']
+      node.identificator = res['Identificator'].to_i
+      node.identificator_text = res['IdentificatorStr']
+      node.identificator_type = res['IdentificatorType'].to_i
+      node.identificator_type_text = res['IdentificatorTypeStr']
+      node.address = res['NodeAdress']
+      node.active = res['Status'].to_i == 1
+      nodes << node
+    end
+    nodes
+  end
+
+end

data/lib/cra/base.rb

@@ -0,0 +1,118 @@
+# -*- encoding : utf-8 -*-
+require 'builder'
+require 'bundler/cli'
+
+class CRA::Base
+  attr_accessor :last_action, :last_request, :last_response
+
+  def tokenize_service(service)
+    case service
+    when 'GetDataUsingCriteriaParameter'
+      'ძებნა სახელით და დაბ. დღით'
+    when 'GetDataUsingPrivateNumberAndIdCardParameter'
+      'ძებნა პირადობის მოწმობით'
+    when 'FetchPersonInfoByPassportNumberUsingCriteriaParameter'
+      'ძებნა პასპორტით'
+    else
+      service
+    end
+  end
+
+  def gov_talk_request(options)
+    self.last_action = tokenize_service(options[:service])
+    self.last_request = options[:params]
+    # create xml
+    xml = xml_generation(options)
+    file1 = gen_filename
+    file2 = gen_filename
+    begin
+      # make signature
+      File.open(file1, 'w') do |f|
+        f.write(xml)
+      end
+      if File.exists?('bin/cra.exe')
+        path_to_exe = 'bin/cra.exe'
+      else
+        path_to_exe = "#{Bundler::CLI.new.send(:locate_gem, 'cra.ge')}/bin/cra.exe"
+      end
+      %x[ mono #{path_to_exe} '#{CRA.config.cert_file}' '#{CRA.config.cert_password}' '#{file1}' '#{file2}' ]
+      # send request
+      xml2 = File.read(file2)
+      response = RestClient.post CRA.config.url, xml2, :content_type => :xml
+      hash = Hash.from_xml(response.body)
+      # manage response
+      if hash['GovTalkMessage']['Header']['MessageDetails']['Qualifier'] == 'error'
+        ex_root = hash['GovTalkMessage']['GovTalkDetails']['GovTalkErrors']['Error']
+        ex_text = "#{ex_root['Type'].upcase}-#{ex_root['Number']}: #{ex_root['Text']}"
+        self.last_response = ex_text
+        raise CRA::ServiceException, ex_text
+      elsif hash['GovTalkMessage']['Body']['ErrorResult']
+        ex_root = hash['GovTalkMessage']['Body']['ErrorResult']
+        ex_text = "#{ex_root['Message']}"
+        self.last_response = ex_text
+        raise CRA::ServiceException, ex_text
+      end
+      hash['GovTalkMessage']['Body']
+      self.last_response = hash['GovTalkMessage']['Body']
+    ensure
+      FileUtils.rm(file1)
+      FileUtils.rm(file2)
+    end
+  end
+
+  private
+
+  def xml_generation(options)
+    service_name = options[:service]
+    class_name   = options[:class]
+    message_name = options[:message]
+    params       = options[:params]
+    xml = Builder::XmlMarkup.new( :indent => 2 )
+    xml.instruct! :xml, :encoding => 'utf-8'
+    xml.GovTalkMessage(xmlns: 'http://www.govtalk.gov.uk/CM/envelope') do |xml|
+      xml.EnvelopeVersion '2.0'
+      xml.Header do |xml|
+        xml.MessageDetails do |xml|
+          xml.Class class_name
+          xml.Qualifier 'request'
+          xml.Function 'submit'
+        end
+        xml.SenderDetails do |xml|
+          xml.IDAuthentication do |xml|
+            xml.SenderID CRA.config.user
+            xml.Authentication do |xml|
+              xml.Method 'clear'
+              xml.Value CRA.config.password
+            end
+          end
+        end
+      end
+      xml.Body do |xml|
+        xml.Message(xmlns: "urn:g3.ge:cra:call:#{message_name}:v1") do |xml|
+          xml.Data do |xml|
+            xml.Request do |xml|
+              if params.size < 2
+                params.each do |k, v|
+                  xml.tag!(k, v)
+                end
+              else
+                xml.tag! service_name do |xml|
+                  params.each do |k, v|
+                    xml.tag!(k, v)
+                  end
+                end
+              end
+            end
+          end
+          xml.Thumbprint CRA.config.cert_trace
+        end
+      end
+    end
+  end
+
+  def gen_filename
+    FileUtils.mkdir_p('tmp')
+    "tmp/#{Digest::MD5.hexdigest "#{Time.now}#{rand(100)}"}.xml"
+  end
+
+end

data/lib/cra/config.rb

@@ -5,7 +5,10 @@ module CRA
 
   class Config
     include Singleton
-    attr_accessor :pem_file
+    attr_accessor :user, :password, :test_mode, :cert_file, :cert_password, :cert_trace
+    def url
+      self.test_mode ? 'https://test.submission.e-government.ge/submission' : 'https://submission.e-government.ge/submission'
+    end
   end
 
   class << self

data/lib/cra/passport_info.rb

@@ -0,0 +1,115 @@
+# -*- encoding : utf-8 -*-
+require 'base64'
+
+class CRA::PassportInfo
+  DATE_FORMAT = '%Y-%m-%dT%H:%M:%S'
+
+  attr_accessor :doc_id, :doc_type, :doc_description, :doc_status, :doc_status_text
+  attr_accessor :is_id_card, :id_card_serial, :id_card_number, :id_card_issuer, :id_card_issue_date, :id_card_valid_date
+  attr_accessor :passport_number, :passport_issuer, :passport_issue_date, :passport_valid_date
+  attr_accessor :person_id, :social_id, :private_number
+  attr_accessor :first_name, :last_name, :middle_name
+  attr_accessor :birth_date, :birth_place
+  attr_accessor :gender
+  attr_accessor :citizenship, :citizenship_code, :second_citizenship, :second_citizenship_code
+  attr_accessor :living_place_id, :living_place, :living_place_registration, :living_place_registration_end, :actual_living_place
+  attr_accessor :region_id, :region_name
+  attr_accessor :response_id, :response_code
+  attr_accessor :is_person_dead, :is_document_lost
+  attr_accessor :photos
+
+  def self.extract_date(text)
+    DateTime.strptime(text.to_s, DATE_FORMAT)
+  rescue Exception => ex
+  end
+
+  def self.eval_hash(hash)
+    if hash['PersonInfo']
+      CRA::PassportInfo.init_with_hash(hash)
+    elsif hash['ArrayOfPersonInfo']
+      CRA::PassportInfo.list_with_hash(hash)
+    end
+  end
+
+  def self.init_with_hash(hash)
+    hash = hash['PersonInfo'] || hash
+    passport = CRA::PassportInfo.new
+    passport.doc_id = hash['DocumentID'].to_i
+    passport.doc_type = hash['DocumentTypeID'].to_i
+    passport.doc_description = hash['DocumentDescription']
+    passport.doc_status = hash['DocumentStatusEnum']
+    passport.doc_status_text = hash['DocumentStatusStr']
+    passport.is_id_card = hash['IsIdCard'].downcase == 'true'
+    passport.id_card_serial = hash['IdCardSerial']
+    passport.id_card_number = hash['IdCardNumber']
+    passport.id_card_issuer = hash['IdCardIssuer']
+    passport.id_card_issue_date = extract_date(hash['IdCardIssueDate'])
+    passport.id_card_valid_date = extract_date(hash['IdCardValidDate'])
+    passport.passport_number = hash['PaspNumber'].strip if hash['PaspNumber']
+    passport.passport_issuer = hash['PaspIssuer'].strip if hash['PaspIssuer']
+    passport.passport_issue_date = extract_date(hash['PaspIssueDate'])
+    passport.passport_valid_date = extract_date(hash['PaspValidDate'])
+    passport.person_id = hash['PersonID'].to_i
+    # passport.social_id = hash[:social_id].to_i
+    passport.private_number = hash['PrivateNumber']
+    passport.first_name = hash['FirstName']
+    passport.last_name = hash['LastName']
+    passport.middle_name = hash['MiddleName']
+    passport.birth_date = extract_date(hash['BirthDate'])
+    passport.birth_place = hash['BirthPlace']
+    passport.gender = hash['Gender'].to_i
+    passport.citizenship = hash['Citizenship']
+    passport.citizenship_code = hash['CitizenshipCode']
+    passport.second_citizenship = hash['DoubleCitizenship'].strip if hash['DoubleCitizenship']
+    passport.second_citizenship_code = hash['DoubleCitizenshipCode']
+    passport.living_place_id = hash['LivingPlaceID'].to_i rescue nil
+    passport.living_place = hash['LivingPlace']
+    passport.actual_living_place = hash['FaLivingPlace'].strip if hash['FaLivingPlace']
+    passport.living_place = passport.living_place.split(' ').join(' ') if passport.living_place
+    passport.actual_living_place = passport.actual_living_place.split(' ').join(' ') if passport.actual_living_place
+    passport.living_place_registration = extract_date(hash['LivingPlaceRegDate'])
+    passport.living_place_registration_end = extract_date(hash['LivingPlaceRegEndDate'])
+    passport.region_id = hash['RegionID'].to_i
+    passport.region_name = hash['RegionStr']
+    passport.response_id = hash['ResponseID'].to_i
+    passport.is_person_dead = hash['IsPersonDead'] == 'true'
+    passport.is_document_lost = hash['IsDocumentLost'] == 'true'
+    passport.photos = []
+    if hash['Photos'] and hash['Photos'].is_a?(Array)
+      hash['Photos'].each do |photo|
+        passport.photos.push(photo['base64Binary'])
+      end
+    elsif hash['Photos']
+      passport.photos.push(hash['Photos']['base64Binary'])
+    end
+    passport
+  end
+
+  def self.list_with_hash(hash)
+    documents = []
+    hash['ArrayOfPersonInfo']['PersonInfo'].each do |row|
+      documents << CRA::PassportInfo.init_with_hash(row)
+    end
+    documents
+  end
+
+  def full_name(opts = {})
+    if opts[:with_middle_name]
+      "#{first_name} #{last_name} #{middle_name}"
+    else
+      "#{first_name} #{last_name}"
+    end
+  end
+
+  # Returns binary content of the photo.
+  def binary(index)
+    Base64.decode64(self.photos[index])
+  end
+
+  def write_photo(index, file = nil)
+    File.open(file || 'photo', 'wb') do |file|
+      file.write self.binary(index)
+    end
+  end
+
+end

data/lib/cra/person_at_address.rb

@@ -0,0 +1,37 @@
+# -*- encoding : utf-8 -*-
+class CRA::PersonAtAddress
+  attr_accessor :first_name, :last_name, :birth_date, :active, :status_text, :gender, :address, :private_number
+
+  def self.extract_date(text)
+    DateTime.strptime(text.to_s, '%d/%m/%Y')
+    #rescue Exception => ex
+  end
+
+  def self.init_with_hash(hash)
+    hash = hash['PersonsAtAddress'] || hash
+    person = CRA::PersonAtAddress.new
+    person.first_name = hash['MD_FIRST']
+    person.last_name = hash['MD_LAST']
+    person.birth_date = CRA::PersonAtAddress.extract_date(hash['MD_BIRTH_DATE'])
+    person.status_text = hash['APPD_STATUS_DESCRIPTION']
+    person.active = person.status_text == 'აქტიური'
+    person.gender = hash['MD_GENDER_STR']
+    person.address = hash['OA_RP_FULL_ADDRESS']
+    person.private_number = hash['PN_PRIVATE_NUMBER']
+    person
+  end
+
+  def self.list_from_hash(hash)
+    persons = []
+    hash = hash['PersonsAtAddress']
+    if hash.is_a? Array
+      hash.each do |row|
+        persons << CRA::PersonAtAddress.init_with_hash(row)
+      end
+    else
+      persons << CRA::PersonAtAddress.init_with_hash(hash)
+    end
+    persons
+  end
+
+end

data/lib/cra/services.rb

@@ -1,50 +1,123 @@
 # -*- encoding : utf-8 -*-
 require 'singleton'
+require 'rest_client'
+require 'active_support/core_ext/hash/conversions'
 
 module CRA
+  ROOT_ID    = 0
+  GEORGIA_ID = 1
+  TBILISI_ID = 4
 
   class Services < CRA::Base
     include Singleton
 
-    # Get service consumer UPN.
-    def my_upn
-      process_request('GetMyUPN', {})
-    end
-
-    # Getting personal information by personal number.
-    def by_personal_id(personal_number)
-      raise ArgumentError('personal_number required') if personal_number.blank?
-      response = process_request('GetDataUsingPrivateNumber', { 'privateNumber' => personal_number })
-      CRA::PasportInfo.init_with_hash(response)
-    end
-
-    # Getting personal information by ID card information.
-    def by_id_card(serial, number)
-      raise ArgumentError('id card serial required') if serial.blank?
-      raise ArgumentError('id card number required') if serial.blank?
-      response = process_request('PersonInfoByDocumentNumber', { 'idCardSerial' => serial, 'idCardNumber' => number })
-      CRA::PasportInfo.init_with_hash(response)
-    end
-
-    # Getting documents by name and date of birth.
-    def list_by_name_and_dob(last_name, first_name, year, month, day)
-      raise ArgumentError('first_name required') if first_name.blank?
-      raise ArgumentError('last_name required') if last_name.blank?
-      raise ArgumentError('year required') if year.blank?
-      raise ArgumentError('month required') if month.blank?
-      raise ArgumentError('day required') if day.blank?
-      response = process_request('GetDataUsingCriteria', { 'lastName' => last_name, 'firstName' => first_name, 'year' => year, 'month' => month, 'day' => day })
-      CRA::PasportInfo.list_with_hash(response)
-    end
-
-    def test_service
-      action_name = 'AddrGetRootNode'
-      soap_action = self.soap_action(action_name)
-      response = get_client.request action_name do
-        http.headers['SOAPAction'] = soap_action
-        #soap.body = { 'idCardSerial' => 'გ', 'idCardNumber' => '1355876' }
-      end      
-      puts response.to_hash
+    public
+
+    # Returns array of passports.
+    def by_name_and_dob(lname, fname, year, month, day)
+      body = self.gov_talk_request({
+        service: 'GetDataUsingCriteriaParameter',
+        message: 'CRAGetDataUsingCriteria',
+        class:   'CRAGetDataUsingCriteria',
+        params: {
+          LastName: lname,
+          FirstName: fname,
+          Year: year,
+          Month: month,
+          Day: day,
+        }
+      })
+      CRA::PassportInfo.list_with_hash(body)
+    end
+
+    # Returns ID card information.
+    def by_id_card(private_number, id_card_serial, id_card_numb)
+      body = self.gov_talk_request({
+        service: 'GetDataUsingPrivateNumberAndIdCardParameter',
+        message: 'GetDataUsingPrivateNumberAndCard',
+        class:   'GetDataUsingPrivateNumberAndCard',
+        params: {
+          PrivateNumber: private_number,
+          IdCardSerial: id_card_serial,
+          IdCardNumber:  id_card_numb,
+        }
+      })
+      CRA::PassportInfo.init_with_hash(body)
+    end
+
+    # Returns passport information.
+    def by_passport(private_number, passport)
+      body = self.gov_talk_request({
+        service: 'FetchPersonInfoByPassportNumberUsingCriteriaParameter',
+        message: 'CRA_FetchInfoByPassportCriteria',
+        class:   'CRA_FetchInfoByPassportCriteria',
+        params: {
+          PrivateNumber: private_number,
+          Number: passport
+        }
+      })
+      CRA::PassportInfo.init_with_hash(body)
+    end
+
+    # Returns array of addresses.
+    def address_by_name(parent_id, name)
+      body = self.gov_talk_request({
+        service: 'AddrFindeAddressByNameParameter',
+        message: 'CRA_AddrFindeAddressByName',
+        class:   'CRA_AddrFindeAddressByName',
+        params: {
+          Id: parent_id,
+          Word: name,
+        }
+      })
+      CRA::Address.list_from_hash(body['ArrayOfResults']['Results'])
+    end
+
+    # Getting address root.
+    def address_root
+      body = self.gov_talk_request({
+        message: 'CRA_AddrGetRootNode',
+        class:   'CRA_AddrGetRootNode',
+        params: {}
+      })
+      CRA::AddressNode.list_from_hash(body['ArrayOfNodeInfo']['NodeInfo'])
+    end
+
+    # Returns array of address nodes.
+    def address_by_parent(parent_id)
+      body = self.gov_talk_request({
+        message: 'CRA_AddrGetNodesByParentID',
+        class:   'CRA_AddrGetNodesByParentID',
+        params: {
+          long: parent_id,
+        }
+      })
+      CRA::AddressNode.list_from_hash(body['ArrayOfNodeInfo']['NodeInfo'])
+    end
+
+    # Get address info by it's id.
+    def address_info(id)
+      body = self.gov_talk_request({
+        message: 'CRA_AddrGetAddressInfoByID',
+        class:   'CRA_AddrGetAddressInfoByID',
+        params: {
+          long: id,
+        }
+      })
+      # puts body.to_s
+      CRA::AddressInfo.init_from_hash(body['AddressInfo'])
+    end
+
+    # Get persons array at the given address. 
+    def persons_at_address(address_id)
+      body = self.gov_talk_request({
+        message: 'CRA_GetPersonsAtAddress',
+        class:   'CRA_GetPersonsAtAddress',
+        params: {
+          long: address_id,
+        }
+      })
+      CRA::PersonAtAddress.list_from_hash(body['ArrayOfPersonsAtAddress'])
     end
 
   end

data/lib/cra/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module CRA
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/cra.rb

@@ -1,7 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'savon'
 require 'cra/version'
-
 require 'cra/config'
 
 class String
@@ -15,41 +13,19 @@ class String
 end
 
 module CRA
-  BASE_URL = 'http://stateinstitution.cra.ge'
-  WSDL_URL = 'https://stateinstitutions.cra.ge/Service.asmx?WSDL'
-
   MALE = 1
   FEMALE = 2
 
-  class Base
-    attr_accessor :last_request, :last_response, :last_action
-
-    def process_request(action, request)
-      soap_action = self.soap_action(action)
-      response = get_client.request action do
-        http.headers['SOAPAction'] = soap_action
-        soap.body = request
-      end
-      @last_action   = action
-      @last_request  = request
-      @last_response = response["#{action.underscore}_response".to_sym]["#{action.underscore}_result".to_sym]
-    end
-
-    def get_client
-      Savon::Client.new WSDL_URL do 
-        http.auth.ssl.cert_file = CRA.config.pem_file
-        http.auth.ssl.cert_key_file = CRA.config.pem_file
-        http.auth.ssl.verify_mode = :peer 
-      end
-    end
-
-    def soap_action(name)
-      "#{BASE_URL}/#{name}"
-    end
-
+  class ServiceException < Exception
   end
 
 end
 
-require 'cra/pasport_info'
+require 'cra/address'
+require 'cra/address_node'
+require 'cra/address_info'
+require 'cra/passport_info'
+require 'cra/person_at_address'
+
+require 'cra/base'
 require 'cra/services'

data/spec/address_spec.rb

@@ -0,0 +1,131 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe 'Find address by name' do
+  before(:all) do
+    @addresses = CRA.serv.address_by_name(CRA::TBILISI_ID, 'ტაბიძე')
+  end
+  context do
+    subject { @addresses }
+    it { should_not be_nil }
+    it { should_not be_empty }
+    its(:size) { should == 2 }
+  end
+  context do
+    subject { @addresses.first }
+    its(:id) { should == 988572 }
+    its(:name) { should == 'საქართველო/თბილისი/კრწანისი/გ.ტაბიძე-შ.დადიანის/' }
+    its(:old_name) { should be_nil }
+    its(:active) { should == true }
+  end
+  context do
+    subject { @addresses.last }
+    its(:id) { should == 1989533 }
+    its(:name) { should == 'საქართველო/თბილისი/მთაწმინდა/კიკეთი/გ. ტაბიძე/' }
+    its(:old_name) { should be_nil }
+    its(:active) { should == true }
+  end
+end
+
+describe 'Getting root node' do
+  before(:all) do
+    @nodes = CRA.serv.address_root
+  end
+  context do
+    subject { @nodes }
+    it { should_not be_nil }
+    it { should_not be_empty }
+    its(:size) { should == 3 }
+  end
+  context do
+    subject { @nodes.first }
+    its(:id) { should == 1 }
+    its(:description) { should == 'საქართველო' }
+    its(:description_full) { should == 'საქართველო' }
+    its(:identificator) { should == 1 }
+    its(:identificator_text) { should == 'ჩვენი ქვეყანა' }
+    its(:identificator_type) { should == 1 }
+    its(:identificator_type_text) { should == 'ჩვეულებრივი' }
+    its(:address) { should be_nil }
+    its(:active) { should == true }
+  end
+end
+
+describe 'Find address by parent id' do
+  before(:all) do
+    @nodes = CRA.serv.address_by_parent(CRA::TBILISI_ID)
+  end
+  context do
+    subject { @nodes }
+    it { should_not be_nil }
+    it { should_not be_empty }
+    its(:size) { should == 11 }
+  end
+  context do
+    subject { @nodes.first }
+    its(:id) { should == 191 }
+    its(:description) { should == 'გლდანი' }
+    its(:description_full) { should == 'გლდანი' }
+    its(:identificator) { should == 32 }
+    its(:identificator_text) { should == 'ქალაქის რაიონი' }
+    its(:identificator_type) { should == 1 }
+    its(:identificator_type_text) { should == 'ჩვეულებრივი' }
+    its(:address) { should == 'თბილისი' }
+    its(:active) { should == true }
+  end
+end
+
+describe 'Get address info' do
+  before(:all) do
+    @info = CRA.serv.address_info(1990702)
+  end
+  subject { @info }
+  it { should_not be_nil }
+  its(:id) { should == 1990702 }
+  its(:path) { should == [1, 4, 190, 10891, 1989533, 1990702] }
+  its(:address) { should == 'თბილისი ს. კიკეთი გ. ტაბიძე ქ. N 1' }
+  its(:region_id) { should == 190 }
+  its(:region_name) { should == 'თბილისი/მთაწმინდა' }
+end
+
+describe 'Get persons at address' do
+  before(:all) do
+    @persons = CRA.serv.persons_at_address(1982180)
+  end
+  context do
+    subject { @persons }
+    it { should_not be_nil }
+    it { should_not be_empty }
+    its(:size) { should == 1 }
+  end
+  context do
+    subject { @persons.first }
+    its(:first_name) { should == 'ირაკლი' }
+    its(:last_name) { should == 'ცქიტიშვილი' }
+    its(:birth_date) { should == Date.new(1982, 1, 23) }
+    its(:active) { should == true }
+    its(:status_text) { should == 'აქტიური' }
+    its(:private_number) { should == '18001008167' }
+  end
+end
+
+describe 'Get address with multiple persons' do
+  before(:all) do
+    @persons = CRA.serv.persons_at_address(576056)
+  end
+  context do
+    subject { @persons }
+    it { should_not be_nil }
+    it { should_not be_empty }
+    its(:size) { should == 4}
+  end
+  context do
+    subject { @persons.first }
+    its(:first_name) { should == 'ნათია' }
+    its(:last_name) { should == 'ბოდოკია' }
+    its(:birth_date) { should == Date.new(1984, 5, 7) }
+    its(:active) { should == true }
+    its(:status_text) { should == 'აქტიური' }
+    its(:private_number) { should == '01010013915' }
+  end
+end

data/spec/config_spec.rb

@@ -1,6 +1,10 @@
 # -*- encoding : utf-8 -*-
 require 'spec_helper'
 
-describe 'configure CRA gem' do
-  specify { CRA.config.pem_file.should == 'spec/data/telasi.pem' }
+describe CRA.config do
+  its(:user) { should_not be_nil }
+  its(:password) { should_not be_nil }
+  its(:test_mode) { should == true }
+  its(:cert_file) { should_not be_nil }
+  its(:cert_password) { should_not be_nil }
 end

data/spec/passport_spec.rb

@@ -0,0 +1,90 @@
+# -*- encoding : utf-8 -*-
+require 'spec_helper'
+
+describe 'get person info by id card' do
+  before(:all) do
+    @person_info = CRA.serv.by_id_card('02001000490', 'გ', '1355876')
+  end
+  context 'person information' do
+    subject { @person_info }
+    it { should_not be_nil }
+    its(:doc_id) { should > 0 }
+    its(:doc_type) { should == 1 }
+    its(:doc_description) { should == 'პირადობის მოწმობა' }
+    its(:doc_status) { should == 'Active' }
+    its(:doc_status_text) { should == 'აქტიური' }
+    its(:is_id_card) { should == true }
+    its(:id_card_serial) { should == 'გ' }
+    its(:id_card_number) { should == '1355876' }
+    its(:id_card_issuer) { should == 'სამოქალაქო რეესტრის სააგენტოს მთაწმინდა-კრწანისის სამსახური' }
+    its(:id_card_issue_date) { should_not be_nil }
+    its(:id_card_valid_date) { should_not be_nil }
+    its(:passport_number) { should be_blank }
+    its(:passport_issuer) { should be_blank }
+    its(:passport_issue_date) { should be_nil }
+    its(:person_id) { should == 969036 }
+    its(:private_number) { should == '02001000490' }
+    its(:first_name) { should == 'დიმიტრი' }
+    its(:last_name) { should == 'ყურაშვილი' }
+    its(:middle_name) { should == 'ალბერტი' }
+    its(:birth_date) { should_not be_nil }
+    its(:birth_place) { should == 'საქართველო, აბაშა' }
+    its(:gender) { should == CRA::MALE }
+    its(:citizenship) { should == 'საქართველო' }
+    its(:citizenship_code) { should == 'GEO' }
+    its(:second_citizenship) { should be_blank }
+    its(:second_citizenship_code) { should be_blank }
+    its(:living_place_id) { should == 920434 }
+    its(:living_place) { should == 'თბილისი მისამართის გარეშე' }
+    its(:living_place_registration) { should_not be_nil }
+    its(:living_place_registration_end) { should be_nil }
+    its(:actual_living_place) { should == 'თბილისი აკ.ხორავას ჩიხი N 8' }
+    its(:is_person_dead) { should == false }
+    its(:is_document_lost) { should == false }
+    its(:photos) { should_not be_empty }
+    specify { subject.photos.size.should == 1 }
+    specify { subject.photos.first.should_not be_blank }
+  end
+  context 'last response' do
+    specify { CRA.serv.last_action.should == 'ძებნა პირადობის მოწმობით' }
+    specify { CRA.serv.last_request.is_a?(Hash).should == true }
+    specify { CRA.serv.last_response.is_a?(Hash).should == true }
+  end
+end
+
+describe 'get person info by name and date' do
+  before(:all) do
+    @person_info = CRA.serv.by_name_and_dob('ყურაშვილი', 'დიმიტრი', 1979, 4, 4)
+  end
+  context 'documents list' do
+    subject { @person_info }
+    it { should_not be_nil }
+    it { should_not be_empty }
+    its(:size) { should == 5 }
+  end
+  context 'last response' do
+    specify { CRA.serv.last_action.should == 'ძებნა სახელით და დაბ. დღით' }
+    specify { CRA.serv.last_request.is_a?(Hash).should == true }
+    specify { CRA.serv.last_response.is_a?(Hash).should == true }
+  end
+end
+
+describe 'get person info by passport' do
+  before(:all) do
+    @person_info = CRA.serv.by_passport('01008017948', '07PB00777')
+  end
+  context 'passport info' do
+    subject { @person_info }
+    it { should_not be_nil }
+    its(:first_name) { should == 'დავით' }
+    its(:last_name) { should == 'ფრუიძე' }
+    its(:private_number) { should == '01008017948' }
+    its(:passport_number) { should == '07PB00777' }
+    its(:is_id_card) { should == false }
+  end
+  context 'last response' do
+    specify { CRA.serv.last_action.should == 'ძებნა პასპორტით' }
+    specify { CRA.serv.last_request.is_a?(Hash).should == true }
+    specify { CRA.serv.last_response.is_a?(Hash).should == true }
+  end
+end

data/spec/spec_helper.rb

@@ -1,14 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# Savon
-
-require 'savon'
-
-HTTPI.log = false
-Savon.configure do |config|
-  config.log = false
-end
-
 # RSpec
 
 require 'rspec'
@@ -20,5 +11,4 @@ end
 # Test options.
 
 require 'cra'
-
-CRA.config.pem_file = 'spec/data/telasi.pem'
+require 'spec_helper_private'

metadata

@@ -2,7 +2,7 @@
 name: cra.ge
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dimitri Kurashvili
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-29 00:00:00 Z
+date: 2012-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -24,21 +24,54 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: savon
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.2"
+        version: "3.2"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.6"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id005
 description: CRA services
 email: 
 - dimitri@c12.ge
-executables: []
-
+executables: 
+- cra.exe
 extensions: []
 
 extra_rdoc_files: []
@@ -51,16 +84,24 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/compile.sh
+- bin/cra.cs
 - cra.gemspec
 - lib/cra.rb
+- lib/cra/address.rb
+- lib/cra/address_info.rb
+- lib/cra/address_node.rb
+- lib/cra/base.rb
 - lib/cra/config.rb
-- lib/cra/pasport_info.rb
+- lib/cra/passport_info.rb
+- lib/cra/person_at_address.rb
 - lib/cra/services.rb
 - lib/cra/version.rb
+- spec/address_spec.rb
 - spec/config_spec.rb
-- spec/experimental_spec.rb
-- spec/service_spec.rb
+- spec/passport_spec.rb
 - spec/spec_helper.rb
+- bin/cra.exe
 homepage: http://github.com/dimakura/cra.ge
 licenses: []
 
@@ -89,7 +130,7 @@ signing_key:
 specification_version: 3
 summary: Ruby client for C(ivil)R(egistry)A(gency) services
 test_files: 
+- spec/address_spec.rb
 - spec/config_spec.rb
-- spec/experimental_spec.rb
-- spec/service_spec.rb
+- spec/passport_spec.rb
 - spec/spec_helper.rb

data/lib/cra/pasport_info.rb

@@ -1,100 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'base64'
-
-class CRA::PasportInfo
-
-  attr_accessor :doc_id, :doc_type, :doc_description, :doc_status, :doc_status_text
-  attr_accessor :is_id_card, :id_card_serial, :id_card_number, :id_card_issuer, :id_card_issue_date, :id_card_valid_date
-  attr_accessor :pasport_number, :passport_issuer, :passport_issue_date, :passport_valid_date
-  attr_accessor :person_id, :social_id, :private_number
-  attr_accessor :first_name, :last_name, :middle_name
-  attr_accessor :birth_date, :birth_place
-  attr_accessor :gender
-  attr_accessor :citizenship, :citizenship_code, :second_citizenship, :second_citizenship_code
-  attr_accessor :living_place_id, :living_place, :living_place_registration, :living_place_registration_end, :actual_living_place
-  attr_accessor :region_id, :region_name
-  attr_accessor :response_id, :response_code
-  attr_accessor :is_person_dead, :is_document_lost
-  attr_accessor :photos
-
-  def self.init_with_hash(hash)
-    passport = CRA::PasportInfo.new
-    passport.doc_id = hash[:document_id].to_i
-    passport.doc_type = hash[:document_type_id].to_i
-    passport.doc_description = hash[:document_description]    
-    passport.doc_status = hash[:document_status_enum]
-    passport.doc_status_text = hash[:document_status_str]
-    passport.is_id_card = hash[:is_id_card]
-    passport.id_card_serial = hash[:id_card_serial]
-    passport.id_card_number = hash[:id_card_number]
-    passport.id_card_issuer = hash[:id_card_issuer]
-    passport.id_card_issue_date = hash[:id_card_issue_date]
-    passport.id_card_valid_date = hash[:id_card_valid_date]
-    passport.pasport_number = hash[:pasport_number]
-    passport.passport_issuer = hash[:passport_issuer]
-    passport.passport_issue_date = hash[:passport_issue_date]
-    passport.passport_valid_date = hash[:passport_valid_date]
-    passport.person_id = hash[:person_id].to_i
-    passport.social_id = hash[:social_id].to_i
-    passport.private_number = hash[:private_number]
-    passport.first_name = hash[:first_name]
-    passport.last_name = hash[:last_name]
-    passport.middle_name = hash[:middle_name]
-    passport.birth_date = hash[:birth_date]
-    passport.birth_place = hash[:birth_place]
-    passport.gender = hash[:gender].to_i
-    passport.citizenship = hash[:citizenship]
-    passport.citizenship_code = hash[:citizenship_code]
-    passport.second_citizenship = hash[:double_citizenship]
-    passport.second_citizenship_code = hash[:double_citizenship_code]
-    passport.living_place_id = hash[:living_place_id].to_i
-    passport.living_place = hash[:living_place]
-    passport.actual_living_place = hash[:fa_living_place]
-    passport.living_place = passport.living_place.split(' ').join(' ') if passport.living_place
-    passport.actual_living_place = passport.actual_living_place.split(' ').join(' ') if passport.actual_living_place
-    passport.living_place_registration = hash[:living_place_reg_date]
-    passport.living_place_registration_end = hash[:living_place_reg_end_date]
-    passport.region_id = hash[:region_id].to_i
-    passport.region_name = hash[:region_str_]
-    passport.response_id = hash[:response_id].to_i
-    passport.is_person_dead = hash[:is_person_dead]
-    passport.is_document_lost = hash[:is_document_lost]
-    passport.photos = []
-    if hash[:photos] and hash[:photos].is_a?(Array)
-      hash[:photos].each do |photo|
-        passport.photos.push(photo[:base64_binary])
-      end
-    elsif hash[:photos]
-      passport.photos.push(hash[:photos][:base64_binary])
-    end
-    passport
-  end
-
-  def self.list_with_hash(hash)
-    documents = []
-    hash[:person_info].each do |row|
-      documents << CRA::PasportInfo.init_with_hash(row)
-    end
-    documents
-  end
-
-  def full_name(opts = {})
-    if opts[:with_middle_name]
-      "#{first_name} #{last_name} #{middle_name}"
-    else
-      "#{first_name} #{last_name}"
-    end
-  end
-
-  # Returns binary content of the photo.
-  def binary(index)
-    Base64.decode64(self.photos[index])
-  end
-
-  def write_photo(index, file = nil)
-    File.open(file || 'photo', 'wb') do |file|
-      file.write self.binary(index)
-    end
-  end
-
-end

data/spec/experimental_spec.rb

@@ -1,11 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-require 'cra'
-
-describe 'test' do
-  before(:all) do
-    CRA.serv.test_service
-  end
-  subject { true }
-  it { should == true }
-end

data/spec/service_spec.rb

@@ -1,87 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-require 'cra'
-
-describe 'my UPN' do
-  before(:all) do
-    @upn = CRA.serv.my_upn
-  end
-  context do
-    subject { @upn }
-    it { should == 'CRA\telasi' }
-  end
-  context do
-    subject { CRA.serv }
-    its(:last_request) { should == {} }
-    its(:last_response) { should == 'CRA\telasi' }
-    its(:last_action) { should == 'GetMyUPN' }
-  end
-end
-
-describe 'get person info by id' do
-  before(:all) do
-    @person_info = CRA.serv.by_personal_id('02001000490')
-  end
-  subject { @person_info }
-  its(:doc_id) { should > 0 }
-  its(:doc_type) { should == 1 }
-  its(:doc_description) { should == 'პირადობის მოწმობა' }
-  its(:doc_status) { should == 'Active' }
-  its(:doc_status_text) { should == 'აქტიური' }
-  its(:is_id_card) { should == true }
-  its(:id_card_serial) { should == 'გ' }
-  its(:id_card_number) { should == '1355876' }
-  its(:id_card_issuer) { should == 'სამოქალაქო რეესტრის სააგენტოს მთაწმინდა-კრწანისის სამსახური' }
-  its(:id_card_issue_date) { should_not be_nil }
-  its(:id_card_valid_date) { should_not be_nil }
-  its(:pasport_number) { should be_nil }
-  its(:passport_issuer) { should be_nil }
-  its(:passport_issue_date) { should be_nil }
-  its(:passport_valid_date) { should be_nil }
-  its(:person_id) { should == 969036 }
-  its(:private_number) { should == '02001000490' }
-  its(:first_name) { should == 'დიმიტრი' }
-  its(:last_name) { should == 'ყურაშვილი' }
-  its(:middle_name) { should == 'ალბერტი' }
-  its(:birth_date) { should_not be_nil }
-  its(:birth_place) { should == 'საქართველო, აბაშა' }
-  its(:gender) { should == CRA::MALE }
-  its(:citizenship) { should == 'საქართველო' }
-  its(:citizenship_code) { should == 'GEO' }
-  its(:second_citizenship) { should be_nil }
-  its(:second_citizenship_code) { should be_nil }
-  its(:living_place_id) { should == 920434 }
-  its(:living_place) { should == 'თბილისი მისამართის გარეშე' }
-  its(:living_place_registration) { should_not be_nil }
-  its(:living_place_registration_end) { should be_nil }
-  its(:actual_living_place) { should == 'თბილისი აკ.ხორავას ჩიხი N 8' }
-  its(:is_person_dead) { should == false }
-  its(:is_document_lost) { should == false }
-  its(:photos) { should_not be_empty }
-end
-
-describe 'get person info by id card' do
-  before(:all) do
-    @person_info = CRA.serv.by_id_card('გ', '1355876')
-  end
-  subject { @person_info }
-  its(:doc_id) { should > 0 }
-  its(:first_name) { should == 'დიმიტრი' }
-  its(:last_name) { should == 'ყურაშვილი' }
-  its(:private_number) { should == '02001000490' }
-end
-
-describe 'find person documents by name and dob' do
-  before(:all) do
-    @documents = CRA.serv.list_by_name_and_dob('ყურაშვილი', 'დიმიტრი', 1979, 4, 4)
-  end
-  context do
-    subject { @documents }
-    its(:size) { should == 5 }
-  end
-  context do
-    subject { @documents.first }
-    its(:person_id) { should == 969036 }
-    its(:private_number) { should == '02001000490' }
-  end
-end