recurly 0.4.15 → 0.4.16

data/lib/patches/rails2/active_resource/base.rb

@@ -0,0 +1,35 @@
+module ActiveResource
+  class Base
+
+    # Patch for Rails 3.0 and below (fixed in 3.1) to properly
+    # resolve resources inside nested modules, allowing for
+    # ActiveRecord models and other classes with the same names
+    # as Recurly's nested resources (CreditCard, etc)
+    #
+    #   This issue was unintentially fixed in Rails 3.1 by this commit:
+    #     https://github.com/rails/rails/commit/a962bfe47232200c20dce02047201247d24d77f7
+    def find_or_create_resource_for(name)
+      resource_name = name.to_s.camelize
+      
+      const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
+      if self.class.const_defined?(*const_args)
+        self.class.const_get(*const_args)
+      else
+        ancestors = self.class.name.split("::")
+        if ancestors.size > 1
+          find_resource_in_modules(resource_name, ancestors)
+        elsif Object.const_defined?(*const_args)
+          Object.const_get(*const_args)
+        else
+          raise NameError
+        end
+      end
+    rescue NameError
+      resource = self.class.const_set(resource_name, Class.new(ActiveResource::Base))
+      resource.prefix = self.class.prefix
+      resource.site   = self.class.site
+      resource
+    end
+
+  end
+end

data/lib/patches/rails3/active_model/serializers/xml.rb

@@ -0,0 +1,28 @@
+module ActiveModel
+  module Serializers
+    module Xml
+
+      # Patch for Rails 3.0 to properly serialize nil values (without type="yaml")
+      #
+      #   This issue was fixed in Rails 3.0.20 by this pull request:
+      #     https://github.com/rails/rails/pull/8853
+
+      class Serializer
+        class Attribute
+
+        protected
+
+          def compute_type
+            return if value.nil?
+            type = ActiveSupport::XmlMini::TYPE_NAMES[value.class.name]
+            type ||= :string if value.respond_to?(:to_str)
+            type ||= :yaml
+            type
+          end
+
+        end
+      end
+
+    end
+  end
+end

data/lib/recurly.rb

@@ -5,12 +5,22 @@ require 'openssl'
 require 'addressable/uri'
 
 # load ActiveResource patches
-if defined?(::Rails::VERSION::MAJOR) and ::Rails::VERSION::MAJOR == 3
+if ::ActiveResource::VERSION::MAJOR == 3
+  if ::ActiveResource::VERSION::MINOR == 0 &&
+     ::ActiveResource::VERSION::TINY < 20
+    require 'patches/rails3/active_model/serializers/xml'
+  end
   require 'patches/rails3/active_resource/connection'
-elsif defined?(::Rails::VERSION::MAJOR) and ::Rails::VERSION::MAJOR == 2
+elsif ::ActiveResource::VERSION::MAJOR == 2
   require 'patches/rails2/active_resource/connection'
 end
 
+if ::ActiveResource::VERSION::MAJOR == 2 ||
+    (::ActiveResource::VERSION::MAJOR == 3 &&
+     ::ActiveResource::VERSION::MINOR == 0)
+  require 'patches/rails2/active_resource/base'
+end
+
 require 'recurly/version'
 require 'recurly/exceptions'
 require 'recurly/formats/xml_with_pagination'
@@ -20,7 +30,7 @@ require 'recurly/rails3/railtie' if defined?(::Rails::Railtie)
 require 'recurly/base'
 
 # load rails2 fixes
-if defined?(::Rails::VERSION::MAJOR) and ::Rails::VERSION::MAJOR == 2
+if ::ActiveResource::VERSION::MAJOR == 2
   require 'recurly/rails2/compatibility'
 end
 
@@ -89,7 +99,7 @@ module Recurly
         end
       end
     end
-    
+
     def site_for_environment(environment)
       if environment == :development
         "http://api.lvh.me:3000"

data/lib/recurly/account.rb

@@ -47,17 +47,20 @@ module Recurly
     }
 
     # Lists all accounts (with optional filter)
+    # This method also accepts a Hash that allows you to specify a page number, etc.
     #
     # examples:
     #   Account.list(:all) #=> returns all accounts
     #   Account.list(:active) #=> returns active accounts
     #   Account.list(:pastdue) #=> returns pastdue accounts
     #   Account.list(:free) #=> returns the free accounts
+    #   Account.list(:active, {:page => 3}) #=> returns the 3rd page of active accounts
     #
-    def self.list(status = :all)
-      opts = {}
+    def self.list(status = :all, params = {})
+      opts = {:params => params}
+
       if status && status != :all
-        opts[:params] = {:show => SHOW_PARAMS[status] || status}
+        params[:show] = SHOW_PARAMS[status] || status
       end
       find(:all, opts)
     end

data/lib/recurly/base.rb

@@ -100,7 +100,6 @@ module Recurly
           Recurly::Formats::XmlWithErrorsFormat.new.decode(xml)
         )
       rescue => e
-        logger.warn "Recurly::Base#load_errors exception parsing nested error information"
         # Fallback to default errors parsing
         errors.from_xml xml
         raise
@@ -126,7 +125,7 @@ module Recurly
             message = message[(humanized_name.size + 1)..-1] if message[0, humanized_name.size + 1].downcase == "#{humanized_name} "
 
             # HACK: Special case nested billing errors
-            if self.is_a?(Recurly::BillingInfo) && Recurly::BillingInfo::CreditCard.known_attributes.include?(field)
+            if self.respond_to?(:credit_card) && self.credit_card && self.is_a?(Recurly::BillingInfo) && Recurly::BillingInfo::CreditCard.known_attributes.include?(field)
               self.credit_card.errors.add field.to_sym, message
               next
             end

data/lib/recurly/subscription.rb

@@ -20,6 +20,13 @@ module Recurly
       super
     end
 
+    # API inconsistency workaround: Pull plan_code into subscription to conform to known_attributes
+    def load(attributes, remove_root = false)
+      attributes = attributes.with_indifferent_access
+      attributes[:plan_code] ||= attributes[:plan][:plan_code] if attributes.include?(:plan)
+      super
+    end
+    
     def self.refund(account_code, refund_type = :partial)
       raise "Refund type must be :full, :partial, or :none." unless [:full, :partial, :none].include?(refund_type)
       Subscription.delete(nil, {:account_code => account_code, :refund => refund_type})

data/lib/recurly/version.rb

@@ -1,3 +1,3 @@
 module Recurly #:nodoc
-  VERSION = "0.4.15"
+  VERSION = "0.4.16"
 end

data/spec/config/recurly.yml

@@ -1,6 +1,6 @@
 ---
-username: hello@test.com
-password: 2a655d41659d4ae0b37fcaec06331bf5
-private_key: 4cdbdfbb90f84b3c8fb4ca337d1b2cfc
-subdomain: intuit
+username: api-test@litle.com
+password: 6499f1cd3ae14875beb91417d31e91b7
+private_key: 78753d36439c423aba60e581be828a2a
+subdomain: litle-test
 environment: :development

data/spec/integration/subscription_spec.rb

@@ -21,6 +21,7 @@ module Recurly
         subscription = Subscription.find(account.account_code)
         subscription.state.should == "active"
         subscription.plan.plan_code.should == "paid"
+        subscription.plan_code.should == "paid"
       end
     end
 
@@ -217,4 +218,4 @@ module Recurly
 
     end
   end
-end
+end

metadata

@@ -1,133 +1,139 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: recurly
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 15
-  version: 0.4.15
+version: !ruby/object:Gem::Version
+  version: 0.4.16
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Isaac Hall
 - Jacques Crocker
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-21 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 22
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta.22
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta.22
+- !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby API wrapper for Recurly. Super Simple Subscription billing.
-email: 
+email:
 - support@recurly.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- lib/patches/rails2/active_resource/base.rb
 - lib/patches/rails2/active_resource/connection.rb
+- lib/patches/rails3/active_model/serializers/xml.rb
 - lib/patches/rails3/active_resource/connection.rb
 - lib/recurly/account.rb
 - lib/recurly/account_base.rb
@@ -182,95 +188,32 @@ files:
 - spec/unit/transaction_spec.rb
 - spec/unit/transparent_spec.rb
 - spec/unit/verification_spec.rb
-- spec/vcr/account/accept-language-account/1313708721.yml
-- spec/vcr/account/close/1313708721.yml
-- spec/vcr/account/create/1313708721.yml
-- spec/vcr/account/create-blank/1313708721.yml
-- spec/vcr/account/create-duplicate/1313708721.yml
-- spec/vcr/account/create-min/1313708721.yml
-- spec/vcr/account/find/1313708721.yml
-- spec/vcr/account/list/1313708721.yml
-- spec/vcr/account/update/1313708721.yml
-- spec/vcr/billing/create/1313708721.yml
-- spec/vcr/billing/destroy/1313708721.yml
-- spec/vcr/billing/errors/1313708721.yml
-- spec/vcr/billing/find/1313708721.yml
-- spec/vcr/billing/update/1313708721.yml
-- spec/vcr/charge/create/1313708721.yml
-- spec/vcr/charge/delete-uninvoiced/1313708721.yml
-- spec/vcr/charge/list-all/1313708721.yml
-- spec/vcr/charge/list-invoiced/1313708721.yml
-- spec/vcr/charge/list-pending/1313708721.yml
-- spec/vcr/charge/lookup/1313708721.yml
-- spec/vcr/coupon/create/1296774903.yml
-- spec/vcr/coupon/destroy/1296774903.yml
-- spec/vcr/credit/create/1313708090.yml
-- spec/vcr/credit/delete/1313708090.yml
-- spec/vcr/credit/list/1313708090.yml
-- spec/vcr/credit/lookup/1313708090.yml
-- spec/vcr/invoice/create/1296674173.yml
-- spec/vcr/invoice/create-no-charges/1296674173.yml
-- spec/vcr/invoice/list/1296674173.yml
-- spec/vcr/invoice/lookup/1296674173.yml
-- spec/vcr/plan/all.yml
-- spec/vcr/plan/find.yml
-- spec/vcr/plan/update.yml
-- spec/vcr/subscription/addons/add/1296674173.yml
-- spec/vcr/subscription/addons/create/1296674173.yml
-- spec/vcr/subscription/addons/remove/1296674173.yml
-- spec/vcr/subscription/cancel/1296674173.yml
-- spec/vcr/subscription/cancel-with-code/1296674173.yml
-- spec/vcr/subscription/change1/1296674173.yml
-- spec/vcr/subscription/change2/1296674173.yml
-- spec/vcr/subscription/create/1296674173.yml
-- spec/vcr/subscription/find/1296674173.yml
-- spec/vcr/subscription/reactivate/1296674173.yml
-- spec/vcr/subscription/refund-full/1296674173.yml
-- spec/vcr/subscription/refund-none/1296674173.yml
-- spec/vcr/subscription/refund-partial/1296674173.yml
-- spec/vcr/transaction/all/1311126815.yml
-- spec/vcr/transaction/create-no-account/1311126815.yml
-- spec/vcr/transaction/create-with-account/1311126815.yml
-- spec/vcr/transaction/list-filled/1311126815.yml
-- spec/vcr/transaction/list-initial/1311126815.yml
-- spec/vcr/transaction/lookup/1311126815.yml
-- spec/vcr/transaction/void/1311126815.yml
-- spec/vcr/transparent/post-url/1317063400.yml
-- spec/vcr/transparent/post-url/1317063474.yml
-has_rdoc: true
 homepage: http://github.com/recurly/recurly-client-ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -363756991346156052
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: recurly
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby API wrapper for Recurly
-test_files: 
+test_files:
 - spec/config/recurly.yml
 - spec/config/test1.yml
 - spec/config/test2.yml
