recurly 3.0.0.beta.1 → 3.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4560816624b25f0c01b6403a22f7b6425c9b7dde31ef860544d4eb3b7bc36fc5
-  data.tar.gz: 154f6697035218babd3b843c820e17fd7650cc275ce1f931eb0800204b67b9ea
+  metadata.gz: 2eff2defc3b440056f3a6fde80b0d8a7f2ec6e514e317666fe28f9f0d7f7a10b
+  data.tar.gz: 540a0e4f98a3a366974e650471e93e4fc70e2e54f2c9004905a6633cc066c4fc
 SHA512:
-  metadata.gz: e1c15b8a70794c06a3d064c4d4b830975d6f5c4aeddfa14a7d5387294d2ecb1ea42f8e96070cf6adb4742a606ed36b2e8fd3e97c96b39688da2099ab72a5159d
-  data.tar.gz: bc16dd1d21814913aa3cb3e23d85bf745a14f47a4fe22ec1931171eef20adae9333f1ad990deacc27857f53a6941b361452123e97a32c697a05c19530e2d920b
+  metadata.gz: 503ebf6c95d9195f90fc221d1ff125d99626c5608648a913f8480c02c57a9229141cedd86004394db94fa1fe69f2549b740934d91eca85d5da86d666cec51d1d
+  data.tar.gz: d77e6d6c319e9a16007f470300f4358be1048673c9783cf92b06347043c0db1609c2f2eb0c6d991a7f2856749be3f15407595e6d0d39796f26522c3fa4fcd2d8

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.0
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
 before_install: gem install bundler -v 1.14.6

data/lib/recurly/client.rb

@@ -103,7 +103,7 @@ module Recurly
     end
 
     def get(path, **options)
-      response = run_request(:get, path, options.compact, headers)
+      response = run_request(:get, path, nil, headers)
       raise_api_error!(response) if response.status != 200
       JSONParser.parse(self, response.body)
     rescue Faraday::ClientError => ex

data/lib/recurly/client/operations.rb

@@ -42,7 +42,7 @@ module Recurly
 
     # Create an account
     #
-    # @param body [Requests::CreateAccount] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::CreateAccount}
+    # @param body [Requests::CreateAccount] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::CreateAccount}
     # @return [Resources::Account] An account.
     def create_account(body:)
       path = interpolate_path("/sites/{site_id}/accounts", site_id: site_id)
@@ -74,7 +74,7 @@ module Recurly
     # Modify an account
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::AccountUpdatable] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::AccountUpdatable}
+    # @param body [Requests::AccountUpdatable] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AccountUpdatable}
     # @return [Resources::Account] An account.
     def update_account(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}", site_id: site_id, account_id: account_id)
