killbill-client 0.7.4 → 0.8.0

data/lib/killbill_client/models/rolled_up_usage.rb

@@ -0,0 +1,30 @@
+module KillBillClient
+  module Model
+    class RolledUpUsage < RolledUpUsageAttributes
+
+      has_many :audit_logs, KillBillClient::Model::AuditLog
+      has_many :rolled_up_units, KillBillClient::Model::RolledUpUnitAttributes
+
+      KILLBILL_API_USAGES_PREFIX = "#{KILLBILL_API_PREFIX}/usages"
+
+      class << self
+        def find_by_subscription_id(subscription_id, start_date, end_date, options = {})
+          find_by_subscription_id_and_type(subscription_id, start_date, end_date, nil, options)
+        end
+
+        def find_by_subscription_id_and_type(subscription_id, start_date, end_date, unit_type, options = {})
+          params                  = {}
+          params[:startDate] = start_date
+          params[:endDate]  = end_date
+
+          path = "#{KILLBILL_API_USAGES_PREFIX}/#{subscription_id}"
+          path = "#{path}/#{unit_type}" if unit_type
+          get path,
+              params,
+              options
+        end
+      end
+
+    end
+  end
+end

data/lib/killbill_client/models/{usage.rb → usage_record.rb}

@@ -1,6 +1,6 @@
 module KillBillClient
   module Model
-    class Usage < UsageAttributes
+    class UsageRecord < SubscriptionUsageRecordAttributes
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
@@ -8,11 +8,15 @@ module KillBillClient
       KILLBILL_API_USAGES_PREFIX = "#{KILLBILL_API_PREFIX}/usages"
 
       class << self
-        def find_by_subscription_id(subscription_id, options = {})
+        def find_by_subscription_id(subscription_id, start_date, end_date, options = {})
+          params                  = {}
+          params[:startDate] = start_date
+          params[:endDate]  = end_date
+
           get "#{KILLBILL_API_USAGES_PREFIX}/#{subscription_id}",
-              {
-              },
-              options
+              params,
+              options,
+              KillBillClient::Model::RolledUpUsageAttributes.new.class
         end
       end
 

data/lib/killbill_client/version.rb

@@ -1,8 +1,8 @@
 module KillBillClient
   module Version
     MAJOR = 0
-    MINOR = 7
-    PATCH = 4
+    MINOR = 8 
+    PATCH = 0 
     PRE = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

data/spec/killbill_client/remote/model_spec.rb

@@ -98,7 +98,7 @@ describe KillBillClient::Model do
     pm.plugin_info = {}
     pm.payment_method_id.should be_nil
 
-    pm = pm.create('KillBill Spec test')
+    pm = pm.create(true, 'KillBill Spec test')
     pm.payment_method_id.should_not be_nil
 
     # Try to retrieve it

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: killbill-client
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Killbill core team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
 description: An API client library for Kill Bill.
@@ -58,8 +58,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -88,8 +88,6 @@ files:
 - lib/killbill_client/models/gen/credit_attributes.rb
 - lib/killbill_client/models/gen/custom_field_attributes.rb
 - lib/killbill_client/models/gen/deleted_event_subscription_attributes.rb
-- lib/killbill_client/models/gen/direct_payment_attributes.rb
-- lib/killbill_client/models/gen/direct_transaction_attributes.rb
 - lib/killbill_client/models/gen/event_subscription_attributes.rb
 - lib/killbill_client/models/gen/gateway_notification_attributes.rb
 - lib/killbill_client/models/gen/hosted_payment_page_billing_address_attributes.rb
@@ -114,16 +112,22 @@ files:
 - lib/killbill_client/models/gen/plugin_property_attributes.rb
 - lib/killbill_client/models/gen/price_attributes.rb
 - lib/killbill_client/models/gen/product_attributes.rb
+- lib/killbill_client/models/gen/profiling_data_attributes.rb
+- lib/killbill_client/models/gen/profiling_data_attributes_item.rb
 - lib/killbill_client/models/gen/require_gen.rb
+- lib/killbill_client/models/gen/rolled_up_unit_attributes.rb
+- lib/killbill_client/models/gen/rolled_up_usage_attributes.rb
 - lib/killbill_client/models/gen/session_attributes.rb
 - lib/killbill_client/models/gen/stack_trace_element_attributes.rb
 - lib/killbill_client/models/gen/subject_attributes.rb
 - lib/killbill_client/models/gen/subscription_attributes.rb
+- lib/killbill_client/models/gen/subscription_usage_record_attributes.rb
 - lib/killbill_client/models/gen/tag_attributes.rb
 - lib/killbill_client/models/gen/tag_definition_attributes.rb
 - lib/killbill_client/models/gen/tenant_attributes.rb
 - lib/killbill_client/models/gen/tenant_key_attributes.rb
-- lib/killbill_client/models/gen/usage_attributes.rb
+- lib/killbill_client/models/gen/unit_usage_record_attributes.rb
+- lib/killbill_client/models/gen/usage_record_attributes.rb
 - lib/killbill_client/models/helpers/custom_field_helper.rb
 - lib/killbill_client/models/helpers/tag_helper.rb
 - lib/killbill_client/models/invoice.rb
@@ -138,13 +142,14 @@ files:
 - lib/killbill_client/models/product.rb
 - lib/killbill_client/models/resource.rb
 - lib/killbill_client/models/resources.rb
+- lib/killbill_client/models/rolled_up_usage.rb
 - lib/killbill_client/models/security.rb
 - lib/killbill_client/models/subscription.rb
 - lib/killbill_client/models/tag.rb
 - lib/killbill_client/models/tag_definition.rb
 - lib/killbill_client/models/tenant.rb
 - lib/killbill_client/models/transaction.rb
-- lib/killbill_client/models/usage.rb
+- lib/killbill_client/models/usage_record.rb
 - lib/killbill_client/utils.rb
 - lib/killbill_client/version.rb
 - lib/rails/generators/killbill_client/config_generator.rb
@@ -161,18 +166,18 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--exclude"
-- "."
+- --exclude
+- .
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []