hbci 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce916948b36a1f61620a4b24e65427e49a03ba97e023564089b746d7bd401e4d
-  data.tar.gz: c37152dfaa3c4c780d15b4e26fa12823bea19ba62a54561fa0ee6121f079f6c2
+  metadata.gz: 6d8863eaee26a37c3a6abe14db9196ffdded7a0c556ba1f16e96b9359b7c208a
+  data.tar.gz: 2384b7d356861ba1100e0ffe94da7818d209e06d380882a11b25e6e6c6b7c340
 SHA512:
-  metadata.gz: 7525c7cd7bbd0172a0ecf21c16833d92dbc16355eee232a1cde22eaa039578cd54a723046765dbf36ed68da97cb021ec91574ce09e742e19fd272095c204b890
-  data.tar.gz: 269ac9f6aed0b1238bc2eeb54ddd52d6501169cdc94f6f94215c9d1f260044dfd6091e822ad632c7ebdef20b403870718ddc0ebe391dc2d09d0c84772419334e
+  metadata.gz: 6aa8166bb31112f62d23eeca4f43df2d3fe700885559b613444459f07d0efca42d091e5612b87f2b44394b652cc9a4fcbd7e5e4421744077a86ff80f5f1a02ac
+  data.tar.gz: 5e18b33710be68bba1b1688c02ad86ee2e46aba6a807671c9227d8f80c7137738c189260bfc4fe782ed3d6831217e0c111d78f7b208e781989bb0c0166098647

data/README.md

@@ -37,9 +37,6 @@ credentials = BankCredentials::Hbci.new({
   user_id:    'user_id',
   pin:        'pin'
 })
-
-connector = Hbci::Connector.instance
-connector.credentials = credentials
 ```
 
 Now, you can receive your balances, accounts and transactions:
@@ -51,10 +48,12 @@ iban = 'DE05740900000011111111'
 start_date = 3.day.ago
 end_date = Time.now
 
-Hbci::Dialog.open do |dialog|
-  transactions = Hbci::Services::TransactionsReceiver.new(dialog, iban).perform(start_date, end_date)
-  transactions.each do |transaction|
-    puts transaction
+Hbci::Connector.open(credentials) do |connector|
+  Hbci::Dialog.open(connector) do |dialog|
+    transactions = Hbci::Services::TransactionsReceiver.new(connector, dialog, iban).perform(start_date, end_date)
+    transactions.each do |transaction|
+      puts transaction
+    end
   end
 end
 ```
@@ -64,20 +63,25 @@ end
 ```ruby
 iban = 'DE05740900000011111111'
 
-Hbci::Dialog.open do |dialog|
-  puts Hbci::Services::BalanceReceiver.new(dialog, iban).perform
+Hbci::Connector.open(credentials) do |connector|
+  Hbci::Dialog.open(connector) do |dialog|
+    puts Hbci::Services::BalanceReceiver.new(connector, dialog, iban).perform
+  end
 end
 ```
 
 ### Receiving the accounts
 
 ```ruby
-Hbci::Dialog.open do |dialog|
-  accounts = Hbci::Services::AccountsReceiver.new(dialog).perform
-  accounts.each do |account|
-    puts account
+Hbci::Connector.open(credentials) do |connector|
+  Hbci::Dialog.open(connector) do |dialog|
+    accounts = Hbci::Services::AccountsReceiver.new(dialog).perform
+    accounts.each do |account|
+      puts account
+    end
   end
 end
+
 ```
 ## Banks tested 
 

data/examples/credentials.rb

@@ -51,7 +51,3 @@ raise 'missing iban' unless @iban
   user_id: @options[:user_id],
   pin: @options[:pin]
 )
-
-connector = Hbci::Connector.instance
-connector.credentials = @credentials
-

data/examples/get_accounts.rb

@@ -3,9 +3,11 @@
 require_relative '../lib/hbci'
 require_relative 'credentials'
 
-Hbci::Dialog.open(system_id: @options[:system_id]) do |dialog|
-  accounts = Hbci::Services::AccountsReceiver.new(dialog).perform
-  accounts.each do |account|
-    puts account
+Hbci::Connector.open(@credentials) do |connector|
+  Hbci::Dialog.open(connector, system_id: @options[:system_id]) do |dialog|
+    accounts = Hbci::Services::AccountsReceiver.new(dialog).perform
+    accounts.each do |account|
+      puts account
+    end
   end
 end

data/examples/get_balance.rb

@@ -3,6 +3,8 @@
 require_relative '../lib/hbci'
 require_relative 'credentials'
 
