venice 0.4.0 → 0.4.1

data/lib/venice/client.rb

@@ -3,8 +3,8 @@ require 'net/https'
 require 'uri'
 
 module Venice
-  ITUNES_PRODUCTION_RECEIPT_VERIFICATION_ENDPOINT = "https://buy.itunes.apple.com/verifyReceipt"
-  ITUNES_DEVELOPMENT_RECEIPT_VERIFICATION_ENDPOINT = "https://sandbox.itunes.apple.com/verifyReceipt"
+  ITUNES_PRODUCTION_RECEIPT_VERIFICATION_ENDPOINT = 'https://buy.itunes.apple.com/verifyReceipt'
+  ITUNES_DEVELOPMENT_RECEIPT_VERIFICATION_ENDPOINT = 'https://sandbox.itunes.apple.com/verifyReceipt'
 
   class Client
     attr_accessor :verification_url
@@ -12,13 +12,13 @@ module Venice
 
     class << self
       def development
-        client = self.new
+        client = new
         client.verification_url = ITUNES_DEVELOPMENT_RECEIPT_VERIFICATION_ENDPOINT
         client
       end
 
       def production
-        client = self.new
+        client = new
         client.verification_url = ITUNES_PRODUCTION_RECEIPT_VERIFICATION_ENDPOINT
         client
       end
@@ -33,7 +33,8 @@ module Venice
       @shared_secret = options[:shared_secret] if options[:shared_secret]
 
       json = json_response_from_verifying_data(data)
-      status, receipt_attributes = json['status'].to_i, json['receipt']
+      status = json['status'].to_i
+      receipt_attributes = json['receipt'].dup
       receipt_attributes['original_json_response'] = json if receipt_attributes
 
       case status
@@ -73,8 +74,8 @@ module Venice
       http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
       request = Net::HTTP::Post.new(uri.request_uri)
-      request['Accept'] = "application/json"
-      request['Content-Type'] = "application/json"
+      request['Accept'] = 'application/json'
+      request['Content-Type'] = 'application/json'
       request.body = parameters.to_json
 
       response = http.request(request)

data/lib/venice/in_app_receipt.rb

@@ -42,7 +42,6 @@ module Venice
     # For a transaction that was canceled by Apple customer support, the time and date of the cancellation.
     attr_reader :cancellation_at
 
-
     def initialize(attributes = {})
       @quantity = Integer(attributes['quantity']) if attributes['quantity']
       @product_id = attributes['product_id']
@@ -65,28 +64,26 @@ module Venice
 
         self.original = InAppReceipt.new(original_attributes)
       end
-
     end
 
     def to_hash
       {
-        :quantity => @quantity,
-        :product_id => @product_id,
-        :transaction_id => @transaction_id,
-        :purchase_date => (@purchased_at.httpdate rescue nil),
-        :original_transaction_id => (@original.transaction_id rescue nil),
-        :original_purchase_date => (@original.purchased_at.httpdate rescue nil),
-        :app_item_id => @app_item_id,
-        :version_external_identifier => @version_external_identifier,
-        :expires_at => (@expires_at.httpdate rescue nil),
-        :cancellation_at => (@cancellation_at.httpdate rescue nil)
+        quantity: @quantity,
+        product_id: @product_id,
+        transaction_id: @transaction_id,
+        purchase_date: (@purchased_at.httpdate rescue nil),
+        original_transaction_id: (@original.transaction_id rescue nil),
+        original_purchase_date: (@original.purchased_at.httpdate rescue nil),
+        app_item_id: @app_item_id,
+        version_external_identifier: @version_external_identifier,
+        expires_at: (@expires_at.httpdate rescue nil),
+        cancellation_at: (@cancellation_at.httpdate rescue nil)
       }
     end
     alias_method :to_h, :to_hash
 
     def to_json
-      self.to_hash.to_json
+      to_hash.to_json
     end
-
   end
 end

data/lib/venice/pending_renewal_info.rb

@@ -1,8 +1,7 @@
 module Venice
   class PendingRenewalInfo
-
     # For an expired subscription, the reason for the subscription expiration.
-    # This key is only present for a receipt containing an expired auto-renewable subscription. 
+    # This key is only present for a receipt containing an expired auto-renewable subscription.
     attr_reader :expiration_intent
 
     # The current renewal status for the auto-renewable subscription.
@@ -29,14 +28,13 @@ module Venice
     # Use this value along with the cancellation date to identify possible issues in your app that may lead customers to contact Apple customer support.
     attr_reader :cancellation_reason
 
-
     def initialize(attributes)
       @expiration_intent = Integer(attributes['expiration_intent']) if attributes['expiration_intent']
       @auto_renew_status = Integer(attributes['auto_renew_status']) if attributes['auto_renew_status']
       @auto_renew_product_id = attributes['auto_renew_product_id']
 
       if attributes['is_in_billing_retry_period']
-        @is_in_billing_retry_period = (attributes[is_in_billing_retry_period] == "1" ? true : false)
+        @is_in_billing_retry_period = (attributes[is_in_billing_retry_period] == '1')
       end
 
       @product_id = attributes['product_id']
@@ -60,7 +58,7 @@ module Venice
     alias_method :to_h, :to_hash
 
     def to_json
-      self.to_hash.to_json
+      to_hash.to_json
     end
   end
 end

data/lib/venice/receipt.rb

@@ -68,29 +68,28 @@ module Venice
           @pending_renewal_info << PendingRenewalInfo.new(pending_renewal_attributes)
         end
       end
-
     end
 
     def to_hash
       {
-        :bundle_id => @bundle_id,
-        :application_version => @application_version,
-        :original_application_version => @original_application_version,
-        :original_purchase_date => (@original_purchase_date.httpdate rescue nil),
-        :expires_at => (@expires_at.httpdate rescue nil),
-        :receipt_type => @receipt_type,
-        :adam_id => @adam_id,
-        :download_id => @download_id,
-        :requested_at => (@requested_at.httpdate rescue nil),
-        :in_app => @in_app.map{|iap| iap.to_h },
-        :pending_renewal_info => @pending_renewal_info.map { |pend_info| pend_info.to_h },
-        :latest_receipt_info => @latest_receipt_info
+        bundle_id: @bundle_id,
+        application_version: @application_version,
+        original_application_version: @original_application_version,
+        original_purchase_date: (@original_purchase_date.httpdate rescue nil),
+        expires_at: (@expires_at.httpdate rescue nil),
+        receipt_type: @receipt_type,
+        adam_id: @adam_id,
+        download_id: @download_id,
+        requested_at: (@requested_at.httpdate rescue nil),
+        in_app: @in_app.map(&:to_h),
+        pending_renewal_info: @pending_renewal_info.map(&:to_h),
+        latest_receipt_info: @latest_receipt_info
       }
     end
     alias_method :to_h, :to_hash
 
     def to_json
-      self.to_hash.to_json
+      to_hash.to_json
     end
 
     class << self
@@ -132,26 +131,28 @@ module Venice
 
       def message
         case @code
-          when 21000
-            "The App Store could not read the JSON object you provided."
-          when 21002
-            "The data in the receipt-data property was malformed."
-          when 21003
-            "The receipt could not be authenticated."
-          when 21004
-            "The shared secret you provided does not match the shared secret on file for your account."
-          when 21005
-            "The receipt server is not currently available."
-          when 21006
-            "This receipt is valid but the subscription has expired. When this status code is returned to your server, the receipt data is also decoded and returned as part of the response."
-          when 21007
-            "This receipt is a sandbox receipt, but it was sent to the production service for verification."
-          when 21008
-            "This receipt is a production receipt, but it was sent to the sandbox service for verification."
-          when 21010
-            "This receipt could not be authorized. Treat this the same as if a purchase was never made."
-          else
-            "Unknown Error: #{@code}"
+        when 21000
+          'The App Store could not read the JSON object you provided.'
+        when 21002
+          'The data in the receipt-data property was malformed.'
+        when 21003
+          'The receipt could not be authenticated.'
+        when 21004
+          'The shared secret you provided does not match the shared secret on file for your account.'
+        when 21005
+          'The receipt server is not currently available.'
+        when 21006
+          'This receipt is valid but the subscription has expired. When this status code is returned to your server, the receipt data is also decoded and returned as part of the response.'
+        when 21007
+          'This receipt is a sandbox receipt, but it was sent to the production service for verification.'
+        when 21008
+          'This receipt is a production receipt, but it was sent to the sandbox service for verification.'
+        when 21010
+          'This receipt could not be authorized. Treat this the same as if a purchase was never made.'
+        when 21100..21199
+          'Internal data access error.'
+        else
+          "Unknown Error: #{@code}"
         end
       end
     end

data/lib/venice/version.rb

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

data/spec/client_spec.rb

@@ -1,61 +1,78 @@
 require 'spec_helper'
 
 describe Venice::Client do
-  let(:receipt_data) { "asdfzxcvjklqwer" }
+  let(:receipt_data) { 'asdfzxcvjklqwer' }
   let(:client) { subject }
 
