chartmogul-ruby 1.6.7 → 1.7.3

data/fixtures/vcr_cassettes/ChartMogul_Subscription/API_Interactions/correctly_interracts_with_the_API.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -63,7 +63,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -114,7 +114,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -165,7 +165,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -214,7 +214,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 200
@@ -263,7 +263,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 202
@@ -306,7 +306,7 @@ http_interactions:
       User-Agent:
       - Faraday v0.9.2
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 204

data/fixtures/vcr_cassettes/ChartMogul_Subscription/API_Interactions/has_multiple_aliases.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 200
@@ -61,7 +61,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 200

data/fixtures/vcr_cassettes/ChartMogul_Subscription/_update_cancellation_dates/when_array_has_time_objects/is_setting_the_cancellation_dates_of_the_subscription.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -51,7 +51,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -102,7 +102,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 202

data/fixtures/vcr_cassettes/ChartMogul_Subscription/_update_cancellation_dates/when_array_includes_invalid_entries/raises_an_exception.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -51,7 +51,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200

data/fixtures/vcr_cassettes/ChartMogul_Subscription/_update_cancellation_dates/when_array_includes_valid_entries/is_setting_the_cancellation_dates_of_the_subscription.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -51,7 +51,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -102,7 +102,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Mjk5ZjAyMjYzMDRkNThhNWZiYzFlNTcwOTdlZGU3Mjk6OWM4NWIwNGFkN2FjNzE2NTUwYTY1NjZhZWYwYzM5ZmU=
+      - Basic hidden
   response:
     status:
       code: 202

data/fixtures/vcr_cassettes/ChartMogul_Subscription/_update_cancellation_dates/when_array_is_empty/makes_an_API_call_and_removes_the_cancellation_dates.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -51,7 +51,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Hidden
+      - Basic hidden
   response:
     status:
       code: 200
@@ -102,7 +102,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic Mjk5ZjAyMjYzMDRkNThhNWZiYzFlNTcwOTdlZGU3Mjk6OWM4NWIwNGFkN2FjNzE2NTUwYTY1NjZhZWYwYzM5ZmU=
+      - Basic hidden
   response:
     status:
       code: 202

data/fixtures/vcr_cassettes/ChartMogul_Transactions_Payment/API_Interactions/correctly_interracts_with_the_API.yml

@@ -12,7 +12,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -63,7 +63,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -113,7 +113,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -162,7 +162,7 @@ http_interactions:
       Content-Type:
       - application/json
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 201
@@ -209,7 +209,7 @@ http_interactions:
       User-Agent:
       - Faraday v0.9.2
       Authorization:
-      - Basic YmIzN2I0Njk5NjNlMjhlYjY2MjA1ZWYzZmU1MWQ1NmM6ZmM1YjQxYzM3YTNlZTcwYjQyN2UwYzU1ODg2NzA2ZmQ=
+      - Basic hidden
   response:
     status:
       code: 204

data/lib/chartmogul.rb

@@ -53,6 +53,7 @@ require 'chartmogul/ping'
 require 'chartmogul/plan'
 require 'chartmogul/plan_group'
 require 'chartmogul/plan_groups/plans'
+require 'chartmogul/account'
 
 require 'chartmogul/metrics/arpa'
 require 'chartmogul/metrics/arr'
@@ -78,10 +79,14 @@ module ChartMogul
   class << self
     extend ConfigAttributes
 
+    def global_config
+      @global_config ||= ChartMogul::Configuration.new
+    end
 
+    # This configuration is thread-safe and fits multi-account async
+    # jobs processing use case.
     def config
-      Thread.current[CONFIG_THREAD_KEY] = ChartMogul::Configuration.new if Thread.current[CONFIG_THREAD_KEY].nil?
-      Thread.current[CONFIG_THREAD_KEY]
+      Thread.current[CONFIG_THREAD_KEY] ||= ChartMogul::Configuration.new
     end
 
     config_accessor :account_token

data/lib/chartmogul/account.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ChartMogul
+  class Account < APIResource
+    set_resource_name 'Account'
+    set_resource_path '/v1/account'
+
+    readonly_attr :name
+    readonly_attr :currency
+    readonly_attr :time_zone
+    readonly_attr :week_start_on
+
+    include API::Actions::Custom
+
+    def self.retrieve
+      custom!(:get, '/v1/account')
+    end
+  end
+end

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

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

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

@@ -15,7 +15,7 @@ module ChartMogul
               req.body = JSON.dump(serialize_for_write)
             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
@@ -30,7 +30,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/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/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

@@ -12,6 +12,7 @@ module ChartMogul
       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::Activities.all(customer_uuid, options)

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 = {})