app_monit 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5023058b95f44aab030c66dd92936dc54e165fb7
-  data.tar.gz: 6f6b8b96777a6847b200c858b77486190ea56770
+  metadata.gz: 77edac5c532fcf5239cfbe239328f0141c7351b5
+  data.tar.gz: e1e5f037eb95285a8fb6e3d2cd906969dbb7930a
 SHA512:
-  metadata.gz: df9e4553cde84385a09506d7beb03f2ddb9e1b0ca2f2619c6e0f1e1e97a00c9b161df826bddf0627881f18327fa7d066fea3a2f1e3d268b44c7d9af9af18b720
-  data.tar.gz: 316a5421865682ff2f5701135870429a8eb12c6814488f34a6a38357d87095b03d55e37c7a9326caf9667af09379d1d2504294f36f27b509fd52c686f9270baa
+  metadata.gz: f5ff7e424a0fb92555deb94a9db0144513b4b3cea233cd33d5aa5ef1069e062db8ab9db94852f46ca913595660fc46269b6db58eddb2e730443009a9afabfece
+  data.tar.gz: 36e104bf7cf3a755f5fe698551e4f7f9fccc5a7b435108f04cf3508b1bf903ec5737c441ffcdf54c106dfa77fd28ea5498d6b6a78776c7343792bfae757b4e7b

data/README.md

@@ -73,15 +73,15 @@ You can use the following methods to query your data:
 * `#sum`
 * `#funnel`
 
-The examples are based on the following events:
+The examples are based on the following events
 
 ```ruby
 AppMonit::Event.create(:registered, user: { id: '1' })
 AppMonit::Event.create(:registered, user: { id: '2' })
 
-AppMonit::Event.create(:purchase, user: { id: '1' }, product: { price_in_cents: 100, name: 'water', alcoholic: false })
-AppMonit::Event.create(:purchase, user: { id: '1' }, product: { price_in_cents: 150, name: 'soda', alcoholic: false })
-AppMonit::Event.create(:purchase, user: { id: '1' }, product: { price_in_cents: 200, name: 'beer', alcoholic: true })
+AppMonit::Event.create(:purchase, user: { id: '1' }, product: { price_in_cents: 100, name: 'water', alcoholic: false, tags: ['plain', 'wet'] })
+AppMonit::Event.create(:purchase, user: { id: '1' }, product: { price_in_cents: 150, name: 'soda', alcoholic: false, tags: ['sparkling', 'wet'] })
+AppMonit::Event.create(:purchase, user: { id: '1' }, product: { price_in_cents: 200, name: 'beer', alcoholic: true, tags: ['sparkling', 'wet'] })
 ```
 
 #### `#count`