-  describe "#verify!" do
-    context "no shared_secret" do
+  describe '#verify!' do
+    context 'with a receipt response' do
+      before do
+        client.stub(:json_response_from_verifying_data).and_return(response)
+      end
+
+      let(:response) do
+        {
+          'status' => 0,
+          'receipt' => {}
+        }
+      end
+
+      it 'does not generate a self-referencing Hash' do
+        receipt = client.verify! 'asdf'
+        expect(receipt.original_json_response['receipt']).not_to have_key('original_json_response')
+      end
+    end
+
+    context 'no shared_secret' do
       before do
         client.shared_secret = nil
         Venice::Receipt.stub :new
       end
 
-      it "should only include the receipt_data" do
+      it 'should only include the receipt_data' do
         Net::HTTP.any_instance.should_receive(:request) do |post|
-          post.body.should eq({'receipt-data' => receipt_data}.to_json)
+          post.body.should eq({ 'receipt-data' => receipt_data }.to_json)
           post
         end
         client.verify! receipt_data
       end
     end
 
-    context "with a shared secret" do
-      let(:secret) { "shhhhhh" }
+    context 'with a shared secret' do
+      let(:secret) { 'shhhhhh' }
 
       before do
         Venice::Receipt.stub :new
       end
 
-      context "set secret manually" do
+      context 'set secret manually' do
         before do
           client.shared_secret = secret
         end
 
-        it "should include the secret in the post" do
+        it 'should include the secret in the post' do
           Net::HTTP.any_instance.should_receive(:request) do |post|
-            post.body.should eq({'receipt-data' => receipt_data, 'password' => secret}.to_json)
+            post.body.should eq({ 'receipt-data' => receipt_data, 'password' => secret }.to_json)
             post
           end
           client.verify! receipt_data
         end
       end
 
-      context "set secret when verification" do
-        let(:options) { {shared_secret: secret}  }
+      context 'set secret when verification' do
+        let(:options) { { shared_secret: secret } }
 
-        it "should include the secret in the post" do
+        it 'should include the secret in the post' do
           Net::HTTP.any_instance.should_receive(:request) do |post|
-            post.body.should eq({'receipt-data' => receipt_data, 'password' => secret}.to_json)
+            post.body.should eq({ 'receipt-data' => receipt_data, 'password' => secret }.to_json)
             post
           end
           client.verify! receipt_data, options
         end
       end
-
     end
 
-    context "with a latest receipt info attribute" do
+    context 'with a latest receipt info attribute' do
       before do
         client.stub(:json_response_from_verifying_data).and_return(response)
       end
@@ -64,37 +81,36 @@ describe Venice::Client do
         {
           'status' => 0,
           'receipt' => {},
-          'latest_receipt' => "<encoded string>",
+          'latest_receipt' => '<encoded string>',
           'latest_receipt_info' =>  [
             {
-              "original_purchase_date_pst" => "2012-12-30 09:39:24 America/Los_Angeles",
-              "unique_identifier" => "0000b01147b8",
-              "original_transaction_id" => "1000000061051565",
-              "expires_date" => "1365114731000",
-              "transaction_id" => "1000000070104252",
-              "quantity" => "1",
-              "product_id" => "com.ficklebits.nsscreencast.monthly_sub",
-              "original_purchase_date_ms" => "1356889164000",
-              "bid" => "com.ficklebits.nsscreencast",
-              "web_order_line_item_id" => "1000000026812043",
-              "bvrs" => "0.1",
-              "expires_date_formatted" => "2013-04-04 22:32:11 Etc/GMT",
-              "purchase_date" => "2013-04-04 22:27:11 Etc/GMT",
-              "purchase_date_ms" => "1365114431000",
-              "expires_date_formatted_pst" => "2013-04-04 15:32:11 America/Los_Angeles",
-              "purchase_date_pst" => "2013-04-04 15:27:11 America/Los_Angeles",
-              "original_purchase_date" => "2012-12-30 17:39:24 Etc/GMT",
-              "item_id" => "590265423"
+              'original_purchase_date_pst' => '2012-12-30 09:39:24 America/Los_Angeles',
+              'unique_identifier' => '0000b01147b8',
+              'original_transaction_id' => '1000000061051565',
+              'expires_date' => '1365114731000',
+              'transaction_id' => '1000000070104252',
+              'quantity' => '1',
+              'product_id' => 'com.ficklebits.nsscreencast.monthly_sub',
+              'original_purchase_date_ms' => '1356889164000',
+              'bid' => 'com.ficklebits.nsscreencast',
+              'web_order_line_item_id' => '1000000026812043',
+              'bvrs' => '0.1',
+              'expires_date_formatted' => '2013-04-04 22:32:11 Etc/GMT',
+              'purchase_date' => '2013-04-04 22:27:11 Etc/GMT',
+              'purchase_date_ms' => '1365114431000',
+              'expires_date_formatted_pst' => '2013-04-04 15:32:11 America/Los_Angeles',
+              'purchase_date_pst' => '2013-04-04 15:27:11 America/Los_Angeles',
+              'original_purchase_date' => '2012-12-30 17:39:24 Etc/GMT',
+              'item_id' => '590265423'
             }
           ]
         }
       end
 
