graphite-api 0.0.2.0 → 0.0.2.1

data/README.md

@@ -1,8 +1,8 @@
-# GraphiteAPI [Beta]
+# GraphiteAPI ( [![Gem Version](https://fury-badge.herokuapp.com/rb/graphite-api.png)](http://badge.fury.io/rb/graphite-api) )
 A Ruby API toolkit for [Graphite](http://graphite.wikidot.com/).
 
 ## Description
-**GraphiteAPI** is a library written in Ruby that provides two ways for interacting with **Graphite's Carbon Daemon**, the first is for Ruby applications using the **GraphiteAPI::Client**, the second is through **GraphiteAPI-Middleware** daemon, both methods implements Graphite's [plaintext protocol](http://graphite.readthedocs.org/en/1.0/feeding-carbon.html).
+**GraphiteAPI** provides two ways for interacting with **Graphite's Carbon Daemon**, the first is for Ruby applications using the **GraphiteAPI::Client**, the second is through **GraphiteAPI-Middleware** daemon, both methods implements Graphite's [plaintext protocol](http://graphite.readthedocs.org/en/1.0/feeding-carbon.html).
 
 ## Package Content
 * Includes a **simple** client for ruby.
@@ -129,11 +129,11 @@ example.middleware.value2 99 1334929231
 [root@graphite-middleware-node]
 ```
 
-* Send metrics via **GraphtieAPI client**
+* Or via **GraphtieAPI client**
 
 ```ruby
 require 'graphite-api'
-client = GraphiteAPI::Client.new(:graphite => graphite-middleware-node)
+client = GraphiteAPI::Client.new(:graphite => 'graphite-middleware-node:2005')
 client.example.middleware.value 10.2 
 client.example.middleware.value2 27
 client.bla.bla.value2 27

data/lib/graphite-api/buffer.rb

@@ -16,25 +16,28 @@
 #    ["mem.usage", 190.0, 1326842520]
 #    ["shuki.tuki", 999.0, 1326842520]
 # -----------------------------------------------------
+require 'set'
+
 module GraphiteAPI
   class Buffer
-    include Utils
-    
-    attr_reader :options,:keys_to_send,:reanimation_mode, :streamer_buff
+    include Utils    
+
+    CLOSING_STREAM  = "\n"   # end of message - when streaming to buffer obj
+    CHARS_TO_IGNORE = %w(\r) # skip these chars when parsing new message
+    FLOATS_ROUND_BY = 2      # round(x) after summing floats 
 
-    CLOSING_STREAM_CHAR = "\n"                     # end of message - when streaming to buffer obj
-    CHARS_TO_IGNORE     = ["\r"]                   # skip these chars when parsing new message
-    FLOATS_ROUND_BY = 2                            # round(x) after summing floats 
-    VALID_MESSAGE = /^[\w|\.]+ \d+(?:\.|\d)* \d+$/ # how a valid message should look like
+    VALID_MESSAGE   = /^[\w|\.]+ \d+(?:\.|\d)* \d+$/
     
     def initialize options
       @options = options
-      @keys_to_send  = Hash.new {|h,k| h[k] = []}
+      @keys_to_sync  = Hash.new { |h,k| h[k] = Set.new }
       @streamer_buff = Hash.new {|h,k| h[k] = ""}
       @reanimation_mode = !options[:reanimation_exp].nil?
       start_cleaner if reanimation_mode
     end
 
+    private_reader :options, :keys_to_sync, :reanimation_mode, :streamer_buff
+
     def push hash
       debug [:buffer,:add, hash]
       time = Utils.normalize_time(hash[:time],options[:slice])
@@ -44,7 +47,7 @@ module GraphiteAPI
     alias_method :<<, :push
     
     def stream message, client_id = nil
-      message.each_char do |char|
+      message.gsub(/\t/,' ').each_char do |char|
         next if invalid_char? char
         streamer_buff[client_id] += char 
         
@@ -59,7 +62,7 @@ module GraphiteAPI
     
     def pull as = nil
       Array.new.tap do |data|
-        keys_to_send.each do |time,keys|
+        keys_to_sync.each do |time,keys|
           keys.each do |key|
             data.push cache_get(time, key, as)
           end
@@ -70,13 +73,13 @@ module GraphiteAPI
     end
     
     def new_records?
-      !keys_to_send.empty?
+      !keys_to_sync.empty?
     end
     
     private
     
     def closed_stream? string
-      string[-1,1] == CLOSING_STREAM_CHAR
+      string[-1,1] == CLOSING_STREAM
     end
     
     def invalid_char? char
@@ -85,24 +88,24 @@ module GraphiteAPI
     
     def cache_set time, key, value
       buffer_cache[time][key] = sum buffer_cache[time][key], value.to_f 
-      keys_to_send[time].push key unless keys_to_send[time].include? key
+      keys_to_sync[time].add key
     end
     
     def sum float1, float2
-      ("%.#{FLOATS_ROUND_BY}f" % (float1 + float2)).to_f # can't use round on 1.8.X
+      ("%.#{FLOATS_ROUND_BY}f" % (float1 + float2)).to_f
     end
         
     def cache_get time, key, as
       metric = [prefix + key,buffer_cache[time][key],time]
       as == :string ? metric.join(" ") : metric
     end
-        
+
     def build_metric key, value, time
       { :metric => { key => value },:time => Time.at(time.to_i) }
     end
 
     def clear
-      keys_to_send.clear
+      keys_to_sync.clear
       buffer_cache.clear unless reanimation_mode
     end
     
@@ -123,7 +126,7 @@ module GraphiteAPI
     end
 
     def clean age
-      [buffer_cache,keys_to_send].each {|o| o.delete_if {|t,k| Time.now.to_i - t > age}}
+      [buffer_cache,keys_to_sync].each {|o| o.delete_if {|t,k| Time.now.to_i - t > age}}
     end
     
     def start_cleaner

data/lib/graphite-api/client.rb

@@ -46,9 +46,7 @@ require File.expand_path '../utils', __FILE__
 module GraphiteAPI
   class Client
     include Utils
-    
-    extend Utils::ClassMethods
-      
+
     def initialize opt
       @options = build_options validate opt.clone
       @buffer  = GraphiteAPI::Buffer.new options
@@ -60,13 +58,13 @@ module GraphiteAPI
       
     end
 
-    attr_private_reader :options, :buffer, :connectors
-    delegate :loop, :stop, :to => :Reactor
+    private_reader :options, :buffer, :connectors
+
+    def_delegator :"GraphiteAPI::Reactor", :loop
+    def_delegator :"GraphiteAPI::Reactor", :stop
     
     def every interval, &block
-      Reactor.every interval do 
-        block.call self
-      end
+      Reactor.every( interval ) { block.call self }
     end
     
     def metrics metric, time = Time.now 
@@ -84,24 +82,21 @@ module GraphiteAPI
     protected
     
     class Proxy
-      extend Utils::ClassMethods
+      include Utils
       
       def initialize client
         @client = client
         @keys = []
       end
       
-      attr_private_reader :client, :keys
+      private_reader :client, :keys
       
       def method_missing m, *args, &block
         keys.push m
         if keys.size > 10 # too deep
           super
-        elsif !args.empty?
-          client.metrics(
-            Hash[keys.join("."),args.first],
-            *args[1..-1]
-          ) 
+        elsif args.any?
+          client.metrics(Hash[keys.join("."),args.first],*args[1..-1])
         else
           self
         end

data/lib/graphite-api/connector.rb

@@ -12,14 +12,15 @@ require 'socket'
 
 module GraphiteAPI
   class Connector
-
-    attr_reader :options, :host, :port
+    include Utils
     
     def initialize host, port
       @host = host
       @port = port
     end
     
+    private_reader :host, :port
+    
     def puts message
       begin
         Logger.debug [:connector,:puts,[host,port].join(":"),message]

data/lib/graphite-api/connector_group.rb

@@ -2,7 +2,7 @@ module GraphiteAPI
   class ConnectorGroup
     include Utils
     
-    attr_reader :options, :connectors
+    private_reader :options, :connectors
 
     def initialize options
       @options = options

data/lib/graphite-api/logger.rb

@@ -22,12 +22,12 @@ module GraphiteAPI
       # :std => out|err|file-name
       def init(options)
         self.logger = ::Logger.new(options[:std] || STDOUT)
-        self.logger.level= eval "::Logger::#{options[:level].to_s.upcase}"
+        self.logger.level= ::Logger.const_get "#{options[:level].to_s.upcase}"
       end
       
       def method_missing(m,*args,&block)
-        if logger.respond_to? m then logger.send(m,*args,&block) end
-      end      
+        logger.send m, *args, &block if logger.respond_to? m
+      end
     end
   end
-end
+end

data/lib/graphite-api/middleware.rb

@@ -17,7 +17,6 @@
 #   log_level        info 
 # -----------------------------------------------------
 
-require 'rubygems'
 require 'eventmachine'
 require 'socket'
 require File.expand_path '../utils', __FILE__
@@ -26,13 +25,12 @@ module GraphiteAPI
   class Middleware < EventMachine::Connection
 
     include Utils
-    extend  Utils::ClassMethods
     
     def initialize buffer
       @buffer = buffer and super
     end
     
-    attr_private_reader :buffer,:client_id
+    private_reader :buffer, :client_id
     
     def post_init
       @client_id = peername
@@ -72,8 +70,8 @@ module GraphiteAPI
           GraphiteAPI::Reactor.every options[:interval], &block
           GraphiteAPI::Reactor.add_shutdown_hook &block
         end
-      end
-      
-    end # start
+      end  
+    end
+    
   end # Middleware
 end # GraphiteAPI

data/lib/graphite-api/reactor.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'eventmachine'
 
 module GraphiteAPI

data/lib/graphite-api/runner.rb

@@ -16,6 +16,21 @@ module GraphiteAPI
 
     private
     
+    def daemonize pid
+      block_given? or raise ArgumentError.new "the block is missing..."
+
+      fork do
+        Process.setsid
+        exit if fork
+        Dir.chdir '/tmp'
+        STDIN.reopen('/dev/null')
+        STDOUT.reopen('/dev/null','a')
+        STDERR.reopen('/dev/null','a')
+        File.open(pid,'w') { |f| f.write(Process.pid) } rescue nil
+        yield
+      end
+    end
+    
     def run!
       begin
         Middleware.start options

data/lib/graphite-api/utils.rb

@@ -1,33 +1,29 @@
+require 'forwardable'
+
 module GraphiteAPI
   module Utils
-    module ClassMethods
-      def attr_private_reader *args
-        args.each { |o| attr_reader o or private o }
+    
+    def self.included base
+      base.extend ClassUtils
+      base.extend Forwardable
+      base.__send__ :include, LoggerUtils
+    end
+
+    module LoggerUtils
+      [:info,:error,:warn,:debug].each do |m|
+        define_method m do |*args,&block|
+          Logger.send m, *args, &block
+        end
       end
+    end
 
-      def delegate *sources, options
-        instance_eval do
-          options.fetch(:to).tap do |target|
-            sources.each do |source|
-              define_method source do |*args, &block|
-                if target.is_a? Symbol
-                  eval String target 
-                else
-                  target
-                end.send source,*args, &block
-              end # define
-            end # sources
-          end # options
-        end # instance_eval
-      end # def delegate
-    end # ClassMethods
-    
-    [:info,:error,:warn,:debug].each do |m|
-      define_method(m) do |*args,&block|
-        Logger.send(m,*args,&block)
+    module ClassUtils      
+      def private_reader *args
+        attr_reader *args
+        private     *args
       end
-    end    
-    
+    end
+        
     module_function
 
     def normalize_time time, slice = 60
@@ -54,21 +50,6 @@ module GraphiteAPI
         :pid => "/tmp/graphite-middleware.pid"
       }
     end
-    
-    def daemonize pid
-      block_given? or raise ArgumentError.new "the block is missing..."
-
-      fork do
-        Process.setsid
-        exit if fork
-        Dir.chdir '/tmp'
-        STDIN.reopen('/dev/null')
-        STDOUT.reopen('/dev/null','a')
-        STDERR.reopen('/dev/null','a')
-        File.open(pid,'w') { |f| f.write(Process.pid) } rescue nil
-        yield
-      end
-    end
 
   end
 end

data/lib/graphite-api/version.rb

@@ -1,5 +1,5 @@
 module GraphiteAPI
   class Version
-    VERSION = "0.0.2.0"
+    VERSION = "0.0.2.1"
   end
 end

data/tasks/tests.rake

@@ -1,5 +1,7 @@
 require "rake/testtask"
 
+task(:test) { ENV['with_coverage'] = "true" }
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "tests"
   t.pattern = "tests/**/*_test.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2.0
+  version: 0.0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-25 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine