ProMotion-iap 0.2.0 → 0.2.1.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58cbbb9a1bfea9bed76bf23bcf61cb8c538bc17
-  data.tar.gz: 2dd27741089d27722aa8a4e7e4fa2fb1153cf75c
+  metadata.gz: 04b7803087c35db767148574597a8ab7ab362330
+  data.tar.gz: 6e75db90ae31c40bc2ba8559202e8e12c4ef8a75
 SHA512:
-  metadata.gz: a15d8be62ab306ff6fb4fa1ac41736a62f92db1c66e27a1c7a330ec510293c8549c020e459575372c6cd1deaded3cc7709e57e0193c51756524afb727e49140c
-  data.tar.gz: c681697056432c9dee095f61392f4dd7b60bb10a4d9da50f13c081364cda6b26ac89444bcbf375757c3b609d98dc14cd06f78914367ec9be51e44716750a0a46
+  metadata.gz: 5f62e32f616300fcce8a2b39e40a74fcb7464af606eb950554f44c14adeb1fbd92f25386675d56de58dc19d28d78f6ca614c86f4c351e4c32285889d239ac0fd
+  data.tar.gz: 64d667a643c98e2c8bb0b64dec33ab25e019edfcc2db8432def098d79e8dc61a1d7886a10bcabfc08eeb7a39d6bfa7295d8819e343cb22c793f49dd0bd6b9c22

data/README.md