-Hbci::Dialog.open(system_id: @options[:system_id]) do |dialog|
-  puts Hbci::Services::BalanceReceiver.new(dialog, @iban).perform
+Hbci::Connector.open(@credentials) do |connector|
+  Hbci::Dialog.open(connector, system_id: @options[:system_id]) do |dialog|
+    puts Hbci::Services::BalanceReceiver.new(connector, dialog, @iban).perform
+  end
 end

data/examples/get_system_id.rb

@@ -3,4 +3,6 @@
 require_relative '../lib/hbci'
 require_relative 'credentials'
 
-puts Hbci::Services::SystemIdReceiver.new.perform
+Hbci::Connector.open(@credentials) do |connector|
+  puts Hbci::Services::SystemIdReceiver.new(connector).perform
+end

data/examples/get_transactions.rb

@@ -6,10 +6,12 @@ require_relative 'credentials'
 start_date = 3.day.ago
 end_date = Time.now
 
-Hbci::Dialog.open(system_id: @options[:system_id]) do |dialog|
-  transactions = Hbci::Services::TransactionsReceiver.new(dialog, @iban, @hbci_version).perform(start_date, end_date)
-  transactions.each do |transaction|
-    puts transaction
+Hbci::Connector.open(@credentials) do |connector|
+  Hbci::Dialog.open(connector, system_id: @options[:system_id]) do |dialog|
+    transactions = Hbci::Services::TransactionsReceiver.new(connector, dialog, @iban, @hbci_version).perform(start_date, end_date)
+    transactions.each do |transaction|
+      puts transaction
+    end
   end
 end
 

data/lib/hbci/connector.rb

@@ -1,15 +1,16 @@
-# frozen_string_literal: true
-
-require 'singleton'
-
 module Hbci
   class Connector
-    include Singleton
-
     attr_accessor :message_number
     attr_reader :credentials
 
-    def initialize
+    def self.open(credentials)
+      connector = new(credentials)
+      yield connector
+      connector.reset_message_number
+    end
+
+    def initialize(credentials)
+      self.credentials = credentials
       reset_message_number
     end
 

data/lib/hbci/dialog.rb

@@ -9,15 +9,15 @@ module Hbci
     attr_reader :response
     attr_reader :connector
 
-    def self.open(system_id: 0)
-      dialog = Dialog.new(system_id: system_id)
+    def self.open(connector, system_id: 0)
+      dialog = Dialog.new(connector, system_id: system_id)
       dialog.initiate
       yield dialog
       dialog.finish
     end
 
-    def initialize(system_id: 0)
-      @connector = Connector.instance
+    def initialize(connector, system_id: 0)
+      @connector = connector
       @initiated = false
       @hbci_version = '3.0'
       @system_id = system_id
@@ -35,7 +35,7 @@ module Hbci
     end
 
     def initiate
-      request_message = MessageFactory.build(self) do |hnvsd|
+      request_message = MessageFactory.build(@connector, self) do |hnvsd|
         hnvsd.add_segment(Segments::HKIDNv2.new)
         hnvsd.add_segment(Segments::HKVVBv3.new)
       end
@@ -51,7 +51,7 @@ module Hbci
     end
 
     def finish
-      request_message = MessageFactory.build(self) do |hnvsd|
+      request_message = MessageFactory.build(@connector, self) do |hnvsd|
         hnvsd.add_segment(Segments::HKENDv1.new)
       end
       request_message.compile

data/lib/hbci/message.rb

@@ -2,10 +2,11 @@
 
 module Hbci
   class Message
-    attr_reader :dialog, :segments, :sec_ref
+    attr_reader :connector, :dialog, :segments, :sec_ref
     attr_accessor :next_position
 
-    def initialize(dialog = nil)
+    def initialize(connector, dialog = nil)
+      @connector = connector
       @dialog = dialog
       @sec_ref = generate_security_reference
       @segments = []

data/lib/hbci/message_factory.rb

@@ -1,7 +1,7 @@
 module Hbci
   module MessageFactory
-    def self.build(dialog)
-      request_message = Message.new(dialog)
+    def self.build(connector, dialog)
+      request_message = Message.new(connector, dialog)
       request_message.add_segment(Segments::HNHBKv3.new)
       request_message.add_segment(Segments::HNVSKv3.new)
       hnvsd = Segments::HNVSDv1.new do |s|

data/lib/hbci/segments/hkidn.rb

@@ -13,8 +13,8 @@ module Hbci
       element :state, default: 1
 
       def compile
