ircmad 0.0.1 → 0.0.2

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"
+  gem.add_dependency "zircon", "0.0.4"
 end

data/lib/ircmad.rb

@@ -4,6 +4,7 @@ require 'em-websocket'
 require 'zircon'
 
 require "ircmad/version"
+require "ircmad/zircon_ext"
 require "ircmad/configurable"
 require "ircmad/irc_client"
 require "ircmad/web_socket"
@@ -42,6 +43,7 @@ class Ircmad
           set :port, c[:port] || '6667'
           set :channel_list, c[:channel_list] || []
           set :username, c[:username]
+          set :password, c[:password]
         end.run!
       }
     end

data/lib/ircmad/irc_client.rb

@@ -5,32 +5,38 @@ class Ircmad
     def initialize(&block)
       instance_eval(&block) if block_given?
 
-      unless @zircon
-        @zircon = Zircon.new config
+      @client = Zircon.new config
 
-        @zircon.send(:login) if @zircon.respond_to?(:login, true)
-        config[:channel_list].each do |channel|
-          @zircon.join channel
-        end
-      end
-      @zircon
+      @client.send(:login) if @client.respond_to?(:login, true)
+      config[:channel_list].each { |channel| @client.join channel }
     end
 
     def run!
       Ircmad.post_channel.subscribe do |msg|
-        data = JSON.parse(msg, :symbolize_names => true) rescue nil
-        privmsg data[:channel], ":#{data[:message]}"
+        parsed_msg = begin
+         JSON.parse(msg, :symbolize_names => true) rescue nil
+        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]}"
+        end
       end
 
       on_privmsg do |msg|
         Ircmad.get_channel << msg
       end
 
-      @zircon.run!
+      @client.run!
     end
 
     def method_missing(action, *args, &block)
-      @zircon.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.1"
+  VERSION = "0.0.2"
 end

data/lib/ircmad/web_socket.rb

@@ -1,14 +1,3 @@
-class Zircon::Message
-  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)
-    }.to_json
-  end
-end
-
 class Ircmad
   class WebSocket
     include Configurable

data/lib/ircmad/zircon_ext.rb

@@ -0,0 +1,12 @@
+class Ircmad
+  class Zircon::Message
+    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)
+      }.to_json
+    end
+  end
+end

metadata

@@ -2,14 +2,14 @@
 name: ircmad
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Takatoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-10 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'
+        version: 0.0.4
   name: zircon
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
 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/zircon_ext.rb
 homepage: http://github.com/ToQoz/ircmad
 licenses: []
 post_install_message: