shades 0.13 → 0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQ0OWUzYTVjZDZhMzMyYTczNjU3YWU1NDU4NTc2ZGFmZDQzODc1NQ==
+    ZjE0ZTFhNzFjNDcxMjQyNjFkY2VmYzdmNmJjNWZmNDAwMjU2NmRlMA==
   data.tar.gz: !binary |-
-    ZTFmM2JhMGZlNmNmNWU4MmJmYTFjMWM5OTgyNjY2OTA3MjMxNGI5NA==
+    ZWM1ZDIxZmNlYWFkZjllODBmMTEyMzNjOTIyZmM4OTczYWMyYzhiZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmViYmEyNjUwOWI0N2MxZDJiY2Q2MjU2MjA0M2RkMmRmMDUzMTY4MjhmNjY1
-    OTNjZTgxNjQzNDMyMWIyYjNlNTNlMGRmNmQ2MjU4YmZlMDRiMzRlM2Y0OGMy
-    ZGFmYmQ3YWExNTY3NDU1NWE3NTAwMWVhZDQ2OWRmOWQwMjIwODk=
+    MWFkNzAzMDI0MWViNDE3NzU4NjcwYzFhZTRlM2JmMmU5ZWQyYjhmYjdjMmM3
+    YTZmOGIxYzlmZWM1NGFjYmM0NjYzYWY3OGFjNDg3MWUxNWUwN2Y1YmZjZjIz
+    ZWIzM2ZiNjZmZjhkZWUwODdlMTg3Y2FjZDdhNDM3ZDZlOWI2Y2Y=
   data.tar.gz: !binary |-
-    OTRkZDA2N2I1N2NmMjZkY2U2NmFmOGFmNGU5ZjFiNWMyMTgzN2YzYTU5NjBm
-    OTVhNGU3Mzk5MmI3YTU4ZDMyM2FmODU1OWE1YWI5ODdhZTczYWU2ZDc4MzUy
-    NzY4Nzg2YjM5M2M5OTUwMWFlOTRiYTJmYjM1NGZmMjI5N2Q0Njc=
+    NzZmOTQ0ZDAyZDc4NDdlNGM3N2I3MDdkZTg5NGJhY2UwYzZmYjMzN2NkODE5
+    NTljNzU1MjMzODlhMTNhOGVkMmViMGQ0MGY2ODY1YTA2ZGU2ZDNkNTc1OTk5
+    YmIyNGM1N2M1NDM4ODRhYWFiNTcyYjAzNDE2N2EzNmM4ZjNiZTY=

data/lib/formatter.rb

@@ -35,7 +35,7 @@ module Shades
       metadata.measures.each do |m|
         row = 1
         max_value = find_abs_max(m, events) + 1.0
-        vlen = Integer(Math::log10(10*max_value)) + 5
+        vlen = Integer(Math::log10(10*(max_value+1))) + 5
         w = [vlen, m.length].max
         events.each do |e|
           v = e.measure(m)

data/lib/queryparser.rb

@@ -142,6 +142,7 @@ module Shades
       OrderToken.new(s)
     end
     def emit(s)
+      # by
       BeginSortingToken::parse(s)
     end
   end

data/lib/stats.rb

@@ -2,6 +2,8 @@ module Stats
 
   SUM  = lambda { Sum.new(0.0)  }
   MEAN = lambda { Mean.new(0.0) }
+  MIN  = lambda { Min.new(Float::MAX) }
+  MAX  = lambda { Max.new(Float::MIN) }
 
   class StatsType
     def self.get(name)
@@ -9,6 +11,10 @@ module Stats
         SUM
       elsif name.eql?("mean")
         MEAN
+      elsif name.eql?("min")
+        MIN
+      elsif name.eql?("max")
+        MAX
       end
     end
   end
@@ -65,4 +71,48 @@ module Stats
       @sum / @n
     end
   end
+
+  class Min < StatsType
+    def initialize(d)
+      @min = d
+    end
+
+    def add(d)
+      @min = [@min, d].min
+    end
+
+    def remove(d)
+      puts "ignoring remove"
+    end
+
+    def merge(stat)
+      @min = [@min, stat.get_value].min
+    end
+
+    def get_value
+      @min
+    end
+  end
+
+  class Max < StatsType
+    def initialize(d)
+      @max = d
+    end
+
+    def add(d)
+      @max = [@max, d].max
+    end
+
+    def remove(d)
+      puts "ignoring remove"
+    end
+
+    def merge(stat)
+      @max = [@max, stat.get_value].max
+    end
+
+    def get_value
+      @max
+    end
+  end
 end

data/shades.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'shades'
-  s.version = '0.13'
+  s.version = '0.14'
 
   s.summary = "Get a new perspective on your data. In-memory data cubing of event data for Ruby."
   s.description = <<-EOF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shades
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
 platform: ruby
 authors:
 - Dietrich Featherston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler