candy_check 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f276e0409f0b3ee54bd5543e939d7635c95059dfc5ae77d9b071d5715d1e291f
-  data.tar.gz: 56858af56be773214faae7e848e4aa9ae5a30b8cba2da782aca8554da7895c94
+  metadata.gz: 0ce2db5208c39a8d9cda9eb6308fae0ae95b34460a053036b16cf2496c5fdffb
+  data.tar.gz: 1eba58dfa69e6c8732ae1f2e33553d2386e85653c5ba867603253d531c2e0891
 SHA512:
-  metadata.gz: 6eb5506e96216125602b47994b99f8038aa20aecf17cf2515ba5ab7578f06415735301f793aa64786bddad59a4c0296bdf5f6f3545151ee0b1f104b7a5eef262
-  data.tar.gz: a6084226820a90997d852976659841930fbeaf5d79507fe392d8551447f0000a3016636f317f79f1af50cb9501f355905a96203751162153ac210ac97bcca519
+  metadata.gz: 0f58665b4df59f402b0e43f6f9a09a74b40caf8ab7fd6511732b7ff742b35f8a1a32f53821a777a423effdc386757aaec88965aa1a63686ca463b9e98f7fc54d
+  data.tar.gz: 245dad3d70c0eccc33c992a5420f2ac2ddb8521a524a06b0361418516d35ee9471f71c12bff4771ce6a00390ba16858d12b836060e463524cd2c3b0310ab59d8

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://travis-ci.org/jnbt/candy_check.svg?branch=master)](https://travis-ci.org/jnbt/candy_check)
 [![Coverage Status](https://coveralls.io/repos/jnbt/candy_check/badge.svg?branch=master)](https://coveralls.io/r/jnbt/candy_check?branch=master)
 [![Code Climate](https://codeclimate.com/github/jnbt/candy_check/badges/gpa.svg)](https://codeclimate.com/github/jnbt/candy_check)
-[![Gemnasium](https://img.shields.io/gemnasium/jnbt/candy_check.svg?style=flat)](https://gemnasium.com/jnbt/candy_check)
 [![Inline docs](http://inch-ci.org/github/jnbt/candy_check.svg?branch=master)](http://inch-ci.org/github/jnbt/candy_check)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg?style=flat)](http://www.rubydoc.info/github/jnbt/candy_check/master)
 
@@ -76,6 +75,14 @@ For **subscription verification**, Apple also returns a list of the user's purch
 verifier.verify_subscription(your_receipt_data, your_secret) # => ReceiptCollection or VerificationFailure
 ```
 
+If you want to restrict the subscription verification to some specific products, pass their ids as an array:
+
+```ruby
+# ... create your verifier as above
+product_ids = ['sk_product_id_1', 'sk_product_id_2'...]
+verifier.verify_subscription(your_receipt_data, your_secret, product_ids) # => ReceiptCollection or VerificationFailure
+```
+
 Please see the class documentation for [`CandyCheck::AppStore::ReceiptCollection`](http://www.rubydoc.info/github/jnbt/candy_check/master/CandyCheck/AppStore/ReceiptCollection) for further details.
 
 ### PlayStore

data/lib/candy_check/app_store/receipt_collection.rb

@@ -8,9 +8,11 @@ module CandyCheck
 
       # Initializes a new instance which bases on a JSON result
       # from Apple's verification server
-      # @param attributes [Array<Hash>]
+      # @param attributes [Array<Hash>] raw data from Apple's server
       def initialize(attributes)
-        @receipts = attributes.map { |r| Receipt.new(r) }
+        @receipts = attributes.map {|r| Receipt.new(r) }.sort{ |a, b|
+          a.purchase_date - b.purchase_date
+        }
       end
 
       # Check if the latest expiration date is passed

data/lib/candy_check/app_store/subscription_verification.rb

@@ -3,13 +3,28 @@ module CandyCheck
     # Verifies a latest_receipt_info block against a verification server.
     # The call return either an {ReceiptCollection} or a {VerificationFailure}
     class SubscriptionVerification < CandyCheck::AppStore::Verification
+      # Builds a fresh verification run
+      # @param endpoint_url [String] the verification URL to use
+      # @param receipt_data [String] the raw data to be verified
+      # @param secret [String] optional: shared secret
+      # @param product_ids [Array<String>] optional: select specific products
+      def initialize(
+        endpoint_url,
+        receipt_data,
+        secret = nil,
+        product_ids = nil
+      )
+        super(endpoint_url, receipt_data, secret)
+        @product_ids = product_ids
+      end
+
       # Performs the verification against the remote server
       # @return [ReceiptCollection] if successful
       # @return [VerificationFailure] otherwise
       def call!
         verify!
         if valid?
-          ReceiptCollection.new(@response['latest_receipt_info'])
+          build_collection(@response['latest_receipt_info'])
         else
           VerificationFailure.fetch(@response['status'])
         end
@@ -17,6 +32,15 @@ module CandyCheck
 
       private
 
+      def build_collection(latest_receipt_info)
+        unless @product_ids.nil?
+          latest_receipt_info = latest_receipt_info.select do |info|
+            @product_ids.include?(info['product_id'])
+          end
+        end
+        ReceiptCollection.new(latest_receipt_info)
+      end
+
       def valid?
         status_is_ok = @response['status'] == STATUS_OK
         @response && status_is_ok && @response['latest_receipt_info']

data/lib/candy_check/app_store/verification.rb

@@ -16,7 +16,7 @@ module CandyCheck
       # Builds a fresh verification run
       # @param endpoint_url [String] the verification URL to use
       # @param receipt_data [String] the raw data to be verified
-      # @param secret [String] the optional shared secret
+      # @param secret [String] optional: shared secret
       def initialize(endpoint_url, receipt_data, secret = nil)
         @endpoint_url = endpoint_url
         @receipt_data = receipt_data

data/lib/candy_check/app_store/verifier.rb

@@ -30,33 +30,33 @@ module CandyCheck
       # @return [Receipt] if successful
       # @return [VerificationFailure] otherwise
       def verify(receipt_data, secret = nil)
-        @verifier = Verification
-        fetch_receipt_information(receipt_data, secret)
+        fetch_receipt_information(Verification, [receipt_data, secret])
       end
 
       # Calls a subscription verification for the given input
       # @param receipt_data [String] the raw data to be verified
-      # @param secret [string] the optional shared secret
+      # @param secret [String] optional: shared secret
+      # @param product_ids [Array<String>] optional: products to filter
       # @return [ReceiptCollection] if successful
       # @return [Verification] otherwise
-      def verify_subscription(receipt_data, secret = nil)
-        @verifier = SubscriptionVerification
-        fetch_receipt_information(receipt_data, secret)
+      def verify_subscription(receipt_data, secret = nil, product_ids = nil)
+        args = [receipt_data, secret, product_ids]
+        fetch_receipt_information(SubscriptionVerification, args)
       end
 
       private
 
-      def fetch_receipt_information(receipt_data, secret = nil)
+      def fetch_receipt_information(verifier_class, args)
         default_endpoint, opposite_endpoint = endpoints
-        result = call_for(default_endpoint, receipt_data, secret)
+        result = call_for(verifier_class, args.dup.unshift(default_endpoint))
         if should_retry?(result)
-          return call_for(opposite_endpoint, receipt_data, secret)
+          return call_for(verifier_class, args.dup.unshift(opposite_endpoint))
         end
         result
       end
 
-      def call_for(endpoint_url, receipt_data, secret)
-        @verifier.new(endpoint_url, receipt_data, secret).call!
+      def call_for(verifier_class, args)
+        verifier_class.new(*args).call!
       end
 
       def should_retry?(result)

data/lib/candy_check/play_store/subscription_purchases/subscription_purchase.rb

@@ -66,7 +66,7 @@ module CandyCheck
         # Get number of overdue days. If this is negative, it is not overdue.
         # @return [Integer]
         def overdue_days
-          (Date.today - expires_at.to_date).to_i
+          (Time.now.utc.to_date - expires_at.to_date).to_i
         end
 
         # Get the auto renewal status as given by Google

data/lib/candy_check/version.rb

@@ -1,4 +1,4 @@
 module CandyCheck
   # The current gem's version
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/spec/app_store/receipt_collection_spec.rb

@@ -8,10 +8,12 @@ describe CandyCheck::AppStore::ReceiptCollection do
       [{
         'expires_date' => '2014-04-15 12:52:40 Etc/GMT',
         'expires_date_pst' => '2014-04-15 05:52:40 America/Los_Angeles',
+        'purchase_date' => '2014-04-14 12:52:40 Etc/GMT',
         'is_trial_period' => 'false'
       }, {
         'expires_date' => '2015-04-15 12:52:40 Etc/GMT',
         'expires_date_pst' => '2015-04-15 05:52:40 America/Los_Angeles',
+        'purchase_date' => '2015-04-14 12:52:40 Etc/GMT',
         'is_trial_period' => 'false'
       }]
     end
@@ -42,16 +44,40 @@ describe CandyCheck::AppStore::ReceiptCollection do
     end
   end
 
+  describe 'unordered receipts' do
+    let(:attributes) do
+      [{
+           'expires_date' => '2015-04-15 12:52:40 Etc/GMT',
+           'expires_date_pst' => '2015-04-15 05:52:40 America/Los_Angeles',
+           'purchase_date' => '2015-04-14 12:52:40 Etc/GMT',
+           'is_trial_period' => 'false'
+       }, {
+           'expires_date' => '2014-04-15 12:52:40 Etc/GMT',
+           'expires_date_pst' => '2014-04-15 05:52:40 America/Los_Angeles',
+           'purchase_date' => '2014-04-14 12:52:40 Etc/GMT',
+           'is_trial_period' => 'false'
+       }]
+    end
+
+    it 'the expires date is the latest one in time' do
+      expected = DateTime.new(2015, 4, 15, 12, 52, 40)
+      subject.expires_at.must_equal expected
+    end
+
+  end
+
   describe 'unexpired trial subscription' do
     two_days_from_now = DateTime.now + 2
 
     let(:attributes) do
       [{
         'expires_date' => '2016-04-15 12:52:40 Etc/GMT',
+        'purchase_date' => '2016-04-15 12:52:40 Etc/GMT',
         'is_trial_period' => 'true'
       }, {
         'expires_date' =>
           two_days_from_now.strftime('%Y-%m-%d %H:%M:%S Etc/GMT'),
+        'purchase_date' => '2016-04-15 12:52:40 Etc/GMT',
         'is_trial_period' => 'true'
       }]
     end
@@ -68,4 +94,5 @@ describe CandyCheck::AppStore::ReceiptCollection do
       subject.overdue_days.must_equal(-2)
     end
   end
+
 end

data/spec/app_store/subscription_verification_spec.rb

@@ -38,20 +38,53 @@ describe CandyCheck::AppStore::SubscriptionVerification do
     response = {
       'status' => 0,
       'latest_receipt_info' => [
-        { 'item_id' => 'some_id' },
-        { 'item_id' => 'some_other_id' }
+        { 'item_id' => 'some_id', 'purchase_date' => '2016-04-15 12:52:40 Etc/GMT' },
+        { 'item_id' => 'some_other_id', 'purchase_date' => '2016-04-15 12:52:40 Etc/GMT' }
       ]
     }
     with_mocked_response(response) do
       result = subject.call!
       result.must_be_instance_of CandyCheck::AppStore::ReceiptCollection
       result.receipts.must_be_instance_of Array
+      result.receipts.size.must_equal(2)
       last = result.receipts.last
       last.must_be_instance_of CandyCheck::AppStore::Receipt
       last.item_id.must_equal('some_other_id')
     end
   end
 
+  describe 'filtered product_ids' do
+    subject do
+      CandyCheck::AppStore::SubscriptionVerification.new(
+        endpoint,
+        data,
+        secret,
+        product_ids
+      )
+    end
+    let(:product_ids) { ['product_1'] }
+
+    it 'returns only filtered reciepts when specifc product_ids are reqested' do
+      response = {
+        'status' => 0,
+        'latest_receipt_info' => [
+          { 'item_id' => 'some_id', 'product_id' => 'product_1', 'purchase_date' => '2016-04-15 12:52:40 Etc/GMT' },
+          { 'item_id' => 'some_other_id', 'product_id' => 'product_1', 'purchase_date' => '2016-04-15 12:52:40 Etc/GMT' },
+          { 'item_id' => 'some_id', 'product_id' => 'product_2', 'purchase_date' => '2016-04-15 12:52:40 Etc/GMT' }
+        ]
+      }
+      with_mocked_response(response) do
+        result = subject.call!
+        result.must_be_instance_of CandyCheck::AppStore::ReceiptCollection
+        result.receipts.must_be_instance_of Array
+        result.receipts.size.must_equal(2)
+        last = result.receipts.last
+        last.must_be_instance_of CandyCheck::AppStore::Receipt
+        last.item_id.must_equal('some_other_id')
+      end
+    end
+  end
+
   private
 
   DummyClient = Struct.new(:response) do

data/spec/app_store/verifier_spec.rb

@@ -89,7 +89,7 @@ describe CandyCheck::AppStore::Verifier do
         subject.verify_subscription(
           data, secret
         ).must_be_same_as receipt_collection
-        assert_recorded([production_endpoint, data, secret])
+        assert_recorded([production_endpoint, data, secret, nil])
       end
     end
 
@@ -97,7 +97,7 @@ describe CandyCheck::AppStore::Verifier do
       failure = get_failure(21_000)
       with_mocked_verifier(failure) do
         subject.verify_subscription(data, secret).must_be_same_as failure
-        assert_recorded([production_endpoint, data, secret])
+        assert_recorded([production_endpoint, data, secret, nil])
       end
     end
 
@@ -106,11 +106,21 @@ describe CandyCheck::AppStore::Verifier do
       with_mocked_verifier(failure, receipt) do
         subject.verify_subscription(data, secret).must_be_same_as receipt
         assert_recorded(
-          [production_endpoint, data, secret],
-          [sandbox_endpoint, data, secret]
+          [production_endpoint, data, secret, nil],
+          [sandbox_endpoint, data, secret, nil]
         )
       end
     end
+
+    it 'passed the product_ids' do
+      product_ids = ['product_1']
+      with_mocked_verifier(receipt_collection) do
+        subject.verify_subscription(
+          data, secret, product_ids
+        ).must_be_same_as receipt_collection
+        assert_recorded([production_endpoint, data, secret, product_ids])
+      end
+    end
   end
 
   private
@@ -134,8 +144,17 @@ describe CandyCheck::AppStore::Verifier do
     CandyCheck::AppStore::VerificationFailure.fetch(code)
   end
 
-  DummyAppStoreVerification = Struct.new(:endpoint, :data, :secret) do
+  class DummyAppStoreVerification
+    attr_reader :endpoint, :data, :secret, :product_ids
     attr_accessor :results
+
+    def initialize(endpoint, data, secret, product_ids = nil)
+      @endpoint = endpoint
+      @data = data
+      @secret = secret
+      @product_ids = product_ids
+    end
+
     def call!
       results.shift
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: candy_check
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jonas Thiel
@@ -362,8 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Check and verify in-app receipts