schlep 0.2.2 → 0.3.0

data/lib/schlep.rb

@@ -11,6 +11,8 @@ module Schlep
 
   def app
     @app ||= ""
+
+    sanitize @app
   end
 
   def configure
@@ -44,9 +46,7 @@ module Schlep
   def hostname
     @hostname ||= `hostname`
 
-    @hostname.gsub! /\s/, "" if @hostname =~ /\s/
-
-    @hostname
+    sanitize @hostname
   end
 
   def redis
@@ -76,11 +76,26 @@ module Schlep
   end
 
   def serialize_message(message)
-    return message if [String, Fixnum, Float].index message.class
-    message.to_json
+    return message unless message.is_a? String
+
+    begin
+      JSON.parse message
+    rescue JSON::ParserError
+      message
+    end
   end
 
   def timestamp
     Time.now.to_f
   end
+
+  private
+
+  def sanitize(string)
+    string.gsub! /\s/, ""
+    string.gsub! /^[^\w]+|[^\w]+$/, ""
+    string.gsub! /[^\w\.]+/, ":"
+
+    string
+  end
 end

data/lib/schlep/version.rb

@@ -1,3 +1,3 @@
 module Schlep
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/test/schlep_test.rb

@@ -58,11 +58,6 @@ class SchlepTest < Test::Unit::TestCase
       assert Schlep.hostname.is_a? String
     end
 
-    should "strip whitespace and newlines" do
-      Schlep.hostname = "test string\n"
-      assert_equal "teststring", Schlep.hostname
-    end
-
     should "not include a newline from the hostname command" do
       assert_nil Schlep.hostname =~ /\s/
     end
@@ -123,8 +118,8 @@ class SchlepTest < Test::Unit::TestCase
   end
 
   context "serialize message" do
-    should "leave valid json alone" do
-      assert_equal "{\"one\":{\"two\":3}}",
+    should "convert json to a hash" do
+      assert_equal ({ "one" => { "two" => 3 }}),
         Schlep.serialize_message("{\"one\":{\"two\":3}}")
     end
 
@@ -133,21 +128,16 @@ class SchlepTest < Test::Unit::TestCase
         Schlep.serialize_message("test string")
     end
 
-    should "convert arrays to json" do
-      assert_equal "[1,2,[3,4]]",
+    should "leave arrays alone" do
+      assert_equal [1,2,[3,4]],
         Schlep.serialize_message([1,2,[3,4]])
     end
 
-    should "convert hashes to json" do
-      assert_equal "{\"one\":{\"two\":3}}",
+    should "leave hashes alone" do
+      assert_equal ({ :one => { :two => 3 }}),
         Schlep.serialize_message({ :one => { :two => 3 }})
     end
 
-    should "convert an array of hashes to json" do
-      assert_equal "[{\"one\":{\"two\":3}},{\"four\":{\"five\":6}}]",
-        Schlep.serialize_message([{ :one => { :two => 3 }},{ :four => { :five => 6 }}])
-    end
-
     should "leave integers alone" do
       assert_equal 123,
         Schlep.serialize_message(123)
@@ -164,4 +154,33 @@ class SchlepTest < Test::Unit::TestCase
       assert Schlep.timestamp.is_a? Float
     end
   end
+
+  # private
+
+  context "sanitize" do
+    should "strip whitespace" do
+      assert_equal "teststring",
+        Schlep.send(:sanitize, "test string")
+    end
+
+    should "strip newlines" do
+      assert_equal "test",
+        Schlep.send(:sanitize, "test\n")
+    end
+
+    should "replace special characters with a colon" do
+      assert_equal "a:b:c:d:e",
+        Schlep.send(:sanitize, "a:b/c^d$$e")
+    end
+
+    should "remove special characters at the beginning or end or a string" do
+      assert_equal "test:string",
+        Schlep.send(:sanitize, "$test$string$")
+    end
+
+    should "not replace periods" do
+      assert_equal "a.b.c.d.e",
+        Schlep.send(:sanitize, "a.b.c.d.e")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schlep
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70203744654020 !ruby/object:Gem::Requirement
+  requirement: &70227564106320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203744654020
+  version_requirements: *70227564106320
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &70203744652700 !ruby/object:Gem::Requirement
+  requirement: &70227564105360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203744652700
+  version_requirements: *70227564105360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70203744652060 !ruby/object:Gem::Requirement
+  requirement: &70227564104540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203744652060
+  version_requirements: *70227564104540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70203744650800 !ruby/object:Gem::Requirement
+  requirement: &70227564103280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203744650800
+  version_requirements: *70227564103280
 description: Ruby client for schlep. Schlep provides a simple interface for logging
   and broadcasting events.
 email: