shushu 0.1.16 → 1.0.0rc1

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shushu
 version: !ruby/object:Gem::Version
-  version: 0.1.16
-  prerelease: 
+  version: 1.0.0rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Ryan Smith
@@ -44,43 +44,24 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 description: A ruby wrapper around Shushu's HTTP API.
-email: ryan@heroku.com
+email: ryan@heroku.com, christopher.continanza@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - readme.md
 - lib/helpers/http_helpers.rb
-- lib/models/account.rb
-- lib/models/acct_own.rb
-- lib/models/b_event.rb
-- lib/models/billable_unit.rb
+- lib/models/billable_event.rb
 - lib/models/heart_beat.rb
-- lib/models/line_item.rb
-- lib/models/p_method.rb
-- lib/models/r_code.rb
+- lib/models/rate_code.rb
 - lib/models/report.rb
-- lib/models/res_own.rb
-- lib/models/rev_rep.rb
-- lib/models/unit_group.rb
-- lib/presenters/base_presenter.rb
-- lib/presenters/line_item_presenter.rb
-- lib/presenters/report_presenter.rb
-- lib/presenters/unit_group_presenter.rb
-- lib/presenters/unit_presenter.rb
-- lib/services/line_item_builder.rb
+- lib/models/resource_ownership.rb
 - lib/shushu.rb
+- lib/totalable.rb
 - test/fixtures.rb
-- test/models/b_event_test.rb
-- test/models/billable_unit_test.rb
-- test/models/line_item_test.rb
-- test/models/p_method_test.rb
-- test/models/r_code_test.rb
-- test/models/rev_rep_test.rb
-- test/models/unit_group_test.rb
-- test/presenters/line_item_presenter_test.rb
-- test/presenters/report_presenter_test.rb
-- test/services/line_item_builder_test.rb
+- test/models/billable_event_test.rb
+- test/models/rate_code_test.rb
+- test/reports_test.rb
 - test/test_helper.rb
 homepage: http://github.com/heroku/shushu
 licenses: []
@@ -97,9 +78,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -107,13 +88,6 @@ signing_key:
 specification_version: 3
 summary: Shushu client lib
 test_files:
-- test/models/b_event_test.rb
-- test/models/billable_unit_test.rb
-- test/models/line_item_test.rb
-- test/models/p_method_test.rb
-- test/models/r_code_test.rb
-- test/models/rev_rep_test.rb
-- test/models/unit_group_test.rb
-- test/presenters/line_item_presenter_test.rb
-- test/presenters/report_presenter_test.rb
-- test/services/line_item_builder_test.rb
+- test/models/billable_event_test.rb
+- test/models/rate_code_test.rb
+- test/reports_test.rb

data/lib/models/account.rb

@@ -1,13 +0,0 @@
-module Shushu
-  module Account
-    extend self
-
-    def create
-      Shushu.handle_req {RestClient.post(accounts_url, {}, Shushu.headers)}
-    end
-
-    def accounts_url
-      [Shushu.url, "/accounts"].join
-    end
-  end
-end

data/lib/models/acct_own.rb

@@ -1,25 +0,0 @@
-module Shushu
-  module AcctOwn
-    extend self
-
-    def act(args)
-      pmid , eid = args.delete(:payment_method_id), args.delete(:entity_id)
-      args[:state] = "active"
-      Shushu.handle_req do
-        RestClient.put(acct_own_url(pmid, eid), args, Shushu.headers)
-      end
-    end
-
-    def deact(args)
-      pmid, eid = args.delete(:payment_method_id), args.delete(:entity_id)
-      args[:state] = "inactive"
-      Shushu.handle_req do
-        RestClient.put(acct_own_url(pmid, eid), args, Shushu.headers)
-      end
-    end
-
-    def acct_own_url(payment_method_id, entity_id)
-      [Shushu.url, "/payment_methods/#{payment_method_id}/account_ownerships/#{entity_id}"].join
-    end
-  end
-end

data/lib/models/billable_unit.rb