@@ -102,7 +102,7 @@ module Recurly
     # Update an account's acquisition data
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::AccountAcquisitionUpdatable] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::AccountAcquisitionUpdatable}
+    # @param body [Requests::AccountAcquisitionUpdatable] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AccountAcquisitionUpdatable}
     # @return [Resources::AccountAcquisition] An account's updated acquisition data.
     def update_account_acquisition(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/acquisition", site_id: site_id, account_id: account_id)
@@ -147,7 +147,7 @@ module Recurly
     # Set an account's billing information
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::BillingInfoCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::BillingInfoCreate}
+    # @param body [Requests::BillingInfoCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::BillingInfoCreate}
     # @return [Resources::BillingInfo] Updated billing information.
     def update_billing_info(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/billing_info", site_id: site_id, account_id: account_id)
@@ -184,7 +184,7 @@ module Recurly
     # Generate an active coupon redemption on an account
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::CreateCouponRedemption] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::CreateCouponRedemption}
+    # @param body [Requests::CreateCouponRedemption] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::CreateCouponRedemption}
     # @return [Resources::CouponRedemption] Returns the new coupon redemption.
     def create_coupon_redemption(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/coupon_redemptions/active", site_id: site_id, account_id: account_id)
@@ -233,7 +233,7 @@ module Recurly
     # Create an invoice for pending line items
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::InvoiceCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::InvoiceCreate}
+    # @param body [Requests::InvoiceCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceCreate}
     # @return [Resources::InvoiceCollection] Returns the new invoices.
     def create_invoice(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/invoices", site_id: site_id, account_id: account_id)
@@ -243,7 +243,7 @@ module Recurly
     # Preview new invoice for pending line items
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::InvoiceCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::InvoiceCreate}
+    # @param body [Requests::InvoiceCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceCreate}
     # @return [Resources::InvoiceCollection] Returns the invoice previews.
     def preview_invoice(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/invoices/preview", site_id: site_id, account_id: account_id)
@@ -271,7 +271,7 @@ module Recurly
     # Create a new line item for the account
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::LineItemCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::LineItemCreate}
+    # @param body [Requests::LineItemCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::LineItemCreate}
     # @return [Resources::LineItem] Returns the new line item.
     def create_line_item(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/line_items", site_id: site_id, account_id: account_id)
@@ -316,7 +316,7 @@ module Recurly
     # Create a new shipping address for the account
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
-    # @param body [Requests::ShippingAddressCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::ShippingAddressCreate}
+    # @param body [Requests::ShippingAddressCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::ShippingAddressCreate}
     # @return [Resources::ShippingAddress] Returns the new shipping address.
     def create_shipping_address(account_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses", site_id: site_id, account_id: account_id)
@@ -337,7 +337,7 @@ module Recurly
     #
     # @param account_id [String] Account ID or code (use prefix: `code-`, e.g. `code-bob`).
     # @param shipping_address_id [String] Shipping Address ID.
-    # @param body [Requests::ShippingAddressUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::ShippingAddressUpdate}
+    # @param body [Requests::ShippingAddressUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::ShippingAddressUpdate}
     # @return [Resources::ShippingAddress] The updated shipping address.
     def update_shipping_address(account_id:, shipping_address_id:, body:)
       path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses/{shipping_address_id}", site_id: site_id, account_id: account_id, shipping_address_id: shipping_address_id)
@@ -416,7 +416,7 @@ module Recurly
 
     # Create a new coupon
     #
-    # @param body [Requests::CreateCoupon] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::CreateCoupon}
+    # @param body [Requests::CreateCoupon] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::CreateCoupon}
     # @return [Resources::Coupon] A new coupon.
     def create_coupon(body:)
       path = interpolate_path("/sites/{site_id}/coupons", site_id: site_id)
@@ -435,7 +435,7 @@ module Recurly
     # Update an active coupon
     #
     # @param coupon_id [String] Coupon ID or code (use prefix: `code-`, e.g. `code-10off`).
-    # @param body [Requests::UpdateCoupon] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::UpdateCoupon}
+    # @param body [Requests::UpdateCoupon] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::UpdateCoupon}
     # @return [Resources::Coupon] The updated coupon.
     def update_coupon(coupon_id:, body:)
       path = interpolate_path("/sites/{site_id}/coupons/{coupon_id}", site_id: site_id, coupon_id: coupon_id)
@@ -579,7 +579,7 @@ module Recurly
     # Refund an invoice
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: `number-`, e.g. `number-1000`).
-    # @param body [Requests::InvoiceRefund] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::InvoiceRefund}
+    # @param body [Requests::InvoiceRefund] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceRefund}
     # @return [Resources::Invoice] Returns the new credit invoice.
     def refund_invoice(invoice_id:, body:)
       path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/refund", site_id: site_id, invoice_id: invoice_id)
@@ -637,7 +637,7 @@ module Recurly
 
     # Create a plan
     #
-    # @param body [Requests::PlanCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::PlanCreate}
+    # @param body [Requests::PlanCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::PlanCreate}
     # @return [Resources::Plan] A plan.
     def create_plan(body:)
       path = interpolate_path("/sites/{site_id}/plans", site_id: site_id)
@@ -656,7 +656,7 @@ module Recurly
     # Update a plan
     #
     # @param plan_id [String] Plan ID or code (use prefix: `code-`, e.g. `code-gold`).
-    # @param body [Requests::PlanUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::PlanUpdate}
+    # @param body [Requests::PlanUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::PlanUpdate}
     # @return [Resources::Plan] A plan.
     def update_plan(plan_id:, body:)
       path = interpolate_path("/sites/{site_id}/plans/{plan_id}", site_id: site_id, plan_id: plan_id)
@@ -691,7 +691,7 @@ module Recurly
     # Create an add-on
     #
     # @param plan_id [String] Plan ID or code (use prefix: `code-`, e.g. `code-gold`).
-    # @param body [Requests::AddOnCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::AddOnCreate}
+    # @param body [Requests::AddOnCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AddOnCreate}
     # @return [Resources::AddOn] An add-on.
     def create_plan_add_on(plan_id:, body:)
       path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons", site_id: site_id, plan_id: plan_id)
@@ -712,7 +712,7 @@ module Recurly
     #
     # @param add_on_id [String] Add-on ID or code (use prefix: `code-`, e.g. `code-gold`).
     # @param plan_id [String] Plan ID or code (use prefix: `code-`, e.g. `code-gold`).
-    # @param body [Requests::AddOnUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::AddOnUpdate}
+    # @param body [Requests::AddOnUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AddOnUpdate}
     # @return [Resources::AddOn] An add-on.
     def update_plan_add_on(add_on_id:, plan_id:, body:)
       path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons/{add_on_id}", site_id: site_id, add_on_id: add_on_id, plan_id: plan_id)
@@ -770,7 +770,7 @@ module Recurly
 
     # Create a new subscription
     #
-    # @param body [Requests::SubscriptionCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::SubscriptionCreate}
+    # @param body [Requests::SubscriptionCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionCreate}
     # @return [Resources::Subscription] A subscription.
     def create_subscription(body:)
       path = interpolate_path("/sites/{site_id}/subscriptions", site_id: site_id)
@@ -802,7 +802,7 @@ module Recurly
     # Modify a subscription
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: `uuid-`, e.g. `uuid-123457890`).
-    # @param body [Requests::SubscriptionUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::SubscriptionUpdate}
+    # @param body [Requests::SubscriptionUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionUpdate}
     # @return [Resources::Subscription] A subscription.
     def modify_subscription(subscription_id:, body:)
       path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}", site_id: site_id, subscription_id: subscription_id)
@@ -849,7 +849,7 @@ module Recurly
     # Create a new subscription change
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: `uuid-`, e.g. `uuid-123457890`).
-    # @param body [Requests::SubscriptionChangeCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::Requests::SubscriptionChangeCreate}
+    # @param body [Requests::SubscriptionChangeCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionChangeCreate}
     # @return [Resources::SubscriptionChange] A subscription change.
     def create_subscription_change(subscription_id:, body:)
       path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/change", site_id: site_id, subscription_id: subscription_id)

data/lib/recurly/request.rb

@@ -5,6 +5,7 @@ module Recurly
   class Request
     extend Schema::SchemaFactory
     extend Schema::RequestCaster
+    extend Schema::JsonDeserializer
     include Schema::SchemaValidator
 
     attr_reader :attributes

data/lib/recurly/resources/account_acquisition.rb

@@ -3,8 +3,8 @@ module Recurly
     class AccountAcquisition < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute campaign
       #   @return [String] An arbitrary identifier for the marketing campaign that led to the acquisition of this account.

data/lib/recurly/resources/account_balance.rb

@@ -3,8 +3,8 @@ module Recurly
     class AccountBalance < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute balances
       #   @return [Hash] Account balance

data/lib/recurly/resources/account_mini.rb

@@ -0,0 +1,30 @@
+module Recurly
+  module Resources
+    class AccountMini < Resource
+
+      # @!attribute code
+      #   @return [String] The unique identifier of the account.
+      define_attribute :code, String
+
+      # @!attribute email
+      #   @return [String] The email address used for communicating with this customer.
+      define_attribute :email, String
+
+      # @!attribute first_name
+      #   @return [String]
+      define_attribute :first_name, String
+
+      # @!attribute [r] id
+      #   @return [String]
+      define_attribute :id, String, {:read_only => true}
+
+      # @!attribute last_name
+      #   @return [String]
+      define_attribute :last_name, String
+
+      # @!attribute [r] object
+      #   @return [String] Object type
+      define_attribute :object, String, {:read_only => true}
+    end
+  end
+end

data/lib/recurly/resources/add_on_mini.rb

@@ -0,0 +1,26 @@
+module Recurly
+  module Resources
+    class AddOnMini < Resource
+
+      # @!attribute accounting_code
+      #   @return [String] Accounting code for invoice line items for this add-on. If no value is provided, it defaults to add-on's code.
+      define_attribute :accounting_code, String
+
+      # @!attribute code
+      #   @return [String] The unique identifier for the add-on within its plan.
+      define_attribute :code, String
+
+      # @!attribute [r] id
+      #   @return [String] Add-on ID
+      define_attribute :id, String, {:read_only => true}
+
+      # @!attribute name
+      #   @return [String] Describes your add-on and will appear in subscribers' invoices.
+      define_attribute :name, String
+
+      # @!attribute [r] object
+      #   @return [String] Object type
+      define_attribute :object, String, {:read_only => true}
+    end
+  end
+end

