cod 0.2.0 → 0.3.0

data/lib/cod/context.rb

@@ -1,72 +1,25 @@
 require 'weakref'
 
 module Cod
-  # Channels inside a context know each other and can be looked up by their
-  # identifier. Context is also responsible for holding connections and for
-  # doing background work. For most purposes, you will only need one context; 
-  # by using methods on the Cod module directly, you implicitly hold a context
-  # and call methods there. 
+  # Context will allow to produce channels retaining some state. Until now, 
+  # this hasn't been neccessary. 
   #
   class Context
-    
-    def self.install_at_fork(ref)
-      at_fork do |old_handler|
-        old_handler.call rescue nil
-        
-        begin
-          ref.reset
-        rescue WeakRef::RefError
-          # IGNORED EXCEPTION
-        end
-      end
-    end
-    
-    def initialize
-      @connections = {}
-      
-      self.class.install_at_fork(WeakRef.new(self))
-    end
-    
     def pipe(name=nil)
       Cod::Channel::Pipe.new(name)
     end
     
     def beanstalk(url, name=nil)
       Cod::Channel::Beanstalk.new(
-        connection(:beanstalk, url), name)
-    end
-    
-    def reset
-      @connections = {}
-    end
-    
-  private
-    # Returns a connection to a system identified by type and url. Currently, 
-    # connections are never released or closed. This is only a minor drawback
-    # since there will be few of them. (considering we only use this for 
-    # beanstalk) 
-    #
-    def connection(type, url)
-      key = connection_key(type, url)
-      
-      connection = @connections[key]
-      return connection if connection
-    
-      produce_connection(type, url).tap { |connection|
-        @connections.store(key, connection) }
+        Connection::Beanstalk.new(url), name)
     end
     
-    def connection_key(type, url)
-      [type, url]
+    def tcp(destination)
+      Cod::Channel::TCPConnection.new(destination)
     end
-    
-    def produce_connection(type, url)
-      case type
-        when :beanstalk
-          return Connection::Beanstalk.new(url)
-      end
-      
-      fail "Tried to produce a connection of unknown type #{type.inspect}."
+
+    def tcpserver(bind_to)
+      Cod::Channel::TCPServer.new(bind_to)
     end
   end
 end

data/lib/cod/object_io.rb

@@ -0,0 +1,3 @@
+require 'cod/objectio/reader'
+require 'cod/objectio/writer'
+require 'cod/objectio/serializer'

data/lib/cod/objectio/reader.rb

@@ -0,0 +1,129 @@
+module Cod::ObjectIO
+  # Reads objects from one or more IO streams. 
+  #
+  class Reader
+    attr_reader :waiting_messages
+    attr_reader :registered_ios
+    
+    # Initializes an object reader that reads from one or several IO objects. 
+    # You can either pass the io object in the constructor (io) or you can 
+    # provide the instance with a block that is called each time a read is
+    # attempted. The block should return an array of IO objects to also read
+    # from. 
+    #
+    # Example: 
+    #   reader = Reader.new { make_connection }
+    #    
+    def initialize(serializer, io=nil, &block)
+      @serializer = serializer
+      @waiting_messages = []
+      @establish_block = block
+      @registered_ios = Set.new
+      
+      register io if io
+    end    
+    
+    # Called before each attempt to read from the wire. This should return 
+    # the IO objects that need to be considered when reading. 
+    #
+    def establish
+      sockets = @establish_block && @establish_block.call(@io) ||
+        nil
+      
+      [sockets].flatten
+    end
+    
+    def register(ios)
+      return unless ios
+      ios.each do |io|
+        registered_ios << io
+      end
+    end
+    
+    def unregister(ios)
+      ios.each do |io|
+        registered_ios.delete(io)
+      end
+    end
+    
+    def get(opts={})
+      return waiting_messages.shift if queued?
+      
+      start_time = Time.now
+      loop do
+        # p [:looping, opts]
+        read_from_wire opts
+        
+        # Early return in case we have a message waiting
+        return waiting_messages.shift if queued?
+        
+        if opts[:timeout] && (Time.now-start_time) > opts[:timeout]
+          raise Cod::Channel::TimeoutError, 
+            "No messages waiting in pipe."
+        end
+      end
+      
+      fail "NOTREACHED"
+    end
+    
+    def waiting?
+      read_from_wire
+      queued?
+    end
+    
+    def queued?
+      ! waiting_messages.empty?
+    end
+    
+    def close
+      @registered_ios.each { |io| io.close }
+    end
+    
+  private 
+    
+    # Checks if data is waiting and processes messages. 
+    #
+    def read_from_wire(opts={})
+      # Establish new connections and register them
+      register establish
+
+      # Wait for sockets to have data
+      ready_read, _, _ = IO.select(Array(registered_ios), nil, nil, 0.1)
+      
+      # Read all ready sockets
+      process_nonblock(ready_read) if ready_read
+    end
+    
+    # Reads all data waiting in each io in the ios array. 
+    #
+    def process_nonblock(ios)
+      ios.each do |io|
+        process_nonblock_single(io)
+      end
+    end
+    
+    # Reads all data waiting in a single io. 
+    #
+    def process_nonblock_single(io)
+      buffer = io.read_nonblock(1024*1024*1024)
+
+      sio = StringIO.new(buffer)
+      while not sio.eof?
+        waiting_messages << deserialize(io, sio)
+      end
+    rescue EOFError
+      # Connection has failed/ been disconnected. 
+      # We will need to reconnect this. If possible. 
+      registered_ios.delete(io)
+      raise
+    end
+        
+    # Deserializes a message (in message format, string) into the object that
+    # was transmitted. Overwrite this message if you want to control the 
+    # message format. 
+    #
+    def deserialize(*args)
+      @serializer.deserialize(*args)
+    end
+  end
+end

data/lib/cod/objectio/serializer.rb

@@ -0,0 +1,26 @@
+module Cod::ObjectIO
+  class Serializer
+    attr_reader :transformer
+    
+    def initialize(transformer=nil)
+      @transformer = transformer
+    end
+    
+    # NOTE: source_io is provided to be able to provide back-channels through
+    # that same, not to read from it. Reading from this IO object will block
+    # you. 
+    #
+    def deserialize(source_io, buffer_io)
+      if @transformer
+        Marshal.load(buffer_io, proc { 
+          |obj| transformer.transform(source_io, obj) }) 
+      else
+        Marshal.load(buffer_io)
+      end
+    end
+    
+    def serialize(message)
+      Marshal.dump(message)
+    end
+  end
+end

data/lib/cod/objectio/writer.rb

@@ -0,0 +1,32 @@
+module Cod::ObjectIO
+  # Writes objects to an IO stream. 
+  #
+  class Writer    
+    def initialize(serializer, io=nil, &block)
+      @serializer = serializer
+      @io = io
+      @reconnect_block = block
+    end
+    
+    def put(message)
+      attempt_reconnect
+
+      @io.write(serialize(message)) if @io
+    end
+    
+    def close
+      @io.close
+    end
+    
+  private
+    def attempt_reconnect
+      if @reconnect_block
+        @io = @reconnect_block[]
+      end
+    end
+  
+    def serialize(message)
+      @serializer.serialize(message)
+    end
+  end
+end

metadata

@@ -1,111 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cod
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Kaspar Schiess
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-27 00:00:00 +02:00
+date: 2011-07-20 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154614480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: flexmock
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154614480
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &2154476000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154476000
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &2154475480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2154475480
 description: 
 email: kaspar.schiess@absurd.li
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Gemfile
 - HISTORY.txt
 - LICENSE
 - Rakefile
 - README
 - lib/at_fork.rb
+- lib/cod/channel/abstract.rb
 - lib/cod/channel/base.rb
 - lib/cod/channel/beanstalk.rb
 - lib/cod/channel/pipe.rb
+- lib/cod/channel/tcp.rb
+- lib/cod/channel/tcpconnection.rb
+- lib/cod/channel/tcpserver.rb
 - lib/cod/channel.rb
 - lib/cod/client.rb
 - lib/cod/connection/beanstalk.rb
 - lib/cod/context.rb
 - lib/cod/directory/subscription.rb
 - lib/cod/directory.rb
+- lib/cod/object_io.rb
+- lib/cod/objectio/connection.rb
+- lib/cod/objectio/reader.rb
+- lib/cod/objectio/serializer.rb
+- lib/cod/objectio/writer.rb
 - lib/cod/service.rb
 - lib/cod/topic.rb
 - lib/cod.rb
+- examples/example_scaffold.rb
 - examples/master_child.rb
 - examples/ping.rb
 - examples/pong.rb
 - examples/service.rb
 - examples/service_directory.rb
+- examples/tcp.rb
 has_rdoc: true
 homepage: http://kschiess.github.com/cod
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Really simple IPC.
 test_files: []
-