recurly 2.3.11 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 873a38d1e4a0a1b0f115d2f5749649c5f0d264acefad31a307f691bcec256e7d
-  data.tar.gz: 46ba2bea261e2f0834a4013595864d018578a27617a1417561f9cd71547f1f3b
+SHA1:
+  metadata.gz: 39d29efdd5130af37d30fed7585a480ddd295dcb
+  data.tar.gz: 6d5f1620ff648319c552eb70249b39e8dd6cd678
 SHA512:
-  metadata.gz: 6d3429a1c7abd43d25e78f1980cbe1b5b586220b58bdf6497fca88c7602615da5a66691c071e7f027a34ecc35bcf58b256a2ca274a092c83dcc8d2d8df793616
-  data.tar.gz: dfb1edaa1e0b5f0def52198b3ce1274dbda58b3f6d9162f6bae6a0f1d0d4b044716246296584a756cce4e5e51887ea78da4908f6c0b142417595e7efa13c9788
+  metadata.gz: b8fc77aced05652c1691ba483954b35fcfe4e8052286469ee3b641d02b5e5de3fc2bbbb2c71969fd65991f1bdbd135bdbe8f123cb8383ff02ac1f58e5d51b869
+  data.tar.gz: 25f9aa18dc272ef1befb71692e0807e0f81f8f95b9a9265308dc058b6a7f473f93c159e99eb55f40f722e1d43c28de26640b9c6dc8a7737c3870671545bd5da2

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

data/lib/recurly.rb

@@ -68,8 +68,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
@@ -81,22 +79,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/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',
@@ -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

@@ -43,7 +43,6 @@ module Recurly
             }
             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]

data/lib/recurly/invoice.rb

@@ -17,6 +17,8 @@ module Recurly
     belongs_to :account
     # @return [Subscription]
     belongs_to :subscription
+    # @return [Invoice]
+    belongs_to :original_invoice, class_name: 'Invoice'
 
     # @return [Redemption]
     has_one :redemption

data/lib/recurly/resource.rb

@@ -1,5 +1,6 @@
 require 'date'
 require 'erb'
+require 'recurly/resource/association'
 
 module Recurly
   # The base class for all Recurly resources (e.g. {Account}, {Subscription},
@@ -321,8 +322,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
@@ -403,14 +405,15 @@ module Recurly
 
           if el.children.empty? && href = el.attribute('href')
             resource_class = Recurly.const_get(
-              Helper.classify(el.attribute('type') || el.name), false
+              Helper.classify(association_class_name(el.name) ||
+                el.attribute('type') || el.name), false
             )
             case el.name
-            when *associations[:has_many]
+            when *associations_for_relation(:has_many)
               record[el.name] = Pager.new(
                 resource_class, :uri => href.value, :parent => record
               )
