recurly 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68f32d491f33a88e96aa9b2ee3e25fc4968ed793
-  data.tar.gz: 383e00e6ab08ff05b8e7deb7a2d8997b69a37a72
+  metadata.gz: e8cdc190978fed596fdf9c6a17d30eb2b63ba8e5
+  data.tar.gz: 575cb6981a32e629ab3f3ef35289a23a2d3bcd15
 SHA512:
-  metadata.gz: 02ac3550d2c8559afd2d9367d6af0ee08c688bf2b3658ec0e1b4ee0884a4061c3c6eb9642a9a5b01f18f1c6508ec98c93b8786e984abc58f2a5308ec43d4e7a8
-  data.tar.gz: 77be1aa37e383d5d562527c903c6cca4e141bfd23c424d26afcd1fba3ac3753af4c17183a25a2a2e524e524d9745007fb9740b094e3dcb610e3769ce794680f0
+  metadata.gz: 2472d0013209e92ead7acb9d45b0a9778def95669be78b51a97f6da8f45f045abb16d18cfd00651a138d8e5cb4a2b3e8309a019225260162c767706c60a86830
+  data.tar.gz: 36b4556facfc67c1c7906db07d8fc8c5a66a0f92b52a97043016f5fcdeb537a87f4c511e717ca155044924efe00b52e9a11a147b83f9c57862bb401354db3601

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

data/lib/rails/recurly.rb

@@ -5,7 +5,12 @@ module Recurly
     end
 
     initializer :recurly_set_accept_language do
-      ActionController::Base.prepend_before_filter do
+      prepend_method = :prepend_before_filter
+      if ActionController::Base.respond_to?(:prepend_before_action)
+        prepend_method = :prepend_before_action
+      end
+
+      ActionController::Base.send(prepend_method) do
         Recurly::API.accept_language = request.env['HTTP_ACCEPT_LANGUAGE']
       end
     end

data/lib/recurly/coupon.rb

@@ -96,7 +96,7 @@ module Recurly
 
     def redeem! account_code, currency = nil
       redemption = redeem account_code, currency
-      raise Invalid.new(self) unless redemption.persisted?
+      raise Invalid.new(redemption) unless redemption.persisted?
       redemption
     end
 

data/lib/recurly/gift_card.rb

@@ -16,6 +16,7 @@ module Recurly
       redemption_code
       unit_amount_in_cents
       updated_at
+      canceled_at
     )
 
     def self.preview(attributes = {})

data/lib/recurly/measured_unit.rb

@@ -6,6 +6,7 @@ module Recurly
       display_name
       description
       created_at
+      updated_at
     )
     alias to_param id
   end

data/lib/recurly/resource.rb

@@ -140,21 +140,30 @@ module Recurly
     #   rescue Recurly::Resource::Invalid => e
     #     e.record.errors # => errors: {"account_code"=>["can't be blank"]}>
     #   end
-    class Invalid < API::UnprocessableEntity
+    class Invalid < Error
       # @return [Resource, nil] The invalid record.
       attr_reader :record
 
-      def initialize(record_or_message)
-        set_message case record_or_message
-        when Resource
-          @record = record_or_message
-          record_or_message.errors.map { |k, v| "#{k} #{v * ', '}" }.join '; '
+      def initialize(message)
+        if message.is_a? Resource
+          @record = message
+          set_message(record_to_message)
         else
-          record_or_message
+          set_message(message)
         end
       end
+
+      private
+
+      def record_to_message
+        @record.errors.map do |k, v|
+          message = v.join(', ')
+          k == 'base' ? message : "#{k} #{message}"
+        end.join('; ')
+      end
     end
 
+
     class << self
       # @return [String] The demodulized name of the resource class.
       # @example
@@ -407,12 +416,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 
-          
+          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/subscription.rb

@@ -70,6 +70,7 @@ module Recurly
       address
       revenue_schedule_type
       shipping_address_id
+      timeframe
     )
     alias to_param uuid
 

data/lib/recurly/subscription/add_ons.rb

@@ -27,7 +27,8 @@ module Recurly
 
         exist = @add_ons.find { |a| a.add_on_code == add_on.add_on_code }
         if exist
-          exist.quantity ||= 1 and exist.quantity += 1
+          exist.quantity ||= 1
+          exist.quantity += add_on.quantity || 1
 
           if add_on.unit_amount_in_cents
             exist.unit_amount_in_cents = add_on.unit_amount_in_cents

data/lib/recurly/version.rb

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

data/lib/recurly/webhook.rb

@@ -25,6 +25,7 @@ module Recurly
     autoload :SubscriptionNotification,         'recurly/webhook/subscription_notification'
     autoload :InvoiceNotification,              'recurly/webhook/invoice_notification'
     autoload :TransactionNotification,          'recurly/webhook/transaction_notification'
+    autoload :DunningNotification,              'recurly/webhook/dunning_notification'
     autoload :BillingInfoUpdatedNotification,   'recurly/webhook/billing_info_updated_notification'
     autoload :CanceledSubscriptionNotification, 'recurly/webhook/canceled_subscription_notification'
     autoload :CanceledAccountNotification,      'recurly/webhook/canceled_account_notification'
@@ -44,6 +45,7 @@ module Recurly
     autoload :ProcessingPaymentNotification,    'recurly/webhook/processing_payment_notification'
     autoload :ProcessingInvoiceNotification,    'recurly/webhook/processing_invoice_notification'
     autoload :ScheduledPaymentNotification,     'recurly/webhook/scheduled_payment_notification'
+    autoload :NewDunningEventNotification,      'recurly/webhook/new_dunning_event_notification'
 
     # This exception is raised if the Webhook Notification initialization fails
     class NotificationError < Error
@@ -54,7 +56,7 @@ module Recurly
     def self.parse xml_body
       xml = XML.new xml_body
       class_name = Helper.classify xml.name
-      
+
       if Webhook.const_defined?(class_name, false)
         klass = Webhook.const_get class_name
         klass.from_xml xml_body

data/lib/recurly/webhook/dunning_notification.rb

@@ -0,0 +1,14 @@
+module Recurly
+  module Webhook
+    class DunningNotification < Notification
+      # @return [Account]
+      has_one :account
+      # @return [Subscription]
+      has_one :subscription
+      # @return [Invoice]
+      has_one :invoice
+      # @return [Transaction]
+      has_one :transaction
+    end
+  end
+end

data/lib/recurly/webhook/new_dunning_event_notification.rb

@@ -0,0 +1,6 @@
+module Recurly
+  module Webhook
+    class NewDunningEventNotification < DunningNotification
+    end
+  end
+end

metadata

@@ -1,57 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.4
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 11.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: 11.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.8.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.24.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.24.6
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'An API client library for Recurly: http://recurly.com'
 email: support@recurly.com
 executables:
@@ -60,21 +144,18 @@ 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/account_balance.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/delivery.rb
@@ -87,29 +168,30 @@ files:
 - 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/resource.rb
 - lib/recurly/shipping_address.rb
-- lib/recurly/subscription.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
 - lib/recurly/webhook/canceled_subscription_notification.rb
 - lib/recurly/webhook/closed_invoice_notification.rb
+- lib/recurly/webhook/dunning_notification.rb
 - lib/recurly/webhook/expired_subscription_notification.rb
 - lib/recurly/webhook/failed_payment_notification.rb
 - lib/recurly/webhook/invoice_notification.rb
 - lib/recurly/webhook/new_account_notification.rb
+- lib/recurly/webhook/new_dunning_event_notification.rb
 - lib/recurly/webhook/new_invoice_notification.rb
 - lib/recurly/webhook/new_subscription_notification.rb
 - lib/recurly/webhook/notification.rb
@@ -125,32 +207,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