chartmogul-ruby 1.7.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b73de02f8130e5d5e2c132e89bed5575fed0c501c194586255629b46f7acc0e
-  data.tar.gz: efc54b760b1ca2fa40f949ab30fc78f9ca16970a7aaadbfc7963d93ce0e6d503
+  metadata.gz: 11764c4ea2047d068ef4a7de177763aad2cffd7bf5db14482bea9c14fbf3f0bb
+  data.tar.gz: 70a0fb241323b87f03e67c2a5bf662594f38e567d5ceafbc8c2d7f1b68d1d4b9
 SHA512:
-  metadata.gz: e7add992a1e3a5f421f27331c837b2d174bc0935ff935a9fd2e018061e1d129ad3d3fe13fa9f8fc10cf84adf245340075ed5db71766f15ede64ce5d8eadf7573
-  data.tar.gz: f45d866b83041a3695f8addb971cd083636b39cea420b5080ed1bc3e0cf3a96a8829c835f4ff83c9b0324b163506a2ceec01d3cf37d8f9477f336270cd16c32f
+  metadata.gz: b7103c010405cc5bf453885fe6f96950aea533c01024f420426bf89521a64d1a1ab1a7122651d913be5e95eed14fa3c4f64a41875f439a351ba81c798b9fca8c
+  data.tar.gz: f392443972c1cc32d0a1000cb6e7ac65622cacd20908489f10ad5e691434f9f538f39ed922528da5d94b482d570c127c8b14046490263aca3ded0f8b01745fab

data/.github/workflows/test.yml

@@ -0,0 +1,44 @@
+name: Run specs and generate Code Climate report
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.3, 2.4, 2.5, 2.6, 2.7]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Set ENV for codeclimate (pull_request)
+        run: |
+          git fetch --no-tags --prune --depth=1 origin +refs/heads/$GITHUB_HEAD_REF:refs/remotes/origin/$GITHUB_HEAD_REF
+          echo "GIT_BRANCH=$GITHUB_HEAD_REF" >> $GITHUB_ENV
+          echo "GIT_COMMIT_SHA=$(git rev-parse origin/$GITHUB_HEAD_REF)" >> $GITHUB_ENV
+        if: github.event_name == 'pull_request'
+      - name: Set ENV for codeclimate (push)
+        run: |
+          echo "GIT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
+          echo "GIT_COMMIT_SHA=$GITHUB_SHA" >> $GITHUB_ENV
+        if: github.event_name == 'push'
+      - name: Install Code Climate test report
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+      - name: Run tests
+        run: bundle exec rake
+      - name: Send Report to Code Climate
+        env:
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        if: ${{ success() }}
+        run: ./cc-test-reporter after-build

data/2.0-Upgrade.md

@@ -0,0 +1,9 @@
+# Upgrading to chartmogul-ruby 2.0.0
+
+The gem upgrade brings breaking changes to the Metrics API. All other APIs remain unaffected. Please note the following changes:
+
+* If you used the Metrics API to get a customer's activities or subscriptions, make the following changes in the namespace
+  - `ChartMogul::Metrics::Activity.all('cus_58c7d166-3bd1-4c10-948e-e68bb0fa2478')` should be replaced with `ChartMogul::Metrics::Customers::Activity.all('cus_58c7d166-3bd1-4c10-948e-e68bb0fa2478')`
+  - `ChartMogul::Metrics::Subscription.all('cus_3f6f53d3-bca7-4fcd-ad47-345180ef329b')` should be replace with `ChartMogul::Metrics::Customers::Subscription.all('cus_3f6f53d3-bca7-4fcd-ad47-345180ef329b')`
+
+

data/README.md

@@ -8,7 +8,6 @@
 
 <p align="center">
   <a href="https://badge.fury.io/rb/chartmogul-ruby"><img src="https://badge.fury.io/rb/chartmogul-ruby.svg" alt="Gem Version"></a>
-  <a href="https://travis-ci.org/chartmogul/chartmogul-ruby"><img src="https://travis-ci.org/chartmogul/chartmogul-ruby.svg?branch=main" alt="Travis project"></a>
   <a href="https://codeclimate.com/github/chartmogul/chartmogul-ruby/test_coverage"><img src="https://api.codeclimate.com/v1/badges/40e8bdff4d1dbf2451de/test_coverage" /></a>
 </p>
 
@@ -52,21 +51,19 @@ This gem supports Ruby 2.3 and above.
 
 ## Configuration
 
-Configure `chartmogul-ruby` with your Account Token and Secret Key, available from the administration section of your ChartMogul account.
+Configure `chartmogul-ruby` with your API Key, available from the administration section of your ChartMogul account.
 You can either do this in the global scope for the whole runtime (eg. in initializer):
 
 ```ruby
-ChartMogul.global_account_token = '<Account key goes here>'
-ChartMogul.global_secret_key = '<Secret key goes here>'
+ChartMogul.global_api_key = '<API key goes here>'
 ```
 
 Or in a thread-safe scope for the current thread only (eg. different accounts in different async jobs):
 ```ruby
-ChartMogul.account_token = '<Account key goes here>'
-ChartMogul.secret_key = '<Secret key goes here>'
+ChartMogul.api_key = '<API key goes here>'
 ```
 
-Thread-safe configuration is used if available, otherwise global is used. 
+Thread-safe configuration is used if available, otherwise global is used.
 
 Test your authentication:
 ```ruby

data/changelog.md

@@ -1,5 +1,18 @@
 # chartmogul-ruby Change Log
 
+## Version 3.0.0 - 29 October 2021
+- Update ChartMogul::Configuration to use `api_key` instead of `account_token`& `secret_key` combo for authentication
+
+## Version 2.9.0 - 3 Nov 2021
+- Adds post install message informing about authentication changes *& deprecation warning.
+
+## Version 2.1.0 - 9 July 2021
+- Adds ChartMogul::Metrics::ActivitiesExport class to support async activities export endpoint
+
+## Version 2.0.0 - 25 June 2021
+- Moves customer scoped Metrics::Activities and Metrics::Subscriptions under Metrics::Customers namespace
+- Adds unscoped activities API endpoint
+
 ## Version 1.7.2 - 16 March 2021
 - Fix bug preventing instantiating attributes on ChartMogul::Customers objects
 

data/chartmogul-ruby.gemspec

@@ -16,6 +16,12 @@ Gem::Specification.new do |spec|
   spec.license               = 'MIT'
   spec.required_ruby_version = '>= 2.3'
 
+  spec.post_install_message  = %q{
+  Starting October 29 2021, we are updating our developer libraries to support the enhanced API Access Management. Please use the same API Key for both API Token and Secret Key.
+  [Deprecation] - account_token/secret_key combo is deprecated. Please use API key for both fields.
+  Version 3.x will introduce a breaking change in authentication configuration. For more details, please visit: https://dev.chartmogul.com/docs/authentication
+  }
+
   spec.files                 = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir                = 'exe'
   spec.executables           = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/fixtures/vcr_cassettes/ChartMogul_Metrics_ActivitiesExport/get_activities_export.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.chartmogul.com/v1/activities_export/44037b8f-4a89-4fc6-8114-2288c71a9518
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic hidden
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      server:
+      - nginx/1.10.1
+      date:
+      - Fri, 09 Jul 2021 14:06:07 GMT
+      content-type:
+      - application/json
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      vary:
+      - Accept-Encoding, Accept-Encoding
+      status:
+      - 200 OK
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"44037b8f-4a89-4fc6-8114-2288c71a9518","status":"succeeded","file_url":"https://chartmogul-customer-export.s3.eu-west-1.amazonaws.com/activities-acme-corp-062ea48c-5d74-46dd-bd60-23206cdc241a.zip?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=123%2Feu-west-1%2Fs3%2Faws4_request\u0026X-Amz-Date=20210709T135547Z\u0026X-Amz-Expires=604800\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=abc","params":{"kind":"activities","params":{"end_date":"2020-12-31
+        00:00:00 +0000","start_date":"2020-01-01 00:00:00 +0000","activity_type":"new_biz"}},"expires_at":"2021-07-16T13:55:47+00:00","created_at":"2021-07-09T13:55:44+00:00"}'
+    http_version:
+  recorded_at: Fri, 09 Jul 2021 14:06:07 GMT
+recorded_with: VCR 5.1.0

data/fixtures/vcr_cassettes/ChartMogul_Metrics_ActivitiesExport/post_activities_export.yml

@@ -0,0 +1,83 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.chartmogul.com/v1/activities_export
+    body:
+      encoding: UTF-8
+      string: '{"start-date":"2020-01-01T00:00:00Z","end-date":"2020-12-31T00:00:00Z","type":"new_biz"}'
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic hidden
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      server:
+      - nginx/1.10.1
+      date:
+      - Fri, 09 Jul 2021 14:37:32 GMT
+      content-type:
+      - application/json
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      vary:
+      - Accept-Encoding, Accept-Encoding
+      status:
+      - 200 OK
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"17042239-3674-4a61-b838-b6b307f28506","status":"pending","file_url":null,"params":{"kind":"activities","params":{"activity_type":"new_biz","start_date":"2020-01-01
+        00:00:00 +0000","end_date":"2020-12-31 00:00:00 +0000"}},"expires_at":null,"created_at":"2021-07-09T14:37:32+00:00"}'
+    http_version:
+  recorded_at: Fri, 09 Jul 2021 14:37:32 GMT
+- request:
+    method: get
+    uri: https://api.chartmogul.com/v1/activities_export/17042239-3674-4a61-b838-b6b307f28506
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic hidden
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      server:
+      - nginx/1.10.1
+      date:
+      - Fri, 09 Jul 2021 14:38:10 GMT
+      content-type:
+      - application/json
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      vary:
+      - Accept-Encoding, Accept-Encoding
+      status:
+      - 200 OK
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: ASCII-8BIT
+      string: '{"id":"17042239-3674-4a61-b838-b6b307f28506","status":"succeeded","file_url":"https://chartmogul-customer-export.s3.eu-west-1.amazonaws.com/activities-acme-corp-062ea48c-5d74-46dd-bd60-23206cdc241a.zip?X-Amz-Algorithm=AWS4-HMAC-SHA256\u0026X-Amz-Credential=123%2Feu-west-1%2Fs3%2Faws4_request\u0026X-Amz-Date=20210709T135547Z\u0026X-Amz-Expires=604800\u0026X-Amz-SignedHeaders=host\u0026X-Amz-Signature=abc","params":{"kind":"activities","params":{"end_date":"2020-12-31
+        00:00:00 +0000","start_date":"2020-01-01 00:00:00 +0000","activity_type":"new_biz"}},"expires_at":"2021-07-16T14:37:43+00:00","created_at":"2021-07-09T14:37:32+00:00"}'
+    http_version:
+  recorded_at: Fri, 09 Jul 2021 14:38:10 GMT
+recorded_with: VCR 5.1.0

data/fixtures/vcr_cassettes/ChartMogul_Metrics_Activity/behaves_like_PageableWithAnchor/should_be_pageable.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.chartmogul.com/v1/activities?per_page=2
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic hidden
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      server:
+      - nginx/1.10.1
+      date:
+      - Fri, 18 Jun 2021 11:59:07 GMT
+      content-type:
+      - application/json
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      vary:
+      - Accept-Encoding, Accept-Encoding
+      status:
+      - 200 OK
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: ASCII-8BIT
+      string: '{"entries":[{"description":"purchased the Basic1 plan","activity-mrr-movement":4478,"activity-mrr":4478,"activity-arr":53736,"date":"2016-08-01T06:28:25+00:00","type":"new_biz","currency":"EUR","subscription-external-id":"si_18dZuXAN0YShtow4jjqxxNnW","plan-external-id":"a3e832e1-1bd1-4889-8466-8efdbfbdd94b","customer-name":"Customer
+        for test@example.com","customer-uuid":"6456e930-8c8e-11eb-a506-0ff43d2cc026","customer-external-id":"cus_8vQm8XjeEOw75p","billing-connector-uuid":"decdeb4c-8c8d-11eb-a506-b3974867f58c","uuid":"2f545d5f-f241-458c-8e99-38c0e5a6e6ff"},{"description":"purchased
+        the Basic1 plan","activity-mrr-movement":4425,"activity-mrr":4425,"activity-arr":53100,"date":"2016-08-17T09:28:10+00:00","type":"new_biz","currency":"EUR","subscription-external-id":"si_18jQLGAN0YShtow4kFWpOMVX","plan-external-id":"a3e832e1-1bd1-4889-8466-8efdbfbdd94b","customer-name":"Customer
+        for test@example.com","customer-uuid":"63ad1285-8c8e-11eb-a506-47d6b1cc7553","customer-external-id":"cus_91TH9rjhhYCpai","billing-connector-uuid":"decdeb4c-8c8d-11eb-a506-b3974867f58c","uuid":"9d5ba7fd-e06d-4750-a8f6-2983f3a30fb2"}],"has_more":true,"per_page":2}'
+  recorded_at: Fri, 18 Jun 2021 11:59:07 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/ChartMogul_Metrics_Activity/should_have_Activity_entries.yml

@@ -2,13 +2,13 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.chartmogul.com/v1/customers/cus_91af761e-9d0a-11e5-b514-1feab446feac/activities
+    uri: https://api.chartmogul.com/v1/activities?per_page=2
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - Faraday v0.9.2
+      - Faraday v1.0.1
       Content-Type:
       - application/json
       Authorization:
@@ -16,26 +16,29 @@ http_interactions:
   response:
     status:
       code: 200
-      message: 
+      message: OK
     headers:
       server:
-      - nginx/1.9.10
+      - nginx/1.10.1
       date:
-      - Fri, 01 Jul 2016 14:47:49 GMT
+      - Fri, 18 Jun 2021 11:59:07 GMT
       content-type:
       - application/json
-      content-length:
-      - '278'
+      transfer-encoding:
+      - chunked
       connection:
-      - close
+      - keep-alive
+      vary:
+      - Accept-Encoding, Accept-Encoding
       status:
       - 200 OK
       access-control-allow-credentials:
       - 'true'
     body:
-      encoding: UTF-8
-      string: '{"entries":[{"id":16664702,"description":"purchased the Yael Cohen
-        plan","activity-mrr-movement":10871,"activity-mrr":10871,"activity-arr":130452,"date":"2015-04-16T13:38:29+00:00","type":"new_biz","currency":"USD","currency-sign":"$","subscription_external_id":"si_IJxVS1c1TjSB0s"}],"has_more":false,"per_page":200,"page":1}'
-    http_version: 
-  recorded_at: Fri, 01 Jul 2016 14:47:49 GMT
-recorded_with: VCR 3.0.3
+      encoding: ASCII-8BIT
+      string: '{"entries":[{"description":"purchased the Basic1 plan","activity-mrr-movement":4478,"activity-mrr":4478,"activity-arr":53736,"date":"2016-08-01T06:28:25+00:00","type":"new_biz","currency":"EUR","subscription-external-id":"si_18dZuXAN0YShtow4jjqxxNnW","plan-external-id":"a3e832e1-1bd1-4889-8466-8efdbfbdd94b","customer-name":"Customer
+        for test@example.com","customer-uuid":"6456e930-8c8e-11eb-a506-0ff43d2cc026","customer-external-id":"cus_8vQm8XjeEOw75p","billing-connector-uuid":"decdeb4c-8c8d-11eb-a506-b3974867f58c","uuid":"2f545d5f-f241-458c-8e99-38c0e5a6e6ff"},{"description":"purchased
+        the Basic1 plan","activity-mrr-movement":4425,"activity-mrr":4425,"activity-arr":53100,"date":"2016-08-17T09:28:10+00:00","type":"new_biz","currency":"EUR","subscription-external-id":"si_18jQLGAN0YShtow4kFWpOMVX","plan-external-id":"a3e832e1-1bd1-4889-8466-8efdbfbdd94b","customer-name":"Customer
+        for test@example.com","customer-uuid":"63ad1285-8c8e-11eb-a506-47d6b1cc7553","customer-external-id":"cus_91TH9rjhhYCpai","billing-connector-uuid":"decdeb4c-8c8d-11eb-a506-b3974867f58c","uuid":"9d5ba7fd-e06d-4750-a8f6-2983f3a30fb2"}],"has_more":true,"per_page":2}'
+  recorded_at: Fri, 18 Jun 2021 11:59:07 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/ChartMogul_Metrics_Activity.yml

@@ -0,0 +1,37 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.chartmogul.com/v1/activities
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic hidden
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      server:
+      - nginx/1.10.1
+      date:
+      - Fri, 18 Jun 2021 10:37:37 GMT
+      content-type:
+      - application/json
+      transfer-encoding:
+      - chunked
+      connection:
+      - keep-alive
+      status:
+      - 401 Unauthorized
+    body:
+      encoding: UTF-8
+      string: '{"code":401,"message":"No valid API key provided","param":null}'
+  recorded_at: Fri, 18 Jun 2021 10:37:37 GMT
+recorded_with: VCR 6.0.0

data/fixtures/vcr_cassettes/ChartMogul_Metrics_Customers_Activity/should_have_Activity_entries.yml

@@ -0,0 +1,41 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.chartmogul.com/v1/customers/cus_91af761e-9d0a-11e5-b514-1feab446feac/activities
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Content-Type:
+      - application/json
+      Authorization:
+      - Basic hidden
+  response:
+    status:
+      code: 200
+      message: 
+    headers:
+      server:
+      - nginx/1.9.10
+      date:
+      - Fri, 01 Jul 2016 14:47:49 GMT
+      content-type:
+      - application/json
+      content-length:
+      - '278'
+      connection:
+      - close
+      status:
+      - 200 OK
+      access-control-allow-credentials:
+      - 'true'
+    body:
+      encoding: UTF-8
+      string: '{"entries":[{"id":16664702,"description":"purchased the Yael Cohen
+        plan","activity-mrr-movement":10871,"activity-mrr":10871,"activity-arr":130452,"date":"2015-04-16T13:38:29+00:00","type":"new_biz","currency":"USD","currency-sign":"$","subscription_external_id":"si_IJxVS1c1TjSB0s"}],"has_more":false,"per_page":200,"page":1}'
+    http_version: 
+  recorded_at: Fri, 01 Jul 2016 14:47:49 GMT
+recorded_with: VCR 3.0.3

data/lib/chartmogul/api_resource.rb

@@ -90,7 +90,7 @@ module ChartMogul
 
     def self.build_connection
       Faraday.new(url: ChartMogul.api_base) do |faraday|
-        faraday.use Faraday::Request::BasicAuthentication, ChartMogul.account_token, ChartMogul.secret_key
+        faraday.use Faraday::Request::BasicAuthentication, ChartMogul.api_key, ''
         faraday.use Faraday::Response::RaiseError
         faraday.request :retry, max: ChartMogul.max_retries, retry_statuses: RETRY_STATUSES,
                                 max_interval: MAX_INTERVAL, backoff_factor: BACKOFF_FACTOR,

data/lib/chartmogul/concerns/pageable_with_anchor.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ChartMogul
+  module Concerns
+    module PageableWithAnchor
+      def self.included(base)
+        base.instance_eval do
+          readonly_attr :has_more
+          readonly_attr :per_page
+        end
+      end
+    end
+  end
+end

data/lib/chartmogul/configuration.rb

@@ -2,8 +2,7 @@
 
 module ChartMogul
   class Configuration
-    attr_accessor :account_token
-    attr_accessor :secret_key
+    attr_accessor :api_key
     attr_accessor :max_retries
     attr_accessor :api_base
   end

data/lib/chartmogul/line_items/one_time.rb

@@ -14,8 +14,11 @@ module ChartMogul
       writeable_attr :tax_amount_in_cents
       writeable_attr :transaction_fees_in_cents
       writeable_attr :external_id
-      writeable_attr :plan_uuid
+      writeable_attr :transaction_fees_currency
+      writeable_attr :discount_description
+      writeable_attr :event_order
 
+      writeable_attr :plan_uuid
       writeable_attr :invoice_uuid
 
       def initialize(attributes = {})

data/lib/chartmogul/line_items/subscription.rb

@@ -19,6 +19,9 @@ module ChartMogul
       writeable_attr :transaction_fees_in_cents
       writeable_attr :external_id
       writeable_attr :subscription_set_external_id
+      writeable_attr :transaction_fees_currency
+      writeable_attr :discount_description
+      writeable_attr :event_order
 
       readonly_attr :subscription_uuid
       writeable_attr :invoice_uuid

data/lib/chartmogul/metrics/activities_export.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module ChartMogul
+  module Metrics
+    class ActivitiesExport < APIResource
+      set_resource_name 'ActivitiesExport'
+      set_resource_path '/v1/activities_export'
+
+      readonly_attr :id
+      readonly_attr :status
+      readonly_attr :file_url
+      readonly_attr :params
+      readonly_attr :expires_at
+      readonly_attr :created_at
+
+      writeable_attr :start_date
+      writeable_attr :end_date
+      writeable_attr :type
+
+      include API::Actions::Retrieve
+      include API::Actions::Create
+
+      def serialize_for_write
+        super.tap do |attributes|
+          attributes.clone.each do |k, v|
+            attributes[preprocess_attributes(k)] = attributes.delete(k)
+          end
+        end
+      end
+
+      def preprocess_attributes(attribute)
+        return attribute unless %i[start_date end_date].include?(attribute)
+
+        attribute.to_s.tr('_', '-')
+      end
+    end
+  end
+end

data/lib/chartmogul/metrics/activity.rb

@@ -3,7 +3,6 @@
 module ChartMogul
   module Metrics
     class Activity < ChartMogul::Object
-      readonly_attr :id
       readonly_attr :description
       readonly_attr :type
       readonly_attr :date, type: :time
@@ -11,25 +10,30 @@ module ChartMogul
       readonly_attr :activity_mrr
       readonly_attr :activity_mrr_movement
       readonly_attr :currency
-      readonly_attr :currency_sign
       readonly_attr :subscription_external_id
+      readonly_attr :plan_external_id
+      readonly_attr :customer_name
+      readonly_attr :customer_uuid
+      readonly_attr :customer_external_id
+      readonly_attr :billing_connector_uuid
+      readonly_attr :uuid
 
-      def self.all(customer_uuid, options = {})
-        ChartMogul::Metrics::Activities.all(customer_uuid, options)
+      def self.all(options = {})
+        ChartMogul::Metrics::Activities.all(options)
       end
     end
 
     class Activities < APIResource
       set_resource_name 'Activities'
-      set_resource_path '/v1/customers/:customer_uuid/activities'
+      set_resource_path '/v1/activities'
 
       include Concerns::Entries
-      include Concerns::Pageable
+      include Concerns::PageableWithAnchor
 
       set_entry_class Activity
 
-      def self.all(customer_uuid, options = {})
-        super(options.merge(customer_uuid: customer_uuid))
+      def self.all(options = {})
+        super(options)
       end
     end
   end

data/lib/chartmogul/metrics/customers/activity.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module ChartMogul
+  module Metrics
+    module Customers
+      class Activity < ChartMogul::Object
+        readonly_attr :id
+        readonly_attr :description
+        readonly_attr :type
+        readonly_attr :date, type: :time
+        readonly_attr :activity_arr
+        readonly_attr :activity_mrr
+        readonly_attr :activity_mrr_movement
+        readonly_attr :currency
+        readonly_attr :currency_sign
+        readonly_attr :subscription_external_id
+
+        def self.all(customer_uuid, options = {})
+          ChartMogul::Metrics::Customers::Activities.all(customer_uuid, options)
+        end
+      end
+
+      class Activities < APIResource
+        set_resource_name 'Activities'
+        set_resource_path '/v1/customers/:customer_uuid/activities'
+
+        include Concerns::Entries
+        include Concerns::Pageable
+
+        set_entry_class Activity
+
+        def self.all(customer_uuid, options = {})
+          super(options.merge(customer_uuid: customer_uuid))
+        end
+      end
+    end
+  end
+end

data/lib/chartmogul/metrics/customers/subscription.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module ChartMogul
+  module Metrics
+    module Customers
+      class Subscription < ChartMogul::Object
+        readonly_attr :id
+        readonly_attr :external_id
+        readonly_attr :plan
+        readonly_attr :quantity
+        readonly_attr :mrr
+        readonly_attr :arr
+        readonly_attr :status
+        readonly_attr :billing_cycle
+        readonly_attr :billing_cycle_count
+        readonly_attr :start_date, type: :time
+        readonly_attr :end_date, type: :time
+        readonly_attr :currency
+        readonly_attr :currency_sign
+
+        def self.all(customer_uuid, options = {})
+          ChartMogul::Metrics::Customers::Subscriptions.all(customer_uuid, options)
+        end
+      end
+
+      class Subscriptions < APIResource
+        set_resource_name 'Subscriptions'
+        set_resource_path '/v1/customers/:customer_uuid/subscriptions'
+
+        include Concerns::Entries
+        include Concerns::Pageable
+
+        set_entry_class Subscription
+
+        def self.all(customer_uuid, options = {})
+          super(options.merge(customer_uuid: customer_uuid))
+        end
+      end
+    end
+  end
+end

data/lib/chartmogul/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChartMogul
-  VERSION = '1.7.3'
+  VERSION = '3.0.0'
 end

data/lib/chartmogul.rb

@@ -43,6 +43,7 @@ require 'chartmogul/concerns/entries'
 require 'chartmogul/concerns/summary'
 require 'chartmogul/concerns/pageable'
 require 'chartmogul/concerns/pageable2'
+require 'chartmogul/concerns/pageable_with_anchor'
 
 require 'chartmogul/subscription'
 require 'chartmogul/invoice'
@@ -66,8 +67,10 @@ require 'chartmogul/metrics/mrr_churn_rate'
 require 'chartmogul/metrics/all_key_metrics'
 require 'chartmogul/metrics/base'
 
+require 'chartmogul/metrics/customers/activity'
+require 'chartmogul/metrics/customers/subscription'
 require 'chartmogul/metrics/activity'
-require 'chartmogul/metrics/subscription'
+require 'chartmogul/metrics/activities_export'
 
 require 'chartmogul/enrichment/customer'
 
@@ -89,8 +92,7 @@ module ChartMogul
       Thread.current[CONFIG_THREAD_KEY] ||= ChartMogul::Configuration.new
     end
 
-    config_accessor :account_token
-    config_accessor :secret_key
+    config_accessor :api_key
     config_accessor :max_retries, MAX_RETRIES
     config_accessor :api_base, API_BASE
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartmogul-ruby
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Petr Kopac
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -171,9 +171,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- 2.0-Upgrade.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -221,21 +222,26 @@ files:
 - fixtures/vcr_cassettes/ChartMogul_Metrics_ARR/behaves_like_Metrics_API_resource/should_have_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_ASP/behaves_like_Metrics_API_resource/behaves_like_Summary/should_have_summary.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_ASP/behaves_like_Metrics_API_resource/should_have_entries.yml
-- fixtures/vcr_cassettes/ChartMogul_Metrics_Activity/behaves_like_Pageable/should_be_pageable.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_ActivitiesExport/get_activities_export.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_ActivitiesExport/post_activities_export.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_Activity.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_Activity/behaves_like_PageableWithAnchor/should_be_pageable.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_Activity/should_have_Activity_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_AllKeyMetric/should_have_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_CustomerChurnRate/behaves_like_Metrics_API_resource/behaves_like_Summary/should_have_summary.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_CustomerChurnRate/behaves_like_Metrics_API_resource/should_have_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_CustomerCount/behaves_like_Metrics_API_resource/behaves_like_Summary/should_have_summary.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_CustomerCount/behaves_like_Metrics_API_resource/should_have_entries.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_Customers_Activity/behaves_like_Pageable/should_be_pageable.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_Customers_Activity/should_have_Activity_entries.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_Customers_Subscription/behaves_like_Pageable/should_be_pageable.yml
+- fixtures/vcr_cassettes/ChartMogul_Metrics_Customers_Subscription/should_have_Subscription_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_LTV/behaves_like_Metrics_API_resource/behaves_like_Summary/should_have_summary.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_LTV/behaves_like_Metrics_API_resource/should_have_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_MRR/behaves_like_Summary/should_have_summary.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_MRR/should_have_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_MRRChurnRate/behaves_like_Metrics_API_resource/behaves_like_Summary/should_have_summary.yml
 - fixtures/vcr_cassettes/ChartMogul_Metrics_MRRChurnRate/behaves_like_Metrics_API_resource/should_have_entries.yml
-- fixtures/vcr_cassettes/ChartMogul_Metrics_Subscription/behaves_like_Pageable/should_be_pageable.yml
-- fixtures/vcr_cassettes/ChartMogul_Metrics_Subscription/should_have_Subscription_entries.yml
 - fixtures/vcr_cassettes/ChartMogul_Ping/pings/and_fails_on_incorrect_credentials.yml
 - fixtures/vcr_cassettes/ChartMogul_Ping/pings/and_fails_with_500_internal_server_error.yml
 - fixtures/vcr_cassettes/ChartMogul_Ping/pings/and_fails_with_504_gateway_timeout_error.yml
@@ -274,6 +280,7 @@ files:
 - lib/chartmogul/concerns/entries.rb
 - lib/chartmogul/concerns/pageable.rb
 - lib/chartmogul/concerns/pageable2.rb
+- lib/chartmogul/concerns/pageable_with_anchor.rb
 - lib/chartmogul/concerns/summary.rb
 - lib/chartmogul/config_attributes.rb
 - lib/chartmogul/configuration.rb
@@ -292,6 +299,7 @@ files:
 - lib/chartmogul/invoice.rb
 - lib/chartmogul/line_items/one_time.rb
 - lib/chartmogul/line_items/subscription.rb
+- lib/chartmogul/metrics/activities_export.rb
 - lib/chartmogul/metrics/activity.rb
 - lib/chartmogul/metrics/all_key_metrics.rb
 - lib/chartmogul/metrics/arpa.rb
@@ -300,10 +308,11 @@ files:
 - lib/chartmogul/metrics/base.rb
 - lib/chartmogul/metrics/customer_churn_rate.rb
 - lib/chartmogul/metrics/customer_count.rb
+- lib/chartmogul/metrics/customers/activity.rb
+- lib/chartmogul/metrics/customers/subscription.rb
 - lib/chartmogul/metrics/ltv.rb
 - lib/chartmogul/metrics/mrr.rb
 - lib/chartmogul/metrics/mrr_churn_rate.rb
-- lib/chartmogul/metrics/subscription.rb
 - lib/chartmogul/object.rb
 - lib/chartmogul/ping.rb
 - lib/chartmogul/plan.rb
@@ -322,7 +331,12 @@ homepage: https://github.com/chartmogul/chartmogul-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\n  Starting October 29 2021, we are updating our developer
+  libraries to support the enhanced API Access Management. Please use the same API
+  Key for both API Token and Secret Key.\n  [Deprecation] - account_token/secret_key
+  combo is deprecated. Please use API key for both fields.\n  Version 3.x will introduce
+  a breaking change in authentication configuration. For more details, please visit:
+  https://dev.chartmogul.com/docs/authentication\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -337,8 +351,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Chartmogul API Ruby Client
 test_files: []

data/.travis.yml

@@ -1,25 +0,0 @@
-os: linux
-dist: bionic
-
-language: ruby
-
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-
-before_install: gem install bundler
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
-branches:
-  only:
-    - main
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/lib/chartmogul/metrics/subscription.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module ChartMogul
-  module Metrics
-    class Subscription < ChartMogul::Object
-      readonly_attr :id
-      readonly_attr :external_id
-      readonly_attr :plan
-      readonly_attr :quantity
-      readonly_attr :mrr
-      readonly_attr :arr
-      readonly_attr :status
-      readonly_attr :billing_cycle
-      readonly_attr :billing_cycle_count
-      readonly_attr :start_date, type: :time
-      readonly_attr :end_date, type: :time
-      readonly_attr :currency
-      readonly_attr :currency_sign
-
-      def self.all(customer_uuid, options = {})
-        ChartMogul::Metrics::Subscriptions.all(customer_uuid, options)
-      end
-    end
-
-    class Subscriptions < APIResource
-      set_resource_name 'Subscriptions'
-      set_resource_path '/v1/customers/:customer_uuid/subscriptions'
-
-      include Concerns::Entries
-      include Concerns::Pageable
-
-      set_entry_class Subscription
-
-      def self.all(customer_uuid, options = {})
-        super(options.merge(customer_uuid: customer_uuid))
-      end
-    end
-  end
-end