venice 0.4.1 → 0.4.2

data/lib/venice/client.rb

@@ -9,6 +9,7 @@ module Venice
   class Client
     attr_accessor :verification_url
     attr_writer :shared_secret
+    attr_writer :exclude_old_transactions
 
     class << self
       def development
@@ -31,13 +32,13 @@ module Venice
     def verify!(data, options = {})
       @verification_url ||= ITUNES_DEVELOPMENT_RECEIPT_VERIFICATION_ENDPOINT
       @shared_secret = options[:shared_secret] if options[:shared_secret]
+      @exclude_old_transactions = options[:exclude_old_transactions] if options[:exclude_old_transactions]
 
-      json = json_response_from_verifying_data(data)
-      status = json['status'].to_i
-      receipt_attributes = json['receipt'].dup
+      json = json_response_from_verifying_data(data, options)
+      receipt_attributes = json['receipt'].dup if json['receipt']
       receipt_attributes['original_json_response'] = json if receipt_attributes
 
-      case status
+      case json['status'].to_i
       when 0, 21006
         receipt = Receipt.new(receipt_attributes)
 
@@ -55,32 +56,46 @@ module Venice
 
         return receipt
       else
-        raise Receipt::VerificationError.new(status, receipt)
+        raise Receipt::VerificationError, json
       end
     end
 
     private
 
-    def json_response_from_verifying_data(data)
+    def json_response_from_verifying_data(data, options = {})
       parameters = {
         'receipt-data' => data
       }
 
       parameters['password'] = @shared_secret if @shared_secret
+      parameters['exclude-old-transactions'] = @exclude_old_transactions if @exclude_old_transactions
 
       uri = URI(@verification_url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
+      http.open_timeout = options[:open_timeout] if options[:open_timeout]
+      http.read_timeout = options[:read_timeout] if options[:read_timeout]
+
       request = Net::HTTP::Post.new(uri.request_uri)
       request['Accept'] = 'application/json'
       request['Content-Type'] = 'application/json'
       request.body = parameters.to_json
 
-      response = http.request(request)
+      begin
+        response = http.request(request)
+      rescue Timeout::Error
+        raise TimeoutError
+      end
 
       JSON.parse(response.body)
     end
   end
+
+  class Client::TimeoutError < Timeout::Error
+    def message
+      'The App Store timed out.'
+    end
+  end
 end

data/lib/venice/receipt.rb

@@ -94,7 +94,9 @@ module Venice
 
     class << self
       def verify(data, options = {})
-        verify!(data, options) rescue false
+        verify!(data, options)
+      rescue VerificationError, Client::TimeoutError
+        false
       end
 
       def verify!(data, options = {})
@@ -121,16 +123,22 @@ module Venice
     end
 
     class VerificationError < StandardError
-      attr_accessor :code
-      attr_accessor :receipt
+      attr_accessor :json
 
-      def initialize(code, receipt)
-        @code = Integer(code)
-        @receipt = receipt
+      def initialize(json)
+        @json = json
+      end
+
+      def code
+        Integer(json['status'])
+      end
+
+      def retryable?
+        json['is-retryable']
       end
 
       def message
-        case @code
+        case code
         when 21000
           'The App Store could not read the JSON object you provided.'
         when 21002
@@ -152,7 +160,7 @@ module Venice
         when 21100..21199
           'Internal data access error.'
         else
-          "Unknown Error: #{@code}"
+          "Unknown Error: #{code}"
         end
       end
     end

data/lib/venice/version.rb

@@ -1,3 +1,3 @@
 module Venice
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/client_spec.rb

@@ -112,5 +112,50 @@ describe Venice::Client do
         receipt.latest_receipt_info.should_not be_nil
       end
     end
+
+    context 'with an error response' do
+      before do
+        client.stub(:json_response_from_verifying_data).and_return(response)
+      end
+
+      let(:response) do
+        {
+          'status' => 21000,
+          'receipt' => {}
+        }
+      end
+
+      it 'raises a VerificationError' do
+        expect do
+          client.verify!('asdf')
+        end.to raise_error(Venice::Receipt::VerificationError) do |error|
+          expect(error.json).to eq(response)
+          expect(error.code).to eq(21000)
+          expect(error).not_to be_retryable
+        end
+      end
+    end
+
+    context 'with a retryable error response' do
+      before do
+        client.stub(:json_response_from_verifying_data).and_return(response)
+      end
+
+      let(:response) do
+        {
+          'status' => 21000,
+          'receipt' => {},
+          'is-retryable' => true
+        }
+      end
+
+      it 'raises a VerificationError' do
+        expect do
+          client.verify!('asdf')
+        end.to raise_error(Venice::Receipt::VerificationError) do |error|
+          expect(error).to be_retryable
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: venice
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-17 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander