langrove 0.0.4.4 → 0.0.4.5

data/functional/config/daemons.yml

@@ -4,9 +4,9 @@
         :protocol:
             :class: SocketToFile
         :adaptor:
-            :connection: Datagram
             :iface: 127.0.0.1
             :port: 12701
+            :transport: udp
         :client: 
             :class: SocketToFile
         :handler: 

data/lib/langrove/_base.rb

@@ -10,6 +10,7 @@ module Client; end
 module Daemon; end
 module Handler; end
 module Protocol; end
+module Job; end
 
 module LanGrove
   
@@ -24,3 +25,4 @@ require 'langrove/adaptor/base'
 require 'langrove/handler/base'
 require 'langrove/protocol/base'
 require 'langrove/client/base'
+require 'langrove/job/base'

data/lib/langrove/adaptor/base.rb

@@ -1,3 +1,2 @@
 module LanGrove::Adaptor; end
 require 'langrove/adaptor_base'
-require 'langrove/adaptor/datagram'

data/lib/langrove/adaptor_base.rb

@@ -10,26 +10,104 @@ module LanGrove::Adaptor
     
       @config = config
       @logger = logger
-    
+      
+      @transport = :tcp
       @iface     = '127.0.0.1'
       @port      = 12701
       
-      @iface   = @config[ :iface ] if @config.has_key? :iface
-      @port    = @config[ :port ]  if @config.has_key? :port
+      @iface     = @config[ :iface ] if @config.has_key? :iface
+      @port      = @config[ :port ]  if @config.has_key? :port
+      @transport = @config[ :transport ].to_sym  if @config.has_key? :transport
       
-      if @config.has_key? :connector then
+      #
+      # Assign the call signature for the EventMachine server
+      #
+      @em_server_call = case @transport
         
-        #
-        # TODO: may need to override default connection handler
-        #
+        when :tcp
+          
+          :start_server
+          
+        when :udp
+          
+          :open_datagram_socket
+          
+        else
+          
+          :start_server
         
       end
     
     end
   
     def listen( client, protocol, handler )
+      
+      #
+      # <client> = {
+      # 
+      #    :class   => <loaded class constant>
+      #    :config  => <client's branch of config>
+      # 
+      # } 
+      # 
+      # <protocol> = {  ...the same, but protocolic }
+      #
+      #
     
-      raise LanGrove::DaemonConfigException.new( "NotYetExtended: undefined listen()" )
+      @logger.info "starting listen at UDP #{@iface}:#{@port}"
+      
+      EventMachine::send( @em_server_call, @iface, @port, 
+      
+        client[:class] ) do | client_connected |
+          
+          #
+          # @em_server_call as:
+          # 
+          # udp - EM::open_datagram_socket, yields an instance of 
+          #       client[:class] into here on bind to the port 
+          #
+          #       ie. at starting to listen
+          #       
+          #       unverified: ? If more than 1 datagram source is 
+          #                   transmitting to here - will there still
+          #                   still be only ONE EM:Connection instance?
+          # 
+          # tcp - EM::start_server yields an new instance of client[:class]
+          #       with every connecting socket pair.
+          #
+          #       ie. On socket pair binding - so each remote client will 
+          #           have it's own associated instance of a client[:class] 
+          #           running in the machine.
+          #
+          
+          
+          #
+          # Initialize the client with the (application layer) Protocol
+          #
+          
+          client_connected.logger = @logger
+          
+          client_connected.config = client[ :config ]
+          
+          client_connected.protocol = protocol[ :class ]\
+          
+            .new( protocol[ :config ], @logger )
+            
+          @logger.info( "TODO: make a reference to the Client on the Handler" )
+     
+          #
+          # Bi-Directionally bind the Client and Handler
+          #
+          handler.connect( client_connected )
+          client_connected.handler = handler
+          
+          #
+          # Client is ready and running inside the reactor
+          #
+          # EM::start_server will yield again on the next connect.
+          # 
+          
+      end
     
     end
   

data/lib/langrove/client_base.rb

