graphite-api 0.0.2.1 → 0.0.3.beta1

data/lib/graphite-api.rb

@@ -3,6 +3,8 @@ module GraphiteAPI
 
   autoload :Version,         "#{ROOT}/graphite-api/version"
   autoload :Client,          "#{ROOT}/graphite-api/client"
+  autoload :Cache,           "#{ROOT}/graphite-api/cache"
+  autoload :SafeBuffer,      "#{ROOT}/graphite-api/safe_buffer"
   autoload :Reactor,         "#{ROOT}/graphite-api/reactor"
   autoload :Connector,       "#{ROOT}/graphite-api/connector"
   autoload :Middleware,      "#{ROOT}/graphite-api/middleware"

data/lib/graphite-api/cache.rb

@@ -0,0 +1,5 @@
+module GraphiteAPI
+  module Cache
+    autoload :Memory, File.expand_path("../cache/memory", __FILE__)
+  end
+end

data/lib/graphite-api/cache/memory.rb

@@ -0,0 +1,33 @@
+module GraphiteAPI
+  module Cache
+    class Memory
+
+      def initialize options
+        Reactor.every(60) { clean(options[:age]) }
+      end
+      
+      def get time, key
+        cache[time][key]
+      end
+      
+      def set time, key, value
+        cache[time][key] = value.to_f 
+      end
+      
+      def incr *args
+        set(value.to_f + get(*args))
+      end
+      
+      private
+      
+      def cache
+        @cache ||= Hash.new {|h,k| h[k] = Hash.new {|h1,k1| h1[k1] = 0}}
+      end
+      
+      def clean age
+        cache.delete_if {|t,k| Time.now.to_i - t > age}
+      end
+      
+    end
+  end
+end

data/lib/graphite-api/client.rb

@@ -49,7 +49,7 @@ module GraphiteAPI
 
     def initialize opt
       @options = build_options validate opt.clone
-      @buffer  = GraphiteAPI::Buffer.new options
+      @buffer  = GraphiteAPI::SafeBuffer.new options
       @connectors = GraphiteAPI::ConnectorGroup.new options
       
       every options.fetch :interval do

data/lib/graphite-api/safe_buffer.rb

@@ -0,0 +1,89 @@
+require 'thread'
+require 'set'
+
+module GraphiteAPI
+  class SafeBuffer
+    include Utils
+    
+    def initialize options
+      @options = options
+      @queue = Queue.new
+      @streamer = Hash.new {|h,k| h[k] = ""}
+
+      if options[:reanimation_exp]
+        @cache = Cache::Memory.new options[:reanimation_exp]
+      end      
+    end
+    
+    private_reader :queue, :options, :streamer, :cache
+    
+    # {:metric => {'a' => 10},:time => today}
+    def push hash
+      debug [:buffer,:add, hash]
+      time = Utils.normalize_time(hash[:time],options[:slice])
+      hash[:metric].each { |k,v| queue.push [time,k,v] }
+    end
+    
+    alias_method :<<, :push
+
+    # this method isn't thread safe
+    # if you are running with multiple threads
+    # use #push instead
+    def stream message, client_id = nil
+      message.gsub(/\t/,' ').each_char do |char|
+        next if invalid_char? char
+        streamer[client_id] += char 
+        
+        if closed_stream? streamer[client_id]
+          if valid_stream_message streamer[client_id]
+            push stream_message_to_obj streamer[client_id]
+          end
+          streamer.delete client_id
+        end
+      end
+    end
+    
+    def pull format = nil
+      data = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = 0} }
+      while new_records?
+        time, key, value = queue.pop
+        data[time][key] += value.to_f
+      end
+      data.map do |time, hash|
+        hash.map do |key, value|
+          value = cache.incr(time,key,value) if cache
+          results = ["#{prefix}#{key}",("%.2f"%value).to_f, time]
+          format == :string ? results.join(" ") : results
+        end
+      end.flatten(1)
+    end
+    
+    def new_records?
+      !queue.empty?
+    end
+    
+    private
+    
+    def stream_message_to_obj message
+      parts = message.split
+      {:metric => { parts[0] => parts[1] },:time => Time.at(parts[2].to_i) }
+    end
+    
+    def invalid_char? char
+      ["\r"].include? char
+    end
+    
+    def closed_stream? string
+      string[-1,1] == "\n"
+    end
+    
+    def valid_stream_message message
+      message =~ /^[\w|\.]+ \d+(?:\.|\d)* \d+$/
+    end
+    
+    def prefix
+      @prefix ||= options[:prefix].empty? ? '' : Array(options[:prefix]).join('.') << '.'
+    end
+        
+  end
+end

data/lib/graphite-api/version.rb

@@ -1,5 +1,5 @@
 module GraphiteAPI
   class Version
-    VERSION = "0.0.2.1"
+    VERSION = "0.0.3.beta1"
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: graphite-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
-  prerelease: 
+  version: 0.0.3.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Eran Barak Levi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -39,6 +39,8 @@ files:
 - bin/graphite-middleware
 - lib/core-extensions/numeric.rb
 - lib/graphite-api/buffer.rb
+- lib/graphite-api/cache/memory.rb
+- lib/graphite-api/cache.rb
 - lib/graphite-api/cli.rb
 - lib/graphite-api/client.rb
 - lib/graphite-api/connector.rb
@@ -47,6 +49,7 @@ files:
 - lib/graphite-api/middleware.rb
 - lib/graphite-api/reactor.rb
 - lib/graphite-api/runner.rb
+- lib/graphite-api/safe_buffer.rb
 - lib/graphite-api/utils.rb
 - lib/graphite-api/version.rb
 - lib/graphite-api.rb
@@ -67,12 +70,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: graphite-api
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Graphite Ruby Client