siffer 0.0.4 → 0.0.5

data/spec/registration_spec.rb

@@ -19,14 +19,14 @@ describe Siffer::Registration do
     msg.content do |xml|
       xml.SIF_Ping
     end
-    res = Rack::MockRequest.new(@server).post("/",:input => msg)
+    res = response_to(msg)
     res.body.should match(/SIF_Category>4/)
     res.body.should match(/SIF_Code>9/)
   end
   
   it "should return ACL for successful registration" do
     msg = Siffer::Messages::Register.new("Default Agent", "Default Agent")
-    res = Rack::MockRequest.new(@server).post("/",:input => msg)
+    res = response_to(msg)
     res.body.should match(/SIF_Ack/)
     res.body.should match(/SIF_Status/)
   end

data/spec/request_logger_spec.rb

@@ -1,15 +1,28 @@
 require File.join(File.dirname(__FILE__),"spec_helper")
 
 describe Siffer::RequestLogger do
-  msg = "<SIF_Message><SIF_SystemControl><SIF_Ping /></SIF_SystemControl></SIF_Message>"
-
-  it "should log requests" do
-    log = []
-    app = Rack::Builder.new do
-      use Siffer::RequestLogger, log
+  msg = "<SIF_Message><SIF_SystemControl><SIF_Ping /><SIF_Header><SIF_SourceId>Test Source</SIF_SourceId></SIF_Header></SIF_SystemControl></SIF_Message>"
+  
+  before(:each) do
+    @@log = []
+    @app = Rack::Builder.new do
+      use Siffer::RequestLogger, @@log
       run Siffer::Server.new("admin" => "none")
-    end
-    res = Rack::MockRequest.new(app).post("/", :input => msg)
-    log.size.should == 1
+    end  
+  end
+  
+  it "should log requests" do
+    res = Rack::MockRequest.new(@app).post("/", :input => msg)
+    @@log.size.should == 1
+  end
+  
+  it "should identify SIF_Source in log message" do
+    res = Rack::MockRequest.new(@app).post("/", :input => msg)
+    @@log[0].should match(/Ping request made by Test Source/)
+  end
+  
+  it "should ignore request bodies that are not SIF based" do
+    res = Rack::MockRequest.new(@app).get("/")
+    @@log[0].should match(/Unknown request made by Unknown Source/)
   end
 end

data/spec/request_spec.rb

@@ -1,5 +1,10 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
+# setup messages to use for mock requests 
+ping = "<SIF_Message><SIF_SystemControl><SIF_Ping /></SIF_SystemControl></SIF_Message>"
+status = "<SIF_Message><SIF_SystemControl><SIF_Status /></SIF_SystemControl></SIF_Message>"
+register = "<SIF_Message><SIF_Register /></SIF_Message>"
+
 describe Siffer::Request do  
   it "should provide access to the body as a SIF_Message (Siffer::Message)" do
     msg = Siffer::Messages::Register.new("register-source","source-name")
@@ -7,4 +12,14 @@ describe Siffer::Request do
     request.message.type.should == "Register"
     request.message.source_id.should == "register-source"
   end
+  
+  it "should identify message by predicate through body" do
+    Siffer::Protocol::ACCEPTABLE_PATHS.each do |name,path|
+      unless name == :root
+        req = Siffer::Request.new("rack.input" => eval(name.to_s))
+        req.should eval("be_#{name.to_s}")
+      end
+    end
+  end
+   
 end

data/spec/response_spec.rb

@@ -4,9 +4,9 @@ require 'webrick'
 Thread.abort_on_exception = true
 
 describe Siffer::Response do
-  it "should default content-type to application/xml" do
+  it "should default content-type to application/xml with UTF-8" do
     response = Siffer::Response.new()
-    response.content_type.should == Siffer::Messaging::MIME_TYPES["appxml"]
+    response.content_type.should == Siffer::Messaging::MIME_TYPES["appxmlencoded"]
   end
   
   it "should receive response from url,data" do

data/spec/server_spec.rb

@@ -27,9 +27,4 @@ describe Siffer::Server do
     }.should raise_error("Administration URL required")
   end
   
-  it "should respond to uri" do
-    server = Siffer::Server.new("admin" => 'none')
-    server.uri.should == "http://localhost:8300"
-  end
-  
 end

data/spec/spec_helper.rb

@@ -19,8 +19,17 @@ end
 # the Response object for each Request.
 def for_every_path(options = {}, &block)
   component = options.delete(:on)
+  options["CONTENT_TYPE"] ||= Siffer::Messaging::MIME_TYPES["appxml"]
   Siffer::Protocol::ACCEPTABLE_PATHS.each do |name,path|
     res = Rack::MockRequest.new(component).post(path,options)
     yield res
   end
+end
+
+# Provides the minium to get a response from a Siffer::Server
+def response_to(msg, &block)
+  Rack::MockRequest.new(Siffer::Server.new("admin" => "none")
+                    ).post("/",{
+                    :input => msg, 
+                    "CONTENT_TYPE" => Siffer::Messaging::MIME_TYPES["appxml"]})
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: siffer
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Clint Hill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -07:00
+date: 2009-01-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,24 +85,25 @@ files:
 - spec/response_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- lib/agent.rb
-- lib/container.rb
-- lib/messages
-- lib/messages/ack.rb
-- lib/messages/acl.rb
-- lib/messages/error.rb
-- lib/messages/message.rb
-- lib/messages/register.rb
-- lib/messages/request_body.rb
-- lib/messages/status.rb
-- lib/messages.rb
-- lib/messaging.rb
-- lib/protocol.rb
-- lib/registration.rb
-- lib/request.rb
-- lib/request_logger.rb
-- lib/response.rb
-- lib/server.rb
+- lib/siffer
+- lib/siffer/agent.rb
+- lib/siffer/container.rb
+- lib/siffer/messages
+- lib/siffer/messages/ack.rb
+- lib/siffer/messages/acl.rb
+- lib/siffer/messages/error.rb
+- lib/siffer/messages/message.rb
+- lib/siffer/messages/register.rb
+- lib/siffer/messages/request_body.rb
+- lib/siffer/messages/status.rb
+- lib/siffer/messages.rb
+- lib/siffer/messaging.rb
+- lib/siffer/protocol.rb
+- lib/siffer/registration.rb
+- lib/siffer/request.rb
+- lib/siffer/request_logger.rb
+- lib/siffer/response.rb
+- lib/siffer/server.rb
 - lib/siffer.rb
 - doc/rdoc
 - doc/rdoc/classes
@@ -134,24 +135,25 @@ files:
 - doc/rdoc/created.rid
 - doc/rdoc/files
 - doc/rdoc/files/lib
-- doc/rdoc/files/lib/agent_rb.html
-- doc/rdoc/files/lib/container_rb.html
-- doc/rdoc/files/lib/messages
-- doc/rdoc/files/lib/messages/ack_rb.html
-- doc/rdoc/files/lib/messages/acl_rb.html
-- doc/rdoc/files/lib/messages/error_rb.html
-- doc/rdoc/files/lib/messages/message_rb.html
-- doc/rdoc/files/lib/messages/register_rb.html
-- doc/rdoc/files/lib/messages/request_body_rb.html
-- doc/rdoc/files/lib/messages/status_rb.html
-- doc/rdoc/files/lib/messages_rb.html
-- doc/rdoc/files/lib/messaging_rb.html
-- doc/rdoc/files/lib/protocol_rb.html
-- doc/rdoc/files/lib/registration_rb.html
-- doc/rdoc/files/lib/request_logger_rb.html
-- doc/rdoc/files/lib/request_rb.html
-- doc/rdoc/files/lib/response_rb.html
-- doc/rdoc/files/lib/server_rb.html
+- doc/rdoc/files/lib/siffer
+- doc/rdoc/files/lib/siffer/agent_rb.html
+- doc/rdoc/files/lib/siffer/container_rb.html
+- doc/rdoc/files/lib/siffer/messages
+- doc/rdoc/files/lib/siffer/messages/ack_rb.html
+- doc/rdoc/files/lib/siffer/messages/acl_rb.html
+- doc/rdoc/files/lib/siffer/messages/error_rb.html
+- doc/rdoc/files/lib/siffer/messages/message_rb.html
+- doc/rdoc/files/lib/siffer/messages/register_rb.html
+- doc/rdoc/files/lib/siffer/messages/request_body_rb.html
+- doc/rdoc/files/lib/siffer/messages/status_rb.html
+- doc/rdoc/files/lib/siffer/messages_rb.html
+- doc/rdoc/files/lib/siffer/messaging_rb.html
+- doc/rdoc/files/lib/siffer/protocol_rb.html
+- doc/rdoc/files/lib/siffer/registration_rb.html
+- doc/rdoc/files/lib/siffer/request_logger_rb.html
+- doc/rdoc/files/lib/siffer/request_rb.html
+- doc/rdoc/files/lib/siffer/response_rb.html
+- doc/rdoc/files/lib/siffer/server_rb.html
 - doc/rdoc/files/lib/siffer_rb.html
 - doc/rdoc/files/LICENSE.html
 - doc/rdoc/files/README_rdoc.html

data/doc/rdoc/files/lib/agent_rb.html

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>File: agent.rb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-  <div id="fileHeader">
-    <h1>agent.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/agent.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sat Jan 17 23:26:22 -0700 2009</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>

data/doc/rdoc/files/lib/container_rb.html

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>File: container.rb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-  <div id="fileHeader">
-    <h1>container.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/container.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sun Dec 28 10:26:15 -0700 2008</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-    <div id="requires-list">
-      <h3 class="section-bar">Required files</h3>
-
-      <div class="name-list">
-      daemons/daemonize&nbsp;&nbsp;
-      </div>
-    </div>
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>

data/doc/rdoc/files/lib/messages/ack_rb.html

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>File: ack.rb</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-  <div id="fileHeader">
-    <h1>ack.rb</h1>
-    <table class="header-table">
-    <tr class="top-aligned-row">
-      <td><strong>Path:</strong></td>
-      <td>lib/messages/ack.rb
-      </td>
-    </tr>
-    <tr class="top-aligned-row">
-      <td><strong>Last Update:</strong></td>
-      <td>Sat Jan 17 13:55:33 -0700 2009</td>
-    </tr>
-    </table>
-  </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>