rm_vendor 0.2 → 0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmUyNjMyYjdhMWI4YTZhYjBjYTgzODZlNjBhODM2YTUyNTJkYTQ5OA==
+    YjUyYzdhMWQ5OTY1OTdmOGEyYmJlODQzYjk5ZmRhNDlhN2I4OWIzOQ==
   data.tar.gz: !binary |-
-    OWY1YmEwZjYyZmRjMjgyOTc5ZTA4YzkzZjEyNjczMDBmM2E3YmQ5Ng==
+    YjFlNDA4NTkyMjA3ZDAxYThmZmZiNTBhNDlhOTk2ODZlOGJiOTkxZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTY2NjEwMjlmNjQxMjgwY2RiMjM5MTNmN2IxZTAyYWY0NjdjYWQyOTU0ZjIx
-    YTFkOTBjMDkxZGMyNzczMjFjYWQzNDU1MzE2MGUxNjRhYTU4MTg4ZWY4ZjY4
-    NTJhODc2NjQ0YmY2ZGUwZDM5NWJhZjcyNTEwN2YxNzdjMTcyYzc=
+    MjlkYWJiMDNmNjIwODVhYWIxM2ZlNjdhYWVkZWY4MjczZmJkNTUzOTZhMWMz
+    NGNkYzBhMWU5ZmRmYzVlZDI3MTQxODE2YjVhODY1NTNjNWExYThhZThmOThj
+    NTdkOTczY2U4ZWMxZTNmODhkMWYwNzY3OGNjYTMxMWZiMTg4NDQ=
   data.tar.gz: !binary |-
-    Zjc0OTc0MGM1OTJkODRkYTMyYWE3YmJmMWRkMzAzZGVlYTNmNDg2Njg3YjJl
-    YmU5MmZiOTUwZDcwMzNjN2M1ZDllOTFkM2Y1NzhlMDIzODZkYjdhYmVlNDBh
-    NTM5NjUyNGJmYjU5N2Q0OWQ5NTY2NzA4M2Q4ZTc0NWUxM2I3Yzc=
+    NWJiY2EwZGMwNjJhYTI5NGM2MjIzZDIwNDE1NzY3ZjExNjZhNGEyNWRjOGZj
+    ZjQ5NjBmYTVkN2ZiMWJhNmE5NjM3ZTM2ZTczYmMxMTk0MjlkN2I5Y2I3ZDI5
+    Yjk1NzA3OGQ2NDkyOGE1Nzc3OTEzMTk1Mjc5NjkzYzVjNTI3MDY=

data/README.md

@@ -14,19 +14,18 @@ And then execute:
 
 #### Initialize.
 
-Initialize your product with your In App Purchase ID. Vendor will check if the product exists and return it's attributes:
+Initialize your products with your In App Purchase ID. Vendor will check if the product exists and return it's attributes:
     
 ```Ruby
-@product = Vendor::Product.new(:id => "com.your.item.id") do |product|
-  p "Product exists: #{product.success}"
-  p "Product response: #{product.response}"
+@products = Vendor::Products.new([{:name => "first_item", :id => "com.your.first_item.id"}, {:name => "second_item", :id => "com.your.second_item.id"}]) do |products|
+  products.map{ |product| NSLog "Product exists?: #{product.success}" }
 end
 ```
 
 You don't need to pass along a block though. If you're sure your product exists, then you can just do this:
       
 ```Ruby
-@product = Vendor::Product.new(:id => "com.your.item.id")
+@products = Vendor::Products.new([{:name => "first_item", :id => "com.your.first_item.id"}, {:name => "second_item", :id => "com.your.second_item.id"}])
 ```
 
 #### Get product info.
@@ -34,10 +33,10 @@ You don't need to pass along a block though. If you're sure your product exists,
 After you've initialized your product, you get its information:
   
 ```Ruby
-@product.price
-@product.title
-@product.description
-@product.bought?
+@product[:first_item].price
+@product[:first_item].title
+@product[:first_item].description
+@product[:first_item].bought?
 ```
 
 #### Purchase product.
@@ -45,7 +44,7 @@ After you've initialized your product, you get its information:
 To purchase a product, simply do:
 
 ```Ruby
-@product.purchase do |product|
+@product[:first_item].purchase do |product|
   p "Purchase successful: #{product.success}"
   p "Purchase transaction: #{product.transaction}"
 end
@@ -56,16 +55,15 @@ end
 Vendor also works with subscriptions. To initialize a subscription:
 
 ```Ruby
-@subscription = Vendor::Product.new(:id => "com.your.subscription.id", :secret => "abcdefg12345", :subscription => true) do |subscription|
-  p "Subscription exists: #{subscription.success}"
-  p "Subscription response: #{subscription.response}"
+@subscription_products = Vendor::Products.new([{:name => "subscription", :id => "com.your.subscription.id", :secret => "abcdefg12345", :subscription => true}]) do |subscriptions|
+  subscriptions.map{ |subscription| NSLog "Subscription exists?: #{subscription.success}" }
 end
 ```
 
 To purchase a subscription:
 
 ```Ruby
