recognizer 0.1.5 → 0.1.6

data/lib/recognizer/amqp.rb

@@ -2,6 +2,10 @@ require "rubygems"
 require "thread"
 require "bunny"
 
+if RUBY_PLATFORM == "java"
+  require File.join(File.dirname(__FILE__), "patches", "openssl")
+end
+
 module Recognizer
   class AMQP
     def initialize(carbon_queue, logger, options)

data/lib/recognizer/config.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require "json"
 
-require File.join(File.dirname(__FILE__), 'patches', 'hash')
+require File.join(File.dirname(__FILE__), "patches", "hash")
 
 module Recognizer
   class Config
@@ -10,7 +10,7 @@ module Recognizer
         raise "Missing config file path"
       end
       if File.readable?(options[:config_file])
-        config_file_contents = File.open(options[:config_file], 'r').read
+        config_file_contents = File.open(options[:config_file], "r").read
         begin
           @config = JSON.parse(config_file_contents)
         rescue JSON::ParserError => error

data/lib/recognizer/librato.rb

@@ -3,7 +3,11 @@ require "recognizer/version"
 require "thread"
 require "librato/metrics"
 
-require File.join(File.dirname(__FILE__), 'patches', 'float')
+require File.join(File.dirname(__FILE__), "patches", "float")
+
+if RUBY_PLATFORM == "java"
+  require File.join(File.dirname(__FILE__), "patches", "openssl")
+end
 
 module Recognizer
   class Librato
@@ -30,11 +34,11 @@ module Recognizer
             mutex.synchronize do
               begin
                 librato.submit
+                logger.info("Successfully flushed metrics to Librato")
               rescue => error
                 logger.error("Encountered an error when flushing metrics to Librato :: #{error}")
               end
             end
-            logger.info("Successfully flushed metrics to Librato")
           end
         end
       end
@@ -62,6 +66,9 @@ module Recognizer
             unless parts.first =~ /^[A-Za-z0-9\._-]*$/
               raise "metric name must only consist of alpha-numeric characters, periods, underscores, and dashes"
             end
+            unless parts.last =~ /^[0-9]{10}$/
+              raise "metric timestamp must be epoch, 10 digits"
+            end
 
             path      = parts.shift.split(".")
             value     = Float(parts.shift).pretty

data/lib/recognizer/patches/hash.rb

@@ -1,20 +1,10 @@
 class Hash
-  def symbolize_keys(item=self)
-    case item
-    when Array
-      item.map do |i|
-        symbolize_keys(i)
-      end
-    when Hash
-      Hash[
-           item.map do |key, value|
-             new_key = key.is_a?(String) ? key.to_sym : key
-             new_value = symbolize_keys(value)
-             [new_key, new_value]
-           end
-          ]
-    else
-      item
+  def symbolize_keys
+    inject(Hash.new) do |result, (key, value)|
+      new_key = key.is_a?(String) ? key.to_sym : key
+      new_value = value.is_a?(Hash) ? value.symbolize_keys : value
+      result[new_key] = new_value
+      result
     end
   end
 end

data/lib/recognizer/patches/openssl.rb

@@ -0,0 +1,8 @@
+require "openssl"
+
+module OpenSSL
+  module SSL
+    remove_const(:VERIFY_PEER)
+    const_set(:VERIFY_PEER, VERIFY_NONE)
+  end
+end

data/lib/recognizer/version.rb

@@ -1,3 +1,3 @@
 module Recognizer
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/recognizer.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
   s.add_dependency("json")
   s.add_dependency("mixlib-cli", ">= 1.1.0")
   s.add_dependency("bunny", "0.7.9")
-  s.add_dependency("librato-metrics", "0.4.2")
+  s.add_dependency("librato-metrics", "0.6.0.pre3")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recognizer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Sean Porter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-12 00:00:00 -07:00
+date: 2012-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,12 +72,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: -1876988210
         segments: 
         - 0
-        - 4
-        - 2
-        version: 0.4.2
+        - 6
+        - 0
+        - pre3
+        version: 0.6.0.pre3
   type: :runtime
   version_requirements: *id004
 description: A drop-in replacement for Graphite Carbon (TCP & AMQP), sending metrics to Librato Metrics.
@@ -97,6 +98,7 @@ files:
 - lib/recognizer/librato.rb
 - lib/recognizer/patches/float.rb
 - lib/recognizer/patches/hash.rb
+- lib/recognizer/patches/openssl.rb
 - lib/recognizer/tcp.rb
 - lib/recognizer/version.rb
 - lib/recognizer.rb