vault_client 0.0.1 → 0.0.2

data/lib/billable_events_client.rb

@@ -37,11 +37,9 @@ module BillableEventsClient
   end
 
   def resource(hid, event_id)
-    url = VaultClient.url.dup
-    url << "/resources/#{hid}/billable_events/#{event_id}"
-    @resource ||= begin
-      RestClient::Resource.new(url, :headers => {:accept => "application/json"})
-    end
+    url = VaultClient.url
+    url += "/resources/#{hid}/billable_events/#{event_id}"
+    RestClient::Resource.new(url, :headers => {:accept => "application/json"})
   end
 
 end

data/lib/dto/usage_report.rb

@@ -16,7 +16,7 @@ module VaultClient
       def query(args)
         assert_args!(args, :account_id, :from, :to)
         res = resource(args[:account_id])
-        JSON.parse res.get(:params => {:from => encode_time(args[:from]), :to => encode_time(args[:to])})
+        Yajl::Parser.parse(res.get(:params => {:from => encode_time(args[:from]), :to => encode_time(args[:to])}))
       end
 
       def resource(account_id)

data/lib/models/usage_report.rb

@@ -1,6 +1,14 @@
 module VaultClient
   class UsageReport
 
+    def self.build(account_id, from, to)
+      dto = DataTransferObject::UsageReport.query(:account_id => account_id, :from => from, :to => to)
+      billable_units  = dto["billable_units"].map{|bu| BillableUnit.new(bu)}
+      total           = dto["total"].to_i
+      from, to        = [dto["from"], dto["to"]].map {|t| Time.parse(t)}
+      new(account_id, from, to, billable_units, total)
+    end
+
     attr_accessor(
       :account_id,
       :from,

data/lib/presenters/line_item_presenter.rb

@@ -65,4 +65,3 @@ module VaultClient
 
   end
 end
-

data/lib/vault_client.rb

@@ -1,5 +1,5 @@
 require 'rest-client'
-require 'json'
+require 'yajl'
 require 'vault_helper'
 require 'resource_ownership_client'
 require 'billable_events_client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &8576100 !ruby/object:Gem::Requirement
+  requirement: &17073680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,18 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *8576100
+  version_requirements: *17073680
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &8572460 !ruby/object:Gem::Requirement
+  name: yajl-ruby
+  requirement: &17689640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *8572460
+  version_requirements: *17689640
 description: A ruby wrapper around The Vault's HTTP API.
 email: ryan@heroku.com
 executables: []
@@ -40,6 +40,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - readme.md
+- lib/dto/billable_event.rb
 - lib/dto/usage_report.rb
 - lib/presenters/base_presenter.rb
 - lib/presenters/unit_presenter.rb