-@subscription.purchase do |subscription|
+@subscription_products[:subscription].purchase do |subscription|
   p "Subscription successful: #{subscription.success}"
   p "Subscription transaction: #{subscription.transaction}"
 end
@@ -74,8 +72,8 @@ end
 To see wether product is registered as a subscription and if user is currently subscribed:
 
 ```Ruby
-@subscription.subscribed?
-@subscription.subscription?
+@subscription_products[:subscription].subscribed?
+@subscription_products[:subscription].subscription?
 ```
 
 ## Example App.

data/lib/Vendor.rb

@@ -23,5 +23,5 @@ Motion::Project::App.setup do |app|
   
   app.pods ||= Motion::Project::CocoaPods.new(app)
   app.pods.pod 'CocoaSecurity', '~> 1.2.1'
-  app.pods.pod 'AFNetworking', '~> 1.3.3'
+  app.pods.pod 'CargoBay', :git => 'https://github.com/holgersindbaek/CargoBay'
 end

data/lib/project/buy.rb

@@ -2,8 +2,7 @@ module Vendor
   class Buy
     attr_accessor :params, :block, :request_operation_queue
 
-    def initialize(params)
-      @params = params
+    def initialize
       SKPaymentQueue.defaultQueue.addTransactionObserver(self)
     end
 
@@ -14,12 +13,14 @@ module Vendor
 
 
     # PUBLIC METHODS
-    def purchase(&block)
+    def purchase(params, &block)
+      @params = params
       @block = block
       SKPaymentQueue.defaultQueue.addPayment(SKPayment.paymentWithProductIdentifier(@params.id))
     end
 
-    def restore(&block)
+    def restore(params, &block)
+      @params = params
       @block = block
       SKPaymentQueue.defaultQueue.restoreCompletedTransactions
     end
@@ -29,13 +30,13 @@ module Vendor
     # DELEGATE METHODS
     def finishTransaction(transaction, success:success)
       SKPaymentQueue.defaultQueue.finishTransaction(transaction)
-      SKPaymentQueue.defaultQueue.removeTransactionObserver(self)
-      
+      return if @params.nil?
+      password = @params.secret=="no_secret" ? nil : @params.secret
+
       if success
+        # Verify transaction receipt
         Vendor::Receipt.new(transaction.transactionReceipt, @params) do |block|
-          result_object = BW::JSON.parse(block.object).to_object
-          valid_receipt = block.success && result_object.status.to_i == 0
-
+          valid_receipt = block[:success] && block[:object][:status]==0
           @block.call({success: valid_receipt, transaction: transaction}.to_object) unless @block.blank?
         end
       else

data/lib/project/info.rb

@@ -12,7 +12,10 @@ module Vendor
       productsRequest.start
 
       # Update receipt if bought and subscription
-      Vendor::Receipt.new(NSUserDefaults["#{@params.id}.receipt_data"], @params) if bought? && subscription?
+      receipt = NSUserDefaults["#{@params.id}.receipt"]
+      decoder = CocoaSecurityDecoder.new
+      latest_receipt_data = decoder.base64(receipt[:latest_receipt])
+      Vendor::Receipt.new(latest_receipt_data, @params) if bought? && subscription?
     end
 
 
@@ -40,22 +43,26 @@ module Vendor
     end
 
     def subscribed?
-      return false if !subscription?
-      receipt_object = BW::JSON.parse(NSUserDefaults["#{@params.id}.receipt"]).to_object
-      return false if receipt_object.blank? || receipt_object.status!=0
+      # Return false if product is not a subscription or not bought
+      return false if !subscription? || !bought?
+      receipt = NSUserDefaults["#{@params.id}.receipt"]
+      return false if receipt[:status].to_i!=0
 
+      # Get the latest receipt
+      receipt = NSUserDefaults["#{@params.id}.receipt"]
       decoder = CocoaSecurityDecoder.new
-      latest_receipt_data = decoder.base64(receipt_object.latest_receipt)
+      latest_receipt_data = decoder.base64(receipt[:latest_receipt])
       latest_receipt_plist = NSPropertyListSerialization.propertyListWithData(latest_receipt_data, options:NSPropertyListImmutable, format:nil, error:nil)
 
+      # Get the time for the latest receipt
       purchase_info_data = decoder.base64(latest_receipt_plist.objectForKey("purchase-info"))
       purchase_info_plist = NSPropertyListSerialization.propertyListWithData(purchase_info_data, options:NSPropertyListImmutable, format:nil, error:nil)
-      purchase_info_plist = NSPropertyListSerialization.propertyListWithData(purchase_info_data, options:NSPropertyListImmutable, format:nil, error:nil)
 
+      # Manipulate the time for the latest receipt
       expires_date = purchase_info_plist.objectForKey("expires-date")
-      # ap "expires_date: #{expires_date}"
       expires_calc = expires_date.to_i/1000
 
+      # Check if the latest receipt is too old
       return expires_calc > NSDate.date.timeIntervalSince1970
     end
 
@@ -79,6 +86,5 @@ module Vendor
     def request(request, didFailWithError:error)
       @block.call({success: false, error: error}.to_object)
     end
-
   end
 end

data/lib/project/product.rb

@@ -2,20 +2,11 @@ module Vendor
   class Product
     attr_reader :params, :block, :exists, :info, :buy
 
-    def initialize(options={}, &block)
-      # Set default options
-      default_options = {
-        :id => "no_id",
-        :secret => "no_secret",
-        :subscription => false,
-        :price => "0.99",
-        :title => "No Title",
-        :desc => "No Description."
-      }
-
-      # Set global params and block
-      options = default_options.merge(options)
-      @params = options.to_object
+    def initialize(options, buy_class, &block)
+
+      # Set params and block
+      @buy = buy_class
+      @params = options
       @block = block
 
       # Raise argument error if id is not included
@@ -27,20 +18,17 @@ module Vendor
         @exists = block.success
         @block.call(block) unless @block.nil?
       end
-
-      # Initialize purchase
-      @buy = Vendor::Buy.new(@params)
     end
 
 
 
     # PURCHASE METHODS
     def purchase(&block)
-      @buy.purchase { |result| block.call(result)}
+      @buy.purchase(@params) { |result| block.call(result)}
     end
 
     def restore(&block)
-      @buy.restore { |result| block.call(result)}
+      @buy.restore(@params) { |result| block.call(result)}
     end
 
 

data/lib/project/products.rb

@@ -0,0 +1,43 @@
+module Vendor
+  class Products
+    attr_reader :block, :products
+
+    def [](key)
+      return @products.select{ |p| p.params[:name]==key.to_s }.first
+    end
+
+    def initialize(products=[], &block)
+      # Set up products array
+      @products = []
+
+      # Set up block
+      @block = block
+
+      # Set up blocks for giving a callback
+      @blocks = []
+
+      # Initialize buy block
+      @buy = Vendor::Buy.new
+
+      # Set up info for products
+      products.each do |product|
+        # Set default options
+        default_options = {
+          :id => "no_id",
+          :secret => "no_secret",
+          :subscription => false,
+          :price => "0.99",
+          :title => "No Title",
+          :desc => "No Description."
+        }
+        options = default_options.merge(product)
+
+        # Update product and set exists variable
+        @products << Vendor::Product.new(options.to_object, @buy) do |block|
+          @blocks << block
+          @block.call(@blocks) unless @block.nil? || @blocks.count!=@products.count
+        end
+      end
+    end
+  end
+end

data/lib/project/receipt.rb

@@ -1,41 +1,25 @@
 module Vendor
   class Receipt
 
-    attr_reader :receipt_data, :params, :request_operation_queue, :block
+    attr_reader :receipt_data, :params, :block
 
     def initialize(receipt_data, params, &block)
       @receipt_data = receipt_data
       @params = params
       @block = block
-      @request_operation_queue = NSOperationQueue.alloc.init
 
       check_receipt(receipt_data)
     end
 
     def check_receipt(receipt_data)
-      encoder = CocoaSecurityEncoder.new
-      json_data = {"receipt-data" => encoder.base64(receipt_data)}
-      json_data[:password] = @params.secret if @params.secret != "no_secret"
-      server = App.development? ? "sandbox" : "buy"
-      base_url = NSURL.URLWithString("https://#{server}.itunes.apple.com")
+      password = @params.secret != "no_secret" ? @params.secret : nil
 
-      # TODO - Could look nicer. Dunno if AFMotion could be used instead.
-      client = AFHTTPClient.alloc.initWithBaseURL(base_url)
-      client.setDefaultHeader("Accept", value:"application/json")
-      client.registerHTTPOperationClass(AFJSONRequestOperation.class)
-      client.setParameterEncoding(AFJSONParameterEncoding)
-      AFJSONRequestOperation.addAcceptableContentTypes(NSSet.setWithObject("text/plain"))
-
-      request = client.requestWithMethod("POST", path:"verifyReceipt", parameters:json_data)
-      request_operation = client.HTTPRequestOperationWithRequest(request, success: lambda { |operation, response_object|
-        NSUserDefaults["#{@params.id}.receipt_data"] = receipt_data
-        NSUserDefaults["#{@params.id}.receipt"] = response_object
-        @block.call({success: true, object: response_object}.to_object) unless @block.blank?
-      }, failure: lambda {|operation, error|
+      CargoBay.sharedManager.verifyTransactionReceipt(receipt_data, password:password, success:lambda { |receipt|
+        NSUserDefaults["#{@params.id}.receipt"] = receipt
+        @block.call({success: true, object: receipt}.to_object) unless @block.blank?
+      }, failure: lambda { |error|
         @block.call({success: false, error: error}.to_object) unless @block.blank?
       })
-
-      @request_operation_queue.addOperation(request_operation)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm_vendor
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Holger Sindbaek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,6 +78,7 @@ files:
 - lib/project/buy.rb
 - lib/project/info.rb
 - lib/project/product.rb
+- lib/project/products.rb
 - lib/project/receipt.rb
 - lib/Vendor.rb
 homepage: https://github.com/holgersindbaek/Vendor