recurly 2.0.10 → 2.0.11

data/lib/recurly/js.rb

@@ -23,35 +23,45 @@ module Recurly
       attr_writer :private_key
 
       # @return [String]
-      def sign_billing_info account_code
-        sign 'billinginfoupdate', 'account_code' => account_code
+      def sign_subscription plan_code, account_code, extras = {}
+        sign 'subscriptioncreate', {
+          'plan_code' => plan_code,
+          'account_code' => account_code
+         }, extras
       end
 
       # @return [String]
-      def sign_transaction amount_in_cents, currency = nil, account_code = nil
+      def sign_billing_info account_code, extras = {}
+        sign 'billinginfoupdate', { 'account_code' => account_code }, extras
+      end
+
+      # @return [String]
+      def sign_transaction(
+        amount_in_cents, currency = nil, account_code = nil, extras = {}
+      )
         sign 'transactioncreate', {
           'amount_in_cents' => amount_in_cents,
           'currency'        => currency || Recurly.default_currency,
           'account_code'    => account_code
-        }
+        }, extras
       end
 
       # @return [true]
       # @raise [RequestForgery] If verification fails.
-      def verify_billing_info! params
-        verify! 'billinginfoupdated', params
+      def verify_subscription! params
+        verify! 'subscriptioncreated', params
       end
 
       # @return [true]
       # @raise [RequestForgery] If verification fails.
-      def verify_transaction! params
-        verify! 'transactioncreated', params
+      def verify_billing_info! params
+        verify! 'billinginfoupdated', params
       end
 
       # @return [true]
       # @raise [RequestForgery] If verification fails.
-      def verify_subscription! params
-        verify! 'subscriptioncreated', params
+      def verify_transaction! params
+        verify! 'transactioncreated', params
       end
 
       # @return [String]
@@ -61,13 +71,23 @@ module Recurly
 
       private
 
-      def sign claim, params, timestamp = Time.now
-        signature = OpenSSL::HMAC.hexdigest(
+      def collect_keypaths extras, prefix = nil
+        if extras.is_a? Hash
+          extras.map { |key, value|
+            collect_keypaths value, prefix ? "#{prefix}.#{key}" : key.to_s
+          }.flatten.sort
+        else
+          prefix
+        end
+      end
+
+      def sign claim, params, extras = {}, timestamp = Time.now
+        hexdigest = OpenSSL::HMAC.hexdigest(
           OpenSSL::Digest::Digest.new('SHA1'),
           Digest::SHA1.digest(private_key),
-          digest([timestamp = timestamp.to_i, claim, params])
+          digest([timestamp = timestamp.to_i, claim, params.merge(extras)])
         )
-        "#{signature}-#{timestamp}"
+        ["#{hexdigest}-#{timestamp}", *collect_keypaths(extras)].join '+'
       end
 
       def verify! claim, params
@@ -81,7 +101,7 @@ module Recurly
           raise RequestForgery, 'stale timestamp'
         end
 
-        if signature != sign(claim, params, timestamp)
+        if signature != sign(claim, params, {}, timestamp)
           raise RequestForgery,
             "signature can't be verified (invalid request or private key)"
         end

data/lib/recurly/resource.rb

@@ -467,10 +467,10 @@ module Recurly
               self[member_name] = case member
               when Hash
                 associated.send :new, member.merge(:uri => associated_uri)
-              when associated_class
+              when associated
                 member.uri = associated_uri and member
               else
-                raise ArgumentError, "expected #{associated_class}"
+                raise ArgumentError, "expected #{associated}"
               end
             }
             define_method("build_#{member_name}") { |*args|

data/lib/recurly/transaction.rb

@@ -15,6 +15,8 @@ module Recurly
 
     # @return [Account]
     belongs_to :account
+		# @return [Invoice, nil]
+		belongs_to :invoice
 
     define_attribute_methods %w(
       uuid

data/lib/recurly/version.rb

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

metadata

@@ -1,101 +1,146 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: recurly
-version: !ruby/object:Gem::Version
-  version: 2.0.10
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 11
+  version: 2.0.11
 platform: ruby
-authors:
+authors: 
 - Recurly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-17 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70198296894000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
         version: 0.9.2
   type: :development
-  prerelease: false
-  version_requirements: *70198296894000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70198297061820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1923831893
+        segments: 
+        - 1
+        - 1
+        - pre
+        - 10
         version: 1.1.pre.10
   type: :development
-  prerelease: false
-  version_requirements: *70198297061820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70198297061020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
         version: 2.6.1
   type: :development
-  prerelease: false
-  version_requirements: *70198297061020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &70198297060280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 7
+        - 6
         version: 1.7.6
   type: :development
-  prerelease: false
-  version_requirements: *70198297060280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: guard-minitest
-  requirement: &70198297059360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
   type: :development
-  prerelease: false
-  version_requirements: *70198297059360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rb-fsevent
-  requirement: &70198297058380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 97
+        segments: 
+        - 0
+        - 4
+        - 3
+        - 1
         version: 0.4.3.1
   type: :development
-  prerelease: false
-  version_requirements: *70198297058380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: growl_notify
-  requirement: &70198297057560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
   type: :development
-  prerelease: false
-  version_requirements: *70198297057560
-description: ! 'An API client library for Recurly: http://recurly.com'
+  version_requirements: *id007
+description: "An API client library for Recurly: http://recurly.com"
 email: support@recurly.com
-executables:
+executables: 
 - recurly
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/rails/generators/recurly/config_generator.rb
 - lib/rails/recurly.rb
 - lib/recurly/account.rb
@@ -126,32 +171,40 @@ files:
 - lib/recurly.rb
 - README.markdown
 - bin/recurly
+has_rdoc: true
 homepage: http://github.com/recurly/recurly-client-ruby
-licenses:
+licenses: 
 - MIT
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.markdown
-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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Recurly API Client
 test_files: []
-has_rdoc: true
+