syslog_protocol 0.9.0 → 0.9.1

data/lib/syslog_protocol.rb

@@ -4,5 +4,5 @@ require 'syslog_protocol/logger'
 require 'syslog_protocol/parser'
 
 module SyslogProtocol
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/lib/syslog_protocol/packet.rb

@@ -2,7 +2,7 @@ module SyslogProtocol
   class Packet
     attr_reader :facility, :severity, :hostname, :tag
     attr_accessor :time, :content
-        
+
     def to_s
       assemble
     end
@@ -12,12 +12,17 @@ module SyslogProtocol
         raise "Could not assemble packet without hostname, tag, facility, and severity"
       end
       data = "<#{pri}>#{generate_timestamp} #{@hostname} #{@tag}: #{@content}"
-      while data.bytesize > 1024
-        data = data[0..(data.length-2)]
+
+      if string_bytesize(data) > 1024
+        data = data.slice(0, 1024)
+        while string_bytesize(data) > 1024
+          data = data.slice(0, data.length - 1)
+        end
       end
+
       data
     end
-    
+
     def facility=(f)
       if f.is_a? Integer
         if (0..23).include?(f)
@@ -103,7 +108,7 @@ module SyslogProtocol
       @facility = p / 8
       @severity = p - (@facility * 8)
     end
-    
+
     def generate_timestamp
       time = @time || Time.now
       # The timestamp format requires that a day with fewer than 2 digits have
@@ -112,11 +117,19 @@ module SyslogProtocol
       day = day.sub(/^0/, ' ') if day =~ /^0\d/
       time.strftime("%b #{day} %H:%M:%S")
     end
-    
+
+    if "".respond_to?(:bytesize)
+      def string_bytesize(string)
+        string.bytesize
+      end
+    else
+      def string_bytesize(string)
+        string.length
+      end
+    end
+
     SEVERITIES.each do |k,v|
-      define_method("#{k}?") {SEVERITIES[k] == @severity}
+      define_method("#{k}?") { SEVERITIES[k] == @severity }
     end
-    
   end
-
 end

data/syslog_protocol.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'syslog_protocol'
-  s.version           = '0.9.0'
+  s.version           = '0.9.1'
   s.date              = "2009-08-01"
   # s.rubyforge_project = 'syslog_protocol'
 

data/test/helper.rb

@@ -10,4 +10,4 @@ end
 require 'bacon'
 Bacon.summary_at_exit
 
-require 'syslog_proto'
+require 'syslog_protocol'

data/test/test_logger.rb

@@ -1,15 +1,15 @@
 require File.expand_path('../helper', __FILE__)
 
 describe "syslog logger" do
-  
+
   it "create a new logger with hostname and facility" do
-    lambda {@logger = SyslogProto::Logger.new("space_station", 'test', "local0")}.should.not.raise
+    lambda {@logger = SyslogProtocol::Logger.new("space_station", 'test', "local0")}.should.not.raise
   end
-  
+
   it "hostname and facility must conform to the requirements of a Packet" do
-    lambda {SyslogProto::Logger.new("space station", "some shit", 'test test')}.should.raise ArgumentError
+    lambda {SyslogProtocol::Logger.new("space station", "some shit", 'test test')}.should.raise ArgumentError
   end
-  
+
   it "generates packets" do
     # We have to set a time so we have a consistant timestamp to check against..
     p = @logger.instance_variable_get("@packet")
@@ -24,5 +24,5 @@ describe "syslog logger" do
     @logger.alert("LEAKING ATMOSPHERE").should.equal "<129>#{ts} space_station test: LEAKING ATMOSPHERE"
     @logger.emerg("LEAKING ASTRONAUTS WE ARE DONE").should.equal "<128>#{ts} space_station test: LEAKING ASTRONAUTS WE ARE DONE"
   end
-  
+
 end

data/test/test_packet.rb

@@ -1,23 +1,23 @@
 require File.expand_path('../helper', __FILE__)
 
 describe "a syslog packet" do
-  
-  @p = SyslogProto::Packet.new
-  
+
+  @p = SyslogProtocol::Packet.new
+
   it "should embarrass a person who does not set the fields" do
     lambda { @p.to_s }.should.raise RuntimeError
   end
-  
+
   it "hostname may not be omitted" do
     lambda {@p.hostname = ""}.should.raise ArgumentError
   end
-  
+
   it "hostname may only contain ASCII characters 33-126 (no spaces!)" do
     lambda {@p.hostname = "linux box"}.should.raise ArgumentError
     lambda {@p.hostname = "\000" + "linuxbox"}.should.raise ArgumentError
     lambda {@p.hostname = "space_station"}.should.not.raise
   end
-  
+
   it 'tag may only contain ASCII characters 33-126 (no spaces!)' do
     lambda {@p.tag = "linux box"}.should.raise ArgumentError
     lambda {@p.tag = "\000" + "linuxbox"}.should.raise ArgumentError
@@ -27,66 +27,70 @@ describe "a syslog packet" do
   it "facility may only be set within 0-23 or with a proper string name" do
     lambda {@p.facility = 666}.should.raise ArgumentError
     lambda {@p.facility = "mir space station"}.should.raise ArgumentError
