digidoc_client 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def114f38b327cd277bdc1e7b0d1e35faa36c26e
-  data.tar.gz: 5941f074b02e0814004ba8d74cc027baaf884be2
+  metadata.gz: 225a15c978fa06d9f84aa749118ee378ff81ee1f
+  data.tar.gz: 4ed207821b4f5df451f31b4d7b3d262601e358ad
 SHA512:
-  metadata.gz: 90a3a9da571a4c238eb49ac3fdfc3513a27b25b29196aa96a7ae6dc12c7780eeb47f2c3c2d0fbb569ce94eb38fd062734f4438dc318f5ee9dfde05c94a1bfa60
-  data.tar.gz: b66573ea09748785bac0266f555697b1792ddcaa9b14538da263e61b2a43bb063c4f27435c56bfee5c198230ef8ad9ee7b995cf24b20b0ffac7df377ba4f16b6
+  metadata.gz: c57c02ac4baefe83045e6577102ced2722a60830865eba8741ac3d485400b0014d946e4d9d3a288566b3cc5a2859e35faba35d95ea28ea5c9563b99a06d3fbd6
+  data.tar.gz: 8a5ade4410c890d33fa7115b01e9afb415f5b8ad66dba37990ffa9fcc1ad5d3d8d83112558d158707be4047e49e5ea6be93a14ac192e5691ea90120298e87f20

data/Guardfile

@@ -0,0 +1,20 @@
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end

data/digidoc_client.gemspec

@@ -18,9 +18,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'httpclient', '>= 2.2.4'
-  s.add_dependency 'savon', '>= 0.9.7'
+  s.add_dependency 'httpclient', '>= 2.3.4'
+  s.add_dependency 'savon', '>= 2.4.0'
   s.add_dependency 'mime-types', '>= 1.16'
   s.add_dependency 'crack', '>= 0.1.8'
   s.add_dependency 'nokogiri', '>= 1.4.0'
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
+  s.add_development_dependency "growl"
+  s.add_development_dependency "rb-fsevent"
 end

data/lib/digidoc/client.rb

@@ -7,11 +7,24 @@ require 'mime/types'
 require 'digest/sha1'
 require 'nokogiri'
 
+class NestedOpenStruct < OpenStruct
+  def initialize(hash = nil)
+    @table = {}
+    if hash
+      for k, v in hash
+        @table[k.to_sym] = v.instance_of?(Hash) ? NestedOpenStruct.new(v) : v
+        new_ostruct_member(k)
+      end
+    end
+  end
+end
+
 module Digidoc
   TargetNamespace = 'http://www.sk.ee/DigiDocService/DigiDocService_2_3.wsdl'
-  TestEndpointUrl = 'https://openxades.org:8443/DigiDocService'
+  TestEndpointUrl = 'https://openxades.org:9443/DigiDocService'
 
   class Client
+    cattr_accessor :logger
     attr_accessor :session_code, :endpoint_url, :respond_with_nested_struct, :embedded_datafiles
 
     def initialize(endpoint_url = TestEndpointUrl)
@@ -41,11 +54,11 @@ module Digidoc
       self.session_code = nil
 
       # Make webservice call
-      response = savon_client.request(:wsdl, 'MobileAuthenticate') do |soap|
-        soap.body = {'CountryCode' => country_code, 'PhoneNo' => phone, 'Language' => language, 'ServiceName' => service_name,
+      response = savon_client.call('MobileAuthenticate') do |locals|
+        locals.message 'CountryCode' => country_code, 'PhoneNo' => phone, 'Language' => language, 'ServiceName' => service_name,
           'MessageToDisplay' => message_to_display, 'SPChallenge' => sp_challenge, 'MessagingMode' => messaging_mode,
           'AsyncConfiguration' => async_configuration, 'ReturnCertData' => return_cert_data,
-          'ReturnRevocationData' => return_revocation_data, 'IdCode' => personal_code }
+          'ReturnRevocationData' => return_revocation_data, 'IdCode' => personal_code
       end
 
       if soap_fault?(response)
@@ -59,8 +72,8 @@ module Digidoc
 
     # Authentication status
     def authentication_status(session_code = self.session_code)
-      response = savon_client.request(:wsdl, 'GetMobileAuthenticateStatus') do |soap|
-        soap.body = {'Sesscode' => session_code }
+      response = savon_client.call('GetMobileAuthenticateStatus') do |locals|
+        locals.message 'Sesscode' => session_code
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:get_mobile_authenticate_status_response]
@@ -75,8 +88,8 @@ module Digidoc
       signed_doc_file = options.delete(:signed_doc_file)
       signed_doc_xml = signed_doc_file.read if signed_doc_file
 
-      response = savon_client.request(:wsdl, 'StartSession') do |soap|
-        soap.body = { 'bHoldSession' => true, 'SigDocXML' => signed_doc_xml}
+      response = savon_client.call('StartSession') do |locals|
+        locals.message 'bHoldSession' => true, 'SigDocXML' => signed_doc_xml
       end
 
       if soap_fault?(response)