@@ -64,9 +64,25 @@ module LanGrove
       end
 
       def receive_data( data )
-
+        
+        #
+        # Event machine writes into here at receiving data 
+        # from the client. 
+        # 
+        
         receive( @protocol.decode( data ) )
         
+        # 
+        # ?Multi-message protocol? 
+        # 
+        # @protocol.accumulate( multi_message_part, self )
+        #
+        #   ---- With protocol responding directly to source
+        # 
+        #   ---- With protocol then calling receive_decoded()
+        #        via the self being passed in. 
+        #   
+        
       end
       
     end

data/lib/langrove/daemon_base.rb

@@ -130,9 +130,20 @@ module LanGrove::Daemon class Base
       
       @server    = @my_config[ :server ] if @my_config.has_key? :server
       
-      @logger.info "TODO: fall back to default Adaptor::Base"
       
-      adaptor    = @my_config[ :adaptor ][ :connection ]
+      
+      if @my_config[ :adaptor ].has_key? :class
+        
+        adaptor    = @my_config[ :adaptor ][ :class ]
+        
+      else
+      
+        @logger.warn( "Defaulting to Adaptor::Base" )
+        adaptor    = 'Base'
+      
+      end
+      
+      
       
       @logger.info "TODO: fall back to default Handler::Base"
       
@@ -165,7 +176,10 @@ module LanGrove::Daemon class Base
     # daemons:
     #   name_of_daemon:
     #     adaptor:
-    #       connection: TcpServer  <----------
+    #       class: MySocket  <----------( optional )
+    #       transport: tcp|udp
+    #       iface: N.N.n.n
+    #       port: nNn
     #     handler:
     #       collection: CollectionOfClients 
     #

data/lib/langrove/job/base.rb

@@ -0,0 +1 @@
+require 'langrove/job_base'

data/lib/langrove/job_base.rb

@@ -0,0 +1,24 @@
+#
+# no spec 
+#
+module LanGrove
+  
+  module Job
+    
+    class Base
+      
+      def initialize( config, queue_name, logger)
+        
+        logger.info ( "starting unimplemented queuer") unless logger.nil?
+        
+      end
+   
+      def method_missing( symbol, *args, &block )
+        puts "#{self}.#{symbol}( #{args} )" unless @parameter == :silent
+      end
+      
+    end
+  
+  end
+
+end

data/lib/langrove/version.rb

@@ -1,3 +1,3 @@
 module LanGrove
-  Version = VERSION = '0.0.4.4'
+  Version = VERSION = '0.0.4.5'
 end

data/spec/langrove/adaptor_base_spec.rb

@@ -16,15 +16,30 @@ describe LanGrove::Adaptor::Base do
       
       :connector => @extendhandler,
       
-      :client => {
-        
-       :class => 'Base'
-       
-      }
+      :transport => 'udp'
     }
     
   end
   
+  
+  
+  it 'assigns the session layer protocol as udp' do
+    
+    subject = LanGrove::Adaptor::Base.new( @config, @logger )
+    subject.instance_variable_get( :@em_server_call ).should == :open_datagram_socket
+    
+  end
+  
+  it 'assigns the session layer protocol as tcp by default' do
+    
+    @config.delete :transport
+    
+    subject = LanGrove::Adaptor::Base.new( @config, @logger )
+    
+    subject.instance_variable_get( :@em_server_call ).should == :start_server
+    
+  end
+  
   pending 'may need to override default connection handler' do
     
     LanGrove::Adaptor.const_set( @extendhandler, Class.new )
@@ -32,7 +47,7 @@ describe LanGrove::Adaptor::Base do
     subject = LanGrove::Adaptor::Base.new( @config, @logger )
     connector = subject.instance_variable_get( :@handler )
     
-    connector.should be_a( LanGrove::Adaptor.const_get( @extendhandler ) )
+    connector.should == LanGrove::Adaptor.const_get( @extendhandler )
     
   end
   

data/spec/langrove/daemon_base_spec.rb

@@ -4,11 +4,11 @@ describe LanGrove::Daemon::Base do
   
   before :each do
     
