helu 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63367011c2bac9119e14a1eec6a5b2216406181b
-  data.tar.gz: 55cdd3775667b53eb18ab3549bec8d10a03f64c1
+  metadata.gz: 53fb21dab5afe5f99d560e4326b61e8222040089
+  data.tar.gz: 743acc254c9f25923817058f0028d1ddbf35fc2c
 SHA512:
-  metadata.gz: 309593bf1d36c34ca54c1754e7d1eedba3039871f5f068b2aff12ddac6201cb57f6d4b9c17b2c9d2db4d001f411d95436d4ebb6657f2f1c966410ec7a6edf992
-  data.tar.gz: 58b695a813139495f55fd1de3222d17bf4dfca018e8f9a8915891251a099d8dac78c95b61506d7041f6145463512da33ee08e2ccf81555988bfa5b77e8a990b3
+  metadata.gz: 45cae952adc479e019b24bce56d7c64e7a5ab68aa5d4545b3736e0220099b8848ca167e16e3df84d72f67f0c53ed8a1880d010497dd5778630511e374e4bf7cf
+  data.tar.gz: 41dff4c9c13efa64328622dfa0543996fb0eefbd8c5ec0078bed9c5cfbb655b61685986efab632adbb4b2b5bacc5ad46a8b10e64d74c7b12b39aba142f7437b5

data/README.md

