vault_client 0.0.3 → 0.1.0

data/test/models/b_event_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class BEventTest < VCTest
+  def test_open
+    our_params = {
+      :hid => "app123",
+      :entity_id => 1,
+      :rate_code => "RT01",
+      :time => Time.utc(2012,1).to_s,
+      :product_name => "web",
+      :qty => 1
+    }
+    api_resp_body = VC::HttpHelpers.enc_json(our_params)
+    VC.url = "http://provider:password@shushu.heroku.com"
+    FakeWeb.register_uri(:put, (VC.url + "/resources/app123/billable_events/1"), :body => api_resp_body)
+    event = VC::BEvent.open(our_params)
+    assert_equal(1, event["entity_id"])
+  end
+end
+

data/test/models/billable_unit_test.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class BillableUnitTest < VCTest
+  def test_total
+    unit1 = VC::BillableUnit.new("rate" => 10, "qty" => 10)
+    assert_equal(100, unit1.total)
+  end
+end

data/test/models/line_item_test.rb

@@ -0,0 +1,10 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class LineItemTest < VCTest
+  def test_total
+    unit1 = VC::BillableUnit.new("rate" => 10, "qty" => 10)
+    unit_group1 = VC::UnitGroup.new([unit1])
+    line_item = VC::LineItem.new([unit_group1])
+    assert_equal(100, line_item.total)
+  end
+end

data/test/models/unit_group_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class UnitGroupTest < VCTest
+  def test_total
+    unit1 = VC::BillableUnit.new("rate" => 10, "qty" => 10)
+    unit_group1 = VC::UnitGroup.new([unit1])
+    assert_equal(100, unit_group1.total)
+  end
+
+  def test_check_rates
+    unit1 = VC::BillableUnit.new("rate" => 10, "qty" => 10)
+    unit2 = VC::BillableUnit.new("rate" => 9,  "qty" => 10)
+    unit_group1 = VC::UnitGroup.new([unit1])
+    unit_group2 = VC::UnitGroup.new([unit2])
+    assert_raises(VC::UnitGroup::InvalidUnitGroup) {VC::UnitGroup.new([unit1, unit2])}
+  end
+end

data/test/presenters/line_item_presenter_test.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+class LineItemPresenterTest < VCTest
+  def test_unit_group_total
+    unit1 = VC::BillableUnit.new("rate" => 1000, "qty" => 10, "product_group" => "dyno")
+    unit_group1 = VC::UnitGroup.new([unit1])
+    line_item = VC::LineItem.new([unit_group1])
+    lip = VC::LineItemPresenter.new(line_item)
+    assert_equal("100.00", lip.unit_group_total("dyno"))
+  end
+
+  def test_unit_group_qty
+    unit1 = VC::BillableUnit.new("rate" => 1000, "qty" => 10, "product_group" => "dyno")
+    unit2 = VC::BillableUnit.new("rate" => 1000, "qty" => 1,  "product_group" => "dyno")
+    unit_group1 = VC::UnitGroup.new([unit1, unit2])
+    line_item = VC::LineItem.new([unit_group1])
+    lip = VC::LineItemPresenter.new(line_item)
+    assert_equal("11.000", lip.unit_group_qty("dyno"))
+  end
+
+  def test_unit_group_presenters
+    unit1 = VC::BillableUnit.new("product_group" => "dyno")
+    unit2 = VC::BillableUnit.new("product_group" => "dyno")
+    unit3 = VC::BillableUnit.new("product_group" => "addon")
+    unit_group1 = VC::UnitGroup.new([unit1, unit2])
+    unit_group2 = VC::UnitGroup.new([unit3])
+    line_item = VC::LineItem.new([unit_group1, unit_group2])
+    lip = VC::LineItemPresenter.new(line_item)
+
+    assert_equal(2, lip.unit_group_presenters.length)
+    assert_equal(1, lip.unit_group_presenters("dyno").map(&:product_group).uniq.length)
+    assert_equal("addon", lip.unit_group_presenters("addon").map(&:product_group).uniq.first)
+  end
+end
+
+

data/test/presenters/report_presenter_test.rb

@@ -1,16 +1,22 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class ReportPresenterTest < VaultClientTest
+class ReportPresenterTest < VCTest
+
+  def report
+    VC::Report.new.tap do |r|
+      r.billable_units = Fixtures.billable_units.map {|h| VC::BillableUnit.new(h)}
+    end
+  end
 
   def test_init