@@ -1,7 +1,7 @@
 # ProMotion-iap
 
 [![Gem Version](https://badge.fury.io/rb/ProMotion-iap.svg)](http://badge.fury.io/rb/ProMotion-iap)
-[![Build Status](https://travis-ci.org/clearsightstudio/ProMotion-iap.svg)](https://travis-ci.org/clearsightstudio/ProMotion-iap) 
+[![Build Status](https://travis-ci.org/clearsightstudio/ProMotion-iap.svg)](https://travis-ci.org/clearsightstudio/ProMotion-iap)
 
 ProMotion-iap is in-app purchase notification support for the
  popular RubyMotion gem [ProMotion](https://github.com/clearsightstudio/ProMotion).
@@ -42,7 +42,7 @@ class PurchaseScreen < PM::Screen
       }
     end
 
-    product.purchase do |status, transaction|
+    product.purchase do |status, data|
       case status
       when :in_progress
         # Usually do nothing, maybe a spinner
@@ -54,13 +54,16 @@ class PurchaseScreen < PM::Screen
         # They just canceled, no big deal.
       when :error
         # Failed to purchase
-        transaction.error.localizedDescription # => error message
+        data[:error].localizedDescription # => error message
       end
     end
 
-    product.restore do |status, product|
+    product.restore do |status, data|
       if status == :restored
         # Update your UI, notify the user
+        # data is a hash with :product_id, :error, and :transaction
+      else
+        # Tell the user it failed to restore
       end
     end
 
@@ -113,7 +116,7 @@ class PurchaseScreen < PM::Screen
       }, {...}]
     end
 
-    purchase_iap "productid" do |status, transaction|
+    purchase_iaps [ "productid" ], username: User.current.username do |status, transaction|
       case status
       when :in_progress
         # Usually do nothing, maybe a spinner
@@ -129,9 +132,16 @@ class PurchaseScreen < PM::Screen
       end
     end
 
-    restore_iaps "productid" do |status, products|
+    restore_iaps [ "productid" ], username: User.current.username do |status, data|
       if status == :restored
         # Update your UI, notify the user
+        # This is called once for each product you're trying to restore.
+        data[:product_id] # => "productid"
+      elsif status == :error
+        # Update your UI to show that there was an error.
+        # This will only be called once, no matter how many products you are trying to restore.
+        # You'll get an NSError in your `data` hash.
+        data[:error].localizedDescription # => description of error
       end
     end
 
@@ -155,7 +165,7 @@ Prompts the user to login to their Apple ID and complete the purchase. The callb
 #### restore_iaps(`*`product_ids, &callback)
 
 Restores a previously purchased IAP to the user (for example if they have upgraded their device). This relies on the Apple ID the user
- enters at the prompt. Unfortunately, if there is no purchase to restore for the signed-in account, no error message is generated and 
+ enters at the prompt. Unfortunately, if there is no purchase to restore for the signed-in account, no error message is generated and
  will fail silently.
 
 

data/lib/ProMotion-iap.rb

@@ -4,9 +4,9 @@ unless defined?(Motion::Project::Config)
   raise "ProMotion-iap must be required within a RubyMotion project."
 end
 
-Motion::Project::App.setup do |app|
+Motion::Project::App.pre_setup do |app|
   lib_dir_path = File.dirname(File.expand_path(__FILE__))
-  app.files << File.join(lib_dir_path, "ProMotion/iap.rb")
-  app.files << File.join(lib_dir_path, "ProMotion/product.rb")
+  app.files.unshift File.join(lib_dir_path, "ProMotion/product.rb")
+  app.files.unshift File.join(lib_dir_path, "ProMotion/iap.rb")
   app.frameworks << "StoreKit"
 end

data/lib/ProMotion/iap.rb

@@ -2,23 +2,32 @@ module ProMotion
   module IAP
     attr_accessor :completion_handlers
 
-    def purchase_iaps(*product_ids, &callback)
+    def purchase_iaps(product_ids, options={}, &callback)
       iap_setup
       retrieve_iaps product_ids do |products|
         products.each do |product|
           self.completion_handlers["purchase-#{product[:product_id]}"] = callback
-          payment = SKPayment.paymentWithProduct(product[:product])
+
+          payment = SKMutablePayment.paymentWithProduct(product[:product])
+          payment.applicationUsername = options[:username] if options[:username]
+
           SKPaymentQueue.defaultQueue.addPayment(payment)
         end
       end
     end
     alias purchase_iap purchase_iaps
 
-    def restore_iaps(*product_ids, &callback)
+    def restore_iaps(product_ids, options={}, &callback)
       iap_setup
-      retrieve_iaps product_ids do |products|
+      retrieve_iaps Array(product_ids) do |products|
         products.each do |product|
           self.completion_handlers["restore-#{product[:product_id]}"] = callback
+        end
+        self.completion_handlers["restore-all"] = callback # In case of error
+
+        if options[:username]
+          SKPaymentQueue.defaultQueue.restoreCompletedTransactionsWithApplicationUsername(options[:username])
+        else
           SKPaymentQueue.defaultQueue.restoreCompletedTransactions
         end
       end
@@ -47,6 +56,7 @@ module ProMotion
     end
 
     def iap_shutdown
+      @completion_handlers = nil
       SKPaymentQueue.defaultQueue.removeTransactionObserver(self)
     end
 
@@ -79,18 +89,41 @@ module ProMotion
     end
 
     def iap_callback(status, transaction, finish=false)
-      product_id = transaction.payment.productIdentifier
+      product_id = transaction_product_id(transaction)
+
       if self.completion_handlers["purchase-#{product_id}"]
-        self.completion_handlers["purchase-#{product_id}"].call status, transaction
+        self.completion_handlers["purchase-#{product_id}"].call status, mapped_transaction(transaction)
         self.completion_handlers["purchase-#{product_id}"] = nil if finish
       end
+
       if self.completion_handlers["restore-#{product_id}"]
-        self.completion_handlers["restore-#{product_id}"].call status, transaction
+        self.completion_handlers["restore-#{product_id}"].call status, mapped_transaction(transaction)
         self.completion_handlers["restore-#{product_id}"] = nil if finish
       end
+
       SKPaymentQueue.defaultQueue.finishTransaction(transaction) if finish
     end
 
+    def mapped_transaction(transaction)
+      if transaction.respond_to?(:payment)
+        {
+          product_id:   transaction.payment.productIdentifier,
+          error:        transaction.error,
+          transaction:  transaction
+        }
+      else
+        {
+          product_id:   nil,
+          error:        transaction,
+          transaction:  nil
+        }
+      end
+    end
+
+    def transaction_product_id(transaction)
+      transaction.respond_to?(:payment) ? transaction.payment.productIdentifier : "all"
+    end
+
     public
 
     # SKProductsRequestDelegate methods
@@ -99,7 +132,6 @@ module ProMotion
       unless response.invalidProductIdentifiers.empty?
         red = "\e[0;31m"
         color_off = "\e[0m"
-        puts "#{red}PM::IAP Error - invalid product identifier(s) '#{response.invalidProductIdentifiers.join("', '")}' for application identifier #{NSBundle.mainBundle.infoDictionary['CFBundleIdentifier'].inspect}#{color_off}"
       end
       retrieved_iaps_handler(response.products, &self.completion_handlers["retrieve_iaps"]) if self.completion_handlers["retrieve_iaps"]
       @products_request = nil
@@ -132,6 +164,10 @@ module ProMotion
       end
     end
 
+    def paymentQueue(_, restoreCompletedTransactionsFailedWithError:error)
+      iap_callback(:error, error)
+    end
+
   end
 end
-::PM = ProMotion unless defined?(::PM)
+::PM = ProMotion unless defined?(PM)

data/lib/ProMotion/product.rb

@@ -1,6 +1,6 @@
 module ProMotion
   class IAP::Product
-    include PM::IAP
+    include ProMotion::IAP
 
     attr_reader :product_id
 
@@ -24,4 +24,5 @@ module ProMotion
       end
     end
   end
-end
+end
+::PM = ProMotion unless defined?(PM)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-iap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1.beta1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-stump
@@ -80,12 +80,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Adds in-app purchase support to ProMotion.