-    @logger = LanGrove::FakeLogger.new  :silent
+    @logger = LanGrove::FakeLogger.new :silent
     
     @daemon_name = 'pretend_daemon'
     
-    @adaptor_class = 'Base'
+    @adaptor_class = 'MyEventMachineServer'
     @collection_class = 'Base'
     @client_class = 'Base'
     @protocol_class = 'Base'
@@ -23,7 +23,7 @@ describe LanGrove::Daemon::Base do
           
           :adaptor => {
             
-            :connection => @adaptor_class
+            # Test default
             
           },
           
@@ -62,7 +62,11 @@ describe LanGrove::Daemon::Base do
     
       LanGrove::Daemon::Base.new( @config, @daemon_name, nil )
     
-    }.to raise_error( LanGrove::DaemonConfigException, /Requires a logger/ )
+    }.to raise_error( LanGrove::DaemonConfigException, 
+    
+      /Requires a logger/ 
+      
+    )
     
   end
   
@@ -72,15 +76,36 @@ describe LanGrove::Daemon::Base do
       
       LanGrove::Daemon::Base.new( {}, @daemon_name, @logger )
       
-    }.to raise_error( LanGrove::DaemonConfigException, /Missing config item/ )
+    }.to raise_error( LanGrove::DaemonConfigException, 
+    
+      /Missing config item/ 
+      
+    )
     
   end
   
-  it 'latebinds an adaptor by config' do
+  it 'attempts to latebind an adaptor by config' do
+    
+    @config[ :daemons ][ @daemon_name ][ :adaptor ][ :class ] = @adaptor_class
+    
+    expect {
+     
+      LanGrove::Daemon::Base.new( @config, @daemon_name, @logger )
+      
+    }.to raise_error( LanGrove::ClassLoaderException, 
+    
+    
+      "no such file to load -- adaptor/my_event_machine_server.rb"
+    
+    )
+    
+  end
+  
+  it 'defaults to Adaptor::Base' do
     
-    adaptor = subject.instance_variable_get( :@adaptor )
     
-    adaptor.should be_a( LanGrove::Adaptor.const_get( @adaptor_class ) )
+    adaptor = subject.instance_variable_get( :@adaptor )
+    adaptor.should be_a( LanGrove::Adaptor::Base )
     
   end
   
@@ -125,17 +150,5 @@ describe LanGrove::Daemon::Base do
   end
   
   it 'it schedules periodics' 
-  
-  it 'when run, it calls to listen if server is true' do
-    
-    expect {
-      
-      subject.instance_variable_set( :@server, true )
-      
-      subject.run
-      
-    }.to raise_error( LanGrove::DaemonConfigException, "NotYetExtended: undefined listen()" )
-    
-  end
 
 end

data/spec/langrove/job_base_spec.rb

@@ -0,0 +1,28 @@
+require 'langrove'
+
+describe LanGrove::Job::Base do
+  
+  before :each do
+    
+    @logger = LanGrove::FakeLogger.new
+    
+    @queue_name = :snooker_queue
+    
+    @config = {}
+    
+  end
+  
+  it 'initializes' do
+    
+    test = LanGrove::Job::Base.new( @config, @queue_name, @logger )
+    test.should be_a( LanGrove::Job::Base )
+    
+  end 
+  
+  it 'has methods' do
+    
+    LanGrove::Job::Base.new( @config, @queue_name, @logger ).undefined_method( "TEST" )
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: langrove
 version: !ruby/object:Gem::Version
-  version: 0.0.4.4
+  version: 0.0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2153525920 !ruby/object:Gem::Requirement
+  requirement: &70148317913640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153525920
+  version_requirements: *70148317913640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153525420 !ruby/object:Gem::Requirement
+  requirement: &70148317912900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *2153525420
+  version_requirements: *70148317912900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153524900 !ruby/object:Gem::Requirement
+  requirement: &70148317912160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2153524900
+  version_requirements: *70148317912160
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2153524160 !ruby/object:Gem::Requirement
+  requirement: &70148317911420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,10 +63,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *2153524160
+  version_requirements: *70148317911420
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &2153523420 !ruby/object:Gem::Requirement
+  requirement: &70148317910660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153523420
+  version_requirements: *70148317910660
 - !ruby/object:Gem::Dependency
   name: daemon-kit