@@ -1,35 +0,0 @@
-module Shushu
-  class BillableUnit
-    attr_accessor(
-      :hid,
-      :from,
-      :to,
-      :qty,
-      :rate,
-      :rate_period,
-      :product_group,
-      :product_name
-    )
-
-    def initialize(args_hash)
-      @hid = args_hash["hid"]
-      @from = args_hash["from"]
-      @to = args_hash["to"]
-      @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"]
-    end
-
-    def id
-      #TODO remove stub
-      Time.now.to_i
-    end
-
-    def total
-      @rate * @qty
-    end
-
-  end
-end

data/lib/models/line_item.rb

@@ -1,19 +0,0 @@
-module Shushu
-  class LineItem
-
-    attr_reader :unit_groups
-
-    def initialize(unit_groups)
-      @unit_groups = unit_groups
-    end
-
-    def app_name
-      @unit_groups.first.hid
-    end
-
-    def total
-      @unit_groups.map(&:total).reduce(:+)
-    end
-
-  end
-end

data/lib/models/p_method.rb

@@ -1,20 +0,0 @@
-module Shushu
-  module PMethod
-    extend self
-
-    def create(args)
-      Shushu.handle_req {RestClient.post(p_method_url, args, Shushu.headers)}
-    end
-
-    def update(args)
-      id = args.delete(:id)
-      Shushu.handle_req {RestClient.put(p_method_url(id), args, Shushu.headers)}
-    end
-
-    def p_method_url(id=nil)
-      url = [Shushu.url, "/payment_methods"].join
-      id.nil? ? url : url << "/#{id}"
-    end
-
-  end
-end

data/lib/models/r_code.rb

@@ -1,23 +0,0 @@
-module Shushu
-  module RCode
-    extend self
-
-    def create(args)
-      if args[:slug].nil?
-        Shushu.handle_req do
-          RestClient.post(rate_codes_url, args, Shushu.headers)
-        end
-      else
-        Shushu.handle_req do
-          url = [rate_codes_url, args.delete(:slug)].join("/")
-          RestClient.put(url, args, Shushu.headers)
-        end
-      end
-    end
-
-    def rate_codes_url
-      [Shushu.url, "/rate_codes"].join
-    end
-
-  end
-end

data/lib/models/rev_rep.rb

@@ -1,13 +0,0 @@
-module Shushu
-  module RevRep
-    extend self
-
-    def get(from, to)
-      Shushu.handle_req do
-        RestClient.get([Shushu.url, "/rev_report"].join, {:params => {:from => from.utc.to_s, :to => to.utc.to_s}})
-      end
-    end
-
-  end
-end
-

data/lib/models/unit_group.rb

@@ -1,59 +0,0 @@
-module Shushu
-  class UnitGroup
-    InvalidUnitGroup = Class.new(ShushuException)
-
-    attr_reader :units
-
-    def initialize(units)
-      @units = units
-      check_rates
-    end
-
-    def check_rates
-      if @units.map(&:rate).uniq.length > 1
-        raise(InvalidUnitGroup, "Rates must be homogenius.")
-      end
-    end
-
-    def total
-      rate * qty
-    end
-
-    def qty
-      @units.map(&:qty).reduce(:+)
-    end
-
-    def rate
-      sample_unit.rate
-    end
-
-    def rate_period
-      sample_unit.rate_period
-    end
-
-    def name
-      sample_unit.product_name
-    end
-
-    def hid
-      sample_unit.hid
-    end
-
-    def product_name
-      sample_unit.product_name
-    end
-
-    def product_group
-      sample_unit.product_group
-    end
-
-    def description
-      sample_unit.product_name
-    end
-
-    def sample_unit
-      @sample_unit ||= @units.sample
-    end
-
-  end
-end

data/lib/presenters/base_presenter.rb

@@ -1,25 +0,0 @@
-module Shushu
-  class BasePresenter
-
-    def money(cents)
-      add_commas(pennies_to_dollar(cents.to_i))
-    end
-
-    def add_commas(str)
-      str.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse
-    end
-
-    def pennies_to_dollar(qty)
-      sprintf("%.2f", qty / 100.0)
-    end
-
-    def trunc_hours(hrs)
-      sprintf("%.3f", hrs)
-    end
-
-    def date_range(s, f)
-      s.strftime('%d %b %H:%M ') + " - " + f.strftime('%d %b %H:%M ')
-    end
-
-  end
-end

data/lib/presenters/line_item_presenter.rb

@@ -1,49 +0,0 @@
-module Shushu
-  class LineItemPresenter < BasePresenter
-
-    def initialize(line_item)
-      @line_item = line_item
-      @unit_groups = @line_item.unit_groups
-      @unit_group_presenters = @unit_groups.map {|ug| UnitGroupPresenter.new(ug)}
-    end
-
-    def total
-      money(@line_item.total)
-    end
-
-    def name
-      @line_item.app_name
-    end
-
-    def unit_group_rate(product_group)
-      unit_group_presenters(product_group).sample.rate
-    end
-
-    def unit_group_total(product_group)
-      money(
-        unit_group_presenters(product_group).
-        map(&:unit_group).
-        map(&:total).
-        reduce(:+)
-      )
-    end
-
-    def unit_group_qty(product_group)
-      trunc_hours(
-        unit_group_presenters(product_group).
-        map(&:unit_group).
-        map(&:qty).
-        reduce(:+)
-      )
-    end
-
-    def unit_group_presenters(product_group=nil)
-      if product_group
-        @unit_group_presenters.select {|ugp| ugp.product_group == product_group}
-      else
-        @unit_group_presenters
-      end
-    end
-
-  end
-end

data/lib/presenters/report_presenter.rb

@@ -1,23 +0,0 @@
-module Shushu
-  class ReportPresenter < BasePresenter
-
-    def initialize(report, line_item_builder=LineItemBuilder)
-      @report = report
-      @units = @report.billable_units
-      @builder = line_item_builder
-    end
-
-    def total
-      money(@report.total)
-    end
-
-    def line_item_presenters
-      @line_item_presenters ||= begin
-        @builder.build(@units).map do |li|
-          LineItemPresenter.new(li)
-        end
-      end
-    end
-
-  end
-end

data/lib/presenters/unit_group_presenter.rb

@@ -1,63 +0,0 @@
-module Shushu
-  class UnitGroupPresenter < BasePresenter
-
-    attr_reader :unit_group
-
-    def initialize(unit_group)
-      @unit_group = unit_group
-    end
-
-    def id
-      [:hid, :name].map {|m| unit_group.send(m)}.join("_").gsub("-", "_")
-    end
-
-    def unit_presenters
-      @unit_presenters ||= @unit_group.units.map {|u| UnitPresenter.new(u)}
-    end
-
-    def daily_report_url
-      #TODO remove chart stub
-      #payments_uri("/billable_units/daily")
-      "/billable_units/daily"
-    end
-
-    def compacted_reports
-      #TODO remove chart stub
-      #BillableUnitReporter.compacted(@unit_group.units)
-      []
-    end
-
-    def total
-      money(@unit_group.total)
-    end
-
-    def qty
-      trunc_hours(@unit_group.qty)
-    end
-
-    def rate
-      @unit_group.rate
-    end
-
-    def name
-      @unit_group.name
-    end
-
-    def description
-      @unit_group.description
-    end
-
-    def product_name
-      @unit_group.product_name
-    end
-
-    def product_group
-      @unit_group.product_group
-    end
-
-    def unit_of_measure
-      @unit_group.rate_period
-    end
-
-  end
-end

data/lib/presenters/unit_presenter.rb

@@ -1,34 +0,0 @@
-module Shushu
-  class UnitPresenter < BasePresenter
-
-    def initialize(unit)
-      @unit = unit
-    end
-
-    def total
-      money(@unit.total)
-    end
-
-    def rate
-      [money(@unit.rate), @unit.rate_period].join("/")
-    end
-
-    def qty
-      trunc_hours(@unit.qty)
-    end
-
-    def start
-      @unit.from
-    end
-
-    def end
-      @unit.to
-    end
-
-    def description
-      @unit.product_name
-    end
-
-  end
-end
-

data/lib/services/line_item_builder.rb

@@ -1,17 +0,0 @@
-module Shushu
-  module LineItemBuilder
-    extend self
-
-    # Give build() a collection of units and it will return a
-    # collection of line_items. Each line_item will have a collection
-    # of unit_groups wich will hold a collection of units
-
-    def build(units)
-      units.group_by(&:hid).map do |hid, units_by_hid|
-        units_by_hid.group_by(&:product_name).map do |product_name, units_by_name|
-          UnitGroup.new(units_by_name)
-        end
-      end.map {|unit_groups| LineItem.new(unit_groups)}.flatten
-    end
-  end
-end

data/test/models/b_event_test.rb

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

data/test/models/billable_unit_test.rb

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

data/test/models/line_item_test.rb

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

data/test/models/p_method_test.rb

@@ -1,29 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class PMethodTest < ShushuTest
-
-  def test_create
-    params = {
-      :card_token => "abc123"
-    }
-    api_resp_body = Shushu::HttpHelpers.enc_json(params)
-    Shushu.url = "http://provider:password@shushu.heroku.com"
-    FakeWeb.register_uri(:post, (Shushu.url + "/payment_methods"), :body => api_resp_body)
-    response = Shushu::PMethod.create(params)
-    assert_equal("abc123", response["card_token"])
-  end
-
-  def test_update
-    params = {
-      :id => "1",
-      :card_token => "abc123"
-    }
-    api_resp_body = Shushu::HttpHelpers.enc_json(params)
-    Shushu.url = "http://provider:password@shushu.heroku.com"
-    FakeWeb.register_uri(:put, (Shushu.url + "/payment_methods/1"), :body => api_resp_body)
-    response = Shushu::PMethod.update(params)
-    assert_equal("abc123", response["card_token"])
-    assert_equal("1", response["id"])
-  end
-
-end

data/test/models/rev_rep_test.rb

@@ -1,12 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class RevRepTest < ShushuTest
-  def test_for_month
-    api_resp_body = Shushu::HttpHelpers.enc_json({:ok => true})
-    Shushu.url = "http://provider:password@shushu.heroku.com"
-    url = Shushu.url + "/rev_report?from=2011-01-01+00%3A00%3A00+UTC&to=2011-02-01+00%3A00%3A00+UTC"
-    FakeWeb.register_uri(:get, url, :body => api_resp_body)
-    Shushu::RevRep.get(Time.utc(2011,1), Time.utc(2011,2))
-  end
-end
-

data/test/models/unit_group_test.rb

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

data/test/presenters/line_item_presenter_test.rb

@@ -1,36 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class LineItemPresenterTest < ShushuTest
-  def test_unit_group_total
-    unit1 = Shushu::BillableUnit.new("rate" => 1000, "qty" => 10, "product_group" => "dyno")
-    unit_group1 = Shushu::UnitGroup.new([unit1])
-    line_item = Shushu::LineItem.new([unit_group1])
-    lip = Shushu::LineItemPresenter.new(line_item)
-    assert_equal("100.00", lip.unit_group_total("dyno"))
-  end
-
-  def test_unit_group_qty
-    unit1 = Shushu::BillableUnit.new("rate" => 1000, "qty" => 10, "product_group" => "dyno")
-    unit2 = Shushu::BillableUnit.new("rate" => 1000, "qty" => 1,  "product_group" => "dyno")
-    unit_group1 = Shushu::UnitGroup.new([unit1, unit2])
-    line_item = Shushu::LineItem.new([unit_group1])
-    lip = Shushu::LineItemPresenter.new(line_item)
-    assert_equal("11.000", lip.unit_group_qty("dyno"))
-  end
-
-  def test_unit_group_presenters
-    unit1 = Shushu::BillableUnit.new("product_group" => "dyno")
-    unit2 = Shushu::BillableUnit.new("product_group" => "dyno")
-    unit3 = Shushu::BillableUnit.new("product_group" => "addon")
-    unit_group1 = Shushu::UnitGroup.new([unit1, unit2])
-    unit_group2 = Shushu::UnitGroup.new([unit3])
-    line_item = Shushu::LineItem.new([unit_group1, unit_group2])
-    lip = Shushu::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
-
-