@@ -299,58 +242,3 @@ test_files:
 - spec/unit/transaction_spec.rb
 - spec/unit/transparent_spec.rb
 - spec/unit/verification_spec.rb
-- spec/vcr/account/accept-language-account/1313708721.yml
-- spec/vcr/account/close/1313708721.yml
-- spec/vcr/account/create/1313708721.yml
-- spec/vcr/account/create-blank/1313708721.yml
-- spec/vcr/account/create-duplicate/1313708721.yml
-- spec/vcr/account/create-min/1313708721.yml
-- spec/vcr/account/find/1313708721.yml
-- spec/vcr/account/list/1313708721.yml
-- spec/vcr/account/update/1313708721.yml
-- spec/vcr/billing/create/1313708721.yml
-- spec/vcr/billing/destroy/1313708721.yml
-- spec/vcr/billing/errors/1313708721.yml
-- spec/vcr/billing/find/1313708721.yml
-- spec/vcr/billing/update/1313708721.yml
-- spec/vcr/charge/create/1313708721.yml
-- spec/vcr/charge/delete-uninvoiced/1313708721.yml
-- spec/vcr/charge/list-all/1313708721.yml
-- spec/vcr/charge/list-invoiced/1313708721.yml
-- spec/vcr/charge/list-pending/1313708721.yml
-- spec/vcr/charge/lookup/1313708721.yml
-- spec/vcr/coupon/create/1296774903.yml
-- spec/vcr/coupon/destroy/1296774903.yml
-- spec/vcr/credit/create/1313708090.yml
-- spec/vcr/credit/delete/1313708090.yml
-- spec/vcr/credit/list/1313708090.yml
-- spec/vcr/credit/lookup/1313708090.yml
-- spec/vcr/invoice/create/1296674173.yml
-- spec/vcr/invoice/create-no-charges/1296674173.yml
-- spec/vcr/invoice/list/1296674173.yml
-- spec/vcr/invoice/lookup/1296674173.yml
-- spec/vcr/plan/all.yml
-- spec/vcr/plan/find.yml
-- spec/vcr/plan/update.yml
-- spec/vcr/subscription/addons/add/1296674173.yml
-- spec/vcr/subscription/addons/create/1296674173.yml
-- spec/vcr/subscription/addons/remove/1296674173.yml
-- spec/vcr/subscription/cancel/1296674173.yml
-- spec/vcr/subscription/cancel-with-code/1296674173.yml
-- spec/vcr/subscription/change1/1296674173.yml
-- spec/vcr/subscription/change2/1296674173.yml
-- spec/vcr/subscription/create/1296674173.yml
-- spec/vcr/subscription/find/1296674173.yml
-- spec/vcr/subscription/reactivate/1296674173.yml
-- spec/vcr/subscription/refund-full/1296674173.yml
-- spec/vcr/subscription/refund-none/1296674173.yml
-- spec/vcr/subscription/refund-partial/1296674173.yml
-- spec/vcr/transaction/all/1311126815.yml
-- spec/vcr/transaction/create-no-account/1311126815.yml
-- spec/vcr/transaction/create-with-account/1311126815.yml
-- spec/vcr/transaction/list-filled/1311126815.yml
-- spec/vcr/transaction/list-initial/1311126815.yml
-- spec/vcr/transaction/lookup/1311126815.yml
-- spec/vcr/transaction/void/1311126815.yml
-- spec/vcr/transparent/post-url/1317063400.yml
-- spec/vcr/transparent/post-url/1317063474.yml