data/lib/recurly/resources/coupon_mini.rb

@@ -0,0 +1,38 @@
+module Recurly
+  module Resources
+    class CouponMini < Resource
+
+      # @!attribute code
+      #   @return [String] The code the customer enters to redeem the coupon.
+      define_attribute :code, String
+
+      # @!attribute coupon_type
+      #   @return [String] Whether the coupon is "single_code" or "bulk". Bulk coupons will require a `unique_code_template` and will generate unique codes through the `/generate` endpoint.
+      define_attribute :coupon_type, String, {:enum => ["single_code", "bulk"]}
+
+      # @!attribute discount
+      #   @return [CouponDiscount]
+      define_attribute :discount, :CouponDiscount
+
+      # @!attribute expired_at
+      #   @return [DateTime] The date and time the coupon was expired early or reached its `max_redemptions`.
+      define_attribute :expired_at, DateTime
+
+      # @!attribute [r] id
+      #   @return [String] Coupon ID
+      define_attribute :id, String, {:read_only => true}
+
+      # @!attribute name
+      #   @return [String] The internal name for the coupon.
+      define_attribute :name, String
+
+      # @!attribute [r] object
+      #   @return [String] Object type
+      define_attribute :object, String, {:read_only => true}
+
+      # @!attribute state
+      #   @return [String] Indicates if the coupon is redeemable, and if it is not, why.
+      define_attribute :state, String, {:enum => ["redeemable", "maxed_out", "expired"]}
+    end
+  end
+end

data/lib/recurly/resources/coupon_redemption_mini.rb

@@ -0,0 +1,30 @@
+module Recurly
+  module Resources
+    class CouponRedemptionMini < Resource
+
+      # @!attribute coupon
+      #   @return [Coupon]
+      define_attribute :coupon, :Coupon
+
+      # @!attribute [r] created_at
+      #   @return [DateTime] Created at
+      define_attribute :created_at, DateTime, {:read_only => true}
+
+      # @!attribute discounted
+      #   @return [String] The amount that was discounted upon the application of the coupon, formatted with the currency.
+      define_attribute :discounted, String
+
+      # @!attribute [r] id
+      #   @return [String] Coupon Redemption ID
+      define_attribute :id, String, {:read_only => true}
+
+      # @!attribute [r] object
+      #   @return [String] Will always be `coupon`.
+      define_attribute :object, String, {:read_only => true}
+
+      # @!attribute state
+      #   @return [String] Invoice state
+      define_attribute :state, String, {:enum => ["active", "inactive"]}
+    end
+  end
+end

data/lib/recurly/resources/credit_payment.rb

@@ -3,8 +3,8 @@ module Recurly
     class CreditPayment < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute action
       #   @return [String] The action for which the credit was created.
@@ -15,8 +15,8 @@ module Recurly
       define_attribute :amount, Float
 
       # @!attribute applied_to_invoice
-      #   @return [InvoiceMini]
-      define_attribute :applied_to_invoice, :InvoiceMini
+      #   @return [Invoice]
+      define_attribute :applied_to_invoice, :Invoice
 
       # @!attribute [r] created_at
       #   @return [DateTime] Created at
@@ -39,8 +39,8 @@ module Recurly
       define_attribute :original_credit_payment_id, String
 
       # @!attribute original_invoice
-      #   @return [InvoiceMini]
-      define_attribute :original_invoice, :InvoiceMini
+      #   @return [Invoice]
+      define_attribute :original_invoice, :Invoice
 
       # @!attribute refund_transaction
       #   @return [Transaction]

data/lib/recurly/resources/invoice.rb

@@ -3,8 +3,8 @@ module Recurly
     class Invoice < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute address
       #   @return [Address]

data/lib/recurly/resources/invoice_mini.rb