@@ -95,8 +108,8 @@ module Digidoc
       session_code = options.delete(:session_code) || self.session_code
       version = options.delete(:version) || '1.3'
 
-      response = savon_client.request(:wsdl, 'CreateSignedDoc') do |soap|
-        soap.body = {'Sesscode' => session_code, 'Format' => 'DIGIDOC-XML', 'Version' => version}
+      response = savon_client.call('CreateSignedDoc') do |locals|
+        locals.message 'Sesscode' => session_code, 'Format' => 'DIGIDOC-XML', 'Version' => version
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:create_signed_doc_response]
@@ -116,10 +129,10 @@ module Digidoc
       city = options.delete(:city)
       postal_code = options.delete(:postal_code)
 
-      response = savon_client.request(:wsdl, 'PrepareSignature') do |soap|
-        soap.body = {'Sesscode' => session_code, 'SignersCertificate' => signers_certificate,
+      response = savon_client.call('PrepareSignature') do |locals|
+        locals.message 'Sesscode' => session_code, 'SignersCertificate' => signers_certificate,
           'SignersTokenId' => signers_token_id, 'Role' => role, 'City' => city,
-          'State' => state_or_province, 'PostalCode' => postal_code, 'Country' => country_name, 'SigningProfile' => signing_profile }
+          'State' => state_or_province, 'PostalCode' => postal_code, 'Country' => country_name, 'SigningProfile' => signing_profile
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:prepare_signature_response]
@@ -133,8 +146,8 @@ module Digidoc
       signature = options.delete(:signature)
       signature_id = options.delete(:signature_id)
 
-      response = savon_client.request(:wsdl, 'FinalizeSignature') do |soap|
-        soap.body = {'Sesscode' => session_code, 'SignatureValue' => signature, 'SignatureId' => signature_id}
+      response = savon_client.call('FinalizeSignature') do |locals|
+        locals.message 'Sesscode' => session_code, 'SignatureValue' => signature, 'SignatureId' => signature_id
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:finalize_signature_response]
@@ -147,8 +160,8 @@ module Digidoc
       session_code = options.delete(:session_code) || self.session_code
       signature_id = options.delete(:signature_id)
 
-      response = savon_client.request(:wsdl, 'GetNotary') do |soap|
-        soap.body = {'Sesscode' => session_code, 'SignatureId' => signature_id}
+      response = savon_client.call('GetNotary') do |locals|
+        locals.message 'Sesscode' => session_code, 'SignatureId' => signature_id
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:get_notary_response]
@@ -177,13 +190,13 @@ module Digidoc
       postal_code = options.delete(:postal_code)
       phone = ensure_area_code(phone)
 
-      response = savon_client.request(:wsdl, 'MobileSign') do |soap|
-        soap.body = {'Sesscode' => session_code, 'SignersCountry' => country_code, 'CountryName' => country_name,
+      response = savon_client.call('MobileSign') do |locals|
+        locals.message 'Sesscode' => session_code, 'SignersCountry' => country_code, 'CountryName' => country_name,
           'SignerPhoneNo' => phone, 'Language' => language, 'ServiceName' => service_name,
           'AdditionalDataToBeDisplayed' => message_to_display, 'MessagingMode' => messaging_mode,
           'AsyncConfiguration' => async_configuration, 'ReturnDocInfo' => return_doc_info,
           'ReturnDocData' => return_doc_data, 'SignerIDCode' => personal_code, 'Role' => role, 'City' => city,
-           'StateOrProvince' => state_or_province, 'PostalCode' => postal_code }
+           'StateOrProvince' => state_or_province, 'PostalCode' => postal_code
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:mobile_sign_response]
@@ -198,8 +211,8 @@ module Digidoc
       return_doc_info = options.key?(:return_doc_info) ? options.delete(:return_doc_info) : false
       wait_signature = options.key?(:wait_signature) ? options.delete(:wait_signature) : false
 
-      response = savon_client.request(:wsdl, 'GetStatusInfo') do |soap|
-        soap.body = {'Sesscode' => session_code, 'ReturnDocInfo' => return_doc_info, 'WaitSignature' => wait_signature}
+      response = savon_client.call('GetStatusInfo') do |locals|
+        locals.message 'Sesscode' => session_code, 'ReturnDocInfo' => return_doc_info, 'WaitSignature' => wait_signature
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:get_status_info_response]
@@ -211,9 +224,10 @@ module Digidoc
       options = args.last || {}
       session_code = options.delete(:session_code) || self.session_code
 
-      response = savon_client.request(:wsdl, 'GetSignedDocInfo') do |soap|
-        soap.body = {'Sesscode' => session_code }
+      response = savon_client.call('GetSignedDocInfo') do |locals|
+        locals.message 'Sesscode' => session_code
       end
+
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:get_signed_doc_info_response]
       respond_with_hash_or_nested(result)
     end
