vault-usage-client 0.0.1 → 0.0.4

data/.gitignore

@@ -1,5 +1,8 @@
 .bundle
 doc
+.env
+.rvmrc
 test/.test.profile*
 vendor
 .yardoc
+pkg

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/heroku/vault-test-tools.git
-  revision: 5eabd67610f279b81cadb803cee8ef704093a05d
+  revision: 14b52d0aad51aeefa58b7fc00dde63d5e578cbe8
   specs:
-    vault-test-tools (0.2.2)
+    vault-test-tools (0.2.4)
       minitest
       nokogiri
       rack-perftools_profiler
@@ -15,20 +15,20 @@ GIT
 PATH
   remote: .
   specs:
-    vault-usage-client (0.0.1)
+    vault-usage-client (0.0.4)
       colorize
       excon
       yajl-ruby
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     ansi (1.4.3)
     colorize (0.5.8)
-    excon (0.16.10)
-    json (1.7.6)
-    minitest (4.6.0)
-    nokogiri (1.5.6)
+    excon (0.20.1)
+    json (1.7.7)
+    minitest (4.7.1)
+    nokogiri (1.5.9)
     open4 (1.3.0)
     perftools.rb (2.0.0)
     rack (1.5.2)
@@ -38,15 +38,15 @@ GEM
       rack (~> 1.0)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
     redcarpet (2.2.2)
-    rr (1.0.4)
+    rr (1.0.5)
     turn (0.9.6)
       ansi
     yajl-ruby (1.1.0)
-    yard (0.8.4.1)
+    yard (0.8.6.1)
 
 PLATFORMS
   ruby

data/bin/vault-usage

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'ostruct'
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -12,13 +13,13 @@ stop_time  = Time.utc(*ARGV[2].split('-'))
 
 client = Vault::Usage::Client.new
 
-all_events = client.usage_for_user(user_hid, start_time, stop_time, ['platform:dyno:physical'])[:events]
+all_events = client.usage_for_user(user_hid, start_time, stop_time,
+                                   ['platform:dyno:physical'])
 
 all_events.group_by { |e| e[:consumer] }.each do |consumer, app_events|
   puts "=== #{consumer} ===".blue
 
   app_events.group_by { |e| e[:product] }.each do |product, product_events|
-
     puts " #{product}"
     product_events.
       map { |event| OpenStruct.new(event) }.
@@ -31,7 +32,6 @@ all_events.group_by { |e| e[:consumer] }.each do |consumer, app_events|
         end
         puts
     end
-
   end
   puts
 end

data/lib/vault-usage-client/client.rb

@@ -104,7 +104,7 @@ module Vault::Usage
     #                ...}},
     #       ...]}
     #   ```
-    def usage_for_user(user_hid, start_time, stop_time, exclude=nil)
+    def usage_for_user(user_hid, start_time, stop_time, exclude=nil, callback_url = nil)
       unless start_time.zone.eql?('UTC')
         raise InvalidTimeError.new('Start time must be in UTC.')
       end
@@ -113,12 +113,16 @@ module Vault::Usage
       end
       path = "/users/#{user_hid}/usage/#{iso_format(start_time)}/" +
              "#{iso_format(stop_time)}"
+      query = {}
       unless exclude.nil? || exclude.empty?
-        query = {exclude: exclude.join(',')}
+        query[:exclude] = exclude.join(',')
       end
+      query[:callback_url] = callback_url if callback_url
       connection = Excon.new(@url)
       response = connection.get(path: path, expects: [200], query: query)
-      events = JSON.parse(response.body, {symbolize_keys: true})
+      payload = JSON.parse(response.body, {symbolize_keys: true})
+      return payload[:job_id] if payload[:job_id]
+      events = payload[:events]
       events.each do |event|
         event.each do |key, value|
           event[key] = parse_date(value) if date?(value)

data/lib/vault-usage-client/version.rb

@@ -2,7 +2,7 @@ module Vault
   module Usage
     class Client
       # The `Vault::Usage::Client` gem version.
-      VERSION = '0.0.1'
+      VERSION = '0.0.4'
     end
   end
 end

data/lib/vault-usage-client.rb

@@ -1,6 +1,3 @@
-require 'bundler'
-Bundler.require :default, ENV['RACK_ENV'].to_sym
-
 require 'excon'
 require 'yajl/json_gem'
 

data/test/client_test.rb

@@ -47,7 +47,8 @@ class ClientTest < Vault::TestCase
     Excon.stub(method: :put) do |request|
       assert_equal('Basic dXNlcm5hbWU6c2VjcmV0',
                    request[:headers]['Authorization'])
-      assert_equal('vault-usage.herokuapp.com:443', request[:host_port])
+      assert_equal('vault-usage.herokuapp.com', request[:host])
+      assert_equal('443', request[:port])
       assert_equal("/products/#{@product_name}/usage/#{@app_hid}" +
                    "/events/#{@event_id}/open/#{iso_format(@start_time)}",
                    request[:path])
@@ -103,7 +104,8 @@ class ClientTest < Vault::TestCase
     Excon.stub(method: :put) do |request|
       assert_equal('Basic dXNlcm5hbWU6c2VjcmV0',
                    request[:headers]['Authorization'])
-      assert_equal('vault-usage.herokuapp.com:443', request[:host_port])
+      assert_equal('vault-usage.herokuapp.com', request[:host])
+      assert_equal('443', request[:port])
       assert_equal("/products/#{@product_name}/usage/#{@app_hid}" +
                    "/events/#{@event_id}/close/#{iso_format(@stop_time)}",
                    request[:path])
@@ -144,12 +146,13 @@ class ClientTest < Vault::TestCase
     Excon.stub(method: :get) do |request|
       assert_equal('Basic dXNlcm5hbWU6c2VjcmV0',
                    request[:headers]['Authorization'])
-      assert_equal('vault-usage.herokuapp.com:443', request[:host_port])
+      assert_equal('vault-usage.herokuapp.com', request[:host])
+      assert_equal('443', request[:port])
       assert_equal("/users/#{@user_hid}/usage/#{iso_format(@start_time)}/" +
                    "#{iso_format(@stop_time)}",
                    request[:path])
       Excon.stubs.pop
-      {status: 200, body: JSON.generate([])}
+      {status: 200, body: JSON.generate({events: []})}
     end
     assert_equal([], @client.usage_for_user(@user_hid, @start_time,
                                             @stop_time))
@@ -161,12 +164,22 @@ class ClientTest < Vault::TestCase
     Excon.stub(method: :get) do |request|
       assert_equal({exclude: 'platform:dyno:physical'}, request[:query])
       Excon.stubs.pop
-      {status: 200, body: JSON.generate([])}
+      {status: 200, body: JSON.generate({events: []})}
     end
     assert_equal([], @client.usage_for_user(@user_hid, @start_time, @stop_time,
                                             ['platform:dyno:physical']))
   end
 
+  def test_usage_for_user_with_callback_url
+    Excon.stub(method: :get) do |request|
+      assert_equal({callback_url: 'http://example.com'}, request[:query])
+      Excon.stubs.pop
+      {status: 200, body: JSON.generate({job_id: 'DEADBEEF'})}
+    end
+    assert_equal('DEADBEEF',
+      @client.usage_for_user(@user_hid, @start_time, @stop_time, nil,'http://example.com'))
+  end
+
   # Client.usage_for_user comma-separates product names, when many are
   # provided in the exclusion list, and passes them to the server using a
   # single query argument.
@@ -175,7 +188,7 @@ class ClientTest < Vault::TestCase
       assert_equal({exclude: 'platform:dyno:physical,addons:memcache:100mb'},
                    request[:query])
       Excon.stubs.pop
-      {status: 200, body: JSON.generate([])}
+      {status: 200, body: JSON.generate({events: []})}
     end
     assert_equal([], @client.usage_for_user(@user_hid, @start_time, @stop_time,
                                             ['platform:dyno:physical',
@@ -186,9 +199,9 @@ class ClientTest < Vault::TestCase
   # not passing one at all.
   def test_usage_for_user_with_empty_exclude
     Excon.stub(method: :get) do |request|
-      assert_equal(nil, request[:query])
+      assert_equal({}, request[:query])
       Excon.stubs.pop
-      {status: 200, body: JSON.generate([])}
+      {status: 200, body: JSON.generate({events: []})}
     end
     assert_equal([], @client.usage_for_user(@user_hid, @start_time, @stop_time,
                                             []))
@@ -205,7 +218,7 @@ class ClientTest < Vault::TestCase
                  start_time: iso_format(@start_time),
                  stop_time: iso_format(@stop_time),
                  detail: {}}]
-      {status: 200, body: JSON.generate(events)}
+      {status: 200, body: JSON.generate({events: events})}
     end
     assert_equal([{id: @event_id,
                    product: @product_name,
@@ -256,7 +269,8 @@ class ClientTest < Vault::TestCase
     Excon.stub(method: :put) do |request|
       assert_equal('Basic dXNlcm5hbWU6c2VjcmV0',
                    request[:headers]['Authorization'])
-      assert_equal('vault-usage.herokuapp.com:443', request[:host_port])
+      assert_equal('vault-usage.herokuapp.com', request[:host])
+      assert_equal('443', request[:port])
       assert_equal("/users/#{@user_hid}/apps/#{@app_hid}/open/#{@event_id}" +
                    "/#{iso_format(@start_time)}",
                    request[:path])
@@ -300,7 +314,8 @@ class ClientTest < Vault::TestCase
     Excon.stub(method: :put) do |request|
       assert_equal('Basic dXNlcm5hbWU6c2VjcmV0',
                    request[:headers]['Authorization'])
-      assert_equal('vault-usage.herokuapp.com:443', request[:host_port])
+      assert_equal('vault-usage.herokuapp.com', request[:host])
+      assert_equal('443', request[:port])
       assert_equal("/users/#{@user_hid}/apps/#{@app_hid}/close/#{@event_id}" +
                    "/#{iso_format(@stop_time)}",
                    request[:path])

data/vault-usage-client.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep('^(test|spec|features)/')
   gem.require_paths = ["lib"]
+  gem.executables   = ['vault-usage']
 
   gem.add_dependency 'excon'
   gem.add_dependency 'yajl-ruby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault-usage-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -64,7 +64,8 @@ description: Client for Vault::Usage
 email:
 - csquared@heroku.com
 - jkakar@heroku.com
-executables: []
+executables:
+- vault-usage
 extensions: []
 extra_rdoc_files: []
 files:
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3440025206376780543
+      hash: 255738031400131991
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3440025206376780543
+      hash: 255738031400131991
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23