ircmad 0.0.2 → 0.0.3

data/README.md

@@ -8,8 +8,8 @@ If you use this gateway, you can assess IRC from browser easily.
 
 Data format is JSON.
 ```
-WebSocket Server - '{"username":"ToQoz","channel":"#channel1","body":"hello world"}' -> WebSocket Client
-WebSocket Server <- '{"channel":"#channel1","body":"yes!!!"}' -> WebSocket Client
+WebSocket Server - '{"from":"ToQoz","to":"#channel1","body":"hello world"}' -> WebSocket Client
+WebSocket Server <- '{"to":"#channel1","body":"yes!!!"}' -> WebSocket Client
 ```
 
 ## Installation
@@ -57,10 +57,15 @@ var socket = new WebSocket('ws://localhost:3333')
 
 // Send
 socket.send(JSON.stringify({ channel: '#channel1', body: 'yeah' }))
+ws.send(JSON.stringify({ type: 'join', channel: '#ruby'}))
 
 // Get
 socket.onmessage = function(msg) { console.log(msg.data) };
-// => '{"username":"ToQoz","channel":"#channel1","body":"hello world"}'
+// => '{"from":"ToQoz","to":"#channel1","body":"hello world","type":"privmsg"}'
+
+// => {"from":"zlfu","to":"#ruby","body":null,"type":"join"}
+// => {"from":"hybrid7.debian.local","to":"zlfu","body":"@","type":"353"}
+// => {"from":"hybrid7.debian.local","to":"zlfu","body":"#ruby","type":"366"}
 ```
 
 

data/ircmad.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "eventmachine"
   gem.add_dependency "em-websocket"
-  gem.add_dependency "zircon", "0.0.4"
+  gem.add_dependency "zircon", ">= 0.0.5"
 end

data/lib/ircmad.rb

@@ -29,7 +29,7 @@ class Ircmad
   def run!
     Thread.abort_on_exception = true
     EM.run do
-      c = config.dup
+      c = default_config.merge(config).dup
 
       EM.defer {
         WebSocket.new do
@@ -39,13 +39,24 @@ class Ircmad
 
       EM.defer {
         IRCClient.new do
-          set :server, c[:host] || '127.0.0.1'
-          set :port, c[:port] || '6667'
-          set :channel_list, c[:channel_list] || []
+          set :server, c[:host]
+          set :port, c[:port]
+          set :channel, c[:channel_list].first
+          set :channel_list, c[:channel_list]
           set :username, c[:username]
           set :password, c[:password]
         end.run!
       }
     end
   end
+
+  def default_config
+    {
+      :server => '127.0.0.1',
+      :port => '6667',
+      :channel => '',
+      :channel_list => [],
+      :username => ''
+    }
+  end
 end

data/lib/ircmad/irc_client.rb

@@ -1,42 +1,89 @@
 class Ircmad
   class IRCClient
+    attr_accessor :client
     include Configurable
 
     def initialize(&block)
       instance_eval(&block) if block_given?
 
-      @client = Zircon.new config
-
-      @client.send(:login) if @client.respond_to?(:login, true)
-      config[:channel_list].each { |channel| @client.join channel }
+      Ircmad.post_channel.subscribe(&on_post)
     end
 
     def run!
-      Ircmad.post_channel.subscribe do |msg|
-        parsed_msg = begin
-         JSON.parse(msg, :symbolize_names => true) rescue nil
+      self.client ||= Zircon.new config
+
+      first_join = true
+      client.on_join do |message|
+        if first_join
+          first_join = false
+          config[:channel_list].each { |channel| client.join channel }
+        else
+          Ircmad.get_channel << message
+        end
+      end
+      client.on_privmsg { |msg| Ircmad.get_channel << msg }
+      client.on_numericreply { |msg| Ircmad.get_channel << msg }
+      client.run!
+    rescue Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EPIPE => e
+      puts "#{e}\nRetry Now!"
+      close_client
+      sleep 1
+      retry
+    rescue ArgumentError
+      msg = $!.message
+      if /Invalid message:.*/ =~ msg
+        retry
+      else
+        puts 'Unexpected Error!'
+        puts msg
+        exit!
+      end
+    rescue => e
+      puts 'Unexpected Error!'
+      puts e
+      exit!
+    end
+
+    def on_post
+      proc { |msg|
+        m = begin
+         JSON.parse(msg, :symbolize_names => true)
         rescue JSON::ParserError
           puts "#{msg} is invalid json"
-        rescue  => e
-          puts "Unexpected error"
-          puts e.message
-          puts e.backtrace.join("\n")
         end
 
-        if parsed_msg && parsed_msg[:channel] && parsed_msg[:message]
-          privmsg parsed_msg[:channel], ":#{parsed_msg[:message]}"
+        if m && client
+          m[:type] ||= 'privmsg'
+
+          case m[:type].downcase
+          when 'privmsg'
+            client.privmsg m[:to], ":#{m[:body]}"
+          when 'list'
+            client.list m[:to]
+          when 'names'
+            client.names m[:to]
+          when 'join'
+            client.join m[:to] if m[:to]
+          end
         end
-      end
+      }
+    end
 
-      on_privmsg do |msg|
-        Ircmad.get_channel << msg
-      end
 
-      @client.run!
+
+    def close_client
+      # oh...
+      if @client
+        socket = @client.instance_variable_get(:@socket)
+        if socket.respond_to?(:closed?) && !socket.closed?
+          socket.close
+        end
+        @client = nil
+      end
     end
 
     def method_missing(action, *args, &block)
-      @client.send(action.to_s, *args, &block)
+      client.send(action.to_s, *args, &block)
     end
   end
 end

data/lib/ircmad/version.rb

@@ -1,3 +1,3 @@
 class Ircmad
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ircmad/web_socket.rb

@@ -1,3 +1,5 @@
+require "ircmad/web_socket/buffer"
+
 class Ircmad
   class WebSocket
     include Configurable
@@ -26,8 +28,16 @@ class Ircmad
 
     def run!
       puts "Stating WebSocket server on #{host}:#{port}"
+
+      Ircmad.get_channel.subscribe do |msg|
+        buffer << msg
+      end
+
       EM::WebSocket.start(:host => host, :port => port) do |socket|
         socket.onopen do |sock|
+          buffer.each do |msg|
+            socket.send msg.to_json
+          end
           subscribers[socket.object_id] = Ircmad.get_channel.subscribe { |msg| socket.send msg.to_json }
         end
 
@@ -44,5 +54,9 @@ class Ircmad
         end
       end
     end
+
+    def buffer
+      @buffer ||= Buffer.new
+    end
   end
 end

data/lib/ircmad/web_socket/buffer.rb

@@ -0,0 +1,31 @@
+class Ircmad
+  class WebSocket
+    class Buffer
+      attr_reader :ary, :max
+
+      def initialize(_max = 100)
+        @max = _max
+      end
+
+      def push(element)
+        if size > max
+          shift
+        end
+        ary << element
+      end
+      alias_method :<<, :push
+
+      def ary
+        @ary ||= []
+      end
+
+      def method_missing(action, *args, &block)
+        if ary.respond_to?(action.to_s)
+          ary.send(action.to_s, *args, &block)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/ircmad/zircon_ext.rb

@@ -3,10 +3,33 @@ class Ircmad
     def to_json
       fencoding = -> s { s.respond_to?(:force_encoding) ? s.force_encoding('UTF-8') : s }
       {
-        username: fencoding.call(from),
-        channel: fencoding.call(to),
-        body: fencoding.call(body)
+        from: fencoding.call(from),
+        to: fencoding.call(to),
+        body: fencoding.call(body),
+        type: fencoding.call(type),
+        raw: fencoding.call(raw)
       }.to_json
     end
+
+    # temporary monkey patch
+    def params
+      @params ||= begin
+        params = []
+        case
+        when !@rest[0].empty?
+          middle, trailer, = *@rest
+          params = middle.split(" ")
+        when !@rest[2].nil? && !@rest[2].empty?
+          middle, trailer, = *@rest[2, 2]
+          params = middle.split(" ")
+        when @rest[1]
+          trailer = @rest[1]
+        when @rest[3]
+          trailer = @rest[3]
+        end
+        params << trailer if trailer
+        params
+      end
+    end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: ircmad
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takatoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -49,16 +49,16 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   name: zircon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 description: Bringing IRC into WebSocket
 email:
 - toqoz403@gmail.com
@@ -78,6 +78,7 @@ files:
 - lib/ircmad/irc_client.rb
 - lib/ircmad/version.rb
 - lib/ircmad/web_socket.rb
+- lib/ircmad/web_socket/buffer.rb
 - lib/ircmad/zircon_ext.rb
 homepage: http://github.com/ToQoz/ircmad
 licenses: []