@@ -223,8 +237,8 @@ module Digidoc
       options = args.last || {}
       session_code = options.delete(:session_code) || self.session_code
 
-      response = savon_client.request(:wsdl, 'GetSignedDoc') do |soap|
-        soap.body = {'Sesscode' => session_code }
+      response = savon_client.call('GetSignedDoc') do |locals|
+        locals.message 'Sesscode' => session_code
       end
 
       if soap_fault?(response)
@@ -250,8 +264,8 @@ module Digidoc
 
     # Closes current session
     def close_session(session_code = self.session_code)
-      response = savon_client.request(:wsdl, 'CloseSession') do |soap|
-        soap.body = {'Sesscode' => session_code }
+      response = savon_client.call('CloseSession') do |locals|
+        locals.message 'Sesscode' => session_code
       end
       self.session_code = nil
 
@@ -269,7 +283,7 @@ module Digidoc
       use_hashcode = false #options.key?(:use_hashcode) || true
       filename = filename.gsub('/', '-')
 
-      response = savon_client.request(:wsdl, 'AddDataFile') do |soap|
+      response = savon_client.call('AddDataFile') do |locals|
         file_content = Base64.encode64(file.read)
         # Upload file to webservice
         if use_hashcode
@@ -278,8 +292,8 @@ module Digidoc
           self.embedded_datafiles << datafile
           hex_sha1 = Digest::SHA1.hexdigest(datafile)
           digest_value = Base64.encode64(hex_sha1.lines.to_a.pack('H*'))
-          soap.body = {'Sesscode' => session_code, 'FileName' => filename, 'MimeType' => mime_type, 'ContentType' => 'HASHCODE',
-            'Size' => file.size, 'DigestType' => 'sha1', 'DigestValue' => digest_value}
+          locals.message 'Sesscode' => session_code, 'FileName' => filename, 'MimeType' => mime_type, 'ContentType' => 'HASHCODE',
+            'Size' => file.size, 'DigestType' => 'sha1', 'DigestValue' => digest_value
         else
           soap.body = {'Sesscode' => session_code, 'FileName' => filename, 'MimeType' => mime_type, 'ContentType' => 'EMBEDDED_BASE64',
             'Size' => file.size, 'Content' => file_content}
@@ -301,12 +315,15 @@ module Digidoc
     end
 
     def savon_client
-      Savon::Client.new do |wsdl, http|
-        wsdl.endpoint = self.endpoint_url
-        wsdl.namespace = TargetNamespace
-        http.open_timeout = 10
-        http.auth.ssl.verify_mode = :none # todo: add env dependency
-      end
+      Savon.client(
+        raise_errors: false,
+        endpoint: self.endpoint_url,
+        namespace: TargetNamespace,
+        open_timeout: 10,
+        ssl_version: :TLSv1,
+        ssl_verify_mode: :none,
+        logger: Client.logger
+      )
     end
 
     def datafile(filename, mime_type, size, content, id)
@@ -328,11 +345,11 @@ module Digidoc
 
     # Hex ID generator
     def generate_unique_hex(codeLength)
-        validChars = ("A".."F").to_a + ("0".."9").to_a
-        length = validChars.size
-        hexCode = ''
-        1.upto(codeLength) { |i| hexCode << validChars[rand(length-1)] }
-        hexCode
+      validChars = ("A".."F").to_a + ("0".."9").to_a
+      length = validChars.size
+      hexCode = ''
+      1.upto(codeLength) { |i| hexCode << validChars[rand(length-1)] }
+      hexCode
     end
 
     # Generates unique challenge code (consumer token that gets scrumbled by gateway)

data/lib/digidoc/version.rb

@@ -1,3 +1,3 @@
 module Digidoc
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/lib/client_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Digidoc::Client do
+  describe "#authenticate" do
+    before do
+      @client = Digidoc::Client.new
+      @response = @client.authenticate(phone: phone)
+    end
+
+    let(:phone) {}
+
+    context '303' do
+      let(:phone) { '+37200001' }
+
+      it "returns error" do
+        @response.faultstring.should == '303'
+      end
+    end
+
+    context 'close_session' do
+      it 'closes session' do
+        @client.close_session
+      end
+    end
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format specdoc
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'digidoc_client'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digidoc_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tarmo Talu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,76 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy way to interact with Estonian DigiDoc services.
 email:
 - tarmo.talu@gmail.com
@@ -89,12 +159,16 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - README.markdown
 - Rakefile
 - digidoc_client.gemspec
 - lib/digidoc/client.rb
 - lib/digidoc/version.rb
 - lib/digidoc_client.rb
+- spec/lib/client_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 homepage: http://github.com/tarmotalu/digidoc_client
 licenses: []
 metadata: {}
@@ -118,4 +192,7 @@ rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Ruby library to interact with Estonian DigiDoc services.
-test_files: []
+test_files:
+- spec/lib/client_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb