dde 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/bin/dde_main

@@ -20,11 +20,14 @@ end
 cout "Starting DDE server with service 'excel'\n"
 server = DDE::XlServer.new.start_service
 
-msg = Msg.new  # pointer to Msg FFI struct
+# Command line args define actions to be run after each successful DDE data transaction
+server.actions = ARGV.empty? ? [:timer] : ARGV
+
+# Starting message loop (necessary for DDE message processing)
+cout "Starting DDE message loop\n"
 
-# Starting message loop (necessary for DDE processing)
-cout "Starting message loop\n"
+msg = Msg.new  # pointer to Msg FFI struct
 while msg = get_message(msg)
-    translate_message(msg);
-    dispatch_message(msg);
+  translate_message(msg);
+  dispatch_message(msg);
 end

data/dde.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dde}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["arvicco"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-03-23}
   s.default_executable = %q{dde_main}
   s.description = %q{Server that mimics Excel receiving XLTable data via DDE protocol}
   s.email = %q{arvitallian@gmail.com}

data/lib/dde/client.rb

@@ -13,7 +13,7 @@ module DDE
 #      super init_flags, &dde_callback
 #    end
 
-    # establish a conversation with a server application that supports the specified service
+    # Establish a conversation with a server application that supports the specified service
     # name and topic name pair.
     def start_conversation( service=nil, topic=nil )
       try "Starting conversation #{service} #{topic}", DDE::Errors::ClientError do
@@ -29,6 +29,7 @@ module DDE
       end
     end
 
+    # Stops active conversation, raises error if no conversations active
     def stop_conversation
       try "Stopping conversation", DDE::Errors::ClientError do
         error "DDE not started" unless dde_active?
@@ -45,6 +46,55 @@ module DDE
       end
     end
 
+    # Sends XTYP_POKE transaction to server if conversation was already established.
+    # data:: data being sent (will be coerced to String unless is already a (packed) String)
+    # format:: standard clipboard format of submitted data item (default CF_TEXT)
+    def send_data( data, format = CF_TEXT, item = "" )
+      data_pointer = FFI::MemoryPointer.from_string(data.to_s)
+      result, trans_id = start_transaction(XTYP_POKE, data_pointer, data_pointer.size, format, item)
+      result
+    end
+
+    # Initiates transaction to server if conversation was already established.
+    # transaction_type:: XTYP_ADVSTART, XTYP_ADVSTOP, XTYP_EXECUTE, XTYP_POKE, XTYP_REQUEST
+    # data_pointer:: pointer to data being sent (either FFI::MemoryPointer or DDE data_handle)
+    # cb:: data set size (or -1 to indicate that data_pointer is in fact DDE data_handle)
+    # format:: standard clipboard format of submitted data item (default CF_TEXT)
+    # item:: item to which transaction is related (String, DdeString or DDE string handle)
+    # timeout:: timeout in milliseconds or TIMEOUT_ASYNC to indicate async transaction
+    #
+    # *Returns*:: A pair of [result, trans_id]. Result is nil for failed transactions,
+    # DDE data handle for synchronous transactions in which the client expects data from the server,
+    # nonzero for successful transactions where clients does not expect data from server.
+    # Trans_id: for asynchronous transactions, a unique transaction identifier for use with the
+    # DdeAbandonTransaction function and the XTYP_XACT_COMPLETE transaction. For synchronous transactions,
+    # the low-order word of this variable contains any applicable DDE_ flags resulting from the transaction.
+    #
+    def start_transaction( transaction_type, data_pointer=nil, cb = data_pointer ? data_pointer.size : 0,
+            format=CF_TEXT, item=0, timeout=1000)
+
+      result = nil
+      trans_id = FFI::MemoryPointer.new(:uint32).put_uint32(0,0)
+
+      try "Sending data to server", DDE::Errors::ClientError do
+        error "DDE not started" unless dde_active?
+        error "Conversation not started" unless conversation_active?
+
+        item_handle = case item
+          when String
+            DDE::DdeString.new(@id, service).handle
+          when DdeString
+            item.handle
+          else
+            item
+        end
+
+        error unless result = dde_client_transaction(data_pointer, cb, @conversation, item_handle,
+                                                     format, transaction_type, timeout, trans_id)
+      end
+      [result, trans_id.get_uint32(0)]
+    end
+
     def conversation_active?
       !!@conversation
     end

data/lib/dde/dde_string.rb

@@ -26,7 +26,7 @@ module DDE
         end
       rescue => e
       end
-      raise DDE::Errors::StringError, "Failed to initialize DDE string: #{e}" unless @handle && @name && !e
+      raise DDE::Errors::StringError, "Failed to initialize DDE string: #{e} #{e.backtrace.join("\n")}" unless @handle && @name && !e
       super @name
     end
   end

data/lib/dde/monitor.rb

@@ -6,7 +6,7 @@ module DDE
     attr_accessor :print, :calls
 
     # Creates new DDE monitor instance
-    def initialize(init_flags=nil, &callback)
+    def initialize(init_flags=nil, print = nil, &callback)
       init_flags ||=
               APPCLASS_MONITOR |  # this is monitor
               MF_CALLBACKS     |  # monitor callback functions
@@ -17,6 +17,7 @@ module DDE
               MF_POSTMSGS      |  # monitor posted DDE messages
               MF_SENDMSGS         # monitor sent DDE messages
 
+      @print = print
       @calls = []
 
       callback ||= lambda do |*args|

