recurly 2.1.0 → 2.1.1

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

data/lib/recurly/api.rb

@@ -16,9 +16,27 @@ module Recurly
 
     @@base_uri = "https://api.recurly.com/v2/"
 
+    FORMATS = Helper.hash_with_indifferent_read_access(
+      'pdf' => 'application/pdf',
+      'xml' => 'application/xml'
+    )
+
     class << self
-      # @return [String]
-      attr_accessor :accept_language
+      # Additional HTTP headers sent with each API call
+      # @return [Hash{String => String}]
+      def headers
+        @headers ||= { 'Accept' => accept, 'User-Agent' => user_agent }
+      end
+
+      # @return [String, nil] Accept-Language header value
+      def accept_language
+        headers['Accept-Language']
+      end
+
+      # @param [String] language Accept-Language header value
+      def accept_language=(language)
+        headers['Accept-Language'] = language
+      end
 
       # @return [Net::HTTPOK, Net::HTTPResponse]
       # @raise [ResponseError] With a non-2xx status code.
@@ -63,7 +81,7 @@ module Recurly
       private
 
       def accept
-        'application/xml'
+        FORMATS['xml']
       end
       alias content_type accept
     end

data/lib/recurly/api/net_http_adapter.rb

@@ -32,8 +32,7 @@ module Recurly
         }
 
         def request method, uri, options = {}
-          head = { 'Accept' => accept, 'User-Agent' => user_agent }
-          accept_language and head['Accept-Language'] ||= accept_language
+          head = headers.dup
           head.update options[:head] if options[:head]
           uri = base_uri + uri
           if options[:params] && !options[:params].empty?
@@ -42,9 +41,18 @@ module Recurly
           request = METHODS[method].new uri.request_uri, head
           request.basic_auth(*[Recurly.api_key, nil].flatten[0, 2])
           if options[:body]
-            head['Content-Type'] = content_type
+            request['Content-Type'] = content_type
             request.body = options[:body]
           end
+          if options[:etag]
+            request['If-None-Match'] = options[:etag]
+          end
+          if options[:format]
+            request['Accept'] = FORMATS[options[:format]]
+          end
+          if options[:locale]
+            request['Accept-Language'] = options[:locale]
+          end
           http = ::Net::HTTP.new uri.host, uri.port
           http.use_ssl = uri.scheme == 'https'
           net_http.each_pair { |key, value| http.send "#{key}=", value }

data/lib/recurly/invoice.rb

@@ -32,6 +32,10 @@ module Recurly
     )
     alias to_param invoice_number
 
+    def pdf
+      find to_param, :format => 'pdf'
+    end
+
     private
 
     def initialize attributes = {}

data/lib/recurly/js.rb

@@ -37,7 +37,9 @@ module Recurly
         ).gsub(/\W/, '')
         unsigned = to_query data
         signed = OpenSSL::HMAC.hexdigest 'sha1', private_key, unsigned
-        [signed, unsigned].join '|'
+        signature = [signed, unsigned].join '|'
+        signature = signature.html_safe if signature.respond_to? :html_safe
+        signature
       end
 
       # Fetches a record using a token provided by Recurly.js.

data/lib/recurly/resource.rb

@@ -314,14 +314,9 @@ module Recurly
           raise NotFound, "can't find a record with nil identifier"
         end
 
-        request_options = {}
-        if etag = options[:etag]
-          request_options[:head] = { 'If-None-Match' => etag }
-        end
-
         uri = uuid =~ /^http/ ? uuid : member_path(uuid)
         begin
-          from_response API.get(uri, {}, request_options)
+          from_response API.get(uri, {}, options)
         rescue API::NotFound => e
           raise NotFound, e.description
         end
@@ -352,9 +347,14 @@ module Recurly
       # @return [Resource]
       # @param response [Net::HTTPResponse]
       def from_response response
-        record = from_xml response.body
-        record.instance_eval { @etag, @response = response['ETag'], response }
-        record
+        case response['Content-Type']
+        when %r{application/pdf}
+          response.body
+        else # when %r{application/xml}
+          record = from_xml response.body
+          record.instance_eval { @etag, @response = response['ETag'], response }
+          record
+        end
       end
 
       # Instantiates a record from an XML blob: either a String or XML element.
@@ -370,12 +370,15 @@ module Recurly
         if xml.name == member_name
           record = new
         elsif Recurly.const_defined?(class_name = Helper.classify(xml.name))
-          record = Recurly.const_get(class_name).send :new
+          klass = Recurly.const_get class_name
+          record = klass.send :new
         elsif root = xml.root and root.elements.empty?
           return XML.cast root
         else
           record = {}
         end
+        klass ||= self
+        associations = klass.associations
 
         xml.root.attributes.each do |name, value|
           record.instance_variable_set "@#{name}", value.to_s

data/lib/recurly/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recurly
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70249525629500 !ruby/object:Gem::Requirement
+  requirement: &70288709160800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70249525629500
+  version_requirements: *70288709160800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70249525628300 !ruby/object:Gem::Requirement
+  requirement: &70288709158920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70249525628300
+  version_requirements: *70288709158920
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70249525627820 !ruby/object:Gem::Requirement
+  requirement: &70288709156520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.7.6
   type: :development
   prerelease: false
-  version_requirements: *70249525627820
+  version_requirements: *70288709156520
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70249525627320 !ruby/object:Gem::Requirement
+  requirement: &70288709153760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70249525627320
+  version_requirements: *70288709153760
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70249525626760 !ruby/object:Gem::Requirement
+  requirement: &70288709148540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.4.3.1
   type: :development
   prerelease: false
-  version_requirements: *70249525626760
+  version_requirements: *70288709148540
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70249525626280 !ruby/object:Gem::Requirement
+  requirement: &70288709147340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *70249525626280
+  version_requirements: *70288709147340
 description: ! 'An API client library for Recurly: http://recurly.com'
 email: support@recurly.com
 executables:
@@ -114,8 +114,7 @@ files:
 - lib/recurly/xml.rb
 - lib/recurly.rb
 - README.markdown
-- !binary |-
-  YmluL3JlY3VybHk=
+- bin/recurly
 homepage: http://github.com/recurly/recurly-client-ruby
 licenses:
 - MIT
@@ -139,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Recurly API Client