-    presenter = VaultClient::ReportPresenter.new(units)
+    presenter = VC::ReportPresenter.new(report)
     assert(!presenter.nil?)
   end
 
   def test_returns_line_item_presenters
-    presenter = VaultClient::ReportPresenter.new(units)
+    presenter = VC::ReportPresenter.new(report)
     lip = presenter.line_item_presenters
-    assert_equal(VaultClient::LineItemPresenter, lip.first.class)
+    assert_equal(VC::LineItemPresenter, lip.first.class)
   end
 
 end

data/test/services/line_item_builder_test.rb

@@ -1,24 +1,28 @@
 require File.expand_path('../../test_helper', __FILE__)
 
-class LineItemBuilderTest < VaultClientTest
+class LineItemBuilderTest < VCTest
+
+  def units
+    Fixtures.billable_units.map {|h| VC::BillableUnit.new(h)}
+  end
 
   def test_build
-    line_items = VaultClient::LineItemBuilder.build(units)
+    line_items = VC::LineItemBuilder.build(units)
     assert(!line_items.nil?)
   end
 
   def test_build_creates_line_item_by_hid
-    line_items = VaultClient::LineItemBuilder.build(units)
+    line_items = VC::LineItemBuilder.build(units)
     assert_equal(1, line_items.length)
   end
 
   def test_build_creates_one_unit_group_for_line_item
-    line_item = VaultClient::LineItemBuilder.build(units).pop
+    line_item = VC::LineItemBuilder.build(units).pop
     assert_equal(1, line_item.unit_groups.length)
   end
 
   def test_build_puts_both_units_on_unit_group
-    line_item = VaultClient::LineItemBuilder.build(units).pop
+    line_item = VC::LineItemBuilder.build(units).pop
     unit_group = line_item.unit_groups.pop
     assert_equal(2, unit_group.units.length)
   end

data/test/test_helper.rb

@@ -8,14 +8,12 @@ require "bundler"
 Bundler.require(:default, :test)
 
 require "minitest/autorun"
-require "webmock/minitest"
 require "vault_client"
+require 'fakeweb'
 require "fixtures"
 
-class VaultClientTest < MiniTest::Unit::TestCase
-
-  def units
-    Fixtures.billable_units.map{|h| VaultClient::BillableUnit.new(h)}
-  end
+puts "Blocking network connectivity"
+FakeWeb.allow_net_connect = false
 
+class VCTest < MiniTest::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vault_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2011-12-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &14169520 !ruby/object:Gem::Requirement
+  requirement: &10827140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *14169520
+  version_requirements: *10827140
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &14166100 !ruby/object:Gem::Requirement
+  requirement: &10826660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *14166100
+  version_requirements: *10826660
 description: A ruby wrapper around The Vault's HTTP API.
 email: ryan@heroku.com
 executables: []
@@ -40,31 +40,32 @@ 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
 - lib/presenters/unit_group_presenter.rb
 - lib/presenters/report_presenter.rb
 - lib/presenters/line_item_presenter.rb
-- lib/usage_reports_client.rb
 - lib/vault_client.rb
+- lib/models/account.rb
+- lib/models/acct_own.rb
+- lib/models/report.rb
 - lib/models/unit_group.rb
 - lib/models/line_item.rb
-- lib/models/usage_report.rb
+- lib/models/res_own.rb
+- lib/models/b_event.rb
 - lib/models/billable_unit.rb
-- lib/billable_events_client.rb
-- lib/vault_helper.rb
+- lib/helpers/http_helpers.rb
 - lib/services/line_item_builder.rb
-- lib/services/report_builder.rb
-- lib/resource_ownership_client.rb
+- test/presenters/line_item_presenter_test.rb
 - test/presenters/report_presenter_test.rb
 - test/fixtures.rb
-- test/models/usage_report_test.rb
-- test/resource_ownership_client_test.rb
+- test/models/billable_unit_test.rb
+- test/models/b_event_test.rb
+- test/models/unit_group_test.rb
+- test/models/line_item_test.rb
 - test/services/line_item_builder_test.rb
 - test/test_helper.rb
-homepage: http://github.com/heroku/vault_client
+homepage: http://github.com/heroku/vc
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -87,9 +88,12 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: The Vault
+summary: The Vault Client
 test_files:
+- test/presenters/line_item_presenter_test.rb
 - test/presenters/report_presenter_test.rb
-- test/models/usage_report_test.rb
-- test/resource_ownership_client_test.rb
+- test/models/billable_unit_test.rb
+- test/models/b_event_test.rb
+- test/models/unit_group_test.rb
+- test/models/line_item_test.rb
 - test/services/line_item_builder_test.rb

data/lib/billable_events_client.rb

@@ -1,45 +0,0 @@
-module BillableEventsClient
-  extend self
-  extend VaultHelper
-
-  Open = "open"
-  Close = "close"
-
-  def make_request(action, args)
-    case action
-    when :open
-      open(args)
-    when :close
-      close(args)
-    end
-  end
-
-  def open(args)
-    assert_args!(args, :hid, :event_id, :qty, :time, :rate_code)
-    res = resource(args[:hid], args[:event_id])
-    res.put(
-      :qty          => args[:qty],
-      :time         => encode_time(args[:time]),
-      :state        => Open,
-      :rate_code    => args[:rate_code],
-      :product_name => args[:product_name]
-    )
-  end
-
-  def close(args)
-    assert_args!(args, :hid, :event_id, :time, :rate_code)
-    res = resource(args[:hid], args[:event_id])
-    res.put(
-      :time   => encode_time(args[:time]),
-      :state  => Close,
-      :rate_code => args[:rate_code]
-    )
-  end
-
-  def resource(hid, event_id)
-    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

@@ -1,35 +0,0 @@
-require 'yajl/http_stream'
-module VaultClient
-  module DataTransferObject
-    module UsageReport
-      extend VaultHelper
-      extend self
-
-      def make_request(action, args)
-        case action
-        when :query
-          query(args)
-        else
-          raise "Unkown Action"
-        end
-      end
-
-      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])}))
-        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"
-        RestClient::Resource.new(url, :headers => {:accept => "application/json"})
-      end
-
-    end
-  end
-end

data/lib/models/usage_report.rb

@@ -1,21 +0,0 @@
-module VaultClient
-  class UsageReport
-
-    attr_accessor(
-      :account_id,
-      :from,
-      :to,
-      :billable_units,
-      :total
-    )
-
-    def initialize(account_id, from, to, billable_units, total)
-      @account_id = from
-      @from = from
-      @to = to
-      @billable_units = billable_units
-      @total = total
-    end
-
-  end
-end

data/lib/resource_ownership_client.rb

@@ -1,55 +0,0 @@
-module ResourceOwnershipClient
-  extend self
-  extend VaultHelper
-
-  def make_request(action, args)
-    case action
-    when :activate
-      activate(args)
-    when :transfer
-      transfer(args)
-    when :deactivate
-      deactivate(args)
-    when :query
-      query(args)
-    else
-      raise(ArgumentError, "Resource Ownership API does not respond to #{action}")
-    end
-  end
-
-  def activate(args)
-    assert_args!(args, :account_id, :event_id, :hid, :time)
-    res = resource(args[:account_id], args[:event_id])
-    res.post(:hid => args[:hid], :time => encode_time(args[:time]))
-  end
-
-  def transfer(args)
-    assert_args!(args, :account_id, :prev_account_id, :event_id, :prev_event_id, :hid, :time)
-    res = resource(args[:prev_account_id], args[:prev_event_id])
-    res.put(:account_id => args[:account_id], :event_id => args[:event_id], :hid => args[:hid], :time => encode_time(args[:time]))
-  end
-
-  def deactivate(args)
-    assert_args!(args, :account_id, :event_id, :hid, :time)
-    res = resource(args[:account_id])["#{args[:event_id]}?hid=#{args[:hid]}&time=#{encode_time(args[:time])}"]
-    res.delete
-  end
-
-  def query(args)
-    assert_args!(args, :account_id)
-    res = resource(args[:account_id])
-    res.get
-  end
-
-  def resource(account_id, event_id=nil)
-    url = VaultClient.url.dup
-    url << "/accounts/#{account_id}/resource_ownerships"
-    if event_id
-      url << "/#{event_id}"
-    end
-    @resource ||= begin
-      RestClient::Resource.new(url, :headers => {:accept => "application/json"})
-    end
-  end
-
-end