@@ -1,7 +1,10 @@
-# helu
+# Helu
 
 [![Build Status](https://travis-ci.org/ivanacostarubio/helu.png)](https://travis-ci.org/ivanacostarubio/helu)
 
+In-App purchases for RubyMotion.
+
+![Money](https://raw.github.com/ivanacostarubio/helu/readme/resources/money.jpg)
 
 ## Installation
 
@@ -16,6 +19,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install helu
+    
 
 ## USAGE
 
@@ -47,17 +51,62 @@ The transaction object on the lambda is the one we get from Apple; Therefore, it
 	@helu.restore
 
 
-### Make sure that if your code ever throws out the Helu object, it better also close the store before doing so.
+#### Make sure that if your code ever throws out the Helu object, it better also close the store before doing so.
 
     @helu.close
 
+### Supported types of In App Purchases
+
++ Consumables and Non-Consumables are supported. 
++ Auto-Renewable subscriptions and Non-Renewing Subscriptions are not supported yet. However, we would love some help making it happen. 
+
+### Requesting product information: 
+
+Asynchronous, raw:
+
+    inapps = %w[first second third]
+    @x = Helu::ProductInfoFetcher.new(inapps) do |pi|
+      p pi
+    end
+
+Asynchronous, wrapped in method call:
+
+    Helu::ProductInfoFetcher.fetch(inapps) do |pi|
+      p pi
+    end
+
+Synchronous:
+
+    pi = Helu::ProductInfoFetcher.fetch(inapps)
+    p pi
+
+
+All three calls return hash of the following form:
+
+    {
+      "inapp_id": {
+        id: "inapp_id",
+        title: "inapp_localized_title",
+        description: "inapp_localized_description",
+        price: "0.89", # float
+        currency: "EUR",
+        price_str: "\u20AC0.89",
+      }, # .... 
+    }
+
 
 ## Example App: 
 
-[You can find an example app here](https://github.com/ivanacostarubio/helu-example). Remember that for this to work properly, you must add your app identifier to the Rakefile.
-    
-    
-## Supported types of In App Purchases
+[You can find an example app here](https://github.com/ivanacostarubio/helu-example). 
+Remember that for this to work properly, you must add your app identifier to the Rakefile.
+ 
 
-+ Consumables and Non-Consumables are supported. 
-+ Auto-Renewable subscriptions and Non-Renewing Subscriptions are not supported yet. However, we would love some help making it happen. 
+## License
+
+Helu is relase under the [MIT license](http://opensource.org/licenses/MIT).
+
+## Credits
+
+Ivan Acosta-Rubio   | Initial work
+Michal J.           | Product Info Fetcher
+Simon Traels Ravn   | Removing Observer and Bug fixes.

data/lib/helu.rb

@@ -5,4 +5,5 @@ end
 lib_dir_path = File.dirname(File.expand_path(__FILE__))
 Motion::Project::App.setup do |app|
   app.files.unshift(Dir.glob(File.join(lib_dir_path, "project/**/*.rb")))
+  app.frameworks << "StoreKit"
 end

data/lib/project/fake_helu.rb

@@ -0,0 +1,35 @@
+class FakeHelu
+  attr_reader :product_id
+  attr_accessor :storage, :winning, :restore, :fail
+
+  def initialize(product_id)
+    @produc_id = product_id
+  end
+
+  def bought?
+    #TODO. Be able to switch this
+    false
+  end
+
+  def close
+    # just implementing Helu's interface
+  end
+
+  def buy
+    winning.call(fake_transaction)
+  end
+
+  def fake_fail
+    # TODO: We need to implement a way to fake a fail
+  end
+
+  def restore
+    winning.call(fake_transaction)
+  end
+
+  private 
+
+  def fake_transaction
+    ""
+  end
+end

data/lib/project/helu.rb

@@ -3,6 +3,13 @@ class Helu
   attr_reader :product_id
   attr_accessor :storage, :winning, :restore, :fail
 
+  class <<self
+    # see product_info_fetcher.rb for info
+    def fetch_product_info(*products, &b)
+      ProductInfoFetcher.fetch(*products, &b)
+    end
+  end
+
   def initialize(product_id)
     @product_id = product_id
     SKPaymentQueue.defaultQueue.addTransactionObserver(self)
@@ -26,11 +33,8 @@ class Helu
     @storage.all.include?(product_id)
   end
 
-#  private
-
   def finishTransaction(transaction, wasSuccessful:wasSuccessful)
     SKPaymentQueue.defaultQueue.finishTransaction(transaction)
-    produt_id = transaction.payment.productIdentifier
     if wasSuccessful 
       @winning.call(transaction)
       storage.add(product_id)
@@ -48,11 +52,9 @@ class Helu
   end
 
   def failedTransaction(transaction)
-    produt_id = transaction.payment.productIdentifier
-
-    if (transaction.error.code != SKErrorPaymentCancelled)
+    if transaction.error && (transaction.error.code != SKErrorPaymentCancelled)
       finishTransaction(transaction, wasSuccessful:false)
-    elsif transaction.error.code == SKErrorPaymentCancelled
+    elsif transaction.error && (transaction.error.code == SKErrorPaymentCancelled)
       @fail.call(transaction)
     else
       SKPaymentQueue.defaultQueue.finishTransaction(transaction)
@@ -119,4 +121,4 @@ class Helu
 
   end
 
-end
+end

data/lib/project/product_info_fetcher.rb

@@ -0,0 +1,115 @@
+=begin
+# Sample use:
+## Asynchronous, raw:
+inapps = %w[first second third]
+@x = Helu::ProductInfoFetcher.new(inapps) do |pi|
+  p pi
+end
+
+## Asynchronous, wrapped in method call:
+Helu::ProductInfoFetcher.fetch(inapps) do |pi|
+  p pi
+end
+
+## Synchronous:
+pi = Helu::ProductInfoFetcher.fetch(inapps)
+p pi
+
+
+# All three calls return hash of the following form:
+# {
+#   "inapp_id": {
+#     id: "inapp_id",
+#     title: "inapp_localized_title",
+#     description: "inapp_localized_description",
+#     price: "0.89", # float
+#     currency: "EUR",
+#     price_str: "\u20AC0.89",
+#   },
+#   # ...
+# }
+=end
+class Helu
+  class ProductInfoFetcher
+    @@mutex = Mutex.new
+    @@cache = {}
+    def initialize(*products, &b)
+      raise LocalJumpError, "block expected" if b.nil?
+      @callback = b
+      @products = products.flatten
+
+      # all cached? skip the call...
+      if (@@cache.keys & @products).sort == @products.sort
+        h = @products.inject({}) { |m, prod| m[prod] = @@cache[prod]; m }
+        @callback.call(h)
+      else
+        @sr = SKProductsRequest.alloc.initWithProductIdentifiers(@products)
+        @sr.delegate = self
+        @sr.start
+      end
+
+      self
+    end
+
+    def productsRequest(req, didReceiveResponse: resp)
+      if resp.nil?
+        @callback.call(nil)
+      else
+        h = resp.products.inject({}) { |m, prod|
+          m.merge(sk_to_hash(prod))
+        }
+        @@mutex.synchronize { @@cache.merge!(h) }
+        @callback.call(h)
+      end
+    end
+
+    private
+
+    def sk_to_hash(sk)
+      nf = NSNumberFormatter.alloc.init
+      nf.setFormatterBehavior(NSNumberFormatterBehavior10_4)
+      nf.setNumberStyle(NSNumberFormatterCurrencyStyle)
+      nf.setLocale(sk.priceLocale)
+      price_str = nf.stringFromNumber(sk.price)
+
+      {
+        sk.productIdentifier => {
+        id: sk.productIdentifier,
+        title: sk.localizedTitle,
+        description: sk.localizedDescription,
+        price: sk.price,
+        currency: sk.priceLocale.objectForKey(NSLocaleCurrencyCode),
+        price_str: price_str,
+      }
+      }
+    end
+
+    class <<self
+      # make a sync call out of an async one
+      def call_synchronized(method, *args)
+        finished = false
+        result = nil
+        send(method, *args) do |res|
+          result = res
+          finished = true
+        end
+        sleep 0.1 until finished
+        result
+      end
+
+      def fetch(*products, &b)
+        products.flatten!
+        if b.nil?
+          call_synchronized(:fetch, *products)
+        else
+          new(*products, &b)
+        end
+      end
+
+      def clear_cache
+        @@mutex.synchronize { @@cache = {} }
+      end
+    end
+
+  end
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: helu
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Ivan Acosta-Rubio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'RubyMotion :: StoreKit Wrapper :: Allows In App Purchases '
@@ -33,7 +33,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/helu.rb
+- lib/project/fake_helu.rb
 - lib/project/helu.rb
+- lib/project/product_info_fetcher.rb
 homepage: http://www.ivanacostarubio.com
 licenses:
 - MIT
@@ -44,17 +46,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RubyMotion StoreKit Wrapper