Merge branch 'v2' into subscription_ramp_intervals

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.19.6
+current_version = 2.19.7
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [2.19.7](https://github.com/recurly/recurly-client-ruby/tree/2.19.7) (2023-07-17)
+
+[Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.6...2.19.7)
+
+
+**Merged Pull Requests**
+
+- modify external subscription [#857](https://github.com/recurly/recurly-client-ruby/pull/857) ([amandamfielding](https://github.com/amandamfielding))
+
+
+
 ## [2.19.6](https://github.com/recurly/recurly-client-ruby/tree/2.19.6) (2023-06-13)
 
 [Full Changelog](https://github.com/recurly/recurly-client-ruby/compare/2.19.5...2.19.6)

README.md

@@ -14,7 +14,7 @@ Recurly is packaged as a Ruby gem. We recommend you install it with
 [Bundler](http://gembundler.com/) by adding the following line to your Gemfile:
 
 ``` ruby
-gem 'recurly', '~> 2.19.6'
+gem 'recurly', '~> 2.19.7'
 ```
 
 Recurly will automatically use [Nokogiri](http://nokogiri.org/) (for a nice

lib/recurly/external_subscription.rb

@@ -23,6 +23,10 @@ class ExternalSubscription < Resource
       auto_renew
       app_identifier
       state
+      trial_started_at
+      trial_ends_at
+      canceled_at
+      in_grace_period
     )
 
     # We do not expose PUT or POST in the v2 API.

lib/recurly/version.rb

@@ -1,6 +1,6 @@
 module Recurly
   module Version
-    VERSION = "2.19.6"
+    VERSION = "2.19.7"
 
     class << self
       def inspect

spec/fixtures/accounts/external_subscriptions/show-200.xml

@@ -15,6 +15,10 @@ Content-Type: application/xml; charset=utf-8
         <activated_at nil="nil"></activated_at>
         <expires_at nil="nil"></expires_at>
         <state>active</state>
+        <trial_started_at nil="nil"></trial_started_at>
+        <trial_ends_at nil="nil"></trial_ends_at>
+        <canceled_at nil="nil"></canceled_at>
+        <in_grace_period>false</in_grace_period>
         <created_at type="datetime">2022-11-04T20:33:29Z</created_at>
         <updated_at type="datetime">2022-11-04T20:33:29Z</updated_at>
     </external_subscription>

spec/fixtures/external_subscriptions/show-200.xml

@@ -20,6 +20,10 @@ Content-Type: application/xml; charset=utf-8
     <state>expired</state>
     <activated_at type="datetime">2023-01-13T17:28:02Z</activated_at>
     <expires_at type="datetime">2023-01-13T17:28:02Z</expires_at>
+    <trial_started_at nil="nil"></trial_started_at>
+    <trial_ends_at nil="nil"></trial_ends_at>
+    <canceled_at nil="nil"></canceled_at>
+    <in_grace_period>false</in_grace_period>
     <created_at type="datetime">2023-02-08T23:02:30Z</created_at>
     <updated_at type="datetime">2023-02-08T23:02:30Z</updated_at>
 </external_subscription>

spec/recurly/external_subscription_spec.rb

@@ -20,7 +20,11 @@
       auto_renew: true,
       app_identifier: 'apple_play_store',
       external_id: 'abcd1234',
-      state: 'active'
+      state: 'active',
+      trial_started_at: "2022-11-07 17:08:18",
+      trial_ends_at: "2022-11-14 17:08:18",
+      canceled_at: "2022-11-15 17:08:18",
+      in_grace_period: false
     )
   }
 
@@ -49,6 +53,7 @@
 <activated_at>2022-11-07 17:08:18</activated_at>\
 <app_identifier>apple_play_store</app_identifier>\
 <auto_renew>true</auto_renew>\
+<canceled_at>2022-11-15 17:08:18</canceled_at>\
 <created_at>2022-11-07 17:08:18</created_at>\
 <expires_at>2022-12-07 17:08:18</expires_at>\
 <external_id>abcd1234</external_id>\
@@ -59,9 +64,12 @@
 <reference_code>reference_code 1</reference_code>\
 <updated_at>2019-08-24T14:15:22Z</updated_at>\
 </external_product_reference>\
+<in_grace_period>false</in_grace_period>\
 <last_purchased>2022-11-07 17:08:18</last_purchased>\
 <quantity>1</quantity>\
 <state>active</state>\
+<trial_ends_at>2022-11-14 17:08:18</trial_ends_at>\
+<trial_started_at>2022-11-07 17:08:18</trial_started_at>\
 <updated_at>2022-11-07 17:08:18</updated_at>\
 </external_subscription>
 XML