vault_client 0.0.2 → 0.0.3

data/lib/dto/usage_report.rb

@@ -1,3 +1,4 @@
+require 'yajl/http_stream'
 module VaultClient
   module DataTransferObject
     module UsageReport
@@ -15,16 +16,18 @@ module VaultClient
 
       def query(args)
         assert_args!(args, :account_id, :from, :to)
-        res = resource(args[:account_id])
-        Yajl::Parser.parse(res.get(:params => {:from => encode_time(args[:from]), :to => encode_time(args[:to])}))
+        #res = resource(args[:account_id])
+        #Yajl::Parser.parse(res.get(:params => {:from => encode_time(args[:from]), :to => encode_time(args[:to])}))
+        data = []
+        uri = URI.parse([VaultClient.url, "/accounts/#{args[:account_id]}/usage_reports?from=#{args[:from]}&to=#{args[:to]}"].join)
+        Yajl::HttpStream.get(uri) {|c| data << c}
+        data
       end
 
       def resource(account_id)
         url = VaultClient.url.dup
         url << "/accounts/#{account_id}/usage_reports"
-        @resource ||= begin
-          RestClient::Resource.new(url, :headers => {:accept => "application/json"})
-        end
+        RestClient::Resource.new(url, :headers => {:accept => "application/json"})
       end
 
     end

data/lib/models/billable_unit.rb

@@ -16,8 +16,8 @@ module VaultClient
       @hid = args_hash["hid"]
       @from = args_hash["from"]
       @to = args_hash["to"]
-      @qty = args_hash["qty"]
-      @rate = args_hash["rate"]
+      @qty = args_hash["qty"].to_f
+      @rate = args_hash["rate"].to_i
       @rate_period = args_hash["rate_period"]
       @product_name = args_hash["product_name"]
       @product_group = args_hash["product_group"]

data/lib/models/usage_report.rb

@@ -1,14 +1,6 @@
 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/services/report_builder.rb

@@ -4,11 +4,11 @@ module VaultClient
 
     def usage_report(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)}
-      from = Time.parse(dto["from"])
-      to = Time.parse(dto["to"])
-      total = dto["total"].to_i
-      UsageReport.new(account_id, from, to, billable_units, total)
+      billable_units = dto.map{|bu| BillableUnit.new(bu)}
+      #from = Time.parse(dto["from"])
+      #to = Time.parse(dto["to"])
+      #total = dto["total"].to_i
+      UsageReport.new(account_id, Time.mktime(2011,12), Time.mktime(2011,12,30), billable_units, 99)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault_client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   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: &17073680 !ruby/object:Gem::Requirement
+  requirement: &14169520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *17073680
+  version_requirements: *14169520
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &17689640 !ruby/object:Gem::Requirement
+  requirement: &14166100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *17689640
+  version_requirements: *14166100
 description: A ruby wrapper around The Vault's HTTP API.
 email: ryan@heroku.com
 executables: []