progstr-ruby 1.0.0 → 1.0.2

data/Gemfile

@@ -5,7 +5,6 @@ source "http://rubygems.org"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-gem "json"
 gem "multi_json"
 
 group :development do

data/Gemfile.lock

@@ -6,7 +6,6 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.3)
     multi_json (1.0.3)
     rake (0.9.2)
     rcov (0.9.9)
@@ -18,7 +17,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.2)
-  json
   multi_json
   rcov
   shoulda

data/Rakefile

@@ -17,9 +17,9 @@ Jeweler::Tasks.new do |gem|
   gem.name = "progstr-ruby"
   gem.homepage = "http://github.com/progstr/progstr-ruby"
   gem.license = "MIT"
-  gem.summary = %Q{progstr.log Ruby client library}
-  gem.description = %Q{progstr.log application logging service API client library.}
-  gem.email = "hristo@deshev.com"
+  gem.summary = %Q{Progstr Logger -- Ruby client library}
+  gem.description = %Q{Progstr Logger application logging service API client library.}
+  gem.email = "hristo@progstr.com"
   gem.authors = ["Hristo Deshev"]
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

data/lib/progstr/client.rb

@@ -34,7 +34,7 @@ module Progstr
     end
 
     def execute(message)
-      json = MultiJson.encode(message)
+      json = MultiJson.encode(message.to_hash)
       Progstr::HttpClient::post("v1/log", json)
     end
   end

data/lib/progstr/log_message.rb

@@ -17,10 +17,6 @@ module Progstr
       {:text => @text, :source => @source, :host => get_host(@host), :level => LEVELS[@level], :time => encode_time(@time)}
     end
 
-    def to_json
-      to_hash.to_json
-    end
-
     def encode_time(time)
       time ||= Time.now
       (time.to_f * 1000).to_i

data/lib/progstr/logger_device.rb

@@ -11,7 +11,9 @@ module Progstr
     end
 
     def write(message)
-      Progstr::Client::send(message)
+      if !message.nil?
+        Progstr::Client::send(message)
+      end
     end
 
     def close
@@ -19,15 +21,20 @@ module Progstr
 
     def formatter
       proc do |severity, datetime, progname, msg|
-        Progstr::LogMessage.new :text => msg,
-          :level => resolve_level(severity),
-          :time => datetime,
-          :source => resolve_source(progname)
+        level = resolve_level(severity)
+        if !level.nil?
+          Progstr::LogMessage.new :text => msg,
+            :level => level,
+            :time => datetime,
+            :source => resolve_source(progname)
+        else
+          nil
+        end
       end
     end
 
     def resolve_level(severity)
-      LEVELS_MAP[severity] || :info
+      LEVELS_MAP[severity]
     end
 
     def resolve_source(progname)

data/progstr-ruby.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{progstr-ruby}
+  s.version = "1.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Hristo Deshev}]
+  s.date = %q{2011-09-01}
+  s.description = %q{Progstr Logger application logging service API client library.}
+  s.email = %q{hristo@progstr.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/progstr.rb",
+    "lib/progstr/client.rb",
+    "lib/progstr/config.rb",
+    "lib/progstr/httpclient.rb",
+    "lib/progstr/log_message.rb",
+    "lib/progstr/logger.rb",
+    "lib/progstr/logger_device.rb",
+    "lib/progstr/rails_logger.rb",
+    "lib/progstr/threadpool.rb",
+    "progstr-ruby.gemspec",
+    "script/test-post.rb",
+    "test/helper.rb",
+    "test/test_formatter.rb",
+    "test/test_progstr.rb"
+  ]
+  s.homepage = %q{http://github.com/progstr/progstr-ruby}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
+  s.summary = %q{Progstr Logger -- Ruby client library}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<multi_json>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<multi_json>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/test/test_progstr.rb

@@ -40,7 +40,7 @@ class TestProgstrRuby < Test::Unit::TestCase
       :level => :error,
       :time => newYear
 
-    json = MultiJson.encode(message)
+    json = MultiJson.encode(message.to_hash)
     assert_match /"source":"progstr.something"/, json
     assert_match /"host":"dev-machine"/, json
     assert_match /"text":"test message"/, json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progstr-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-12 00:00:00.000000000Z
+date: 2011-09-01 00:00:00.000000000Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &15006000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *15006000
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &15005520 !ruby/object:Gem::Requirement
+  requirement: &13821980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15005520
+  version_requirements: *13821980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15005040 !ruby/object:Gem::Requirement
+  requirement: &13840640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15005040
+  version_requirements: *13840640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15004560 !ruby/object:Gem::Requirement
+  requirement: &13840160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15004560
+  version_requirements: *13840160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15004080 !ruby/object:Gem::Requirement
+  requirement: &13839680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *15004080
+  version_requirements: *13839680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15003600 !ruby/object:Gem::Requirement
+  requirement: &13839200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,9 +65,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15003600
-description: progstr.log application logging service API client library.
-email: hristo@deshev.com
+  version_requirements: *13839200
+description: Progstr Logger application logging service API client library.
+email: hristo@progstr.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -101,6 +90,7 @@ files:
 - lib/progstr/logger_device.rb
 - lib/progstr/rails_logger.rb
 - lib/progstr/threadpool.rb
+- progstr-ruby.gemspec
 - script/test-post.rb
 - test/helper.rb
 - test/test_formatter.rb
@@ -120,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1547365430839715510
+      hash: 1030051969532090954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,5 +122,5 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: progstr.log Ruby client library
+summary: Progstr Logger -- Ruby client library
 test_files: []