data/lib/dde/xl_server.rb

@@ -7,12 +7,14 @@ module DDE
   class XlServer < Server
 
     attr_reader :format, # data format(s) (registered clipboard formats) that server supports
-                :table # data table for data storage
+                :data    # data storage/processor
+
+    attr_accessor :actions # Actions to be run on table after each successful DDE input (:draw, :debug, :timer)
 
     # Creates new Xl Server instance
     def initialize(init_flags = nil, &dde_callback )
 
-      @table = DDE::XlTable.new
+      @data = DDE::XlTable.new
 
       # Trying to register or retrieve existing format XlTable
       try 'Registering format XlTable', DDE::Errors::FormatError do
@@ -25,88 +27,63 @@ module DDE
     #  HDDEDATA CALLBACK DdeCallback(UINT uType, UINT uFmt, HCONV hConv, HSZ hsz1, HSZ hsz2,
     #                                      HDDEDATA hData, DWORD dwData1, DWORD dwData2)
     def default_callback
-      lambda do |type, format, conv, hsz1, hsz2, data, data1, data2|
+      lambda do |type, format, conv, hsz1, hsz2, data_handle, data1, data2|
         case type
           when XTYP_CONNECT  # Request to connect from client, creating data exchange channel
-            #             format:: Not used.
-            #             conv:: Not used.
-            #             hsz1:: Handle to the topic name.
-            #             hsz2:: Handle to the service name.
-            #             data:: Handle to DDE data. Meaning of this parameter depends on the type of the current transaction.
-            #             data1:: Pointer to a CONVCONTEXT structure that contains context information for the conversation.
-            #                       If the client is not a Dynamic Data Exchange Management Library (DDEML) application,
-            #                       this parameter is 0.
-            #             data2:: Specifies whether the client is the same application instance as the server. If the
-            #                       parameter is 1, the client is the same instance. If the parameter is 0, the client
-            #                       is a different instance.
-            #             *Returns*:: A server callback function should return TRUE(1) to allow the client to establish a
-            #                         conversation on the specified service name and topic name pair, or the function
-            #                         should return FALSE to deny the conversation. If the callback function returns TRUE(1)
-            #                         and a conversation is successfully established, the system passes the conversation
-            #              todo:      handle to the server by issuing an XTYP_CONNECT_CONFIRM transaction to the server's
-            #                         callback function (unless the server specified the CBF_SKIP_CONNECT_CONFIRMS flag
-            #                         in the DdeInitialize function).
+            #     format:: Not used.
+            #     conv:: Not used.
+            #     hsz1:: Handle to the topic name.
+            #     hsz2:: Handle to the service name.
+            #     data_handle:: Handle to DDE data. Meaning depends on the type of the current transaction.
+            #     data1:: Pointer to a CONVCONTEXT structure that contains context information for the conversation.
+            #             If the client is not a DDEML application, this parameter is 0.
+            #     data2:: Specifies whether the client is the same application instance as the server. If the parameter
+            #             is 1, the client is the same instance. If it is 0, the client is a different instance.
+            #     *Returns*:: A server callback function should return TRUE(1, but DDE_FACK works just fine too)
+            #                 to allow the client to establish a conversation on the specified service name and topic
+            #                 name pair, or the function should return FALSE to deny the conversation. If the callback
+            #                 function returns TRUE and a conversation is successfully established, the system passes
+            #                 the conversation handle to the server by issuing an XTYP_CONNECT_CONFIRM transaction to
+            #                 the server's callback function (unless the server specified the CBF_SKIP_CONNECT_CONFIRMS
+            #                 flag in the DdeInitialize function).
 
             if hsz2 == @service.handle
               cout "Service #{@service}: connect requested by client\n"
-              1 # instead of true     # Yes, this server supports requested (name) handle
+              DDE_FACK # instead of true     # Yes, this server supports requested (name) handle
             else
               cout "Service #{@service} unable to process connection request for #{hsz2}\n"
               DDE_FNOTPROCESSED # 0 instead of false    # No, server does not support requested (name) handle
             end
 
           when XTYP_POKE  # Client initiated XTYP_POKE transaction to push unsolicited data to the server
-            #             format:: Specifies the format of the data sent from the server.
-            #             conv:: Handle to the conversation.
-            #             hsz1:: Handle to the topic name. (Excel: [topic]item ?!)
-            #             hsz2:: Handle to the item name.
-            #             data_handle:: Handle to the data that the client is sending to the server.
-            #             *Returns*:: A server callback function should return the DDE_FACK flag if it processes this
-            #                         transaction, the DDE_FBUSY flag if it is too busy to process this transaction,
-            #                         or the DDE_FNOTPROCESSED flag if it rejects this transaction.
-
-            if @table.get_data(data) # Extract incoming DDE data from client into server's table
-              # Converting hsz1 into "[topic]item" string and
-              @table.topic = dde_query_string(@id, hsz1)
-              # @table.draw # Simply printing it for now, no queues
-              @table.timer
-              #                  // Placing table into print queue
-              #                  WaitForSingleObject(hMutex1,INFINITE);
-              #                      q.push(server.xltable);
-              #                  ReleaseMutex(hMutex1);
-              #                  // Allowing the table output thread to start...
-              #                  ReleaseSemaphore(hSemaphore,1,NULL);
-              #
+            #     format:: Specifies the format of the data sent from the server.
+            #     conv:: Handle to the conversation.
+            #     hsz1:: Handle to the topic name. (Excel: [topic]item ?!)
+            #     hsz2:: Handle to the item name.
+            #     data_handle:: Handle to the data that the client is sending to the server.
+            #     *Returns*:: A server callback function should return the DDE_FACK flag if it processes this
+            #                 transaction, the DDE_FBUSY flag if it is too busy to process this transaction,
+            #                 or the DDE_FNOTPROCESSED flag if it rejects this transaction.
+
+            @data.topic = dde_query_string(@id, hsz1)  # Convert hsz1 into "[topic]item" string and
+            if @data.receive(data_handle)              # Receive incoming DDE data and process it
+
+              # Perform actions like :draw, :debug, :timer, :formats on received data (default :timer)
+              @actions.each{|action| @data.send(action.to_sym)}
               DDE_FACK  # Transaction successful
             else
+              @data.debug
               cout "Service #{@service} unable to process data request (XTYP_POKE) for #{hsz2}"
               DDE_FNOTPROCESSED   # 0 Transaction NOT successful - return (HDDEDATA)TRUE; ?!(why TRUE, not FALSE)
             end
-
-          when XTYP_DISCONNECT # DDE client disconnects
-            #              server.xltable.Delete();
-            #              break;
-            DDE_FNOTPROCESSED   # 0 - return((HDDEDATA)NULL);// is it the same as 0 ?!
-
-          when XTYP_ERROR # DDE Error
-            #              WaitForSingleObject(hMutex, INFINITE);
-            #                  std::cerr<<"DDE error.\n";
-            #              ReleaseMutex(hMutex);
-            #              break;
-            DDE_FNOTPROCESSED   # 0 - return((HDDEDATA)NULL);// is it the same as 0 ?!
-
           else
             DDE_FNOTPROCESSED   # 0 - return((HDDEDATA)NULL);// is it the same as 0 ?!
         end
       end
     end
 
-    # Make 'excel' the default name for named service
-    alias_method :__start_service, :start_service
-
     def start_service( name='excel', init_flags=nil, &dde_callback)
-      dde_callback ||= default_callback
-      __start_service( name, init_flags, &dde_callback )
+      super name, init_flags, &dde_callback || default_callback
     end
 
   end

data/lib/dde/xl_table.rb

@@ -66,13 +66,25 @@ module DDE
       @table.each{|row| cout @topic; row.each {|col| cout " #{col}"}; cout "\n"}
     end
 
-    def get_data(dde_handle)
+    def debug
+      return false if empty?
+      Encoding.default_external = 'cp866'
+      # omitting separator gymnastics for now
+      cout "-----\n"
+      @table.each_with_index{|row, i| (cout @topic, i; p row) unless row == []}
+      STDIN.gets
+    end
+    
+    def receive(data_handle, mode = :collect)
+      $mode = mode
       start = Time.now
 
       @offset = 0
       @pos = 0 #; @c=0; @r=0
 
-      @data, size = dde_get_data(dde_handle)
+      @data, total_size = dde_get_data(data_handle) #dde_access_data(dde_handle)
+p @data.get_bytes(0, total_size) if $mode == :debug
+
       return nil unless @data &&  # DDE data is present at given dde_handle
       read_int == TDT_TABLE &&    # and, first data block is tdtTable
       read_int == 4               # and, its length is 4 bytes
@@ -81,40 +93,42 @@ module DDE
       @col = read_int
       return nil unless @row != 0 && @col != 0  # Make sure nonzero row and col
 
+p "data set size #{total_size}, row #{@row}, col #{@col}" if $mode == :debug
+@strings = @floats = @flints = @ints = @blanks = @skips = @bools = @errors = 0
+
       @table = Array.new(@row){||Array.new}
 
-      while @offset < @data.size
+      while @offset <= total_size-4   # Need at least 4 bytes ahead to read data type and size
         type = read_int         # Next data field(s) type
-        byte_size = read_int    # Next data field(s) length in bytes
+        size = read_int    # Next data field(s) length in bytes
 
-#p "type #{TDT_TYPES[type]}, cb #{byte_size}, row #{@pos/@col}, col #{@pos%@col}"
+p "type #{TDT_TYPES[type]}, cb #{size}, row #{@pos/@col}, col #{@pos%@col}" if $mode == :debug
         case type
           when TDT_STRING       # Strings, length byte followed by chars, no zero termination
-            field_end = @offset + byte_size
+            field_end = @offset + size
             while @offset < field_end do
               length = read_char
               self.table = @data.get_bytes(@offset, length) #read_bytes(length)#.force_encoding('CP1251').encode('CP866')
               @offset += length
+              @strings += 1
             end
           when TDT_FLOAT        # Float, 8 bytes (used to represent Integers too in Quik!)
-            (byte_size/8).times do
-#              self.table = read_double
-#            end
-              float_or_int = @data.get_float64(@offset)
+            (size/8).times do
+              float_or_int = @data.get_float64(@offset)   # self.table = read_double
               @offset += 8
               int = float_or_int.round
-              self.table = float_or_int == int ? int : float_or_int
+              self.table = float_or_int == int ? (@flints += 1; int) : (@floats +=1; float_or_int)
             end
           when TDT_BLANK        # Number of blank cells, 2 bytes
-            (byte_size/2).times { read_int.times { self.table = "" } }
+            (size/2).times { read_int.times { self.table = ""; @blanks += 1 } }
           when TDT_SKIP         # Number of cells to skip, 2 bytes - in Quik, it means that these cells contain 0
