patty 0.0.7 → 0.0.8

data/lib/patty/aggregated_storage.rb

@@ -39,7 +39,7 @@ module Patty
 
       def validate_signature(signature = nil)
         if signature.nil? || !signature.is_a?(Patty::TimeSignature)
-          raise "key validation fail for #{signature}"
+          raise "key validation fail for #{signature} class #{signature.class}"
         end
       end
 

data/lib/patty/base.rb

@@ -17,13 +17,17 @@ module Patty
       'events'
     end
 
+    def measure
+      :tminute
+    end
+
     def build_signature(datetime_string = '')
-      Patty::TimeSignature.new(datetime_string[0, 16]).align
+      Patty::TimeSignature.new(datetime_string[0, 19]).align.measure measure
     end
 
     def emit(signature = nil, value = nil, marker = nil)
       if signature.nil?
-        signature = Patty::TimeSignature.from_datetime.align
+        signature = Patty::TimeSignature.from_datetime
       end
 
       current_value = fetch signature, marker

data/lib/patty/time_signature.rb

@@ -3,16 +3,28 @@ require 'date'
 module Patty
   class TimeSignature
 
-    MINUTES = ['00', '10', '20', '30', '40', '50']
-    HOURS   = (0..23).map { |h| "%02d" % h }
-    MONTHS  = (1..12).map { |m| "%02d" % m }
+    SECONDS  = ['00', '30']
+    MINUTES  = (0..59).map { |m| "%02d" % m }
+    TMINUTES = ['0', '1', '2', '3', '4', '5']
+    HOURS    = (0..23).map { |h| "%02d" % h }
+    MONTHS   = (1..12).map { |m| "%02d" % m }
+
+    MEASURE_LENGTHS = {
+      :second  => 19, # 2012-04-10 12:30:32
+      :minute  => 16, # 2012-04-10 12:30
+      :tminute => 15, # 2012-04-10 12:3
+      :hour    => 13, # 2012-04-10 12
+      :day     => 10, # 2012-04-10
+      :month   => 7,  # 2012-04
+      :year    => 4   # 2012
+    }
 
     class << self
       def from_datetime(datetime = lambda{ DateTime.now })
         if datetime.is_a?(Proc)
           datetime = datetime.call
         end
-        self.new(datetime.strftime("%Y-%m-%d %H:%M")).align
+        self.new(datetime.strftime("%Y-%m-%d %H:%M:%S")).align
       end
     end
 
@@ -34,24 +46,19 @@ module Patty
     end
 
     def kind
-      case signature.size
-        when 16
-          :minute
-        when 13
-          :hour
-        when 10
-          :day
-        when 7
-          :month
-        when 4
-          :year
-        else
-          raise 'broken signature'
+      MEASURE_LENGTHS.select{ |k, v| v == signature.size }.keys[0]
+    end
+
+    def measure(title = :tminute)
+      unless MEASURE_LENGTHS.keys.include? title
+        raise ArgumentError, 'bad measure title'
       end
+
+      self.class.new crop(MEASURE_LENGTHS[title])
     end
 
     def align
-      self.class.new "%04d-%02d-%02d %02d:%02d" % [year, month, day, hour, aligned_minute]
+      self.class.new "%04d-%02d-%02d %02d:%02d:%02d" % [year, month, day, hour, minute, aligned_second]
     end
 
     def cut(from = 0, length = 2)
@@ -59,7 +66,7 @@ module Patty
     end
 
     def crop(to = 13)
-      signature.size > to ? signature[0, to] : signature
+      signature.size > to ? signature[0, to] : ''
     end
 
     def year
@@ -82,11 +89,15 @@ module Patty
       cut(14).to_i
     end
 
-    def aligned_minute
-      if kind == :minute
-        "%-1d0" % (minute / 10)
+    def second
+      cut(17).to_i
+    end
+
+    def aligned_second
+      if kind == :second
+        second / 30 == 0 ? '00' : '30'
       else
-        minute
+        second
       end
     end
 
@@ -95,13 +106,17 @@ module Patty
     end
 
     def parents
