recurly 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d61312d1c187372703653f203839c26488c65f9
-  data.tar.gz: d03b58e312e5964b1c0bd05089c6e74004bf0506
+  metadata.gz: e2262959571c90e57a28e1e23e8b43752d9bdc4b
+  data.tar.gz: f330f72ffa67ab66906bb85413fc9f26ec56932d
 SHA512:
-  metadata.gz: d895a375c37a6b4e22d7ccee798ac253fadc2e1059dae919cc7f399cd48edaae57da2370ff9ec0844f3227e7819716d11cf23839dbd7d0a7b0ee438ba13873c8
-  data.tar.gz: 208d445b9da2003b95bf11ee15031fed3057467beed084a9158ee725aa3e82d01018b876e811420ae21bc0e5c045d102140e94b2a9435d2d4826d0317ec1b195
+  metadata.gz: 6acb8408b5370b56c46086b701d19f5aefa7a23d4dd73c89c5962012bd27b1c8bb087980125ec651280b6aa132ac8973ff0058a8befd5d7c812a4107c82321e8
+  data.tar.gz: 9dce505a4d1c0944b21ced09d53dda21aeb75428fc9d182c932efc92fcac00f31ca934aa0f6ef8ed833a1646106fd9eb18f04eb96215784d6d8f504b3bac93d5

data/README.md

@@ -12,7 +12,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.5.1'
+gem 'recurly', '~> 2.5.2'
 ```
 
 Recurly will automatically use [Nokogiri](http://nokogiri.org/) (for a nice

data/lib/recurly.rb

@@ -1,41 +1,33 @@
 # Recurly is a Ruby client for Recurly's REST API.
 module Recurly
-  autoload :Account,           'recurly/account'
-  autoload :AddOn,             'recurly/add_on'
-  autoload :Address,           'recurly/address'
-  autoload :TaxDetail,         'recurly/tax_detail'
-  autoload :Adjustment,        'recurly/adjustment'
-  autoload :API,               'recurly/api'
-  autoload :BillingInfo,       'recurly/billing_info'
-  autoload :Coupon,            'recurly/coupon'
-  autoload :Helper,            'recurly/helper'
-  autoload :Invoice,           'recurly/invoice'
-  autoload :JS,                'recurly/js'
-  autoload :Money,             'recurly/money'
-  autoload :Plan,              'recurly/plan'
-  autoload :Redemption,        'recurly/redemption'
-  autoload :Resource,          'recurly/resource'
-  autoload :Subscription,      'recurly/subscription'
-  autoload :SubscriptionAddOn, 'recurly/subscription_add_on'
-  autoload :Transaction,       'recurly/transaction'
-  autoload :Version,           'recurly/version'
-  autoload :XML,               'recurly/xml'
-  autoload :Webhook,           'recurly/webhook'
+  require 'recurly/error'
+  require 'recurly/helper'
+  require 'recurly/api'
+  require 'recurly/resource'
+  require 'recurly/billing_info'
+  require 'recurly/account'
+  require 'recurly/add_on'
+  require 'recurly/address'
+  require 'recurly/tax_detail'
+  require 'recurly/adjustment'
+  require 'recurly/coupon'
+  require 'recurly/helper'
+  require 'recurly/invoice'
+  require 'recurly/js'
+  require 'recurly/money'
+  require 'recurly/measured_unit'
+  require 'recurly/plan'
+  require 'recurly/redemption'
+  require 'recurly/subscription'
+  require 'recurly/subscription_add_on'
+  require 'recurly/transaction'
+  require 'recurly/usage'
+  require 'recurly/version'
+  require 'recurly/xml'
+  require 'recurly/webhook'
 
   @subdomain = nil
 
-  # The exception class from which all Recurly exceptions inherit.
-  class Error < StandardError
-    def set_message message
-      @message = message
-    end
-
-    # @return [String]
-    def to_s
-      defined? @message and @message or super
-    end
-  end
-
   # This exception is raised if Recurly has not been configured.
   class ConfigurationError < Error
   end

data/lib/recurly/add_on.rb

@@ -11,6 +11,11 @@ module Recurly
       unit_amount_in_cents
       display_quantity_on_hosted_page
       tax_code
+      add_on_type
+      measured_unit_id
+      optional
+      usage_type
+      usage_percentage
       created_at
     )
     alias to_param add_on_code

data/lib/recurly/api.rb

@@ -16,7 +16,7 @@ module Recurly
 
     @@base_uri = "https://api.recurly.com/v2/"
 
-    RECURLY_API_VERSION = '2.1'
+    RECURLY_API_VERSION = '2.2'
 
     FORMATS = Helper.hash_with_indifferent_read_access(
       'pdf' => 'application/pdf',

data/lib/recurly/error.rb

@@ -0,0 +1,13 @@
+module Recurly
+  # The exception class from which all Recurly exceptions inherit.
+  class Error < StandardError
+    def set_message message
+      @message = message
+    end
+
+    # @return [String]
+    def to_s
+      defined? @message and @message or super
+    end
+  end
+end

data/lib/recurly/measured_unit.rb

@@ -0,0 +1,12 @@
+module Recurly
+  class MeasuredUnit < Resource
+    define_attribute_methods %w(
+      id
+      name
+      display_name
+      description
+      created_at
+    )
+    alias to_param id
+  end
+end

data/lib/recurly/resource.rb

@@ -114,9 +114,9 @@ module Recurly
   #
   #   Account.find_each { |account| p account }
   class Resource
-    autoload :Errors, 'recurly/resource/errors'
-    autoload :Pager,  'recurly/resource/pager'
-    autoload :Association,  'recurly/resource/association'
+    require 'recurly/resource/errors'
+    require 'recurly/resource/pager'
+    require 'recurly/resource/association'
 
     # Raised when a record cannot be found.
     #
@@ -316,6 +316,12 @@ module Recurly
       # @example
       #   Recurly::Account.find "heisenberg"
       #   # => #<Recurly::Account account_code: "heisenberg", ...>
+      #   Use the following identifiers for these types of objects:
+      #     for accounts use account_code
+      #     for plans use plan_code
+      #     for invoices use invoice_number
+      #     for subscriptions use uuid
+      #     for transactions use uuid
       def find uuid, options = {}
         if uuid.nil?
           # Should we raise an ArgumentError, instead?
@@ -401,7 +407,12 @@ module Recurly
             }
             next
           end
-
+          
+          # Nokogiri on Jruby-1.7.19 likes to throw NullPointer exceptions
+          # if you try to run certian operations like el.attribute(''). Since
+          # we dont care about text nodes, let's just skip them
+          next if defined?(Nokogiri::XML::Node::TEXT_NODE) && el.node_type == Nokogiri::XML::Node::TEXT_NODE 
+          
           if el.children.empty? && href = el.attribute('href')
             klass_name = Helper.classify(klass.association_class_name(el.name) ||
                                          el.attribute('type') ||

data/lib/recurly/resource/pager.rb

@@ -156,6 +156,17 @@ module Recurly
         new(attributes) { |record| record.save }
       end
 
+      # Instantiates a record in the scope of the pager.
+      #
+      # @return [Resource] The record.
+      # @example
+      #   account = Recurly::Account.find 'schrader'
+      #   subscription = account.subscriptions.build attributes
+      # @see Resource.new
+      def build attributes = {}
+        new(attributes)
+      end
+
       # Instantiates and saves a record in the scope of the pager.
       #
       # @return [Resource] The saved record.

data/lib/recurly/subscription.rb

@@ -1,6 +1,6 @@
 module Recurly
   class Subscription < Resource
-    autoload :AddOns, 'recurly/subscription/add_ons'
+    require 'recurly/subscription/add_ons'
 
     # @macro [attach] scope
     #   @scope class

data/lib/recurly/subscription_add_on.rb

@@ -1,9 +1,19 @@
 module Recurly
   class SubscriptionAddOn < Resource
+    # @return [MeasuredUnit]
+    has_one :measured_unit
+
+    # Singular because the endpoint is /usage not /usages
+    # @return [Usage]
+    has_many :usage
+
     define_attribute_methods %w(
       add_on_code
       quantity
       unit_amount_in_cents
+      add_on_type
+      usage_type
+      usage_percentage
     )
 
     attr_reader :subscription

data/lib/recurly/transaction.rb

@@ -21,6 +21,7 @@ module Recurly
     belongs_to :subscription
 
     define_attribute_methods %w(
+      id
       uuid
       action
       amount_in_cents

data/lib/recurly/usage.rb

@@ -0,0 +1,23 @@
+module Recurly
+  class Usage < Resource
+    # @return [MeasuredUnit]
+    belongs_to :measured_unit
+
+    define_attribute_methods %w(
+      usage_type
+      unit_amount_in_cents
+      usage_percentage
+      amount
+      merchant_tag
+      usage_timestamp
+      recording_timestamp
+      billed_at
+      created_at
+      updated_at
+    )
+
+    # Usages are only writeable and readable through {SubscriptionAddOns} instances.
+    embedded!
+    private_class_method :find
+  end
+end

data/lib/recurly/version.rb

@@ -2,7 +2,7 @@ module Recurly
   module Version
     MAJOR   = 2
     MINOR   = 5
-    PATCH   = 1
+    PATCH   = 2
     PRE     = nil
 
     VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.').freeze

data/lib/recurly/xml/nokogiri.rb

@@ -46,7 +46,7 @@ module Recurly
       end
 
       def to_s
-        root.to_xml(:indent => 0).gsub(/$\n/, '')
+        root.to_xml(:indent => 0,:save_with => Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS).gsub(/$\n/, '')
       end
     end
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: '1.24'
 description: 'An API client library for Recurly: http://recurly.com'
 email: support@recurly.com
 executables:
@@ -60,40 +60,39 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- README.md
-- bin/recurly
 - lib/ecurly.rb
 - lib/rails/generators/recurly/config_generator.rb
 - lib/rails/recurly.rb
-- lib/recurly.rb
 - lib/recurly/account.rb
 - lib/recurly/add_on.rb
 - lib/recurly/address.rb
 - lib/recurly/adjustment.rb
 - lib/recurly/all.rb
-- lib/recurly/api.rb
 - lib/recurly/api/errors.rb
 - lib/recurly/api/net_http_adapter.rb
+- lib/recurly/api.rb
 - lib/recurly/billing_info.rb
 - lib/recurly/coupon.rb
+- lib/recurly/error.rb
 - lib/recurly/helper.rb
 - lib/recurly/invoice.rb
 - lib/recurly/js.rb
+- lib/recurly/measured_unit.rb
 - lib/recurly/money.rb
 - lib/recurly/plan.rb
 - lib/recurly/redemption.rb
-- lib/recurly/resource.rb
 - lib/recurly/resource/association.rb
 - lib/recurly/resource/errors.rb
 - lib/recurly/resource/pager.rb
-- lib/recurly/subscription.rb
+- lib/recurly/resource.rb
 - lib/recurly/subscription/add_ons.rb
+- lib/recurly/subscription.rb
 - lib/recurly/subscription_add_on.rb
 - lib/recurly/tax_detail.rb
-- lib/recurly/transaction.rb
 - lib/recurly/transaction/errors.rb
+- lib/recurly/transaction.rb
+- lib/recurly/usage.rb
 - lib/recurly/version.rb
-- lib/recurly/webhook.rb
 - lib/recurly/webhook/account_notification.rb
 - lib/recurly/webhook/billing_info_updated_notification.rb
 - lib/recurly/webhook/canceled_account_notification.rb
@@ -118,32 +117,36 @@ files:
 - lib/recurly/webhook/transaction_notification.rb
 - lib/recurly/webhook/updated_subscription_notification.rb
 - lib/recurly/webhook/void_payment_notification.rb
-- lib/recurly/xml.rb
+- lib/recurly/webhook.rb
 - lib/recurly/xml/nokogiri.rb
 - lib/recurly/xml/rexml.rb
+- lib/recurly/xml.rb
+- lib/recurly.rb
+- README.md
+- bin/recurly
 homepage: https://github.com/recurly/recurly-client-ruby
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Recurly API Client