-            when *(associations[:has_one] + associations[:belongs_to])
+            when *(associations_for_relation(:has_one) + associations_for_relation(:belongs_to))
               record.links[el.name] = {
                 :resource_class => resource_class,
                 :method => :get,
@@ -431,11 +434,29 @@ module Recurly
         record
       end
 
-      # @return [Hash] A list of association names for the current class.
+      # @return [Array] A list of associations for the current class.
       def associations
-        @associations ||= {
-          :has_many => [], :has_one => [], :belongs_to => []
-        }
+        @associations ||= []
+      end
+
+      # @return [Array] A list of associated resource classes with
+      # the relation [:has_many, :has_one, :belongs_to] for the current class.
+      def associations_for_relation(relation)
+        associations.select{ |a| a.relation == relation }.map(&:resource_class)
+      end
+
+      # @return [String, nil] The actual associated resource class name
+      # for the current class if the resource class does not match the
+      # actual class.
+      def association_class_name(resource_class)
+        association = find_association(resource_class)
+        association.class_name if association
+      end
+
+      # @return [Association, nil] Find association for the current class
+      #                            with resource class name.
+      def find_association(resource_class)
+        associations.find{ |a| a.resource_class == resource_class }
       end
 
       def associations_helper
@@ -448,8 +469,10 @@ module Recurly
       # @param collection_name [Symbol] Association name.
       # @param options [Hash] A hash of association options.
       # @option options [true, false] :readonly Don't define a setter.
+      #                 [String] :class_name Actual associated resource class name
+      #                                      if not same as collection_name.
       def has_many collection_name, options = {}
-        associations[:has_many] << collection_name.to_s
+        associations << Association.new(:has_many, collection_name.to_s, options)
         associations_helper.module_eval do
           define_method collection_name do
             self[collection_name] ||= []
@@ -468,8 +491,10 @@ module Recurly
       # @param member_name [Symbol] Association name.
       # @param options [Hash] A hash of association options.
       # @option options [true, false] :readonly Don't define a setter.
+      #                 [String] :class_name Actual associated resource class name
+      #                                      if not same as member_name.
       def has_one member_name, options = {}
-        associations[:has_one] << member_name.to_s
+        associations << Association.new(:has_one, member_name.to_s, options)
         associations_helper.module_eval do
           define_method(member_name) { self[member_name] }
           if options.key?(:readonly) && options[:readonly] == false
@@ -501,8 +526,13 @@ module Recurly
       # Establishes a belongs_to association.
       #
       # @return [Proc]
+      # @param parent_name [Symbol] Association name.
+      # @param options [Hash] A hash of association options.
+      # @option options [true, false] :readonly Don't define a setter.
+      #                 [String] :class_name Actual associated resource class name
+      #                                      if not same as parent_name.
       def belongs_to parent_name, options = {}
-        associations[:belongs_to] << parent_name.to_s
+        associations << Association.new(:belongs_to, parent_name.to_s, options)
         associations_helper.module_eval do
           define_method(parent_name) { self[parent_name] }
           if options.key?(:readonly) && options[:readonly] == false
@@ -515,7 +545,8 @@ module Recurly
 
       # @return [:has_many, :has_one, :belongs_to, nil] An association type.
       def reflect_on_association name
-        a = associations.find { |k, v| v.include? name.to_s } and a.first
+        a = find_association name.to_s
+        a.relation if a
       end
 
       def embedded! root_index = false
@@ -559,12 +590,9 @@ module Recurly
         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
@@ -663,7 +691,7 @@ module Recurly
         changed_attributes[key] = self[key]
       end
 
-      if self.class.associations.values.flatten.include? key
+      if self.class.find_association key
         value = fetch_association key, value
       # FIXME: More explicit; less magic.
       elsif value && key.end_with?('_in_cents') && !respond_to?(:currency)
@@ -960,12 +988,10 @@ module Recurly
 
     def clear_errors
       errors.clear
-      self.class.associations.each_value do |associations|
-        associations.each do |association|
-          next unless respond_to? "#{association}=" # Clear writable only.
-          [*self[association]].each do |associated|
-            associated.clear_errors if associated.respond_to? :clear_errors
-          end
+      self.class.associations do |association|
+        next unless respond_to? "#{association}=" # Clear writable only.
+        [*self[association]].each do |associated|
+          associated.clear_errors if associated.respond_to? :clear_errors
         end
       end
     end

data/lib/recurly/resource/association.rb

@@ -0,0 +1,16 @@
+module Recurly
+  class Resource
+    class Association
+      attr_reader :relation, :resource_class
+
+      def initialize relation, resource_class, options = {}
+        @relation, @resource_class, @options = relation, resource_class, options
+      end
+
+      def class_name
+        return @class_name if defined? @class_name
+        @class_name = @options[:class_name]
+      end
+    end
+  end
+end

data/lib/recurly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 2.3.11
+  version: 2.4.0
 platform: ruby
 authors:
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,7 @@ files:
 - 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
@@ -117,8 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Recurly API Client
 test_files: []
+has_rdoc: true