hosted_graphite 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8feed7b2061113ad3af0e7defd664a1a73beb2f0
-  data.tar.gz: 68e0bbcafce9ab5d6dcfa3718b708ec330d562a1
+  metadata.gz: 5a96d4721686e9b29cded57b6624a05bec73484c
+  data.tar.gz: e2350801a97eb3b09b97e2ea36e8c97241fd4463
 SHA512:
-  metadata.gz: 432f36fad8a68e71932ba818fbdb107bbad05ed66b37c8f9c45a90f3b5e1957a412aa2c901269ff430d8a6baa9310915f5d5f7e3f5d1c881008dca5df31f380e
-  data.tar.gz: 3599c2698e689e9ef331510032cce5d6de8a0cfe99cc944cdcceefb5d2e57ec236b8c19d443319ffb1086e12d8f0698440e2c29311bf2fecc3c39aba8bbfffbe
+  metadata.gz: 9f6f7351e6d2be3135e9a6f88772e6e3c5d81d1fb71baffa8558f5b4404ea7d4a3592f380b38e93f505013272220f574d0e69ae33c5fecdb97fea05b67d2106d
+  data.tar.gz: 4c93fd58f0c53687a8165f337eb532c404c4c132b54c8862eae29dbabad6ca06b7ebdfb19f602281ccf09b6c4b23dffd263a01b221fad703513d708dfbfde91d

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
+  - 2.3.1
   - 2.2
   - 2.1
   - 2.0.0

data/CHANGELOG.md

@@ -0,0 +1 @@
+1.0.1 : Add sidekiq extension

data/README.md

@@ -65,15 +65,10 @@ gem 'hosted_graphite'
 gem 'statsd-ruby'
 ```
 
-And then require
-
-```ruby
-require 'hosted_graphite/statsd'
-```
-
 #### Basic usage
 
 ```ruby
+HostedGraphite.protocol = :statsd
 # Send some stats
 HostedGraphite.increment 'page_views'
 HostedGraphite.decrement 'likes_count'
@@ -91,9 +86,10 @@ HostedGraphite.time('newsletter.monthly') { @newsletter.deliver_now }
 
   Sidekiq.configure_server do |config|
     config.server_middleware do |chain|
-      # chain.prepend Sidekiq::Middleware::Server::StatsdMetrics, namespace: 'my_app'
+      # my_app is an optional namespace
+      # chain.prepend HostedGraphite::Ext::Sidekiq::StatsdMetrics, 'my_app'
       # or
-      # chain.prepend Sidekiq::Middleware::Server::Metrics
+      # chain.prepend HostedGraphite::Ext::Sidekiq::Metrics
     end
   end
 ```

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hosted_graphite'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/hosted_graphite.rb

@@ -1,17 +1,16 @@
 require 'forwardable'
 require 'hosted_graphite/version'
 require 'hosted_graphite/protocol'
-require 'hosted_graphite/udp'
-require 'hosted_graphite/tcp'
-require 'hosted_graphite/http'
+
 
 module HostedGraphite
   extend Forwardable
   extend self
+  attr_reader :namespace, :protocol
+  attr_writer :namespace, :api_key
 
   def_delegators :protocol, :send_metric
   module_function :send_metric
-  @protocol = nil
 
   class MissingAPIKey < StandardError
     def initialize
@@ -23,21 +22,14 @@ module HostedGraphite
     @api_key ||= ENV['HOSTEDGRAPHITE_APIKEY']
   end
 
-  def api_key=(key)
-    @api_key = key
-  end
+   def protocol=(protocol)
+    protocol   = protocol.to_s.downcase
+    require "hosted_graphite/protocols/#{protocol}"
+    @protocol = @registred_protocols[protocol].new
+   end
 
-  def protocol
-    @protocol
-  end
-
-  def protocol=(protocol)
-    case protocol
-      when Class
-        @protocol = protocol.new
-      when String, Symbol
-        protocol   = protocol.to_s.upcase
-        @protocol = const_get(protocol).new
-    end
+  @registred_protocols = {}
+  private def register(name, klass)
+    @registred_protocols[name] = klass
   end
 end

data/lib/hosted_graphite/ext/sidekiq.rb

@@ -1,18 +1,18 @@
-gem 'sidekiq', '>=  4.1.1'
+gem 'sidekiq', '>=  4.1.2'
 require 'sidekiq'
 
 module HostedGraphite
   module Ext
     module Sidekiq
       class Metrics
-        def initialize(namespace:)
+        def initialize(namespace=nil)
           @client = HostedGraphite
-          @namespace = namespace
+          HostedGraphite.namespace = namespace
         end
 
         def call(worker, msg, _, &block)
           w = msg['wrapped'] || worker.class.to_s
-          w = [@namespace,'jobs', w].compact.join('.')
+          w = ['jobs', w].compact.join('.')
           begin
             @client.increment("#{w}.performed")
             @client.time("#{w}.time", &block)
@@ -25,10 +25,10 @@ module HostedGraphite
       end
 
       class StatsdMetrics < Metrics
-        def initialize(namespace:)
+        def initialize(namespace=nil)
           super
-          require 'hosted_graphite/statsd'
-          @client = StatsD.new
+          require 'hosted_graphite/protocols/statsd'
+          @client = STATSD.new
         end
       end
     end

data/lib/hosted_graphite/{http.rb → protocols/http.rb}

@@ -16,4 +16,5 @@ module HostedGraphite
       @http.request(req)
     end
   end
+  register('http', HTTP)
 end

data/lib/hosted_graphite/protocols/statsd.rb

@@ -0,0 +1,24 @@
+gem 'statsd-ruby'
+require 'hosted_graphite'
+require 'statsd'
+
+module HostedGraphite
+  def_delegators :statsd, :increment, :decrement, :count, :gauge, :set, :timing, :time
+
+  class STATSD < Statsd
+    HOST = 'statsd.hostedgraphite.com'.freeze
+    PORT = 8125.freeze
+
+    def initialize
+      raise MissingAPIKey unless HostedGraphite.api_key
+      super(HOST, PORT)
+      self.namespace = [HostedGraphite.api_key,HostedGraphite.namespace].join('.')
+    end
+  end
+
+  def statsd
+    @statsd ||= STATSD.new
+  end
+
+  register('statsd', STATSD)
+end

data/lib/hosted_graphite/{tcp.rb → protocols/tcp.rb}

@@ -20,4 +20,5 @@ module HostedGraphite
         Addrinfo.tcp(HOST, PORT)
       end
   end
+  register('tcp', TCP)
 end

data/lib/hosted_graphite/{udp.rb → protocols/udp.rb}

@@ -23,4 +23,6 @@ module HostedGraphite
         Addrinfo.udp(HOST, PORT)
       end
   end
+
+  register('udp', UDP)
 end

data/lib/hosted_graphite/statsd.rb

@@ -1,33 +1 @@
-gem 'statsd-ruby'
-require 'hosted_graphite'
-require 'statsd'
-
-module HostedGraphite
-  def_delegators :statsd, :increment, :decrement, :count, :gauge, :set, :timing, :time
-
-  class StatsD < Statsd
-    HOST = 'statsd.hostedgraphite.com'.freeze
-    PORT = 8125.freeze
-
-    def initialize
-      raise MissingAPIKey unless HostedGraphite.api_key
-      super(HOST, PORT)
-      @namespace = HostedGraphite.api_key
-      @prefix    = "#{@namespace}."
-    end
-
-    private
-    def socket
-      Thread.current[:hostedstatsd_socket] ||= UDPSocket.new addr_family
-    end
-
-    def addr_family
-      Addrinfo.udp(@host, @port).afamily
-    end
-  end
-
-  def statsd
-    @statsd ||= StatsD.new
-  end
-
-end
+HostedGraphite.protocol = :stastd

data/lib/hosted_graphite/testing.rb

@@ -1,5 +1,8 @@
 require 'hosted_graphite'
 require 'securerandom'
+require 'hosted_graphite/protocols/http'
+require 'hosted_graphite/protocols/tcp'
+require 'hosted_graphite/protocols/udp'
 module HostedGraphite
     @api_key = SecureRandom.hex
   [TCP, UDP, HTTP].each do |protocol|

data/lib/hosted_graphite/version.rb

@@ -1,3 +1,3 @@
 module HostedGraphite
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/helper.rb

@@ -7,3 +7,4 @@ require 'securerandom'
 require 'minitest/autorun'
 require 'hosted_graphite/testing'
 
+HostedGraphite.api_key = SecureRandom.uuid

data/test/test_http_protocol.rb

@@ -3,14 +3,7 @@ require_relative 'helper'
 class HTTPProtocolTest < Minitest::Test
   attr_reader :api_key
   def setup
-    @previous_api_key = HostedGraphite.api_key
-    @api_key = SecureRandom.uuid
-    HostedGraphite.api_key = @api_key
-    HostedGraphite.protocol = HostedGraphite::HTTP
-  end
-
-  def teardown
-    HostedGraphite.api_key = @previous_api_key
+    HostedGraphite.protocol = :http
   end
 
   def test_http_protocol

data/test/test_stastd.rb

@@ -2,13 +2,7 @@ require_relative 'helper'
 
 class StatsDTest < Minitest::Test
   def setup
-    @previous_api_key = HostedGraphite.api_key
-    HostedGraphite.api_key = SecureRandom.uuid
-    require 'hosted_graphite/statsd'
-  end
-
-  def teardown
-    HostedGraphite.api_key = @previous_api_key
+    HostedGraphite.protocol = 'statsd'
   end
 
   def test_respond_to_time

data/test/test_tcp_protocol.rb

@@ -4,22 +4,15 @@ class TCPProtocolTest < Minitest::Test
   attr_reader :api_key
 
   def setup
-    @previous_api_key = HostedGraphite.api_key
-    @api_key = SecureRandom.uuid
-    HostedGraphite.api_key = @api_key
     HostedGraphite.protocol = 'tcp'
   end
 
-  def teardown
-    HostedGraphite.api_key = @previous_api_key
-  end
-
   def test_tcp_protocol
     assert_instance_of HostedGraphite::TCP, HostedGraphite.protocol
   end
 
   def test_correct_query
     query = HostedGraphite.send_metric('foo', 1.2, 1421792423)
-    assert_equal "#{api_key}.foo 1.2 1421792423\n", query
+    assert_equal "#{HostedGraphite.api_key}.foo 1.2 1421792423\n", query
   end
 end

data/test/test_udp_protocol.rb

@@ -3,22 +3,15 @@ require_relative 'helper'
 class UDPProtocolTest < Minitest::Test
   attr_reader :api_key
   def setup
-    @previous_api_key = HostedGraphite.api_key
-    @api_key = SecureRandom.uuid
-    HostedGraphite.api_key = @api_key
     HostedGraphite.protocol = :udp
   end
 
-  def teardown
-    HostedGraphite.api_key = @previous_api_key
-  end
-
   def test_udp_protocol
     assert_instance_of HostedGraphite::UDP, HostedGraphite.protocol
   end
 
   def test_correct_query
     query = HostedGraphite.send_metric('foo', 1.2, 1421792423)
-    assert_equal "#{api_key}.foo 1.2 1421792423\n", query
+    assert_equal "#{HostedGraphite.api_key}.foo 1.2 1421792423\n", query
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hosted_graphite
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,19 +61,23 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - hosted_graphite.gemspec
 - lib/hosted_graphite.rb
 - lib/hosted_graphite/ext/sidekiq.rb
-- lib/hosted_graphite/http.rb
 - lib/hosted_graphite/protocol.rb
+- lib/hosted_graphite/protocols/http.rb
+- lib/hosted_graphite/protocols/statsd.rb
+- lib/hosted_graphite/protocols/tcp.rb
+- lib/hosted_graphite/protocols/udp.rb
 - lib/hosted_graphite/statsd.rb
-- lib/hosted_graphite/tcp.rb
 - lib/hosted_graphite/testing.rb
-- lib/hosted_graphite/udp.rb
 - lib/hosted_graphite/version.rb
 - test/helper.rb
 - test/test_http_protocol.rb