-      [crop(13), crop(10), crop(7), crop(4)].delete_if{ |p| p.empty? }.map{ |p| self.class.new p }
+      [crop(16), crop(15), crop(13), crop(10), crop(7), crop(4)].delete_if{ |p| p.empty? }.map{ |p| self.class.new p }
     end
 
     def children
       case kind
+        when :minute
+          SECONDS.map{ |s| self.class.new "#{signature}:#{s}" }
+        when :tminute
+          (0..9).map{ |m| self.class.new "#{signature}#{m}" }
         when :hour
-          MINUTES.map{ |m| self.class.new "#{signature}:#{m}" }
+          TMINUTES.map{ |t| self.class.new "#{signature}:#{t}" }
         when :day
           HOURS.map{ |h| self.class.new "#{signature} #{h}" }
         when :month

data/lib/patty/version.rb

@@ -1,5 +1,5 @@
 module Patty
 
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 
 end

data/test/test_time_signature.rb

@@ -4,15 +4,15 @@ require 'patty/time_signature'
 class TimeSignatureTest < Test::Unit::TestCase
 
   def setup
-    @time_signature = Patty::TimeSignature.new('2005-10-10 18:55')
+    @time_signature = Patty::TimeSignature.new('2005-10-10 18:55:35')
   end
 
   def test_to_s
-    assert_equal '2005-10-10 18:55', @time_signature.to_s
+    assert_equal '2005-10-10 18:55:35', @time_signature.to_s
   end
 
   def test_kind
-    assert_equal :minute, @time_signature.kind
+    assert_equal :second, @time_signature.kind
   end
 
   def test_cut
@@ -22,11 +22,13 @@ class TimeSignatureTest < Test::Unit::TestCase
 
   def test_crop
     assert_equal '2005-10-10', @time_signature.crop(10)
-    assert_equal '2005-10-10 18:55', @time_signature.crop(100)
+    assert_equal '', @time_signature.crop(100)
   end
 
   def test_parents
     expected_parents = [
+      Patty::TimeSignature.new('2005-10-10 18:55'),
+      Patty::TimeSignature.new('2005-10-10 18:5'),
       Patty::TimeSignature.new('2005-10-10 18'),
       Patty::TimeSignature.new('2005-10-10'),
       Patty::TimeSignature.new('2005-10'),
@@ -35,10 +37,15 @@ class TimeSignatureTest < Test::Unit::TestCase
     assert_equal expected_parents, @time_signature.parents
   end
 
-  def test_children_for_minute
+  def test_children_for_second
     assert_equal 0, @time_signature.children.size
   end
 
+  def test_children_for_minute
+    @time_signature = Patty::TimeSignature.new('2005-10-10 18:55')
+    assert_equal 2, @time_signature.children.size
+  end
+
   def test_children_for_hour
     @time_signature = Patty::TimeSignature.new('2005-10-10 18')
     assert_equal 6, @time_signature.children.size
@@ -60,8 +67,8 @@ class TimeSignatureTest < Test::Unit::TestCase
   end
 
   def test_from_datetime
-    @time_signature = Patty::TimeSignature.from_datetime DateTime.new(2012, 02, 29, 12, 35)
-    assert_equal '2012-02-29 12:30', @time_signature.signature
+    @time_signature = Patty::TimeSignature.from_datetime DateTime.new(2012, 02, 29, 12, 35, 12)
+    assert_equal '2012-02-29 12:35:00', @time_signature.signature
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: patty
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &84304380 !ruby/object:Gem::Requirement
+  requirement: &83964590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84304380
+  version_requirements: *83964590
 - !ruby/object:Gem::Dependency
   name: riak-client
-  requirement: &84304170 !ruby/object:Gem::Requirement
+  requirement: &83964380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84304170
+  version_requirements: *83964380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &84303960 !ruby/object:Gem::Requirement
+  requirement: &83964170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84303960
+  version_requirements: *83964170
 description: Server part of Patty statistics server
 email: alexander.lomakin@gmail.com
 executables: []