keen-cli 0.1.8 → 0.1.9

data/README.md

@@ -266,6 +266,7 @@ Parameters that apply to most commands include:
 
 ### Changelog
 
++ 0.1.9 - Supports JSON-encoded filters and comma-seperated multiple group by
 + 0.1.8 - Inputted lines can also be arrays of JSON objects. `--batch-size` param is now properly recognized.
 + 0.1.7 - Add docs command
 + 0.1.6 - Big refactoring to make importing events much cleaner and batching happen automatically. Also adds `queries:url`.

data/lib/keen-cli/queries.rb

@@ -106,15 +106,17 @@ module KeenCli
       end
 
       # copy query options in intelligently
-      q_options[:group_by] = options[:"group-by"]
       q_options[:target_property] = options[:"target-property"]
       q_options[:interval] = options[:interval]
       q_options[:timeframe] = options[:timeframe]
-      q_options[:filters] = options[:filters]
       q_options[:percentile] = options[:percentile]
       q_options[:latest] = options[:latest]
       q_options[:email] = options[:email]
 
+      if group_by = options[:"group-by"]
+        q_options[:group_by] = group_by.split(",")
+      end
+
       if property_names = options[:"property-names"]
         q_options[:property_names] = property_names.split(",")
       end
@@ -123,6 +125,10 @@ module KeenCli
         q_options[:timeframe] = { :start => start_time }
       end
 
+      if filters = options[:filters]
+        q_options[:filters] = JSON.parse(filters)
+      end
+
       if end_time = options[:end]
         q_options[:timeframe] = q_options[:timeframe] || {}
         q_options[:timeframe][:end] = end_time

data/lib/keen-cli/version.rb

@@ -1,3 +1,3 @@
 module KeenCli
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/keen-cli/batch_processor_spec.rb

@@ -96,6 +96,31 @@ module KeenCli
         })
       end
 
+      it 'deals with quoted csv values' do
+        batch_processor.csv = true
+        batch_processor.csv_options[:headers] = ['keen.timestamp', 'apple.date', 'apple.banana.cherry', 'apple.banana.walnut']
+        batch_processor.add('"2012-08-09, blah","blah pudding",smoothie,"b,u,tter"')
+        expect(batch_processor.events.first).to eq({
+          "apple" => {
+            "date" => "blah pudding",
+            "banana" => {
+              "cherry" => "smoothie",
+              "walnut" => "b,u,tter"
+            }
+          },
+          "keen" => {
+            "timestamp" => "2012-08-09, blah"
+          }
+        })
+
+      end
+
+      it 'deals with quoted csv headers' do
+        batch_processor.csv = true
+        batch_processor.add('"keen.timestamp","apple.date","apple.banana.cherry","apple.banana.walnut"')
+        expect(batch_processor.csv_options[:headers]).to eq(["keen.timestamp", "apple.date", "apple.banana.cherry", "apple.banana.walnut"])
+      end
+
     end
 
     describe 'add' do

data/spec/keen-cli/queries_spec.rb

@@ -23,12 +23,19 @@ describe KeenCli::CLI do
     end
 
     it 'converts dashes to underscores for certain properties' do
-      url = "https://api.keen.io/3.0/projects/#{project_id}/queries/count?event_collection=minecraft-deaths&group_by=foo&target_property=bar"
+      url = "https://api.keen.io/3.0/projects/#{project_id}/queries/count?event_collection=minecraft-deaths&group_by=%5B%22foo%22%5D&target_property=bar"
       stub_request(:get, url).to_return(:body => { :result => 10 }.to_json)
       _, options = start 'queries:run --analysis-type count --collection minecraft-deaths --group-by foo --target-property bar'
       expect(_).to eq(10)
     end
 
+    it 'allows comma-delimited group by fields' do
+      url = "https://api.keen.io/3.0/projects/#{project_id}/queries/count?event_collection=minecraft-deaths&group_by=%5B%22%5C%22foo%22,%22bar%5C%22%22%5D&target_property=bar"
+      stub_request(:get, url).to_return(:body => { :result => 10 }.to_json)
+      _, options = start 'queries:run --analysis-type count --collection minecraft-deaths --group-by "foo,bar" --target-property bar'
+      expect(_).to eq(10)
+    end
+
     it 'accepts extraction-specific properties' do
       url = "https://api.keen.io/3.0/projects/#{project_id}/queries/extraction?event_collection=minecraft-deaths&property_names=%5B%22foo%22,%22bar%22%5D&latest=1&email=bob@bob.io"
       stub_request(:get, url).to_return(:body => { :result => 10 }.to_json)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keen-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: keen