metriks 0.9.1 → 0.9.2

data/lib/metriks.rb

@@ -1,6 +1,6 @@
 
 module Metriks
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 
   def self.get(name)
     Metriks::Registry.default.get(name)

data/lib/metriks/reporter/librato_metrics.rb

@@ -1,23 +1,7 @@
-require 'faraday'
-require 'faraday_middleware'
-require 'yajl'
-require 'yajl/json_gem'
+require 'net/https'
 
 module Metriks::Reporter
   class LibratoMetrics
-    def self.connection
-      @connection ||= Faraday::Connection.new('https://metrics-api.librato.com') do |b|
-        b.use FaradayMiddleware::EncodeJson
-        b.adapter Faraday.default_adapter
-        b.use Faraday::Response::RaiseError
-        b.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
-      end.tap do |c|
-        c.headers[:content_type] = 'application/json'
-        c.headers[:user_agent] = "Metriks/#{Metriks::VERSION} Faraday/#{Faraday::VERSION}"
-      end
-    end
-
-
     def initialize(email, token, options = {})
       @email = email
       @token = token
@@ -90,19 +74,42 @@ module Metriks::Reporter
         end
       end
 
-      submit(:gauges => gauges.flatten)
+      submit(form_data(gauges.flatten))
     end
 
-    def connection
-      @connection ||= self.class.connection.dup.tap do |c|
-        c.basic_auth @email, @token
+    def submit(data)
+      url = URI.parse('https://metrics-api.librato.com/v1/metrics')
+      req = Net::HTTP::Post.new(url.path)
+      req.basic_auth(@email, @token)
+      req.set_form_data(data)
+
+      http = Net::HTTP.new(url.host, url.port)
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.use_ssl = true
+      store = OpenSSL::X509::Store.new
+      store.set_default_paths
+      http.cert_store = store
+
+      case res = http.start { |http| http.request(req) }
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        # OK
+      else
+        res.error!
       end
     end
 
-    def submit(body)
-      connection.post '/v1/metrics' do |req|
-        req.body = body
+    def form_data(gauges)
+      data = {}
+
+      gauges.each_with_index do |gauge, idx|
+        gauge.each do |key, value|
+          if value
+            data["gauges[#{idx}][#{key}]"] = value.to_s
+          end
+        end
       end
+
+      data
     end
 
     def prepare_metric(base_name, metric, keys, snapshot_keys = [])

data/metriks.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              = 'metriks'
-  s.version           = '0.9.1'
+  s.version           = '0.9.2'
   s.date              = '2012-03-06'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,9 +42,6 @@ Gem::Specification.new do |s|
   s.add_dependency('atomic', ["~> 1.0"])
   s.add_dependency('hitimes', [ "~> 1.1"])
   s.add_dependency('rbtree', [ "~> 0.3" ])
-  s.add_dependency('faraday', ['~> 0.7.0'])
-  s.add_dependency('faraday_middleware', ['~> 0.8.4'])
-  s.add_dependency('yajl-ruby')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/test/librato_metrics_reporter_test.rb

@@ -6,14 +6,6 @@ class LibratoMetricsReporterTest < Test::Unit::TestCase
   def setup
     @registry = Metriks::Registry.new
     @reporter = Metriks::Reporter::LibratoMetrics.new('user', 'password', :registry => @registry)
-
-    @reporter.connection.builder.tap do |c|
-      c.swap 1, Faraday::Adapter::Test do |stub|
-        stub.post '/v1/metrics' do |env|
-          [ 200, {}, '' ]
-        end
-      end
-    end
   end
 
   def teardown
@@ -27,6 +19,8 @@ class LibratoMetricsReporterTest < Test::Unit::TestCase
     @registry.timer('timer.testing').update(1.5)
     @registry.utilization_timer('utilization_timer.testing').update(1.5)
 
+    @reporter.expects(:submit)
+
     @reporter.write
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -56,50 +56,10 @@ dependencies:
         version: "0.3"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: faraday
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: tomdoc
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -108,11 +68,11 @@ dependencies:
         - 2
         version: "0.2"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -121,7 +81,7 @@ dependencies:
         - 10
         version: "0.10"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id005
 description: An experimental metrics client.
 email: eric@sevenscale.com
 executables: []