-            (byte_size/2).times { read_int.times { self.table = 0 } }
+            (size/2).times { read_int.times { self.table = 0; @skips += 1 } }
           when TDT_INT          # Int, 2 bytes
-            (byte_size/2).times { self.table = read_int }
+            (size/2).times { self.table = read_int; @ints += 1 }
           when TDT_BOOL         # Bool, 2 bytes 0/1
-            (byte_size/2).times { self.table = read_int == 0 }
+            (size/2).times { self.table = read_int == 0; @bools += 1 }
           when TDT_ERROR        # Error enum, 2 bytes
-            (byte_size/2).times { self.table = "Error:#{read_int}" }
+            (size/2).times { self.table = "Error:#{read_int}"; @errors += 1 }
           else
             cout "Type: #{type}, #{TDT_TYPES[type]}"
             return nil
@@ -124,6 +138,7 @@ module DDE
       @time = Time.now - start
       @total_time += @time
       @total_records += @row
+      #dde_unaccess_data(dde_handle)
       true      # Data acquisition successful
     end
 
@@ -131,6 +146,11 @@ module DDE
       cout "Last: #{@row} in #{@time} s(#{@time/@row} s/rec), total: #{@total_records} in  #{
               @total_time} s(#{@total_time/@total_records} s/rec)\n"
     end
+    
+    def formats
+      cout "Strings #{@strings} Floats #{@floats} FlInts #{@flints} Ints #{@ints} Blanks #{
+              @blanks} Skips #{@skips} Bools #{@bools} Errors #{@errors}\n"
+    end
 
     def read_char
       @offset += 1
@@ -161,7 +181,7 @@ module DDE
 #        @r+=1
 #      end
 #      todo: Add code for (sync!) publishing of assembled data row here (bunny? rosetta_queue?)     
-
+      p value if $mode == :debug
       @table[@pos/@col][@pos%@col] = value
       @pos += 1
     end

data/spec/dde/app_shared.rb

@@ -16,7 +16,7 @@ module DDETest
         @app.init_flags.should == APPCLASS_STANDARD
         @app.dde_active?.should == true
       end unless described_class == DDE::Monitor
-    
+
     describe '#start_dde' do
       it 'starts DDE with callback and default init_flags' do
         res = @app.start_dde {|*args|}

data/spec/dde/app_spec.rb

@@ -4,6 +4,5 @@ require File.expand_path(File.dirname(__FILE__) + '/app_shared')
 module DDETest
   describe DDE::App do
     it_should_behave_like "DDE App"
-
   end
 end

data/spec/dde/client_spec.rb

@@ -3,32 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/app_shared')
 
 module DDETest
 
-  def start_callback_recorder
-    @client_calls = []
-    @server_calls = []
-    @client = DDE::Client.new {|*args| @client_calls << extract_values(*args); 1}
-    @server = DDE::Server.new do |*args|
-      @server_calls << extract_values(*args)
-      #puts "#{Time.now.strftime('%T.%6N')} #{extract_values(*args)}"
-      DDE_FACK
-    end
-    @server.start_service('service')
-  end
-
-  def stop_callback_recorder
-    @client.stop_conversation if @client.conversation_active?
-    #@client.stop_dde if @client.dde_active?
-    @server.stop_service if @server.service_active?
-    @server.stop_dde if @server.dde_active?
-  end
-
-  def extract_values(type, format, conv, hsz1, hsz2, data, data1, data2)
-    [Win::DDE::TYPES[type], format, conv,
-     dde_query_string(@client.id, hsz1),
-     dde_query_string(@client.id, hsz2),
-     data, data1, data2]
-  end
-
   describe DDE::Client do
     before(:each){ @client = DDE::Client.new }
     after(:each){ @client.stop_dde if @client.dde_active?}
@@ -103,7 +77,7 @@ module DDETest
         it 'initiates XTYP_CONNECT transaction to service`s callback' do
           @client.start_conversation 'service', 'topic'
 
-          @server_calls.first[0].should == 'XTYP_CONNECT'
+          @server_calls.first[0].should == :XTYP_CONNECT
           @server_calls.first[3].should == @client.topic
           @server_calls.first[4].should == @client.service
         end
@@ -112,7 +86,7 @@ module DDETest
           @client.start_conversation 'service', 'topic'
 
           # p @server_calls, @client_calls    # ?????????? No XTYP_DISCONNECT ? Why ?
-          @server_calls[1][0].should == 'XTYP_CONNECT_CONFIRM'
+          @server_calls[1][0].should == :XTYP_CONNECT_CONFIRM
           @server_calls[1][3].should == @client.topic
           @server_calls[1][4].should == @client.service
         end
@@ -157,9 +131,7 @@ module DDETest
 
       context 'with active (initialized) DDE AND existing DDE server supporting "service" topic' do
         before(:each ){start_callback_recorder}
-        after(:each )do
-          stop_callback_recorder
-        end
+        after(:each ){stop_callback_recorder}
 
         it 'fails to stop conversation' do
           lambda{@client.stop_conversation}.
@@ -193,12 +165,36 @@ module DDETest
             pending
             @client.stop_conversation
             p @server_calls, @client_calls    # ?????????? No XTYP_DISCONNECT ? Why ?
-            @server_calls.last[0].should == 'XTYP_DISCONNECT'
+            @server_calls.last[0].should == :XTYP_DISCONNECT
           end
 
         end # context 'conversation already started'
 
       end # context 'with active (initialized) DDE AND existing DDE server supporting "service" topic'
     end # describe '#stop_conversation'
+
+    describe '#send_data' do
+      context 'with active (initialized) DDE AND existing DDE server supporting "service" topic' do
+        before(:each )do
+          start_callback_recorder do |*args|
+            @server_calls << extract_values(*args)
+            if args[0] == XTYP_POKE
+              @data, @size = dde_get_data(args[5])
+            end
+            DDE_FACK
+          end
+          @client.start_conversation 'service', 'topic'
+        end
+        after(:each ){stop_callback_recorder}
+
+        it 'sends data to server' do
+          @client.send_data TEST_STRING, CF_TEXT, "item"
+          @server_calls.last[0].should == :XTYP_POKE
+          @data.get_bytes(0, @size).rstrip.should == TEST_STRING
+        end
+
+      end # context 'with active (initialized) DDE'
+    end # describe #send_data
+
   end # describe DDE::Client
 end

data/spec/dde/monitor_spec.rb

@@ -3,11 +3,15 @@ require File.expand_path(File.dirname(__FILE__) + '/app_shared')
 
 module DDETest
 
+  describe DDE::Monitor, " in general" do
+    it_should_behave_like "DDE App"
+  end
+
   describe DDE::Monitor do
-    before(:each){ @monitor = DDE::Monitor.new }
-    after(:each){ @monitor.stop_dde }
+    before(:each){ }
+    after(:each){ @monitor.stop_dde if @monitor.dde_active? }
+    # SEEMS LIKE IT DOESN'T stop system from sending :XTYP_MONITOR transactions to already dead callback :(
 
-    it_should_behave_like "DDE App"
 
     it 'starts without constructor parameters' do
       @monitor = DDE::Monitor.new
@@ -26,69 +30,5 @@ module DDETest
       MF_SENDMSGS         # monitor sent DDE messages
     end
 
-#    context 'with existing DDE clients and server supporting "service" topic' do
-#      before(:each )do
-#        @client_calls = []
-#        @server_calls = []
-#        @client = DDE::Client.new {|*args| @client_calls << args; 1}
-#        @server = DDE::Server.new {|*args| @server_calls << args; 1}
-#        @server.start_service('service')
-#      end
-#
-#      it 'starts new conversation if DDE is already activated' do
-#        res = @client.start_conversation 'service', 'topic'
-#        res.should == true
-#        @client.conversation_active?.should == true
-#      end
-#
-#      it 'sets @conversation, @service and @topic attributes' do
-#        @client.start_conversation 'service', 'topic'
-#
-#        @client.conversation.should be_an Integer
-#        @client.conversation.should_not == 0
-#        @client.service.should be_a DDE::DdeString
-#        @client.service.should == 'service'
-#        @client.service.name.should == 'service'
-#        @client.conversation.should be_an Integer
-#        @client.conversation.should_not == 0
-#      end
-#
-#      it 'initiates XTYP_CONNECT transaction to service`s callback' do
-#        @client.start_conversation 'service', 'topic'
-#
-#        @server_calls.first[0].should == XTYP_CONNECT
-#        @server_calls.first[3].should == @client.topic.handle
-#        @server_calls.first[4].should == @client.service.handle
-#      end
-#
-#      it 'if server confirms connect, XTYP_CONNECT_CONFIRM transaction to service`s callback follows' do
-#        @client.start_conversation 'service', 'topic'
-#
-#        @server_calls[1][0].should == XTYP_CONNECT_CONFIRM
-#        @server_calls[1][3].should == @client.topic.handle
-#        @server_calls[1][4].should == @client.service.handle
-#      end
-#
-#      it 'client`s callback receives no transactions' do
-#        @client.start_conversation 'service', 'topic'
-#
-#        p @server_calls, @client.service.handle, @client.topic.handle, @client.conversation
-#        @client_calls.should == []
-#      end
-#
-#      it 'fails if another conversation is already in progress' do
-#        @client.start_conversation 'service', 'topic'
-#
-#        lambda{@client.start_conversation 'service1', 'topic1'}.
-#                should raise_error /Another conversation already established/
-#      end
-#
-#      it 'fails to start conversation on unsupported service' do
-#        lambda{@client.start_conversation('not_a_service', 'topic')}.
-#                should raise_error /A client`s attempt to establish a conversation has failed/
-#        @client.conversation_active?.should == false
-#      end
-#
-#    end
   end
 end

data/spec/dde/server_shared.rb

@@ -5,78 +5,68 @@ module DDETest
 
     it_should_behave_like "DDE App"
 
-    it 'new without parameters creates Server but does not activate DDEML or start service' do
-      @server.id.should == nil
-      @server.service.should == nil
-      @server.dde_active?.should == false
-      @server.service_active?.should == false
-    end
-
-    it 'new with attached callback block creates Server and activates DDEML, but does not start service' do
-      @server = described_class.new {|*args|}
-      @server.id.should be_an Integer
-      @server.id.should_not == 0
-      @server.dde_active?.should == true
-      @server.service.should == nil
-      @server.service_active?.should == false
-    end
-
-    describe '#start_service' do
-
-      context 'with inactive (uninitialized) DDE:' do
-        it 'with attached block, initializes DDE and starts new service' do
-          @server.start_service('myservice') {|*args|}.should be_true
-
-          @server.service.should be_a DDE::DdeString
-          @server.service.should == 'myservice'
-          @server.service.name.should == 'myservice'
-          @server.service.handle.should be_an Integer
-          @server.service.handle.should_not == 0
-          @server.service_active?.should == true
-        end
+    context 'specific to Servers:' do
+      before(:each ){ @server = described_class.new {|*args|}}
+      after(:each ){ @server.stop_dde if @server.dde_active?}
+
+      it 'new with attached callback block creates Server and activates DDEML, but does not start service' do
+        @server = described_class.new {|*args|}
+        @server.id.should be_an Integer
+        @server.id.should_not == 0
+        @server.dde_active?.should == true
+        @server.service.should == nil
+        @server.service_active?.should == false
+      end
 
-        it 'returns self if success (allows method chain)' do
-          res = @server.start_service('myservice') {|*args|}
-          res.should == @server
-        end
+      describe '#start_service' do
 
-      end
+        context 'with inactive (uninitialized) DDE:' do
+          it 'with attached block, initializes DDE and starts new service' do
+            @server.start_service('myservice') {|*args|}.should be_true
 
-      context 'with active (initialized) DDE:' do
-        before(:each ){ @server = described_class.new {|*args|}}
+            @server.service.should be_a DDE::DdeString
+            @server.service.should == 'myservice'
+            @server.service.name.should == 'myservice'
+            @server.service.handle.should be_an Integer
+            @server.service.handle.should_not == 0
+            @server.service_active?.should == true
+          end
 
-        it 'starts new service with given name' do
-          res = @server.start_service 'myservice'
-          res.should be_true
+          it 'returns self if success (allows method chain)' do
+            res = @server.start_service('myservice') {|*args|}
+            res.should == @server
+          end
+        end # context 'with inactive (uninitialized) DDE:'
 
-          @server.service.should be_a DDE::DdeString
-          @server.service.should == 'myservice'
-          @server.service.name.should == 'myservice'
-          @server.service.handle.should be_an Integer
-          @server.service.handle.should_not == 0
-        end
+        context 'with active (initialized) DDE:' do
 
-        it 'fails to starts new service if name is not a String' do
-          lambda{@server.start_service(11)}.should raise_error DDE::Errors::ServiceError
-          @server.service_active?.should == false
-        end
+          it 'starts new service with given name' do
+            res = @server.start_service 'myservice'
+            res.should be_true
 
-      end
-    end
+            @server.service.should be_a DDE::DdeString
+            @server.service.should == 'myservice'
+            @server.service.name.should == 'myservice'
+            @server.service.handle.should be_an Integer
+            @server.service.handle.should_not == 0
+          end
 
-    describe '#stop_service' do
+          it 'fails to starts new service if name is not a String' do
+            lambda{@server.start_service(11)}.should raise_error DDE::Errors::ServiceError
+            @server.service_active?.should == false
+          end
+        end # context 'with active (initialized) DDE:'
+      end # describe '#start_service'
 
-      context 'with inactive (uninitialized) DDE:' do
-        it 'fails to stop service' do
-          lambda{@server.stop_service}.should raise_error DDE::Errors::ServiceError
+      describe '#stop_service' do
+        context 'with inactive (uninitialized) DDE:' do
+          it 'fails to stop service' do
+            lambda{@server.stop_service}.should raise_error DDE::Errors::ServiceError
+          end
         end
-      end
 
-      context 'with active (initialized) DDE:' do
-        before(:each){ @server = described_class.new {|*args|}}
-
-        context 'with already registered DDE service: "myservice"' do
-          before(:each){ @server.start_service('myservice')}
+        context 'with active (initialized) DDE: and already registered DDE service: "myservice"' do
+          before(:each){ @server = described_class.new {|*args|}; @server.start_service('myservice')}
           after(:each){ @server.stop_service if @server.service_active?}
 
           it 'stops previously registered service' do
@@ -95,10 +85,8 @@ module DDETest
           it 'returns self if success (allows method chain)' do
             @server.stop_service.should == @server
           end
-
-        end
-
-      end
-    end
-  end
+        end # context 'with active (initialized) DDE: and already registered DDE service: "myservice"'
+      end # describe '#stop_service'
+    end # context 'specific to Servers:'
+  end # shared_examples_for "DDE Server"
 end

data/spec/dde/server_spec.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/server_shared')
 
 module DDETest
 
+  describe DDE::Server, ' in general:' do
+    it_should_behave_like "DDE Server"
+  end
+
   describe DDE::Server do
     before(:each ){ @server = DDE::Server.new }
     after(:each) do
@@ -10,7 +14,12 @@ module DDETest
       @server.stop_dde if @server.dde_active?
     end
 
-    it_should_behave_like "DDE Server"
+    it 'new without parameters creates Server but does not activate DDEML or start service' do
+      @server.id.should == nil
+      @server.service.should == nil
+      @server.dde_active?.should == false
+      @server.service_active?.should == false
+    end
 
     describe '#start_service' do
 
@@ -23,8 +32,6 @@ module DDETest
         lambda{@server.start_service('myservice')}.should raise_error DDE::Errors::ServiceError
         @server.service_active?.should == false
       end
-
-    end
-
-  end
+    end #describe '#start_service'
+  end # describe DDE::Server do
 end

data/spec/dde/xl_server_spec.rb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/server_shared')
 
 module DDETest
 
+  describe DDE::XlServer, ' in general:' do
+    it_should_behave_like "DDE Server"
+  end
+
   describe DDE::XlServer do
     before(:each ){ @server = DDE::XlServer.new }
     after(:each) do
@@ -10,17 +14,15 @@ module DDETest
       @server.stop_dde if @server.dde_active?
     end
 
-    it_should_behave_like "DDE Server"
-
-    it 'new without parameters creates empty table attribute' do
-      @server.table.should be_an DDE::XlTable
-      @server.table.should be_empty
+    it 'new without parameters has empty data attribute' do
+      @server.data.should be_an DDE::XlTable
+      @server.data.should be_empty
     end
 
-    it 'new with attached callback block creates empty table attribute' do
+    it 'new with attached callback block has empty data attribute' do
       server = DDE::XlServer.new {|*args|}
-      @server.table.should be_an DDE::XlTable
-      @server.table.should be_empty
+      @server.data.should be_an DDE::XlTable
+      @server.data.should be_empty
     end
 
     describe '#start_service' do
@@ -55,8 +57,7 @@ module DDETest
           @server.service.handle.should be_an Integer
           @server.service.handle.should_not == 0
         end
-      end
+      end # context 'with active (initialized) DDE:'
     end # describe '#start_service'
-
-  end
+  end # describe DDE::XlServer
 end

data/spec/dde/xl_table_spec.rb

@@ -1,12 +1,51 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 module DDETest
+
+  DDE_DATA = "\x10\x00\x04\x00\b\x00\t\x00\x02\x00\t\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x18\x00fffff\x8Ee@\x00\x00\x00\x00\x00y\xB7@\x00\x00\x00\x00\x80b\xC1@\x02\x00\x01\x00\x00\x01\x00(\x00\x9A\x99\x99\x99\x99\x99\xB9?q=\n\xD7\xA3\x98e@)\\\x8F\xC2\xF5`e@\\\x8F\xC2\xF5(\x8Ce@H\xE1z$XLZA\x01\x00H\x00q=\n\xD7\xA3\x88e@\x00\x00\x00\x00\x80\xED\xC9@\x00\x00\x00\x00\x00\x00\x00\x00\xB8\x1E\x85\xEBQ e@{\x14\xAEG\xE1z\xF4?\xAEG\xE1z\x14\xCEe@\xA4p=\n\xD7\ve@H\xE1z\x14\xAE\x7Fe@\x00\x00\x80\x94\xC0-\aB\x01\x00H\x00ffff&\xF4\xB2@\x00\x00\x00\x00\x00P\x91@\x00\x00\x00\x00\x00\x00\x00\x00=\n\xD7\xA30\xA2\xB2@ffffff\xEE?\x00\x00\x00\x00\x00$\xB3@\x00\x00\x00\x00\x00\x9A\xB2@=\n\xD7\xA3\xF0\xE1\xB2@\x00\x00\x90\x9DEy\xF0A\x01\x00H\x00\x00\x00\x00\x00\x00\xD0m@\x00\x00\x00\x00\x00\xF9\xBE@\x00\x00\x00\x00\x00\x00\x00\x00\x9A\x99\x99\x99\x99\x99m@\xB8\x1E\x85\xEBQ\xB8\xAE?H\xE1z\x14\xAE\xFFm@\x00\x00\x00\x00\x00hm@\xECQ\xB8\x1E\x85\xC3m@\x00\x00\xC0\x8Fp\x80\xE6A\x01\x00H\x00\xCD\xCC\xCC\xCC\xCC\xBCT@\x00\x00\x00\x00\x80\xAF\xE7@\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90T@{\x14\xAEG\xE1z\xA4?fffff\xE6T@\x9A\x99\x99\x99\x99YT@\x1F\x85\xEBQ\xB8\xAET@\x00\x00t\x80r<\x12B\x01\x00\b\x00\xF6(\\\x8F\xC2\n\x97@\x02\x00\b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00H\x00\x83\xC0\xCA\xA1E\xB6\xB3?\x00\x00\x00\x00 \xC8\xF1@\x00\x00\x00\x00\x00\x00\x00\x00@\xA4\xDF\xBE\x0E\x9C\xB3?\xA4p=\n\xD7\xA3\xC0?\t\xF9\xA0g\xB3\xEA\xB3?\xBAk\t\xF9\xA0g\xB3?r\xF9\x0F\xE9\xB7\xAF\xB3?\x00\x00 \xBC\xA35\xE9A"
+  DRAW_OUTPUT = "-----
+[G]V
+[G]V 172.45 6009 8901  0.1 172.77 171.03 172.38 6893920.57
+[G]V 172.27 13275 0 169.01 1.28 174.44 168.37 171.99 12443980432
+[G]V 4852.15 1108 0 4770.19 0.95 4900 4762 4833.94 4422130137
+[G]V 238.5 7929 0 236.8 0.06 239.99 235.25 238.11 3020129406
+[G]V 82.95 48508 0 82.25 0.04 83.6 81.4 82.73 19580887069
+[G]V 1474.69
+[G]V 0.077 72834 0 0.0766 0.13 0.0778 0.0758 0.0769 3383565793
+Last: 8 in 0.0 s(0.0 s/rec), total: 8 in  0.0 s(0.0 s/rec)"
+
   describe DDE::XlTable do
+    before(:each) {@data = DDE::XlTable.new}
+
+    it 'starts out empty and without topic' do
+      @data.should be_empty
+      @data.topic.should == nil
+    end
 
-    it 'starts out empty and without item/topic' do
-      table = DDE::XlTable.new
-      table.should be_empty
-      table.topic.should == nil
+    context 'with server/client pair and started conversation' do
+      before(:each )do
+        start_callback_recorder do|*args|
+          @server_calls << extract_values(*args)
+          if args[0] == XTYP_POKE
+            p extract_values(*args)
+            @data.receive(args[5]) #, :debug)
+          end
+          DDE_FACK
+        end
+        @client.start_conversation 'service', 'topic'
+      end
+
+      after(:each ){stop_callback_recorder}
+
+      it 'starts out empty and without topic' do
+        pending
+        @client.send_data DDE_DATA, CF_TEXT, "item"
+        @data.should_not be_empty
+        @data.topic.should == nil
+        @data.draw.should == nil
+      end
     end
+
   end
+
 end

data/spec/spec_helper.rb

@@ -1,49 +1,110 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
-require 'dde'
-
-# Customize RSpec with my own extensions
-module SpecMacros
-
-  # wrapper for it method that extracts description from example source code, such as:
-  # spec { use{    function(arg1 = 4, arg2 = 'string')  }}
-  def spec &block
-    it description_from(caller[0]), &block # it description_from(*block.source_location), &block
-    #do lambda(&block).should_not raise_error end
-  end
-
-  # reads description line from source file and drops external brackets like its{}, use{}
-  # accepts as arguments either file name and line or call stack member (caller[0])
-  def description_from(*args)
-    case args.size
-      when 1
-        file, line = args.first.scan(/\A(.*?):(\d+)/).first
-      when 2
-        file, line = args
-    end
-    File.open(file) do |f|
-      f.lines.to_a[line.to_i-1].gsub( /(spec.*?{)|(use.*?{)|}/, '' ).strip
-    end
-  end
-end
-
-Spec::Runner.configure { |config| config.extend(SpecMacros) }
-
-module DDETest
-
-  include Win::DDE
-#  @@monitor = DDE::Monitor.new
-
-  TEST_IMPOSSIBLE = 'Impossible'
-
-  def use
-    lambda {yield}.should_not raise_error
-  end
-
-  def any_block
-    lambda {|*args| args}
-  end
-
-end
+require 'rubygems'
+require 'spork'
+
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However, 
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+
+end
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
+
+end
+
+# --- Instructions ---
+# - Sort through your spec_helper file. Place as much environment loading 
+#   code that you don't normally modify during development in the 
+#   Spork.prefork block.
+# - Place the rest under Spork.each_run block
+# - Any code that is left outside of the blocks will be ran during preforking
+#   and during each_run!
+# - These instructions should self-destruct in 10 seconds.  If they don't,
+#   feel free to delete them.
+#
+
+
+
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'spec'
+require 'spec/autorun'
+require 'dde'
+
+# Customize RSpec with my own extensions
+module SpecMacros
+
+  # wrapper for it method that extracts description from example source code, such as:
+  # spec { use{    function(arg1 = 4, arg2 = 'string')  }}
+  def spec &block
+    it description_from(caller[0]), &block # it description_from(*block.source_location), &block
+    #do lambda(&block).should_not raise_error end
+  end
+
+  # reads description line from source file and drops external brackets like its{}, use{}
+  # accepts as arguments either file name and line or call stack member (caller[0])
+  def description_from(*args)
+    case args.size
+      when 1
+        file, line = args.first.scan(/\A(.*?):(\d+)/).first
+      when 2
+        file, line = args
+    end
+    File.open(file) do |f|
+      f.lines.to_a[line.to_i-1].gsub( /(spec.*?{)|(use.*?{)|}/, '' ).strip
+    end
+  end
+end
+
+Spec::Runner.configure { |config| config.extend(SpecMacros) }
+
+module DDETest
+
+  include Win::DDE
+#  @@monitor = DDE::Monitor.new
+
+  TEST_IMPOSSIBLE = 'Impossible'
+  TEST_STRING = "Data String"
+
+  def use
+    lambda {yield}.should_not raise_error
+  end
+
+  def any_block
+    lambda {|*args| args}
+  end
+
+  def start_callback_recorder(&server_block)
+    @client_calls = []
+    @server_calls = []
+    @client = DDE::Client.new {|*args| @client_calls << extract_values(*args); DDE_FACK}
+    @server = DDE::Server.new &server_block || proc {|*args| @server_calls << extract_values(*args); DDE_FACK }
+    @server.start_service('service')
+  end
+
+  def stop_callback_recorder
+    @client.stop_conversation if @client.conversation_active?
+    @server.stop_service if @server.service_active?
+    @server.stop_dde if @server.dde_active?
+    @client.stop_dde if @client.dde_active? #for some reason, need to stop @server FIRST, and @client LATER
+  end
+
+  def extract_values(*args)
+    args.map do |arg|
+      case arg
+        when 0
+          0
+        when Integer
+          id = @client.id if @client
+          id ||= @server.id if @server
+          dde_query_string(id, arg)\
+              || Win::DDE.constants(false).inject(nil) {|res, const| arg == Win::DDE.const_get(const) ? res || const : res }\
+              || arg
+        else
+          arg
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dde
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors: 
 - arvicco
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +03:00
+date: 2010-03-23 00:00:00 +03:00
 default_executable: dde_main
 dependencies: 
 - !ruby/object:Gem::Dependency