quark 0.2.6 → 0.3.0

data/lib/quark/command_processor.rb

@@ -9,10 +9,12 @@ module Quark
     end
 
     def receive_data(data)
-      puts "DEBUG: Received '#{data.chomp.strip}'" if Quark::Config.get("debug")
-      data = Quark::CommandProcessor.process_command(data)
-      send_json(data)
-      data
+      return data.split("\n").collect do |line|
+        puts "DEBUG: Received '#{line.chomp.strip}'" if Quark::Config.get("debug")
+        line = Quark::CommandProcessor.process_command(line)
+        send_json(line) unless line[:results].nil?
+        line
+      end
     end
 
     def send_json(data)
@@ -30,7 +32,7 @@ module Quark
     # if the data perfectly resembles a graphite-formatted metric (without a command prefix)
     # then assume the command is "observe"
       if Quark::Config.get("quark.graphite_compat") and data =~ /^[\w\.\-]+ -?[\d\.]+ \d{10,13}$/
-        command   = "OBSERVE"
+        command   = "PUT"
         arguments = data.chomp
       else
         if data =~ /\}$/
@@ -47,6 +49,7 @@ module Quark
       begin
         if methods.include?(:"process_command_#{command.downcase}")
           rv = send(:"process_command_#{command.downcase}", arguments)
+
           if rv.nil?
             return {
               :success   => true,

data/lib/quark/commands/put.rb

@@ -0,0 +1,23 @@
+module Quark
+  module CommandProcessor
+    def self.process_command_put(data)
+      id, value, timestamp = data.chomp.split(' ')
+      timestamp = timestamp.to_i
+
+    # automatically convert epoch seconds to milliseconds to provide Graphite metric compatibility
+      if timestamp < 2147483647
+        (timestamp = timestamp * 1000)
+      end
+
+      block = Integer(timestamp / Quark::Config.get("quark.blocksize").to_i)
+
+      if Quark::Config.get("debug")
+        puts "PUT #{@_prefix}:#{id}:#{block} #{value} #{timestamp}"
+      end
+
+      @redis.hset("#{@_prefix}:#{id}:#{block}", timestamp, value)
+
+      return nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quark
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &9627280 !ruby/object:Gem::Requirement
+  requirement: &10639560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.9
   type: :runtime
   prerelease: false
-  version_requirements: *9627280
+  version_requirements: *10639560
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &9626580 !ruby/object:Gem::Requirement
+  requirement: &10638880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9626580
+  version_requirements: *10638880
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &9625940 !ruby/object:Gem::Requirement
+  requirement: &10638300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *9625940
+  version_requirements: *10638300
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &9625240 !ruby/object:Gem::Requirement
+  requirement: &10637740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *9625240
+  version_requirements: *10637740
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &9624800 !ruby/object:Gem::Requirement
+  requirement: &10637140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *9624800
+  version_requirements: *10637140
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &9640620 !ruby/object:Gem::Requirement
+  requirement: &10652680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *9640620
+  version_requirements: *10652680
 - !ruby/object:Gem::Dependency
   name: hashlib
-  requirement: &9640100 !ruby/object:Gem::Requirement
+  requirement: &10652080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.35
   type: :runtime
   prerelease: false
-  version_requirements: *9640100
+  version_requirements: *10652080
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &9639660 !ruby/object:Gem::Requirement
+  requirement: &10651640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9639660
+  version_requirements: *10651640
 - !ruby/object:Gem::Dependency
   name: sinatra-cross_origin
-  requirement: &9639140 !ruby/object:Gem::Requirement
+  requirement: &10651060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9639140
+  version_requirements: *10651060
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &9638680 !ruby/object:Gem::Requirement
+  requirement: &10650340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9638680
+  version_requirements: *10650340
 description: A small service for logging and retrieving timeseries metrics into a
   Redis server
 email: garyhetzel@gmail.com
@@ -142,6 +142,7 @@ files:
 - lib/quark/commands/fetch.rb
 - lib/quark/commands/observe.rb
 - lib/quark/commands/ping.rb
+- lib/quark/commands/put.rb
 - lib/quark/errors.rb
 - lib/quark/subscription.rb
 - lib/quark/server.rb