-      it "should create a latest receipt" do
+      it 'should create a latest receipt' do
         receipt = client.verify! 'asdf'
         receipt.latest_receipt_info.should_not be_nil
       end
     end
-
   end
 end

data/spec/in_app_receipt_spec.rb

@@ -1,26 +1,24 @@
 require 'spec_helper.rb'
 
 describe Venice::InAppReceipt do
-
-  describe ".new" do
-
+  describe '.new' do
     let :attributes do
       {
-        "quantity" => 1,
-        "product_id" => "com.foo.product1",
-        "transaction_id" => "1000000070107235",
-        "purchase_date" => "2014-05-28 14:47:53 Etc/GMT",
-        "purchase_date_ms" => "1401288473000",
-        "purchase_date_pst" => "2014-05-28 07:47:53 America/Los_Angeles",
-        "original_transaction_id" => "140xxx867509",
-        "original_purchase_date" => "2014-05-28 14:47:53 Etc/GMT",
-        "original_purchase_date_ms" => "1401288473000",
-        "original_purchase_date_pst" => "2014-05-28 07:47:53 America/Los_Angeles",
-        "is_trial_period" => false,
-        "version_external_identifier" => "123",
-        "app_item_id" => 'com.foo.app1',
-        "expires_date" => "2014-06-28 07:47:53 America/Los_Angeles",
-        "expires_date_ms" => "1403941673000"
+        'quantity' => 1,
+        'product_id' => 'com.foo.product1',
+        'transaction_id' => '1000000070107235',
+        'purchase_date' => '2014-05-28 14:47:53 Etc/GMT',
+        'purchase_date_ms' => '1401288473000',
+        'purchase_date_pst' => '2014-05-28 07:47:53 America/Los_Angeles',
+        'original_transaction_id' => '140xxx867509',
+        'original_purchase_date' => '2014-05-28 14:47:53 Etc/GMT',
+        'original_purchase_date_ms' => '1401288473000',
+        'original_purchase_date_pst' => '2014-05-28 07:47:53 America/Los_Angeles',
+        'is_trial_period' => false,
+        'version_external_identifier' => '123',
+        'app_item_id' => 'com.foo.app1',
+        'expires_date' => '2014-06-28 07:47:53 America/Los_Angeles',
+        'expires_date_ms' => '1403941673000'
       }
     end
 
@@ -29,30 +27,26 @@ describe Venice::InAppReceipt do
     end
 
     its(:quantity) { 1 }
-    its(:product_id) { "com.foo.product1" }
-    its(:transaction_id) { "1000000070107235" }
+    its(:product_id) { 'com.foo.product1' }
+    its(:transaction_id) { '1000000070107235' }
     its(:purchased_at) { should be_instance_of DateTime }
     its(:app_item_id) { 'com.foo.app1' }
-    its(:version_external_identifier) { "123" }
+    its(:version_external_identifier) { '123' }
     its(:original) { should be_instance_of Venice::InAppReceipt }
     its(:expires_at) { should be_instance_of Time }
 
     it "should parse the 'original' attributes" do
       subject.original.should be_instance_of Venice::InAppReceipt
-      subject.original.transaction_id.should == "140xxx867509"
+      subject.original.transaction_id.should == '140xxx867509'
       subject.original.purchased_at.should be_instance_of DateTime
     end
 
-    it "should output a hash with attributes" do
-      in_app_receipt.to_h.should include(:quantity => 1,
-                                          :product_id => "com.foo.product1",
-                                          :transaction_id => "1000000070107235",
-                                          :purchase_date => "Wed, 28 May 2014 14:47:53 GMT",
-                                          :original_purchase_date => "Wed, 28 May 2014 14:47:53 GMT"
-                                        )
+    it 'should output a hash with attributes' do
+      in_app_receipt.to_h.should include(quantity: 1,
+                                         product_id: 'com.foo.product1',
+                                         transaction_id: '1000000070107235',
+                                         purchase_date: 'Wed, 28 May 2014 14:47:53 GMT',
+                                         original_purchase_date: 'Wed, 28 May 2014 14:47:53 GMT')
     end
-
-
   end
-
 end