fyrehose 0.0.1 → 0.0.2

data/fyrehose.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fyrehose"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.date        = Date.today.to_s
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Paul Asmuth"]

data/lib/fyrehose.rb

@@ -1,2 +1,16 @@
+require "socket"
+require "timeout"
+
+require "fyrehose/errors"
 require "fyrehose/input_stream"
-require "fyrehose/protocol_error"
+require "fyrehose/abstract_client"
+require "fyrehose/tcp_client"
+require "fyrehose/udp_client"
+
+module Fyrehose
+
+  def self.next_txid
+    rand(8**32).to_s(36)
+  end
+
+end

data/lib/fyrehose/abstract_client.rb

@@ -0,0 +1,35 @@
+class Fyrehose::AbstractClient
+
+  TIMEOUT = 0.1
+
+  def initialize(host, port, opts = {})
+    @host = host
+    @port = port
+    @opts = opts
+
+    @timeout = if opts[:timeout]
+      opts[:timeout].to_f
+    else
+      TIMEOUT
+    end
+  end
+
+  def deliver(channel, data)
+    channel = channel.to_s
+    data = data.to_s
+
+    if channel.include?(" ")
+      raise Fyrehose::Error.new("channel names must not include whitespace")
+    end
+
+    txid = Fyrehose.next_txid
+    send_data("##{txid} @#{channel} *#{data.size} #{data}\n")
+  end
+
+private
+
+  def send_data(data)
+    raise "implement me"
+  end
+
+end

data/lib/fyrehose/{protocol_error.rb → errors.rb}

@@ -1,5 +1,8 @@
 module Fyrehose
-  class ProtocolError < StandardError
+  class Error < StandardError; end
+  class ConnectionError < Fyrehose::Error; end
+
+  class ProtocolError < Fyrehose::Error
 
     INFO_SIZE = 30
 
@@ -16,4 +19,5 @@ module Fyrehose
     end
 
   end
+
 end

data/lib/fyrehose/reactor.rb

@@ -4,7 +4,7 @@ class Fyrehose::Reactor < EventMachine::Connection
 
   def self.run(host, port, opts = {}, &block)
     unless block
-      raise "missing proc{ |channel,data| } for #run"
+      raise Fyrehose::Error.new("missing proc{ |channel,data| } for #run")
     end
 
     EventMachine.run do
@@ -19,11 +19,13 @@ class Fyrehose::Reactor < EventMachine::Connection
   end
 
   def deliver(channel, data)
-    send_data("##{next_txid} @#{channel} *#{data.size} #{data}\n")
+    txid = Fyrehose.next_txid
+    send_data("##{txid} @#{channel} *#{data.size} #{data}\n")
   end
 
   def set_flags(channel, flags)
-    send_data("##{next_txid} @#{channel} +#{flags}\n")
+    txid = Fyrehose.next_txid
+    send_data("##{txid} @#{channel} +#{flags}\n")
   end
 
   def subscribe(channel)
@@ -50,10 +52,4 @@ class Fyrehose::Reactor < EventMachine::Connection
     end
   end
 
-private
-
-  def next_txid
-    rand(8**32).to_s(36)
-  end
-
 end

data/lib/fyrehose/tcp_client.rb

@@ -0,0 +1,21 @@
+class Fyrehose::TCPClient < Fyrehose::AbstractClient
+
+  def send_data(data)
+    Timeout::timeout(@timeout) do
+      @sock = TCPSocket.new(@host, @port) unless @sock
+      @sock.send(data, 0)
+      parse_response(@sock.gets)
+    end
+  rescue Exception => e
+    @sock = nil
+    raise e
+  end
+
+  def parse_response(str)
+    raise Fyrehose::ConnectionError.new unless str
+    m = str.match(/#[^ ]+ \$([0-9]+)\n/)
+    raise Fyrehose::ProtocolError.new unless m
+    m[1].to_i
+  end
+
+end

data/lib/fyrehose/udp_client.rb

@@ -0,0 +1,18 @@
+class Fyrehose::UDPClient < Fyrehose::AbstractClient
+
+  def open_connection
+    @sock = UDPSocket.new
+    @sock.connect(@host, @port)
+  end
+
+  def send_data(data)
+    Timeout::timeout(@timeout) do
+      open_connection unless @sock
+      @sock.send(data, 0); 0
+    end
+  rescue Exception => e
+    @sock = nil
+    raise e
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fyrehose
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -21,9 +21,12 @@ files:
 - .gitkeep
 - fyrehose.gemspec
 - lib/fyrehose.rb
+- lib/fyrehose/abstract_client.rb
+- lib/fyrehose/errors.rb
 - lib/fyrehose/input_stream.rb
-- lib/fyrehose/protocol_error.rb
 - lib/fyrehose/reactor.rb
+- lib/fyrehose/tcp_client.rb
+- lib/fyrehose/udp_client.rb
 homepage: http://github.com/paulasmuth/fyrehose
 licenses:
 - MIT