-    
+
     lambda {@p.facility = 16}.should.not.raise
     @p.facility.should.equal 16
     lambda {@p.facility = 'local0'}.should.not.raise
     @p.facility.should.equal 16
   end
-  
+
   it "severity may only be set within 0-7 or with a proper string name" do
     lambda {@p.severity = 9876}.should.raise ArgumentError
     lambda {@p.severity = "omgbroken"}.should.raise ArgumentError
-    
+
     lambda {@p.severity = 6}.should.not.raise
     @p.severity.should.equal 6
     lambda {@p.severity = 'info'}.should.not.raise
     @p.severity.should.equal 6
   end
-  
+
   it "severity can be checked using 'some_severity?' methods" do
     @p.info?.should.equal true
     @p.alert?.should.equal false
     @p.emerg?.should.equal false
   end
-  
+
   it "PRI is calculated from the facility and severity" do
     @p.pri.should.equal 134
   end
-  
+
   it "PRI may only be within 0-191" do
     lambda {@p.pri = 22331}.should.raise ArgumentError
     lambda {@p.pri = "foo"}.should.raise ArgumentError
   end
-  
+
   it "facility and severity are deduced and set from setting a valid PRI" do
     @p.pri = 165
     @p.severity.should.equal 5
     @p.facility.should.equal 20
   end
-  
+
   it "return the proper names for facility and severity" do
     @p.severity_name.should.equal 'notice'
     @p.facility_name.should.equal 'local4'
   end
-  
+
   it "set a message, which apparently can be anything" do
     @p.content = "exploring ze black hole"
     @p.content.should.equal "exploring ze black hole"
   end
-  
+
   it "timestamp must conform to the retarded format" do
     @p.generate_timestamp.should.match /(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\s|[1-9])\d\s\d\d:\d\d:\d\d/
   end
-  
+
   it "use the current time and assemble the packet" do
     timestamp = @p.generate_timestamp
     @p.to_s.should.equal "<165>#{timestamp} space_station test: exploring ze black hole"
   end
-  
+
   it "packets larger than 1024 will be truncated" do
     @p.content = "space warp" * 1000
-    @p.to_s.bytesize.should.equal 1024
+    if "".respond_to?(:bytesize)
+      @p.to_s.bytesize.should.equal 1024
+    else
+      @p.to_s.size.should.equal 1024
+    end
   end
-  
+
 end

data/test/test_parser.rb

@@ -1,9 +1,9 @@
 require File.expand_path('../helper', __FILE__)
 
 describe "syslog packet parser" do
-  
+
   it "parse some valid packets" do
-    p = SyslogProto.parse("<34>Oct 11 22:14:15 mymachine su: 'su root' failed for lonvick on /dev/pts/8")
+    p = SyslogProtocol.parse("<34>Oct 11 22:14:15 mymachine su: 'su root' failed for lonvick on /dev/pts/8")
     p.facility.should.equal 4
     p.severity.should.equal 2
     p.pri.should.equal 34
@@ -11,8 +11,8 @@ describe "syslog packet parser" do
     p.tag.should.equal 'su'
     p.content.should.equal "'su root' failed for lonvick on /dev/pts/8"
     p.time.should.equal Time.parse("Oct 11 22:14:15")
-    
-    p = SyslogProto.parse("<13>Feb  5 17:32:18 10.0.0.99 test: Use the BFG!")
+
+    p = SyslogProtocol.parse("<13>Feb  5 17:32:18 10.0.0.99 test: Use the BFG!")
     p.facility.should.equal 1
     p.severity.should.equal 5
     p.pri.should.equal 13
@@ -21,27 +21,27 @@ describe "syslog packet parser" do
     p.content.should.equal "Use the BFG!"
     p.time.should.equal Time.parse("Feb  5 17:32:18")
   end
-  
+
   it "treat a packet with no valid PRI as all content, setting defaults" do
-    p = SyslogProto.parse("nomnom")
+    p = SyslogProtocol.parse("nomnom")
     p.facility.should.equal 1
     p.severity.should.equal 5
     p.pri.should.equal 13
     p.hostname.should.equal 'unknown'
     p.content.should.equal "nomnom"
   end
-  
+
   it "PRI with preceding 0's shall be considered invalid" do
-    p = SyslogProto.parse("<045>Oct 11 22:14:15 space_station my PRI is not valid")
+    p = SyslogProtocol.parse("<045>Oct 11 22:14:15 space_station my PRI is not valid")
     p.facility.should.equal 1
     p.severity.should.equal 5
     p.pri.should.equal 13
     p.hostname.should.equal 'unknown'
     p.content.should.equal "<045>Oct 11 22:14:15 space_station my PRI is not valid"
   end
-  
+
   it "allow the user to pass an origin to be used as the hostname if packet is invalid" do
-    p = SyslogProto.parse("<045>Oct 11 22:14:15 space_station my PRI is not valid", '127.0.0.1')
+    p = SyslogProtocol.parse("<045>Oct 11 22:14:15 space_station my PRI is not valid", '127.0.0.1')
     p.facility.should.equal 1
     p.severity.should.equal 5
     p.pri.should.equal 13

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: syslog_protocol
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Jake Douglas
@@ -23,11 +22,9 @@ dependencies:
   name: bacon
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -69,27 +66,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: Syslog protocol parser and generator