-  requirement: &2153522680 !ruby/object:Gem::Requirement
+  requirement: &70148317909900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: 0.1.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153522680
+  version_requirements: *70148317909900
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2153521940 !ruby/object:Gem::Requirement
+  requirement: &70148317909160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -105,7 +105,7 @@ dependencies:
         version: 1.20.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153521940
+  version_requirements: *70148317909160
 description: ''
 email: richard@clue.co.za
 executables:
@@ -134,7 +134,6 @@ files:
 - functional/tmp/README
 - lib/langrove/_base.rb
 - lib/langrove/adaptor/base.rb
-- lib/langrove/adaptor/datagram.rb
 - lib/langrove/adaptor_base.rb
 - lib/langrove/client/base.rb
 - lib/langrove/client/datagram.rb
@@ -151,13 +150,14 @@ files:
 - lib/langrove/ext.rb
 - lib/langrove/handler/base.rb
 - lib/langrove/handler_base.rb
+- lib/langrove/job/base.rb
+- lib/langrove/job_base.rb
 - lib/langrove/protocol/base.rb
 - lib/langrove/protocol/syslog.rb
 - lib/langrove/protocol_base.rb
 - lib/langrove/version.rb
 - lib/langrove.rb
 - spec/functional/daemon/datagram_spec.rb
-- spec/langrove/adaptor/datagram_spec.rb
 - spec/langrove/adaptor_base_spec.rb
 - spec/langrove/client/datagram_spec.rb
 - spec/langrove/client_base_spec.rb
@@ -170,6 +170,7 @@ files:
 - spec/langrove/ext/persistable_spec.rb
 - spec/langrove/ext/string_spec.rb
 - spec/langrove/handler_base_spec.rb
+- spec/langrove/job_base_spec.rb
 - spec/langrove/protocol/syslog_spec.rb
 - spec/langrove/protocol_base_spec.rb
 - spec/todo_spec.rb
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: eventmachine based networked daemon framework

data/lib/langrove/adaptor/datagram.rb

@@ -1,63 +0,0 @@
-require 'langrove/adaptor/base'
-
-module LanGrove::Adaptor
-  
-  class Datagram < Base
-    
-    def listen( client, protocol, handler )
-      
-      #
-      # <client> = {
-      # 
-      #    :class   => <loaded class constant>
-      #    :config  => <client's branch of config>
-      # 
-      # } 
-      # 
-      # <protocol> = {  ...the same, but protocolic }
-      #
-      #
-    
-      @logger.info "starting listen at UDP #{@iface}:#{@port}"
-      
-      EventMachine::open_datagram_socket( @iface, @port, 
-      
-        client[:class] ) do | client_connected |
-          
-          #
-          # EM::open_datagram_socket (udp) yields on connect
-          # to the socket.
-          # 
-          # EM::start_server (tcp) yields on connect from the
-          # client.
-          #
-          
-          #
-          # Initialize the client with a Protocol
-          #
-          
-          client_connected.logger = @logger
-          
-          client_connected.config = client[ :config ]
-          
-          client_connected.protocol = protocol[ :class ]\
-          
-            .new( protocol[ :config ], @logger )
-            
-          @logger.info( "TODO: make a reference to the Client on the Handler" )
-     
-          #
-          # Insert the Client into th Handler collection
-          #
-          handler.connect( client_connected )
-          
-          #
-          # Client is ready and running inside the reactor
-          #
-          # EM::start_server will yield again on the next connect.
-          # 
-          
-      end
-    end
-  end
-end

data/spec/langrove/adaptor/datagram_spec.rb

@@ -1,6 +0,0 @@
-require 'langrove'
-
-describe LanGrove::Adaptor::Datagram do
-  
-  
-end