client_for_poslynx 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTdlMTQzNzAxMjA5NjM0Zjk2M2FkMDJjMDBmY2YyMmEyMTExYTMwZg==
+    NzFmYTkyYTMxMmQ2M2RiNDhmMGFiZDc1YTk5MmYwOWVkYmM3ZTgwMg==
   data.tar.gz: !binary |-
-    OTlhZGY3NGI2MGQyMGM2ZmY2MzdjMWY1MmZkOTQ5MWI5ZTA2NmE1ZQ==
+    NDk0ZTUwMzJiNGJmMTlhZWUwNDY5OGI4MDQ5ZDFkNzdkMTgzMjBmMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjFkOWU5ZmViMDliM2RiYmQ4NGM1NGUwMDAxZGNhZDg4N2E2MWMwMDI3MGNh
-    NGU1OWVjNDc5ZjQ5ODY4OGVmZDY1ZDFiNTc4ZDgwNDViMzJhNmYxZTJmMWEx
-    ZTg1ZWNlNzEzYTAzMzdkYTFhMGE0ZmFjNTE4NjBhMTIwNjM2NWY=
+    MzY3NDY0NzY2ZjA5NjRlYWUxYjUwOWM0Y2U3YTc0ODIyNDliNTFkOWU3ZDA3
+    NmFmNDBhYzBmNzc3ZDQ5NjgxZDRkYmMzNmRlNWRkYzczMDEzMjk0ZmVlZjk5
+    Yjk0MzdlYWQ4MDFjZjQwZGIzZWQ1Yjk4NjY0OGFjNGM5YTI2NGQ=
   data.tar.gz: !binary |-
-    ZDIxYmY4OWQ0NzIwNmIxZjg5MjhkYTIzMDYxYWU3NWUyYzUwMDhlZTEyZjRk
-    MTY2NGJjM2ZiMmZlZWVjNmZjNGVmOTk3NzkyODUyMGIzOTA3YzM1NDkxZTRm
-    YWRkNTdkMTEyNzc3ZmY2MDU3Y2FhMWZhZDFlZDA3ZTE5NzE4NzI=
+    ZTkxNjY5MTM4NGQyNGNmYWRiMDg1YmFiMzQ4NDNkMmUyYmI1ZjRhYzBhY2I4
+    ODNhZjYzODEwMjdiMzkxZjE3NDZkNjllYjZhNjM4OGQxYTkzMDU1NDgxOGI1
+    MDYwNTRkNzg5NzE1NjcyOGRjZjdlYmI3MTIxYjVlYjdjZjlmMTA=

data/CHANGELOG

@@ -1,48 +1,11 @@
-Version 0.0.1
-- Initial development
-
-Version 0.1.0
-- Initial release
-
-Version 0.1.1
-- Add CHANGELOG file
+Version 1.0.1
+- Allow nested calls to EM_Session#exec_dissociated
 
-Version 0.2.0
-- Improve API for specifying attribute element mappings.
+Version 1.0.0
+- Fake POS terminal script accepts local IP address parameter.
 
-Version 0.2.1
-- Relax Nokogiri gem version requirement.
-
-Version 0.2.2
-- Specify Ruby version requirement of 1.9.3 or greater.
-
-Version 0.2.3
-- Fix bug: Fake terminal script crashes with stak overflow when
-  a single text value is supplied.
-
-Version 0.2.4
-- Fix bug: Fake terminal script crashes during user interaction
-  for a debit sale request without a specified cash back amount.
-
-Version 0.2.5
-- Introduce experimental signature image parsing and conversion
-  to SVG.
-- Fix bug: New format of POSLynx response message XML was causing
-  client to hang.
-
-Version 0.2.6
-- Add enhanced-format signature data handling.
-- Fix misconception about signed number representation in signa-
-  ture image data.
-- Bring signature image handling out of experimental status.
-
-Version 0.3.0
-- Allow user to cancel waiting for reply in
-  poslynx_client_console.
-- Support SSL connections from poslynx_client_console.
-- Change word separators in poslynx_client_console from under-
-  scores to dashes.
-- Fake Poslynx includes signature image data in response.
+Version 1.0.0.pre
+- Add EM_connector adapter and EM_Session adapter
 
 Version 0.9.0
 - Add a network client in the form of an EventManager protocol.
@@ -55,3 +18,49 @@ Version 0.9.0
 - Overhaul the fake pos terminal script to be based on
   EventMachine and to allow request processing to be interrupted
   by the receipt of a new request.
+
+Version 0.3.0
+- Allow user to cancel waiting for reply in
+  poslynx_client_console.
+- Support SSL connections from poslynx_client_console.
+- Change word separators in poslynx_client_console from under-
+  scores to dashes.
+- Fake Poslynx includes signature image data in response.
+
+Version 0.2.6
+- Add enhanced-format signature data handling.
+- Fix misconception about signed number representation in signa-
+  ture image data.
+- Bring signature image handling out of experimental status.
+
+Version 0.2.5
+- Introduce experimental signature image parsing and conversion
+  to SVG.
+- Fix bug: New format of POSLynx response message XML was causing
+  client to hang.
+
+Version 0.2.4
+- Fix bug: Fake terminal script crashes during user interaction
+  for a debit sale request without a specified cash back amount.
+
+Version 0.2.3
+- Fix bug: Fake terminal script crashes with stak overflow when
+  a single text value is supplied.
+
+Version 0.2.2
+- Specify Ruby version requirement of 1.9.3 or greater.
+
+Version 0.2.1
+- Relax Nokogiri gem version requirement.
+
+Version 0.2.0
+- Improve API for specifying attribute element mappings.
+
+Version 0.1.1
+- Add CHANGELOG file
+
+Version 0.1.0
+- Initial release
+
+Version 0.0.1
+- Initial development

data/lib/client_for_poslynx/net/em_session.rb

@@ -118,13 +118,29 @@ module ClientForPoslynx
       # EventMachine::defer and has the same considerations and
       # caveats.
       #
+      # When a call to #exec_dissociated is nested within a
+      # block passed to anothet call, only the outermost invo-
+      # cation is deferred, and the inner call executes in the
+      # same thread as the outer call.
+      #
       # Note that methods of the session should not be called by
       # code within the block since those methods should only be
       # called from code running in the main event loop thread.
       def exec_dissociated(&block)
-        was_successful, resp_data_or_ex = Fiber.yield( [:_exec_dissociated, block] )
-        raise resp_data_or_ex unless was_successful
-        resp_data_or_ex
+        @currently_dissociated ||= false
+
+        if @currently_dissociated
+          block.call
+        else
+          begin
+            @currently_dissociated = true
+            was_successful, resp_data_or_ex = Fiber.yield( [:_exec_dissociated, block] )
+            raise resp_data_or_ex unless was_successful
+            resp_data_or_ex
+          ensure
+            @currently_dissociated = false
+          end
+        end
       end
 
       # Returns control to EventMachine, and returns control to

data/lib/client_for_poslynx/version.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module ClientForPoslynx
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/client_for_poslynx/net/em_session_spec.rb

@@ -252,7 +252,7 @@ module ClientForPoslynx
       end
     end
 
-    context "executing a dissociated code" do
+    context "executing a dissociated block" do
       before do
         allow( em_system ).to receive( :defer ) do |block, callback|
           result = block.call
@@ -286,6 +286,27 @@ module ClientForPoslynx
       end
     end
 
+    context "executing a nested dissociated block" do
+      it "defers execution of the outer code block only" do
+        (
+          allow( em_system ).
+            to receive( :defer ) do |block, callback|
+              result = block.call
+              callback.call result
+            end
+        ).once
+
+        exec_result = nil
+        subject.execute do |s|
+          subject.exec_dissociated {
+            exec_result = subject.exec_dissociated { :the_result }
+          }
+        end
+        expect( exec_result ).to eq( :the_result )
+      end
+
+    end
+
     context "sleeping" do
       before do
         @run_sequence = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: client_for_poslynx
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Steve Jorgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri