chartmogul-ruby 1.6.8 → 2.0.0

data/lib/chartmogul/api/actions/custom.rb

@@ -25,7 +25,7 @@ module ChartMogul
                 req.body = JSON.dump(body_data)
               end
             end
-            ChartMogul::Utils::JSONParser.parse(resp.body, skip_case_conversion: skip_case_conversion)
+            ChartMogul::Utils::JSONParser.parse(resp.body, immutable_keys: immutable_keys)
           end
 
           def custom!(http_method, http_path, body_data = {})

data/lib/chartmogul/api/actions/retrieve.rb

@@ -15,7 +15,8 @@ module ChartMogul
                 req.headers['Content-Type'] = 'application/json'
               end
             end
-            json = ChartMogul::Utils::JSONParser.parse(resp.body, skip_case_conversion: skip_case_conversion)
+
+            json = ChartMogul::Utils::JSONParser.parse(resp.body, immutable_keys: immutable_keys)
             new_from_json(json)
           end
         end

data/lib/chartmogul/api/actions/update.rb

@@ -16,7 +16,7 @@ module ChartMogul
             end
           end
 
-          json = ChartMogul::Utils::JSONParser.parse(resp.body, skip_case_conversion: self.class.skip_case_conversion)
+          json = ChartMogul::Utils::JSONParser.parse(resp.body, immutable_keys: self.class.immutable_keys)
 
           assign_all_attributes(json)
         end
@@ -31,7 +31,7 @@ module ChartMogul
                 req.body = JSON.dump(resource.serialize_for_write)
               end
             end
-            json = ChartMogul::Utils::JSONParser.parse(resp.body, skip_case_conversion: skip_case_conversion)
+            json = ChartMogul::Utils::JSONParser.parse(resp.body, immutable_keys: immutable_keys)
 
             new_from_json(json)
           end

data/lib/chartmogul/api_resource.rb

@@ -17,7 +17,7 @@ module ChartMogul
     MAX_INTERVAL = 60
     THREAD_CONNECTION_KEY = 'chartmogul_ruby.api_resource.connection'
 
-    class << self; attr_reader :resource_path, :resource_name, :resource_root_key, :skip_case_conversion end
+    class << self; attr_reader :resource_path, :resource_name, :resource_root_key end
 
     def self.set_resource_path(path)
       @resource_path = ChartMogul::ResourcePath.new(path)
@@ -31,9 +31,13 @@ module ChartMogul
       @resource_root_key = root_key
     end
 
-    # When true, response hash keys won't be converted to snake case
-    def self.set_skip_case_conversion(value)
-      @skip_case_conversion = value
+    def self.immutable_keys
+      @immutable_keys ||= []
+    end
+
+    # When set with keys, nested hash keys of these immutable keys won't be converted to snake case
+    def self.set_immutable_keys(array)
+      @immutable_keys = array
     end
 
     def self.connection

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/config_attributes.rb

@@ -4,7 +4,7 @@ module ChartMogul
   module ConfigAttributes
     def config_accessor(attribute, default_value = nil)
       define_method(attribute) do
-        attr = config.send(attribute) || default_value
+        attr = config.send(attribute) || global_config.send(attribute) || default_value
         if attr.nil?
           raise ConfigurationError, "Configuration for #{attribute} not set"
         end
@@ -12,9 +12,25 @@ module ChartMogul
         attr
       end
 
+      define_method("global_#{attribute}") do
+        attr = global_config.send(attribute) || default_value
+        if attr.nil?
+          raise ConfigurationError, "Global configuration for #{attribute} not set"
+        end
+
+        attr
+      end
+
       define_method("#{attribute}=") do |val|
         config.send("#{attribute}=", val)
         Thread.current[ChartMogul::APIResource::THREAD_CONNECTION_KEY] = nil
+        val
+      end
+
+      define_method("global_#{attribute}=") do |val|
+        global_config.send("#{attribute}=", val)
+        Thread.current[ChartMogul::APIResource::THREAD_CONNECTION_KEY] = nil
+        val
       end
     end
   end

data/lib/chartmogul/customer.rb

@@ -4,7 +4,7 @@ module ChartMogul
   class Customer < APIResource
     set_resource_name 'Customer'
     set_resource_path '/v1/customers'
-    set_skip_case_conversion true
+    set_immutable_keys([:attributes, :custom])
 
     readonly_attr :uuid
     readonly_attr :id
@@ -132,6 +132,7 @@ module ChartMogul
   class Customers < APIResource
     set_resource_name 'Customers'
     set_resource_path '/v1/customers'
+    set_immutable_keys([:attributes, :custom])
 
     include Concerns::Entries
     include API::Actions::Custom

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/transactions/payment.rb

@@ -12,7 +12,7 @@ module ChartMogul
       writeable_attr :date, type: :time
       writeable_attr :result
       writeable_attr :external_id
-
+      writeable_attr :amount_in_cents
       writeable_attr :invoice_uuid
 
       def initialize(attributes = {})

data/lib/chartmogul/transactions/refund.rb

@@ -12,7 +12,7 @@ module ChartMogul
       writeable_attr :date, type: :time
       writeable_attr :result
       writeable_attr :external_id
-
+      writeable_attr :amount_in_cents
       writeable_attr :invoice_uuid
 
       def initialize(attributes = {})

data/lib/chartmogul/utils/hash_snake_caser.rb

@@ -8,8 +8,9 @@ module ChartMogul
       # Rubyish snake_case, suitable for use during instantiation of Ruby
       # model attributes.
       #
-      def initialize(hash)
+      def initialize(hash, immutable_keys: [])
         @hash = hash
+        @immutable_keys = immutable_keys
       end
 
       def to_snake_keys(value = @hash)
@@ -26,7 +27,13 @@ module ChartMogul
       private
 
       def snake_hash(value)
-        Hash[value.map { |k, v| [underscore_key(k), to_snake_keys(v)] }]
+        Hash[value.map { |k, v| [underscore_key(k), immutable_check(k, v)] }]
+      end
+
+      def immutable_check(k,v)
+        return v if @immutable_keys.include?(k)
+
+        to_snake_keys(v)
       end
 
       def underscore_key(k)

data/lib/chartmogul/utils/json_parser.rb

@@ -4,11 +4,9 @@ module ChartMogul
   module Utils
     class JSONParser
       class << self
-        def parse(json_string, skip_case_conversion: false)
+        def parse(json_string, immutable_keys: [])
           hash = JSON.parse(json_string, symbolize_names: true)
-          return hash if skip_case_conversion
-
-          HashSnakeCaser.new(hash).to_snake_keys
+          HashSnakeCaser.new(hash, immutable_keys: immutable_keys).to_snake_keys
         end
 
         def typecast_custom_attributes(custom_attributes)

data/lib/chartmogul/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chartmogul-ruby
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Petr Kopac
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,10 +171,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- 2.0-Upgrade.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -185,6 +185,7 @@ files:
 - chartmogul-ruby.gemspec
 - fixtures/vcr_cassettes/ChartMogul_APIResource/connection/works_in_a_threaded_environment.yml
 - fixtures/vcr_cassettes/ChartMogul_APIResource/connection/works_when_credentials_are_updated.yml
+- fixtures/vcr_cassettes/ChartMogul_Account/returns_details_of_current_account.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/adds_custom_attributes.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/adds_required_tags.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/can_page_through_search_endpoint.yml
@@ -196,6 +197,7 @@ files:
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/raises_422_for_update_with_invalid_data.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/removes_custom_attributes.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/removes_tags.yml
+- fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/respects_camel_case_for_all_customers_endpoint.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/returns_all_customers_through_list_all_endpoint.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/returns_customer_through_retrieve_endpoint.yml
 - fixtures/vcr_cassettes/ChartMogul_Customer/API_Interactions/returns_right_customers_through_search_endpoint.yml
@@ -220,21 +222,24 @@ 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_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
@@ -262,6 +267,7 @@ files:
 - fixtures/vcr_cassettes/ChartMogul_Subscription/_update_cancellation_dates/when_array_is_empty/makes_an_API_call_and_removes_the_cancellation_dates.yml
 - fixtures/vcr_cassettes/ChartMogul_Transactions_Payment/API_Interactions/correctly_interracts_with_the_API.yml
 - lib/chartmogul.rb
+- lib/chartmogul/account.rb
 - lib/chartmogul/api/actions/all.rb
 - lib/chartmogul/api/actions/create.rb
 - lib/chartmogul/api/actions/custom.rb
@@ -272,6 +278,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
@@ -298,10 +305,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