rm_vendor 0.3.2 → 0.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGI5ODE0ZjIxODM0ODNiYjMyZjY0ZWQ3NjgwZmNmNGRkZjRhNzA0Nw==
+    NDliOWI1YWQ0YzEzMGE3OTY5OTA0YzczZDA1Y2ZjY2YwNjI5NjUzMA==
   data.tar.gz: !binary |-
-    MjVhYTZkOTkyNWZlMWY5MWYwNzlhNTQyYThiNzJkNmM0NTQ4ZjJiYQ==
+    MzUyMTllMDFiYzFhYTk0ZTExYjAxNDAyNjFlYzc0MjViYzZmNWU2MA==
 SHA512:
   metadata.gz: !binary |-
-    OGQyNjE0ZGExZjA5ZjI0NGQ3OGY5NTI5ZjE1OWNkODA1YjhkYjY0MWQyYTI5
-    YWE4N2U4MzU3MDVmN2FlZGIzMDcyYmRjMTRjMDkzNTZiYzI2YTZmOGZlMjhi
-    YWM4YzNkNGRlMWY1ODViY2IxMTNhM2UzNTc3MGZmZGIxYjQxYjk=
+    NmU0MWJkMWQ2YmY1MmIzMWQ5YTA5OGM2ZTZhYjA0MTU0YmRlMzY4MGQwNjEz
+    Mjc3MWY2MDFkZGYxM2Q0MGQ2OTk3ZTM2ZmJiZWRjMTcyM2ZjN2E3NmM4ZmNm
+    YjRmNDQxZDE4ODZkMDljYjM3YmJkMjNiOWYxYWYwZThmNmQxMjQ=
   data.tar.gz: !binary |-
-    YTYyMjcwNGFmZjg4MWEyNjk3MGFjYmQyMGU4YTk1YmQxNTQ1NzA3MGUxYmM0
-    ZjIzZjQ5ZjYxYzZmZjI1MGYwNmMxODgyYzU4NTFkM2U1ZDk2ZWE0NTNhNzNk
-    YTdkNDYyM2EyZjk0MzkyZDExMDYyMTlhN2NmOThmNTE5ZTM5MjI=
+    ODgzYWNkOTNmZmQ2MjNhODdhNjA4MjVjZjI0ODlkMTkxNjFlZGJiYTExZmE1
+    ZGNlZTdjNWI4OTg4ZmFiNDQwODc3YWU4Nzk1NWYzMTJmZDRmNzc2MmRlOGQy
+    NTdhNDFhOWEzMjMwNTIxZmJjZjE4YTE3ZGQ4ODU4NGU1ODEwMTc=

data/lib/Vendor.rb

@@ -9,19 +9,15 @@ require 'sugarcube-nsuserdefaults'
 require 'sugarcube-files'
 require 'motion-cocoapods'
 
-unless defined?(Motion::Project::Config)
-  raise "This file must be required within a RubyMotion project Rakefile."
-end
-
-require 'motion/project/template/ios'
-
 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']
-  
-  app.pods ||= Motion::Project::CocoaPods.new(app)
-  app.pods.pod 'CocoaSecurity'
-  app.pods.pod 'CargoBay', '~> 2.0.2'
+
+  if !App.osx?
+    app.pods ||= Motion::Project::CocoaPods.new(app)
+    app.pods.pod 'CocoaSecurity'
+    app.pods.pod 'CargoBay', '2.0.0'
+  end
 end

data/lib/project/buy.rb

@@ -16,7 +16,7 @@ module Vendor
     def purchase(params, &block)
       @params = params
       @block = block
-      SKPaymentQueue.defaultQueue.addPayment(SKPayment.paymentWithProductIdentifier(@params.id))
+      SKPaymentQueue.defaultQueue.addPayment(SKPayment.paymentWithProduct(@params.sk_product))
     end
 
     def restore(params, &block)
@@ -33,7 +33,7 @@ module Vendor
       return if @params.nil?
       password = @params.secret=="no_secret" ? nil : @params.secret
 
-      if success
+      if success && !App.osx? # If successfull and ios
         # Verify transaction receipt
         Vendor::Receipt.new(transaction.transactionReceipt, @params) do |block|
           valid_receipt = block[:success] && block[:object][:status]==0

data/lib/project/info.rb

@@ -24,8 +24,22 @@ module Vendor
 
     # INFO METHODS
     def price
-      price = NSUserDefaults["#{@params.id}.price"] || @params.price
-      price.to_f.string_with_style(NSNumberFormatterCurrencyStyle)
+      local_price = NSUserDefaults["#{@params.id}.price"] || @params.price
+      number_formatter = NSNumberFormatter.alloc.init
+      number_formatter.setFormatterBehavior(NSNumberFormatterBehavior10_4)
+      number_formatter.setNumberStyle(NSNumberFormatterCurrencyStyle)
+      number_formatter.setLocale(price_locale)
+
+      currency_string = number_formatter.internationalCurrencySymbol
+      format = number_formatter.positiveFormat
+      format.gsub("¤", currency_string)
+      number_formatter.setPositiveFormat(format)
+
+      return number_formatter.stringFromNumber(local_price)
+    end
+
+    def price_locale
+      @params[:price_locale]==nil ? NSLocale.alloc.initWithLocaleIdentifier("en_US") : @params[:price_locale]
     end
 
     def title
@@ -78,6 +92,7 @@ module Vendor
       if exists
         product = response.products.first
         NSUserDefaults["#{@params.id}.price"] = product.price
+        @params[:price_locale] = product.priceLocale
         NSUserDefaults["#{@params.id}.localizedTitle"] = product.localizedTitle
         NSUserDefaults["#{@params.id}.localizedDescription"] = product.localizedDescription
       end
@@ -89,4 +104,4 @@ module Vendor
       @block.call({success: false, response: nil, error: error}.to_object)
     end
   end
-end
+end 

data/lib/project/product.rb

@@ -16,6 +16,7 @@ module Vendor
       # Update product and set exists variable
       @info = Vendor::Info.new(@params) do |block|
         @exists = block.success
+        @params[:sk_product] = block.response.products.first if block.success
         @block.call(block) unless @block.nil?
       end
     end
@@ -38,6 +39,10 @@ module Vendor
       @info.price
     end
 
+    def price_locale
+      @info.price_locale
+    end
+
     def title
       @info.title
     end

data/lib/project/products.rb

@@ -7,7 +7,6 @@ module Vendor
     end
 
     def initialize(products=[], &block)
-      NSLog "Products initialize"
       # Set up products array
       @products = []
 
@@ -28,8 +27,10 @@ module Vendor
           :secret => "no_secret",
           :subscription => false,
           :price => "0.99",
+          :price_locale => nil,
           :title => "No Title",
-          :desc => "No Description."
+          :desc => "No Description.",
+          :sk_product => nil
         }
         options = default_options.merge(product)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rm_vendor
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Holger Sindbaek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake