shades 0.16 → 0.17

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzlmYmQ3MTc0MTQ5NWM3MjNlMDBhNzU5MGIzMDM2ODk4NmQ0OTcyOQ==
-  data.tar.gz: !binary |-
-    OWM3ZjJjNDE5NzI4OGU0MWM3NmRhNzAzOWI5NGVjMmNjYTQ3ZmEwOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGVkM2YxOWEwNzgyMWM2NzBlNTViOGY0ZjQ5YjEyMDg2OTY2ZWI0YmFjNWI3
-    YTNiOTM2OGI1YjllNmQ3YzM0NjM4ZTA0NDIzYjQzOGI3NDU2ZDQzODdmOWI3
-    M2IwMjUxMzJkNmRjODkzMjFmZTk5ODRmNWUwZTYyNzVjNzFmNjA=
-  data.tar.gz: !binary |-
-    ZTc0YzY2NzA1MDgzZGFkNGVhNTY4Njc0ODBmYjY3MzczOTQzN2RhZTdlNjJj
-    ZTZhMDZlMmZjMWNlYTJiZWQ4ODY4YjczYjFmZTUwOGM2NmIzZjBmNWI4ZDQw
-    NjI0NmZhMGM1OGI1Nzg4ZDIyZjUyZTIwNTI2YmViY2Q0YjllY2M=
+SHA1:
+  metadata.gz: d9d8ca3bf32d96256209ac2fe7db83c8e8923eda
+  data.tar.gz: feda5c6eb9ce7ae997f312eb6a70d56552666493
+SHA512:
+  metadata.gz: 95281754e804b285e319e855f3682267cf3b489d2676d99123dfc5d40dc35cef1d94acecea1fa23f2ac8131cc671615ce6c89d8985581313f09d1121e6e65628
+  data.tar.gz: d547693e74ed71eb5b36f076bc343c00b71bc6b370102336586013b525ffcde3b01841f97bd6bf66569cdfd235f07e11819179b73890a263a3ad6ff33eabead8

data/bin/shades

@@ -4,7 +4,9 @@ $: << File.realpath(File.dirname(__FILE__) + "/../lib")
 require 'getoptlong'
 require 'shades'
 
-def main(parseable_output, q)
+require 'json'
+
+def main(parseable_output, json_output, q)
 
   events_in = []
   p = Shades::StreamParser.new do |e|
@@ -16,21 +18,29 @@ def main(parseable_output, q)
   end
 
   events_out = q.run(events_in)
-  fmt = Shades::Formatter.new(" ")
-  if parseable_output
-    fmt.text($stdout, events_out)
+
+  if json_output
+    puts events_out.map { |e| e.to_map }.to_json
   else
-    fmt.pretty_text($stdout, events_out)
+    fmt = Shades::Formatter.new(" ")
+    if parseable_output
+      fmt.text($stdout, events_out)
+    else
+      fmt.pretty_text($stdout, events_out)
+    end
   end
 end
 
 opt_parser = GetoptLong.new
 opt_parser.set_options(
     # create output that can itself be used as input to this program
-    ["-p", "--parseable", GetoptLong::NO_ARGUMENT]
+    ["-p", "--parseable", GetoptLong::NO_ARGUMENT],
+    # json output
+    ["-j", "--json", GetoptLong::NO_ARGUMENT],
   )
 
 parseable_output = false
+json_output = false
 
 begin
   begin
@@ -39,12 +49,14 @@ begin
     case opt
       when "-p" || "--parseable"
         parseable_output = true
+      when "-j" || "--json"
+        json_output = true
     end
   rescue => err
-    $stderr.puts err.message
+   $stderr.puts err.message
   end
 end while 1
 
 qs = ARGV[-1]
 q = Shades::QueryParser::parse(qs)
-main(parseable_output, q)
+main(parseable_output, json_output, q)

data/lib/shades/cube.rb

@@ -233,6 +233,25 @@ module Shades
       f << measures.map   { |k| '%.5f' % measure(k) }
       f.join("\t")
     end
+
+    def dimension_map
+      @dvalues
+    end
+
+    def measure_map
+      mm = {}
+      measures.each do |k, v|
+        mm[k] = measure(k)
+      end
+      mm
+    end
+
+    def to_map
+      {
+        :dimensions => @dvalues,
+        :measures => measure_map
+      }
+    end
   end
 
 end

data/lib/shades/streamparser.rb

@@ -11,7 +11,7 @@ module Shades
     def <<(line)
       line.strip!
       if !@metadata.nil?
-        event = @metadata.parse_event(line, /\s+/)
+        event = @metadata.parse_event(line, /\t/)
         if event.nil?
           puts line
         else

data/shades.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'shades'
-  s.version = '0.16'
+  s.version = '0.17'
 
   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.16'
+  version: '0.17'
 platform: ruby
 authors:
 - Dietrich Featherston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -28,48 +28,46 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! '    Shades computes data cubes for you from events composed of dimensions
-  and measures.
-
-'
+description: |2
+      Shades computes data cubes for you from events composed of dimensions and measures.
 email: d@d2fn.com
 executables:
 - shades
@@ -126,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shades
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Get a new perspective on your data. In-memory data cubing of event data for