-        self.bank.code = Connector.instance.credentials.bank_code
-        self.user_id = Connector.instance.credentials.user_id
+        self.bank.code = request_message.connector.credentials.bank_code
+        self.user_id = request_message.connector.credentials.user_id
         self.system_id = request_message.dialog ? request_message.dialog.system_id : 0
       end
     end

data/lib/hbci/segments/hnhbk.rb

@@ -16,7 +16,7 @@ module Hbci
       def compile
         self.message_size = '000000000000'
         self.dialog_id = request_message.dialog ? request_message.dialog.id : 0
-        self.message_number = Connector.instance.message_number
+        self.message_number = request_message.connector.message_number
       end
 
       def after_compile

data/lib/hbci/segments/hnhbs.rb

@@ -7,7 +7,7 @@ module Hbci
       element :message_number
 
       def compile
-        self.message_number = Connector.instance.message_number
+        self.message_number = request_message.connector.message_number
       end
     end
   end

data/lib/hbci/segments/hnsha.rb

@@ -24,7 +24,7 @@ module Hbci
 
       def compile
         self.security_reference = request_message.sec_ref
-        signature.pin = Connector.instance.credentials.pin
+        signature.pin = request_message.connector.credentials.pin
       end
     end
   end

data/lib/hbci/segments/hnshk.rb

@@ -71,8 +71,8 @@ module Hbci
       private
 
       def set_credentials
-        key.bank_code = Connector.instance.credentials.bank_code
-        key.user_id = Connector.instance.credentials.user_id
+        key.bank_code = request_message.connector.credentials.bank_code
+        key.user_id = request_message.connector.credentials.user_id
       end
     end
   end

data/lib/hbci/segments/hnvsk.rb

@@ -52,8 +52,8 @@ module Hbci
       def compile
         head.position = 998
         security_identification_details.party_identification = request_message.dialog ? request_message.dialog.system_id : 0
-        key.bank_code = Connector.instance.credentials.bank_code
-        key.user_id = Connector.instance.credentials.user_id
+        key.bank_code = request_message.connector.credentials.bank_code
+        key.user_id = request_message.connector.credentials.user_id
       end
     end
   end

data/lib/hbci/services/balance_receiver.rb

@@ -4,12 +4,12 @@ module Hbci
   module Services
     class BalanceReceiver < BaseReceiver
       def perform
-        request_message = MessageFactory.build(dialog) do |hnvsd|
+        request_message = MessageFactory.build(connector, dialog) do |hnvsd|
           hnvsd.add_segment(build_hksal)
         end
         request_message.compile
 
-        @response = Response.new(Connector.instance.post(request_message))
+        @response = Response.new(connector.post(request_message))
 
         raise @response.to_s unless request_successful?
 

data/lib/hbci/services/base_receiver.rb

@@ -3,10 +3,12 @@
 module Hbci
   module Services
     class BaseReceiver
+      attr_reader :connector
       attr_reader :dialog
       attr_reader :iban
 
-      def initialize(dialog, iban, version = nil)
+      def initialize(connector, dialog, iban, version = nil)
+        @connector = connector
         @dialog = dialog
         @iban = Ibanizator.iban_from_string(iban)
         @version = version

data/lib/hbci/services/system_id_receiver.rb

@@ -3,15 +3,21 @@
 module Hbci
   module Services
     class SystemIdReceiver
+      attr_reader :connector
+
+      def initialize(connector)
+        @connector = connector
+      end
+
       def perform
-        request_message = MessageFactory.build(nil) do |hnvsd|
+        request_message = MessageFactory.build(connector, nil) do |hnvsd|
           hnvsd.add_segment(Segments::HKIDNv2.new)
           hnvsd.add_segment(Segments::HKVVBv3.new)
           hnvsd.add_segment(Segments::HKSYNv3.new)
         end
         request_message.compile
 
-        @response = Response.new(Connector.instance.post(request_message))
+        @response = Response.new(connector.post(request_message))
 
         raise @response.to_s unless request_successful?
 

data/lib/hbci/services/transactions_receiver.rb

@@ -11,12 +11,12 @@ module Hbci
 
         transactions = []
         loop do
-          request_message = MessageFactory.build(dialog) do |hnvsd|
+          request_message = MessageFactory.build(connector, dialog) do |hnvsd|
             hnvsd.add_segment(build_hkkaz)
           end
           request_message.compile
 
-          @response = Response.new(Connector.instance.post(request_message))
+          @response = Response.new(connector.post(request_message))
 
           raise @response.to_s unless request_successful?
 

data/lib/hbci/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hbci
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hbci
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Roman Lehnert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bank_credentials