messagefactory 0.0.2 → 0.0.3

data/README.rdoc

@@ -40,7 +40,7 @@ MessageFactory is currently tested on:
 
 === Result:
 
-    #<OpenStruct direction=:incoming, received=Fri Feb 05 19:58:42 UTC 2010, raw=":mod_spox!~mod_spox@host JOIN :#m", type=:join, source="mod_spox!~mod_spox@host", channel="#m">
+    #<MessageFactory::Message direction=:incoming, received=Fri Feb 05 19:58:42 UTC 2010, raw=":mod_spox!~mod_spox@host JOIN :#m", type=:join, source="mod_spox!~mod_spox@host", channel="#m">
 
 == Last remarks
 

data/Rakefile

@@ -13,7 +13,7 @@ require 'spec/rake/spectask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'messagefactory'
-  s.version = '0.0.2'
+  s.version = '0.0.3'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.summary = 'Objectifies content from an IRC server'

data/lib/messagefactory/Factory.rb

@@ -1,8 +1,10 @@
+require 'messagefactory/Handler'
+
 module MessageFactory
     class Factory
         # Create a new Factory
         def initialize
-            @handers = {}
+            @handlers = {}
         end
 
         # s:: string from server
@@ -11,14 +13,15 @@ module MessageFactory
             s = s.dup
             t = nil
             begin
-                if(s.slice(0,1).chr == ':')
+                if(s.slice(0,1) == ':')
                     s.slice!(0..s.index(' '))
                     t = s.slice!(0..s.index(' ')-1)
                 else
                     t = s.slice(0..s.index(' ')-1)
                 end
                 t.strip!
-            rescue
+            rescue => e
+                puts e
                 raise 'Failed to determine message type'
             end
             t.to_sym
@@ -31,10 +34,15 @@ module MessageFactory
             s = nil
             mtype = type(string)
             if(@handlers[mtype])
-                s = @handlers.process(string)
+                s = @handlers[mtype].process(string)
             else
                 if(do_require)
-                    require "messagefactory/handlers/#{mtype}"
+                    begin
+                        require "messagefactory/handlers/#{mtype}"
+                    rescue LoadError
+                        raise NoMethodError.new("No handler found to process string: #{string}")
+                    end
+                    load_handlers
                     s = process(string, false)
                 else
                     raise NoMethodError.new("No handler found to process string: #{string}")
@@ -43,5 +51,24 @@ module MessageFactory
             s
         end
 
+        private
+
+        def load_handlers
+            loaded = @handlers.values.map{|x|x.class}
+            MessageFactory::Handlers.constants.each do |cons|
+                klas = MessageFactory::Handlers.const_get(cons)
+                if(klas.is_a?(Class) && klas < MessageFactory::Handlers::Handler && !loaded.include?(klas))
+                    handler = klas.new
+                    if(handler.types_process.is_a?(Array))
+                        handler.types_process.each do |t|
+                            @handlers[t] = handler
+                        end
+                    else
+                        @handlers[handler.types_process] = handler
+                    end
+                end
+            end
+        end
+
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: messagefactory
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
   - spox
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -07:00
+date: 2010-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: []