@@ -177,6 +177,16 @@ AppMonit::Query.count('registered', group_by: 'alcoholic') #=> { 'result' => [{
                                                            #                  { 'alcoholic' => false, result => 2 }]
 ```
 
+#### Expanded group by
+
+You can specify a group to expand when querying your data:
+
+```ruby
+AppMonit::Query.count('registered', expanded_group_by: 'tags') #=> { 'result' => [{ 'tags' => 'wet',      result => 3 }
+                                                               #                  { 'tags' => 'sparkling', result => 2 }]
+                                                               #                  { 'tags' => 'plain',     result => 1 }]
+```
+
 #### Filter
 
 You can specify a filter when querying your data:

data/lib/app_monit/event.rb

@@ -7,7 +7,7 @@ module AppMonit
     rescue Http::Error
       false
     rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse,
-        Net::HTTPHeaderSyntaxError, Net::ProtocolError, Errno::ETIMEDOUT => error
+        Net::HTTPHeaderSyntaxError, Net::ProtocolError, Errno::ETIMEDOUT, Errno::ECONNREFUSED => error
       raise error unless AppMonit::Config.fail_silent
       false
     end

data/lib/app_monit/http.rb

@@ -39,7 +39,8 @@ module AppMonit
       end
 
       # set headers so event data ends up in the correct bucket on the other side
-      request.add_field('Appmonit-Api-Key', AppMonit::Config.api_key)
+      # only add Appmonit-Api-Key header if there was no api_key configured in the params
+      request.add_field('Appmonit-Api-Key', AppMonit::Config.api_key) unless api_key(path)
       request.add_field('Appmonit-Env', AppMonit::Config.env)
       response = client.request(request)
 
@@ -47,5 +48,17 @@ module AppMonit
 
       response
     end
+
+    private
+
+    def api_key(path)
+      params(path).fetch('api_key', nil)
+    end
+
+    def params(path)
+      URI.decode_www_form(URI.parse(path).query).to_h
+    rescue
+      {}
+    end
   end
 end

data/lib/app_monit/version.rb

@@ -1,3 +1,3 @@
 module AppMonit
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/app_monit/query_spec.rb

@@ -9,17 +9,36 @@ describe AppMonit::Query do
     AppMonit::Config.env       = nil
   end
 
-  %w(count count_unique minimum maximum average sum funnel).each do |method_name|
-    describe method_name do
-      it 'gets the results with the given params' do
-        stub_request(:get, /api.appmon.it\/v1\/queries\/#{method_name}/).to_return(body: {result: '0'}.to_json)
+  describe 'No api_key has been added to the params' do
+    %w(count count_unique minimum maximum average sum funnel).each do |method_name|
+      describe method_name do
+        it 'gets the results with the given params' do
+          stub_request(:get, /api.appmon.it\/v1\/queries\/#{method_name}/).to_return(body: {result: '0'}.to_json)
 
-        params = { valid: 'params' }
-        subject.send(method_name, 'collection_name', params)
+          params = { valid: 'params' }
+          subject.send(method_name, 'collection_name', params)
 
-        params[:event_collection] = 'collection_name'
+          params[:event_collection] = 'collection_name'
 
-        assert_requested(:get, /api.appmon.it\/v1\/queries\/#{method_name}\?query=#{params.to_json}/)
+          assert_requested(:get, /api.appmon.it\/v1\/queries\/#{method_name}\?query=#{params.to_json}/)
+        end
+      end
+    end
+  end
+
+  describe 'An api_key has been added to the params' do
+    %w(count count_unique minimum maximum average sum funnel).each do |method_name|
+      describe method_name do
+        it 'gets the results with the given params' do
+          stub_request(:get, /api.appmon.it\/v1\/queries\/#{method_name}/).to_return(body: {result: '0'}.to_json)
+
+          params = { valid: 'params', api_key: 'XXX' }
+          subject.send(method_name, 'collection_name', params)
+
+          params[:event_collection] = 'collection_name'
+
+          assert_requested(:get, /api.appmon.it\/v1\/queries\/#{method_name}\?api_key=XXX&query=#{params.to_json}/)
+        end
       end
     end
   end

data/test.rb

@@ -1,13 +1,26 @@
 $:<<'lib'
 require 'app_monit'
 
-AppMonit::Config.end_point  = 'http://localhost:3000'
-AppMonit::Config.api_key    = 'SOMEKEY'
-AppMonit::Config.enabled    = true
-AppMonit::Config.async      = true
-AppMonit::Config.flush_rate = 1
+AppMonit::Config.end_point   = 'http://localhost:3000'
+AppMonit::Config.api_key     = 'SOMEKEY'
+AppMonit::Config.enabled     = true
+AppMonit::Config.async       = false
+AppMonit::Config.flush_rate  = 1
+AppMonit::Config.fail_silent = true
 
-AppMonit::Event.create('test', with: 'payload')
+trap(:INT) { @running = false }
+@running = true
+index    = 0
+t        = Time.now
+while @running do
+  AppMonit::Event.create('test', with: 'payload', also: { nested: 'values' })
+  index += 1
 
-AppMonit.logger.debug 'Press enter to exit'
-gets
+  # @running = index < 10
+
+  if index == 1000
+    p "Events per second: #{1000 / (Time.now - t)}"
+    index = 0
+    t     = Time.now
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_monit
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Redmar Kerkhoff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client gem for pushing events from ruby to the appmon.it service