ProMotion-iap 0.2.1.beta1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04b7803087c35db767148574597a8ab7ab362330
-  data.tar.gz: 6e75db90ae31c40bc2ba8559202e8e12c4ef8a75
+  metadata.gz: 21816a8d7a6a4ef77dcff985a2720d55563b5a1c
+  data.tar.gz: 837d821b6607553b86cfbf19aab11fcafb89acda
 SHA512:
-  metadata.gz: 5f62e32f616300fcce8a2b39e40a74fcb7464af606eb950554f44c14adeb1fbd92f25386675d56de58dc19d28d78f6ca614c86f4c351e4c32285889d239ac0fd
-  data.tar.gz: 64d667a643c98e2c8bb0b64dec33ab25e019edfcc2db8432def098d79e8dc61a1d7886a10bcabfc08eeb7a39d6bfa7295d8819e343cb22c793f49dd0bd6b9c22
+  metadata.gz: c203f8c34d6698514b6746baf426ca82961efc12fb47bb61ac15b343e72975840df067e7afcda51781038a836ed66d20837ffd7f97d6b127f77a3519601eab7d
+  data.tar.gz: acf138018aa2c1bbcc561edf55832a726171b6e5651dda3bca39b518b7ca1626fe158e36585a767eeb5c875b79b0450aba2785c97e054c1075d818fb0fb90b9b

data/README.md

@@ -4,7 +4,7 @@
 [![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).
+ popular RubyMotion gem [ProMotion](https://github.com/clearsightstudio/ProMotion). It also works as a stand-alone gem if you are not using ProMotion.
 
 ## Installation
 

data/lib/ProMotion-iap.rb

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

data/lib/ProMotion/iap.rb

@@ -47,8 +47,6 @@ module ProMotion
       @completion_handlers ||= {}
     end
 
-    # private methods
-
     private
 
     def iap_setup
@@ -124,6 +122,12 @@ module ProMotion
       transaction.respond_to?(:payment) ? transaction.payment.productIdentifier : "all"
     end
 
+    def transaction_complete?(transactions)
+      states = transactions.map(&:transactionState)
+      return true unless states.include?(SKPaymentTransactionStatePurchasing)
+      false
+    end
+
     public
 
     # SKProductsRequestDelegate methods
@@ -162,6 +166,7 @@ module ProMotion
           end
         end
       end
+      iap_shutdown if transaction_complete?(transactions)
     end
 
     def paymentQueue(_, restoreCompletedTransactionsFailedWithError:error)
@@ -170,4 +175,4 @@ module ProMotion
 
   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 ProMotion::IAP
+    include PM::IAP
 
     attr_reader :product_id
 
@@ -20,9 +20,9 @@ module ProMotion
 
     def restore(&callback)
       restore_iaps(product_id) do |status, products|
-        callback.call status, products.find{|p| p[:product_id] == product_id }
+        product = products.is_a?(Hash) ? products : products.find{|p| p[:product_id] == product_id }
+        callback.call status, product
       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.1.beta1
+  version: 0.2.1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-07-22 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds in-app purchase support to ProMotion.