logglier 0.2.0 → 0.2.1

data/Gemfile

@@ -1,5 +1,16 @@
-source :gemcutter
+source 'http://rubygems.org'
 
 gemspec
 
-gem "jruby-openssl", :platforms => :jruby
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'json'
+end
+
+platforms :mri_18 do
+  gem 'json'
+end
+
+platforms :rbx do
+  gem 'json'
+end

data/README.md

@@ -55,6 +55,17 @@ Example:
     Logglier.new('https://logs.loggly.com/inputs/<id>',
                  :threaded => true)
 
+#### JSON Formatting
+
+add the ':format => :json' when creating a new Logglier instance. Make
+sure to use a HTTP input that has JSON enabled. Can also be used with
+threaded delivery.
+
+Example:
+
+    Logglier.new('https://logs.loggly.com/inputs/<id>',
+                 :format => :json)
+
 ### Syslog TCP/UDP Inputs
 
     Logglier.new('[udp|tcp]://<hostname>:<port>/<facility>')
@@ -63,7 +74,6 @@ The facility is optional and defaults to 16 (local0) if none is
 specified. Facilities are just integers from 0 to 23, see
 <http://www.faqs.org/rfcs/rfc3164.html>
 
-
 Logging
 -------
 

data/lib/logglier/client/http/sync.rb

@@ -1,3 +1,5 @@
+require 'net/https'
+
 module Logglier
   module Client
     class HTTP

data/lib/logglier/client/http.rb

@@ -1,4 +1,3 @@
-require 'net/https'
 require 'uri'
 
 require File.join(File.dirname(__FILE__), 'http', 'sync')
@@ -13,6 +12,7 @@ module Logglier
 
       def initialize(opts={})
         setup_input_uri(opts)
+        @format = opts[:format] ? opts[:formt].to_sym : nil
         @deliverer = if opts[:threaded]
           Logglier::Client::HTTP::DeliveryThread.new(@input_uri, opts)
         else

data/lib/logglier/client.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Logglier
   module Client
 
@@ -57,8 +59,14 @@ module Logglier
 
       def formatter
         proc do |severity, datetime, progname, msg|
-          message = "#{datetime} "
-          message << massage_message(msg, severity)
+          if @format == :json && msg.is_a?(Hash)
+            msg.merge!({ :severity => severity,
+                         :datetime => datetime,
+                         :progname => progname }).to_json
+          else
+            message = "#{datetime} "
+            message << massage_message(msg, severity)
+          end
         end
       end
 

data/lib/logglier/version.rb

@@ -1,3 +1,3 @@
 module Logglier
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/logglier.gemspec

@@ -2,23 +2,24 @@ dir = File.dirname(__FILE__)
 require File.expand_path(File.join(dir, 'lib', 'logglier', 'version'))
 
 Gem::Specification.new do |s|
-  s.name              = "logglier"
+  s.name              = 'logglier'
   s.version           = Logglier::VERSION
   s.date              = Time.now
-  s.summary           = "Loggly 'plugin' for Logger"
-  s.description       =<<EOD
-Logger => Loggly
-EOD
+  s.summary           = 'Loggly "plugin" for Logger'
+  s.description       = 'Logger => Loggly'
 
   s.authors           = ["Edward Muller (aka freeformz)"]
-  s.email             = "edwardam@interlix.com"
-  s.homepage          = "http://github.com/freeformz/logglier"
+  s.email             = 'edwardam@interlix.com'
+  s.homepage          = 'http://github.com/freeformz/logglier'
 
   s.files             = %w{ README.md Gemfile LICENSE logglier.gemspec Rakefile } + Dir["#{dir}/lib/**/*.rb"]
-  s.require_paths     = ["lib"]
+  s.require_paths     = ['lib']
   s.test_files        = Dir["#{dir}/spec/**/*.rb"]
 
-  s.rubyforge_project = "logglier"
+  s.rubyforge_project = 'logglier'
+
+  s.required_ruby_version     = '>= 1.8.7'
+  s.required_rubygems_version = '>= 1.3.6'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.5.0'

data/spec/http_spec.rb

@@ -20,8 +20,12 @@ describe 'HTTP' do
     @http.should_receive(:request_post).exactly(2).times.and_raise Errno::ECONNRESET
     @proxy.deliver('message')
   end
+
   it "fails for other errors" do
     @http.should_receive(:request_post).once.and_raise EOFError
     @proxy.deliver('message')
   end
+
+  describe "json format" do
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: logglier
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Edward Muller (aka freeformz)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -07:00
+date: 2011-06-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,9 +48,7 @@ dependencies:
         version: 2.5.0
   type: :development
   version_requirements: *id002
-description: |
-  Logger => Loggly
-
+description: Logger => Loggly
 email: edwardam@interlix.com
 executables: []
 
@@ -68,14 +66,14 @@ files:
 - ./lib/logglier/client/http/threaded.rb
 - ./lib/logglier/client/http.rb
 - ./lib/logglier/client/syslog.rb
-- ./lib/logglier/client.rb
 - ./lib/logglier/version.rb
+- ./lib/logglier/client.rb
 - ./lib/logglier.rb
-- ./spec/client_spec.rb
 - ./spec/http_spec.rb
-- ./spec/logglier_spec.rb
-- ./spec/spec_helper.rb
 - ./spec/threaded_spec.rb
+- ./spec/spec_helper.rb
+- ./spec/client_spec.rb
+- ./spec/logglier_spec.rb
 has_rdoc: true
 homepage: http://github.com/freeformz/logglier
 licenses: []
@@ -90,29 +88,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: logglier
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Loggly 'plugin' for Logger
+summary: Loggly "plugin" for Logger
 test_files: 
-- ./spec/client_spec.rb
 - ./spec/http_spec.rb
-- ./spec/logglier_spec.rb
-- ./spec/spec_helper.rb
 - ./spec/threaded_spec.rb
+- ./spec/spec_helper.rb
+- ./spec/client_spec.rb
+- ./spec/logglier_spec.rb