recurly 2.1.12 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: bea20435713d70576e0ee1b03e289e5f24c8834c4b4b46fc77791c30a6a99fe9
-  data.tar.gz: f8185173c9ab5cd1200ac31e75650d2ff1d219379d9416638a0a55b085822bab
+SHA1:
+  metadata.gz: c791903258f0bd8ba1d9cb2826ec0fb030f119e2
+  data.tar.gz: 9f08ec8700651e5f1301ec295c1582c4600fed48
 SHA512:
-  metadata.gz: 53319854fdd42314b0e31855ea0a8306468a4aa390ad00551986051e1dd646a7aa8b6825594a92a34e72e097a73e138053258b9dc4a58abe22ae31e837faf244
-  data.tar.gz: 31cd770a748f8fee1b0cfe4c46ebaf7285d5d76a30a9b5cf17c512a6ad18df7207b693c58af081d427486f081680cbf44d03f95c5b161a9d4cafbba06036b709
+  metadata.gz: 747adc59314fdf0f54576463c186aece07c83a813535bc67c834bdf3370fe3c19de03fe1cb81f72a2300f396df38d26acffb4ceef004be8bf2759b91c81495ba
+  data.tar.gz: cb46b87109a2bd83fcaa46ea562d7c87c373b1a3f178cfcb34078be5a63655e7e344728fb1512a1e7862f2abe5ab1875e6532305671124ae825b5088f583621f

data/README.markdown

@@ -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.1.11'
+gem 'recurly', '~> 2.2.0'
 ```
 
 Recurly will automatically use [Nokogiri](http://nokogiri.org/) (for a nice
@@ -62,7 +62,7 @@ Instructions and examples are available on
 [Recurly's documentation site](http://docs.recurly.com/api/basics).
 
 Recurly's gem API is available
-[here](http://rubydoc.info/gems/recurly/2.1.5/frames).
+[here](http://rubydoc.info/gems/recurly/2.1.9/frames).
 
 
 ## Contributing
@@ -70,7 +70,7 @@ Recurly's gem API is available
 Developing for the Recurly gem is easy with [Bundler](http://gembundler.com/).
 
 Fork and clone the repository, `cd` into the directory, and, with a Ruby of
-your choice (1.8.7 is supported, but we suggest 1.9.2 or greater), set up your
+your choice (1.9.3 or greater), set up your
 environment.
 
 If you don't have Bundler installed, install it with the following command:

data/lib/recurly.rb

@@ -66,8 +66,6 @@ module Recurly
     end
 
     # Assigns a logger to log requests/responses and more.
-    # The logger can only be set if the environment variable
-    # `RECURLY_INSECURE_DEBUG` equals `true`.
     #
     # @return [Logger, nil]
     # @example
@@ -79,22 +77,6 @@ module Recurly
     #   Recurly.logger = nil # Or Recurly.logger = Logger.new nil
     attr_accessor :logger
 
-    def logger=(logger)
-      if ENV['RECURLY_INSECURE_DEBUG'].to_s.downcase == 'true'
-        @logger = logger
-        puts <<-MSG
-        [WARNING] Recurly logger enabled. The logger has the potential to leak
-        PII and should never be used in production environments.
-        MSG
-      else
-        puts <<-MSG
-        [WARNING] Recurly logger has been disabled. If you wish to use it,
-        only do so in a non-production environment and make sure
-        the `RECURLY_INSECURE_DEBUG` environment variable is set to `true`.
-        MSG
-      end
-    end
-
     # Convenience logging method includes a Logger#progname dynamically.
     # @return [true, nil]
     def log level, message

data/lib/recurly/account.rb

@@ -51,8 +51,8 @@ module Recurly
     #   (e.g., the account is already opwn), and may raise an exception if the
     #   attempt fails.
     def reopen
-      return false unless self[:reopen]
-      reload self[:reopen].call
+      return false unless link? :reopen
+      reload follow_link :reopen
       true
     end
 

data/lib/recurly/api.rb

@@ -15,7 +15,6 @@ module Recurly
     require 'recurly/api/errors'
 
     @@base_uri = "https://api.recurly.com/v2/"
-    @@valid_domains = [".recurly.com"]
 
     FORMATS = Helper.hash_with_indifferent_read_access(
       'pdf' => 'application/pdf',
@@ -42,13 +41,13 @@ module Recurly
       # @return [Net::HTTPOK, Net::HTTPResponse]
       # @raise [ResponseError] With a non-2xx status code.
       def head uri, params = {}, options = {}
-        request :head, uri, { :params => params }.merge(options)
+        request :head, uri, { :params => params || {} }.merge(options)
       end
 
       # @return [Net::HTTPOK, Net::HTTPResponse]
       # @raise [ResponseError] With a non-2xx status code.
       def get uri, params = {}, options = {}
-        request :get, uri, { :params => params }.merge(options)
+        request :get, uri, { :params => params || {} }.merge(options)
       end
 
       # @return [Net::HTTPCreated, Net::HTTPResponse]
@@ -65,7 +64,7 @@ module Recurly
 
       # @return [Net::HTTPNoContent, Net::HTTPResponse]
       # @raise [ResponseError] With a non-2xx status code.
-      def delete uri, options = {}
+      def delete uri, body = nil, options = {}
         request :delete, uri, options
       end
 
@@ -74,13 +73,6 @@ module Recurly
         URI.parse @@base_uri.sub('api', Recurly.subdomain)
       end
 
-      def validate_uri!(uri)
-        domain = @@valid_domains.detect { |d| uri.host.end_with?(d) }
-        unless domain
-          raise ArgumentError, "URI #{uri} is invalid. You may only make requests to a Recurly domain."
-        end
-      end
-
       # @return [String]
       def user_agent
         "Recurly/#{Version}; #{RUBY_DESCRIPTION}"

data/lib/recurly/api/net_http_adapter.rb

@@ -36,14 +36,13 @@ module Recurly
           head = headers.dup
           head.update options[:head] if options[:head]
           head.delete_if { |_, value| value.nil? }
-          uri = base_uri + uri
+          uri = base_uri + URI.escape(uri)
           if options[:params] && !options[:params].empty?
             pairs = options[:params].map { |key, value|
               "#{CGI.escape key.to_s}=#{CGI.escape value.to_s}"
             }
             uri += "?#{pairs.join '&'}"
           end
-          self.validate_uri!(uri)
           request = METHODS[method].new uri.request_uri, head
           request.basic_auth(*[Recurly.api_key, nil].flatten[0, 2])
           if options[:body]
@@ -100,6 +99,8 @@ module Recurly
             when 200...300 then response
             else                raise ERRORS[code].new request, response
           end
+        rescue Errno::ECONNREFUSED => e
+          raise Error, e.message
         end
       end
     end

data/lib/recurly/coupon.rb

@@ -51,7 +51,7 @@ module Recurly
     #   account = Account.find account_code
     #   coupon.redeem account
     def redeem account_or_code, currency = nil
-      return false unless self[:redeem]
+      return false unless link? :redeem
 
       account_code = if account_or_code.is_a? Account
         account_or_code.account_code
@@ -59,7 +59,7 @@ module Recurly
         account_or_code
       end
 
-      Redemption.from_response self[:redeem].call(
+      Redemption.from_response follow_link(:redeem,
         :body => (redemption = redemptions.new(
           :account_code => account_code,
           :currency     => currency || Recurly.default_currency

data/lib/recurly/invoice.rb

@@ -40,8 +40,8 @@ module Recurly
     # @return [true, false] +true+ when successful, +false+ when unable to
     #   (e.g., the invoice is no longer open).
     def mark_successful
-      return false unless self[:mark_successful]
-      reload self[:mark_successful].call
+      return false unless link? :mark_successful
+      reload follow_link :mark_successful
       true
     end
 
@@ -50,8 +50,8 @@ module Recurly
     # @return [true, false] +true+ when successful, +false+ when unable to
     #   (e.g., the invoice is no longer open).
     def mark_failed
-      return false unless self[:mark_failed]
-      reload self[:mark_failed].call
+      return false unless link? :mark_failed
+      reload follow_link :mark_failed
       true
     end
 

data/lib/recurly/resource.rb

@@ -1,5 +1,4 @@
 require 'date'
-require 'erb'
 
 module Recurly
   # The base class for all Recurly resources (e.g. {Account}, {Subscription},
@@ -185,7 +184,6 @@ module Recurly
       #   Recurly::Account.member_path "code" # => "accounts/code"
       #   Recurly::Account.member_path nil    # => "accounts"
       def member_path uuid
-        uuid = ERB::Util.url_encode(uuid) if uuid
         [collection_path, uuid].compact.join '/'
       end
 
@@ -321,8 +319,9 @@ module Recurly
           raise NotFound, "can't find a record with nil identifier"
         end
 
+        uri = uuid =~ /^http/ ? uuid : member_path(uuid)
         begin
-          from_response API.get(member_path(uuid), {}, options)
+          from_response API.get(uri, {}, options)
         rescue API::NotFound => e
           raise NotFound, e.description
         end
@@ -394,13 +393,10 @@ module Recurly
 
         xml.each_element do |el|
           if el.name == 'a'
-            name, uri = el.attribute('name').value, el.attribute('href').value
-            record[name] = case el.attribute('method').to_s
-              when 'get', '' then proc { |*opts| API.get uri, {}, *opts }
-              when 'post'    then proc { |*opts| API.post uri, nil, *opts }
-              when 'put'     then proc { |*opts| API.put uri, nil, *opts }
-              when 'delete'  then proc { |*opts| API.delete uri, *opts }
-            end
+            record.links[el.attribute('name').value] = {
+              :method => el.attribute('method').to_s,
+              :href => el.attribute('href').value
+            }
             next
           end
 
@@ -408,17 +404,16 @@ module Recurly
             resource_class = Recurly.const_get(
               Helper.classify(el.attribute('type') || el.name), false
             )
-            record[el.name] = case el.name
+            case el.name
             when *associations[:has_many]
-              Pager.new resource_class, :uri => href.value, :parent => record
+              record[el.name] = Pager.new(
+                resource_class, :uri => href.value, :parent => record
+              )
             when *(associations[:has_one] + associations[:belongs_to])
-              lambda {
-                begin
-                  relation = resource_class.from_response API.get(href.value)
-                  relation.attributes[member_name] = record
-                  relation
-                rescue Recurly::API::NotFound
-                end
+              record.links[el.name] = {
+                :resource_class => resource_class,
+                :method => :get,
+                :href => href.value
               }
             end
           else
@@ -552,22 +547,15 @@ module Recurly
       yield self if block_given?
     end
 
-    def to_param
-      self[self.class.param_name]
-    end
-
     # @return [self] Reloads the record from the server.
     def reload response = nil
       if response
         return if response.body.to_s.length.zero?
         fresh = self.class.from_response response
       else
-        options = {:etag => (etag unless changed?)}
-        fresh = if @href
-                  self.class.from_response API.get(@href, {}, options)
-                else
-                  self.class.find(to_param, options)
-                end
+        fresh = self.class.find(
+          @href || to_param, :etag => (etag unless changed?)
+        )
       end
       fresh and copy_from fresh
       persist! true
@@ -641,9 +629,11 @@ module Recurly
     #   account[:last_name]                # => "Beneke"
     # @see #write_attribute
     def read_attribute key
-      value = attributes[key = key.to_s]
-      if value.respond_to?(:call) && self.class.reflect_on_association(key)
-        value = attributes[key] = value.call
+      key = key.to_s
+      if attributes.key? key
+        value = attributes[key]
+      elsif links.key?(key) && self.class.reflect_on_association(key)
+        value = attributes[key] = follow_link key
       end
       value
     end
@@ -685,6 +675,39 @@ module Recurly
       }
     end
 
+    # @return [Hash] The raw hash of record href links.
+    def links
+      @links ||= {}
+    end
+
+    # Whether a record has a link with the given name.
+    #
+    # @param key [Symbol, String] The name of the link to check for.
+    # @example
+    #   account.link? :billing_info # => true
+    def link? key
+      links.key?(key.to_s)
+    end
+
+    # Fetch the value of a link by following the associated href.
+    #
+    # @param key [Symbol, String] The name of the link to be followed.
+    # @param options [Hash] A hash of API options.
+    # @example
+    #   account.read_link :billing_info # => <Recurly::BillingInfo>
+    def follow_link key, options = {}
+      if link = links[key = key.to_s]
+        response = API.send link[:method], link[:href], nil, options
+        if resource_class = link[:resource_class]
+          response = resource_class.from_response response
+          response.attributes[self.class.member_name] = self
+        end
+        response
+      end
+    rescue Recurly::API::NotFound
+      raise unless resource_class
+    end
+
     # Serializes the record to XML.
     #
     # @return [String] An XML string.
@@ -769,9 +792,10 @@ module Recurly
     #   account.save   # => true
     #   account.valid? # => true
     def valid?
-      return true if persisted? && changed_attributes.empty?
-      return if errors.empty? && changed_attributes?
-      errors.empty?
+      return true if persisted? && !changed?
+      errors_empty = errors.values.flatten.empty?
+      return if errors_empty && changed?
+      errors_empty
     end
 
     # Update a record with a given hash of attributes.
@@ -808,7 +832,7 @@ module Recurly
     #   account.errors                # => {"account_code"=>["can't be blank"]}
     #   account.errors[:account_code] # => ["can't be blank"]
     def errors
-      @errors ||= Errors.new
+      @errors ||= Errors.new { |h, k| h[k] = [] }
     end
 
     # Marks a record as persisted, i.e. not a new or deleted record, resetting
@@ -872,8 +896,9 @@ module Recurly
         @href,
         changed_attributes,
         previous_changes,
+        response,
         etag,
-        response
+        links
       ]
     end
 
@@ -886,7 +911,8 @@ module Recurly
         @changed_attributes,
         @previous_changes,
         @response,
-        @etag = serialization
+        @etag,
+        @links = serialization
     end
 
     # @return [String]
@@ -913,12 +939,12 @@ module Recurly
 
     def invalid! attribute_path, error
       if attribute_path.length == 1
-        (errors[attribute_path[0]] ||= []) << error
+        errors[attribute_path[0]] << error
       else
         child, k, v = attribute_path.shift.scan(/[^\[\]=]+/)
         if c = k ? self[child].find { |d| d[k] == v } : self[child]
           c.invalid! attribute_path, error
-          (e = errors[child] ||= []) << 'is invalid' and e.uniq!
+          e = errors[child] << 'is invalid' and e.uniq!
         end
       end
     end

data/lib/recurly/subscription.rb

@@ -39,6 +39,9 @@ module Recurly
       subscription_add_ons
       coupon_code
       total_billing_cycles
+      net_terms
+      collection_method
+      po_number
     )
     alias to_param uuid
 
@@ -94,8 +97,8 @@ module Recurly
     #   subscription = account.subscriptions.first
     #   subscription.cancel # => true
     def cancel
-      return false unless self[:cancel]
-      reload self[:cancel].call
+      return false unless link? :cancel
+      reload follow_link :cancel
       true
     end
 
@@ -116,11 +119,11 @@ module Recurly
     #   subscription = account.subscriptions.first
     #   subscription.terminate(:partial) # => true
     def terminate refund_type = :none
-      return false unless self[:terminate]
+      return false unless link? :terminate
       unless REFUND_TYPES.include? refund_type.to_s
         raise ArgumentError, "refund must be one of: #{REFUND_TYPES.join ', '}"
       end
-      reload self[:terminate].call(:params => { :refund => refund_type })
+      reload follow_link(:terminate, :params => { :refund => refund_type })
       true
     end
     alias destroy terminate
@@ -131,8 +134,8 @@ module Recurly
     #   (e.g., the subscription is already active), and may raise an exception
     #   if the reactivation fails.
     def reactivate
-      return false unless self[:reactivate]
-      reload self[:reactivate].call
+      return false unless link? :reactivate
+      reload follow_link :reactivate
       true
     end
 
@@ -142,8 +145,8 @@ module Recurly
     #   (e.g., the subscription is not active).
     # @param next_renewal_date [Time] when the subscription should renew.
     def postpone next_renewal_date
-      return false unless self[:postpone]
-      reload self[:postpone].call(
+      return false unless link? :postpone
+      reload follow_link(:postpone,
         :params => { :next_renewal_date => next_renewal_date }
       )
       true

data/lib/recurly/subscription_add_on.rb

@@ -13,6 +13,7 @@ module Recurly
 
       case add_on
       when AddOn, SubscriptionAddOn
+        @add_on = add_on if add_on.is_a? AddOn
         self.add_on_code = add_on.add_on_code
         self.quantity = add_on.quantity
         if add_on.unit_amount_in_cents
@@ -29,6 +30,10 @@ module Recurly
       @subscription = subscription
     end
 
+    def add_on
+      @add_on ||= subscription.plan.add_ons.find add_on_code
+    end
+
     def currency
       subscription.currency if subscription
     end

data/lib/recurly/transaction.rb

@@ -69,9 +69,9 @@ module Recurly
     # @param amount_in_cents [Integer, nil] The amount (in cents) to refund
     #   (refunds fully if nil).
     def refund amount_in_cents = nil
-      return false unless self[:refund]
+      return false unless link? :refund
       refund = self.class.from_response(
-        self[:refund].call :params => { :amount_in_cents => amount_in_cents }
+        follow_link :refund, :params => { :amount_in_cents => amount_in_cents }
       )
       refund.uuid == uuid ? copy_from(refund) && self : refund
     end

data/lib/recurly/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2013-11-12 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
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.6
 description: 'An API client library for Recurly: http://recurly.com'
@@ -60,19 +60,16 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- README.markdown
-- 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/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/helper.rb
@@ -81,42 +78,46 @@ files:
 - lib/recurly/money.rb
 - lib/recurly/plan.rb
 - lib/recurly/redemption.rb
-- lib/recurly/resource.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/transaction.rb
 - lib/recurly/transaction/errors.rb
+- lib/recurly/transaction.rb
 - lib/recurly/version.rb
-- lib/recurly/xml.rb
 - lib/recurly/xml/nokogiri.rb
 - lib/recurly/xml/rexml.rb
+- lib/recurly/xml.rb
+- lib/recurly.rb
+- README.markdown
+- bin/recurly
 homepage: https://github.com/recurly/recurly-client-ruby
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Recurly API Client
 test_files: []
+has_rdoc: true