digidoc_client 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ff73d502c3fa8d6471314bcbb1bfdcb059fcf39
-  data.tar.gz: 26dc4a2c1c2b745b9e0ad7a2b6ba3f2853d24866
+  metadata.gz: 97cf4180a037e5662c655d3c2d715941bffb8e3d
+  data.tar.gz: e4626d04d2fdf7c1ad676425a6a8c2743ece33b1
 SHA512:
-  metadata.gz: 55c82ae9b4bfb2e671d573b7e83ba434d7d35c515c74277fa75e1ed4e2ae86adae57179dad1672834c3598b87376da2ef811ba1ffae4050a475fefdccd73114a
-  data.tar.gz: 9bc495d69b58c94e045a86ee762c7adcb2591660d1c4c525b4bafa89497c3ea84a0248f8724292d5833e5b60d9ee4e8d987f3a935020b491e8e4dcbd2e570b33
+  metadata.gz: 2f16df55441c4cb37fa414d6e1189443a83972155aaf9988fc3236581ce21ddaca2e1aef9bed1eae68a77109cd683f51ab34481740a77597835a6cc1c4b202e6
+  data.tar.gz: 1b97636970606b98920b80b391a846803ec0a85271832b2c9165ff14bb2fdbd2bce93277921cf150d2c0365d246311937b0dda89b0482341663f0a98076e0bf1

data/README.markdown

@@ -12,7 +12,7 @@ Add gem dependency in your `Gemfile` and install the gem:
 
     client = Digidoc::Client.new
     client.authenticate(
-      :phone => '+3725012345', :message_to_display => 'Authenticating',
+      :phone => '+37260000007', :message_to_display => 'Authenticating',
       :service_name => 'Testing'
     )
     client.authentication_status
@@ -20,24 +20,37 @@ Add gem dependency in your `Gemfile` and install the gem:
 ### Signing
 
     client = Digidoc::Client.new
+    client.logger = Logger.new('digidoc_service.log')
     client.start_session
-    client.create_signed_doc 
+    client.create_signed_doc
     client.signed_doc_info
-    
+
     file1 = File.open('file1.pdf')
     client.add_datafile(file1)
     file2 = File.open('file2.pdf')
     client.add_datafile(file2)
-    
-    client.mobile_sign(:phone => '5012345', :role => ' My Company LLC / CTO')
+
+    client.mobile_sign(:phone => '+37260000007', :role => ' My Company LLC / CTO')
     client.sign_status
-    
-    client.save_signed_doc do |content|
-      File.open('signed_document.ddoc', 'w') { |f| f.write(content) }
+
+    # Check signature status here...
+
+    client.save_signed_doc do |content, format|
+      File.open("signed_document.#{format}", 'w') do |f|
+        if format == :bdoc
+          f.binmode
+          f.write(Base64.decode64(content))
+        else
+          f.write(content)
+        end
+      end
     end
-    
+
     client.close_session
 
+### More test numbers and details
+[In English](http://www.id.ee/?id=36381)
+
 ## Digidoc specifications
 
 [In English](http://www.sk.ee/upload/files/DigiDocService_spec_eng.pdf)

data/lib/digidoc/client.rb

@@ -6,6 +6,7 @@ require 'crack/xml'
 require 'mime/types'
 require 'digest/sha1'
 require 'nokogiri'
+require 'logger'
 
 class NestedOpenStruct < OpenStruct
   def initialize(hash = nil)
@@ -24,13 +25,13 @@ module Digidoc
   TestEndpointUrl = 'https://openxades.org:9443/DigiDocService'
 
   class Client
-    cattr_accessor :logger
-    attr_accessor :session_code, :endpoint_url, :respond_with_nested_struct, :embedded_datafiles
+    attr_accessor :logger, :session_code, :endpoint_url, :respond_with_nested_struct, :embedded_datafiles
 
     def initialize(endpoint_url = TestEndpointUrl)
       self.endpoint_url = endpoint_url || TestEndpointUrl
       self.respond_with_nested_struct = true
       self.embedded_datafiles = []
+      #self.logger = Logger.new(STDOUT)
     end
 
     # Authentication message
@@ -84,9 +85,11 @@ module Digidoc
     def start_session(*args)
       self.session_code = nil
       self.embedded_datafiles = []
+
       options = args.last || {}
       signed_doc_file = options.delete(:signed_doc_file)
       signed_doc_xml = signed_doc_file.read if signed_doc_file
+      signed_doc_xml = Base64.encode64(signed_doc_xml) if signed_doc_xml && signed_doc_xml.starts_with?('PK')
 
       response = savon_client.call('StartSession') do |locals|
         locals.message 'bHoldSession' => true, 'SigDocXML' => signed_doc_xml
@@ -104,12 +107,20 @@ module Digidoc
     # Creates DigiDoc container
     def create_signed_doc(*args)
       options = args.last || {}
+      format = options.delete(:format) || :bdoc # vaikimisi bdoc
+
+      if format == :xml
+        version = '1.3'
+        format = 'DIGIDOC-XML'
+      elsif format == :bdoc
+        version = '2.1'
+        format = 'BDOC'
+      end
 
       session_code = options.delete(:session_code) || self.session_code
-      version = options.delete(:version) || '1.3'
 
       response = savon_client.call('CreateSignedDoc') do |locals|
-        locals.message 'Sesscode' => session_code, 'Format' => 'DIGIDOC-XML', 'Version' => version
+        locals.message 'Sesscode' => session_code, 'Format' => format, 'Version' => version
       end
 
       result = soap_fault?(response) ? response.to_hash[:fault] : response.to_hash[:create_signed_doc_response]
@@ -245,8 +256,7 @@ module Digidoc
         result = respond_with_hash_or_nested(response.to_hash[:fault])
       else
         escaped = Crack::XML.parse(response.http.body).to_hash['SOAP_ENV:Envelope']['SOAP_ENV:Body']['dig:GetSignedDocResponse']['SignedDocData']
-        # TODO: is escaping needed? - it removes original escaped & form XML
-        digidoc_container = escaped#CGI.unescapeHTML(escaped)
+        digidoc_container = escaped
 
         if embedded_datafiles.present?
           xmldata = Nokogiri::XML(digidoc_container)
@@ -254,8 +264,10 @@ module Digidoc
           digidoc_container = xmldata.to_xml
         end
 
+        format = digidoc_container.starts_with?('<?xml') ? :xml : :bdoc
+
         if block_given?
-          yield digidoc_container
+          yield(digidoc_container, format)
         else
           digidoc_container
         end
@@ -314,17 +326,23 @@ module Digidoc
     end
 
     def savon_client
-      Savon.client(
+      options = {
         raise_errors: false,
         endpoint: self.endpoint_url,
         namespace: TargetNamespace,
         open_timeout: 10,
         ssl_version: :TLSv1,
-        ssl_verify_mode: :none,
-        logger: Client.logger,
-        log_level: :debug,
-        log: true
-      )
+        ssl_verify_mode: :none
+      }
+
+      if self.logger
+        options.merge!(logger: self.logger,
+          log_level: :debug,
+          log: true
+        )
+      end
+
+      Savon.client(options)
     end
 
     def datafile(filename, mime_type, size, content, id)

data/lib/digidoc/version.rb

@@ -1,3 +1,3 @@
 module Digidoc
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: digidoc_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tarmo Talu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.4
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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.
@@ -157,7 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - README.markdown
@@ -178,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: digidoc_client
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby library to interact with Estonian DigiDoc services.