@@ -0,0 +1,26 @@
+module Recurly
+  module Resources
+    class InvoiceMini < Resource
+
+      # @!attribute id
+      #   @return [String] Invoice ID
+      define_attribute :id, String
+
+      # @!attribute number
+      #   @return [String] Invoice number
+      define_attribute :number, String
+
+      # @!attribute object
+      #   @return [String] Object type
+      define_attribute :object, String
+
+      # @!attribute state
+      #   @return [String] Invoice state
+      define_attribute :state, String, {:enum => ["pending", "processing", "past_due", "paid", "failed"]}
+
+      # @!attribute type
+      #   @return [String] Invoice type
+      define_attribute :type, String, {:enum => ["charge", "credit", "legacy"]}
+    end
+  end
+end

data/lib/recurly/resources/line_item.rb

@@ -3,8 +3,8 @@ module Recurly
     class LineItem < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute accounting_code
       #   @return [String] Internal accounting code to help you reconcile your revenue to the correct ledger. Line items created as part of a subscription invoice will use the plan or add-on's accounting code, otherwise the value will only be present if you define an accounting code when creating the line item.

data/lib/recurly/resources/plan_mini.rb

@@ -0,0 +1,22 @@
+module Recurly
+  module Resources
+    class PlanMini < Resource
+
+      # @!attribute code
+      #   @return [String] Unique code to identify the plan. This is used in Hosted Payment Page URLs and in the invoice exports.
+      define_attribute :code, String
+
+      # @!attribute [r] id
+      #   @return [String] Plan ID
+      define_attribute :id, String, {:read_only => true}
+
+      # @!attribute name
+      #   @return [String] This name describes your plan and will appear on the Hosted Payment Page and the subscriber's invoice.
+      define_attribute :name, String
+
+      # @!attribute [r] object
+      #   @return [String] Object type
+      define_attribute :object, String, {:read_only => true}
+    end
+  end
+end

data/lib/recurly/resources/subscription.rb

@@ -3,8 +3,8 @@ module Recurly
     class Subscription < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute activated_at
       #   @return [DateTime] Activated at
@@ -79,8 +79,8 @@ module Recurly
       define_attribute :pending_change, :SubscriptionChange
 
       # @!attribute plan
-      #   @return [PlanMini]
-      define_attribute :plan, :PlanMini
+      #   @return [Plan]
+      define_attribute :plan, :Plan
 
       # @!attribute po_number
       #   @return [String] For manual invoicing, this identifies the PO number associated with the subscription.

data/lib/recurly/resources/subscription_add_on.rb

@@ -3,8 +3,8 @@ module Recurly
     class SubscriptionAddOn < Resource
 
       # @!attribute add_on
-      #   @return [AddOnMini]
-      define_attribute :add_on, :AddOnMini
+      #   @return [AddOn]
+      define_attribute :add_on, :AddOn
 
       # @!attribute created_at
       #   @return [DateTime] Created at

data/lib/recurly/resources/subscription_change.rb

@@ -31,8 +31,8 @@ module Recurly
       define_attribute :object, String
 
       # @!attribute plan
-      #   @return [PlanMini]
-      define_attribute :plan, :PlanMini
+      #   @return [Plan]
+      define_attribute :plan, :Plan
 
       # @!attribute quantity
       #   @return [Integer] Subscription quantity

data/lib/recurly/resources/transaction.rb

@@ -3,8 +3,8 @@ module Recurly
     class Transaction < Resource
 
       # @!attribute account
-      #   @return [AccountMini]
-      define_attribute :account, :AccountMini
+      #   @return [Account]
+      define_attribute :account, :Account
 
       # @!attribute amount
       #   @return [Float] Total transaction amount sent to the payment gateway.
@@ -71,8 +71,8 @@ module Recurly
       define_attribute :id, String
 
       # @!attribute invoice
-      #   @return [InvoiceMini]
-      define_attribute :invoice, :InvoiceMini
+      #   @return [Invoice]
+      define_attribute :invoice, :Invoice
 
       # @!attribute ip_address_country
       #   @return [String] IP address's country
@@ -139,8 +139,8 @@ module Recurly
       define_attribute :voided_at, DateTime
 
       # @!attribute voided_by_invoice
-      #   @return [InvoiceMini]
-      define_attribute :voided_by_invoice, :InvoiceMini
+      #   @return [Invoice]
+      define_attribute :voided_by_invoice, :Invoice
     end
   end
 end

data/lib/recurly/schema.rb

@@ -42,7 +42,9 @@ module Recurly
     def self.get_recurly_class(type)
       raise ArgumentError, "#{type.inspect} must be a symbol but is a #{type.class}" unless type.is_a?(Symbol)
 
-      if Requests.const_defined?(type)
+      if type == :Address
+        Resources::Address
+      elsif Requests.const_defined?(type)
         Requests.const_get(type)
       elsif Resources.const_defined?(type)
         Resources.const_get(type)
@@ -100,6 +102,11 @@ module Recurly
       def recurly_class
         Schema.get_recurly_class(type == Array ? options[:item_type] : type)
       end
+
+      def is_primitive?
+        t = type == Array ? options[:item_type] : type
+        t.is_a?(Class) || t == :Boolean
+      end
     end
 
     private_constant :List

data/lib/recurly/schema/json_deserializer.rb

@@ -20,21 +20,25 @@ module Recurly
         attributes.each do |attr_name, val|
           next if attr_name == 'object'
 
+          schema_attr = self.schema.get_attribute(attr_name)
+
           # if the Hash val is a recurly type, parse it into a Resource
-          if val.is_a?(Hash) && klazz = JSONParser.recurly_class(val['object'])
-            val = klazz.from_json(val)
-          elsif val.is_a?(Array)
-            val = val.map do |e|
-              if e.is_a?(Hash) && klazz = JSONParser.recurly_class(e['object'])
-                klazz.from_json(e)
-              else
-                e
-              end
-            end
-          elsif attr_name.end_with?("_at") && val && val.is_a?(String)
-            # TODO should use the schema to determine this probably
-            val = DateTime.parse(val)
-          end
+          val = if val.is_a?(Hash) && !schema_attr.is_primitive?
+                  schema_attr.recurly_class.from_json(val)
+                elsif val.is_a?(Array)
+                  val.map do |e|
+                    if e.is_a?(Hash) && !schema_attr.is_primitive?
+                      schema_attr.recurly_class.from_json(e)
+                    else
+                      e
+                    end
+                  end
+                elsif attr_name.end_with?("_at") && val && val.is_a?(String)
+                  # TODO should use the schema to determine this probably
+                  DateTime.parse(val)
+                else
+                  val
+                end
 
           writer = "#{attr_name}="
 

data/lib/recurly/schema/schema_validator.rb

@@ -36,7 +36,7 @@ module Recurly
 
       # Validates an individual attribute
       def validate_attribute!(schema_attr, val)
-        if !schema_attr.type.is_a?(Symbol) && val.class != schema_attr.type
+        unless schema_attr.type.is_a?(Symbol) || val.is_a?(schema_attr.type)
           expected = case schema_attr.type
                      when Array
                        "Array of #{schema_attr.type.item_type}s"

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly
-  VERSION = "3.0.0.beta.1"
+  VERSION = "3.0.0.beta.2"
 end

data/recurly.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   # spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.13"
+  spec.add_dependency "faraday", "~> 0.12"
 
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,20 +170,26 @@ files:
 - lib/recurly/resources/account.rb
 - lib/recurly/resources/account_acquisition.rb
 - lib/recurly/resources/account_balance.rb
+- lib/recurly/resources/account_mini.rb
 - lib/recurly/resources/account_note.rb
 - lib/recurly/resources/add_on.rb
+- lib/recurly/resources/add_on_mini.rb
 - lib/recurly/resources/address.rb
 - lib/recurly/resources/billing_info.rb
 - lib/recurly/resources/coupon.rb
 - lib/recurly/resources/coupon_discount.rb
+- lib/recurly/resources/coupon_mini.rb
 - lib/recurly/resources/coupon_redemption.rb
+- lib/recurly/resources/coupon_redemption_mini.rb
 - lib/recurly/resources/credit_payment.rb
 - lib/recurly/resources/error.rb
 - lib/recurly/resources/error_may_have_transaction.rb
 - lib/recurly/resources/invoice.rb
 - lib/recurly/resources/invoice_collection.rb
+- lib/recurly/resources/invoice_mini.rb
 - lib/recurly/resources/line_item.rb
 - lib/recurly/resources/plan.rb
+- lib/recurly/resources/plan_mini.rb
 - lib/recurly/resources/settings.rb
 - lib/recurly/resources/shipping_address.rb
 - lib/recurly/resources/site.rb