motion-paddle 1.1.7 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f966fce013a984b0b52631cb2f160658c34a1dbb
-  data.tar.gz: 6a5d6d7415a47bfb5b700632e102230c67dd0b79
+  metadata.gz: 7d64c5106e9c291b97d672fe970da18a8fcfbec2
+  data.tar.gz: d38f55e551cbb2c849e51847c128f07ab0c7ca46
 SHA512:
-  metadata.gz: f384ec9bcceba89d13dbae13cf4e9118b895928906eedc9cae54c7b72f3ad61433e3117dd530366bcd62a411ed51af3c5367258d2428931022c9424decf68464
-  data.tar.gz: e5d6ecb55a33ab9e18279179f7edbc3e0030af3c843e79e2fe7c82d32d12c160dd19080ce8716358ac76012373c15f16c531da900e5d4ee98f7fca6b113bf03b
+  metadata.gz: 5743c663e41558ceb8548243a423b841ea9a386a3b1b121cb2f630b9e406f05b1714b1c1bd8c83d5b9239ca0856dc4899a0107e0f6ce0560e3c4c48c80b94a0c
+  data.tar.gz: ef8171f480fd40e877cf382e64656d10fc94567a69b6c23abf48c345dcd2f2c9d115e0cac809ebdfc9bc3df4c9e6bcb1d0a63e58661cfe68bc4d79b47fe71e36

data/README.md

@@ -77,6 +77,41 @@ def applicationDidFinishLaunching(notification)
 end
 ```
 
+### Choosing which store to build for
+
+Use the `store` environment variable to choose which version of the Paddle framework 
+you wish to use: the one for the Paddle store or for the Mac App Store.
+
+```
+rake store=paddle
+rake store=mas
+```
+
+If you are building an app that will run on both the Paddle store and the Mac App Store,
+you will want to update your `Rakefile` to something like this:
+
+```ruby
+Motion::Project::App.setup do |app|
+  #...
+  app.paddle do
+    if mas_store?
+      set :product_id, 'mas_product_id'
+    else
+      set :product_id, 'product_id'
+    end
+    set :vendor_id, 'vendor_id'
+    set :api_key, 'api_key'
+    set :store, ENV.fetch('store', 'paddle')
+    
+    ...
+    
+  end
+end
+```
+
+There is also a `paddle_store?` method available in the block passed to `app.paddle`
+
+
 ###Other `MotionPaddle` methods not in the above example
 
 * `MotionPaddle.enabled?` - true if Paddle framework is included
@@ -97,6 +132,8 @@ end
 * `MotionPaddle.will_continue_at_trial_end=` - set the above property
 * `MotionPaddle.trial_days_left` - get the number of days left in the trial
 * `MotionPaddle.deactivate_license` - deactivate the license
+* `MotionPaddle.paddle_store?` - returns true if using the Paddle store
+* `MotionPaddle.mas_store?` - returns true if using the Mac App Store
 
 **NOTE:** some methods offer a version that uses the spelling "licen**c**e".  This is the name used for the methods in the Paddle framework, so I included this spelling as an option.  The `will_show_licensing_window` methods are the only ones with it spelled with an "s" in the Paddle framework, and they do not have the "c" version in `MotionPaddle`.
 

data/lib/motion-paddle/paddle.rb

@@ -3,12 +3,21 @@ unless defined?(Motion::Project::Config)
 end
 
 class PaddleConfig
-  attr_accessor :product_id, :vendor_id, :api_key, :current_price, :dev_name, :currency, :image, :product_name, :trial_duration, :trial_text, :product_image, :time_trial
+  attr_accessor :product_id, :vendor_id, :api_key, :current_price, :dev_name, :currency, :image, 
+                :product_name, :trial_duration, :trial_text, :product_image, :time_trial, :store
 
   def initialize(config)
     @config = config
   end
 
+  def mas_store?
+    ENV.fetch('store', 'paddle').downcase == 'mas'
+  end
+
+  def paddle_store?
+    ENV.fetch('store', 'paddle').downcase == 'paddle'
+  end
+
   def set(var, val)
     @config.info_plist["MotionPaddle_#{@config.short_version}"] ||= [{}]
     @config.info_plist["MotionPaddle_#{@config.short_version}"].first[var.to_s] = val
@@ -28,7 +37,8 @@ class PaddleConfig
         trial_duration: trial_duration,
         trial_text: trial_text,
         product_image: product_image,
-        time_trial: time_trial
+        time_trial: time_trial,
+        store: store
     }.inspect
   end
 end
@@ -55,6 +65,12 @@ Motion::Project::App.setup do |app|
   end
 
   app.files.push(File.join(File.dirname(__FILE__), 'paddle_setup.rb'))
-
-  app.pods.pod 'Paddle', git: 'https://github.com/PaddleHQ/Mac-Framework.git'
+  
+  # include the correct framework for the store we're targeting
+  if ENV.fetch('store', 'paddle').downcase == 'paddle'
+    app.pods.pod 'Paddle', git: 'https://github.com/PaddleHQ/Mac-Framework.git'
+  elsif ENV.fetch('store', 'paddle').downcase == 'mas'
+    app.pods.pod 'Paddle-MAS', git: 'https://github.com/PaddleHQ/Paddle-MAS.git'
+  end
+  
 end

data/lib/motion-paddle/paddle_setup.rb

@@ -1,7 +1,11 @@
 class MotionPaddle
   class << self
     def enabled?
-      (NSClassFromString('Paddle')!=nil)
+      (NSClassFromString('Paddle') != nil)
+    end
+    
+    def enabled_paddle_store?
+      enabled? && paddle_store? 
     end
 
     def paddle_instance
@@ -12,6 +16,10 @@ class MotionPaddle
       enabled? && PaddleStoreKit.sharedInstance
     end
 
+    def store
+      self.plist['store'] || 'paddle'
+    end
+
     def product_id
       self.plist['product_id']
     end
@@ -62,64 +70,64 @@ class MotionPaddle
     end
 
     def time_trial=(time_trial)
-      paddle_instance.setIsTimeTrial(time_trial) if enabled?
+      paddle_instance.setIsTimeTrial(time_trial) if enabled_paddle_store?
       @time_trial = time_trial
     end
 
     def can_force_exit?
-      enabled? && paddle_instance.canForceExit
+      enabled_paddle_store? && paddle_instance.canForceExit
     end
 
     def can_force_exit=(can_force_exit)
-      enabled? && paddle_instance.setCanForceExit(can_force_exit)
+      enabled_paddle_store? && paddle_instance.setCanForceExit(can_force_exit)
     end
 
     def will_show_licensing_window?
-      enabled? && paddle_instance.willShowLicensingWindow
+      enabled_paddle_store? && paddle_instance.willShowLicensingWindow
     end
 
     def will_show_licensing_window=(will_show_licensing_window)
-      enabled? && paddle_instance.setWillShowLicensingWindow(will_show_licensing_window)
+      enabled_paddle_store? && paddle_instance.setWillShowLicensingWindow(will_show_licensing_window)
     end
 
     def has_tracking_started?
-      enabled? && paddle_instance.hasTrackingStarted
+      enabled_paddle_store? && paddle_instance.hasTrackingStarted
     end
 
     def has_tracking_started=(has_tracking_started)
-      enabled? && paddle_instance.setHasTrackingStarted(has_tracking_started)
+      enabled_paddle_store? && paddle_instance.setHasTrackingStarted(has_tracking_started)
     end
 
     def will_simplify_views?
-      enabled? && paddle_instance.willSimplifyViews
+      enabled_paddle_store? && paddle_instance.willSimplifyViews
     end
 
     def will_simplify_views=(will_simplify_views)
-      enabled? && paddle_instance.setWillSimplifyViews(will_simplify_views)
+      enabled_paddle_store? && paddle_instance.setWillSimplifyViews(will_simplify_views)
     end
 
     def will_show_activation_alert?
-      enabled? && paddle_instance.willShowActivationAlert
+      enabled_paddle_store? && paddle_instance.willShowActivationAlert
     end
 
     def will_show_activation_alert=(will_show_activation_alert)
-      enabled? && paddle_instance.setWillShowActivationAlert(will_show_activation_alert)
+      enabled_paddle_store? && paddle_instance.setWillShowActivationAlert(will_show_activation_alert)
     end
 
     def will_continue_at_trial_end?
-      enabled? && paddle_instance.willContinueAtTrialEnd
+      enabled_paddle_store? && paddle_instance.willContinueAtTrialEnd
     end
 
     def will_continue_at_trial_end=(will_continue_at_trial_end)
-      enabled? && paddle_instance.setWillContinueAtTrialEnd(will_continue_at_trial_end)
+      enabled_paddle_store? && paddle_instance.setWillContinueAtTrialEnd(will_continue_at_trial_end)
     end
 
     def psk_valid_receipts
-      enabled? && psk_instance.validReceipts
+      enabled_paddle_store? && psk_instance.validReceipts
     end
 
     def psk_receipt_for_product_id(product_id)
-      enabled? && psk_instance.receiptForProductId(product_id)
+      enabled_paddle_store? && psk_instance.receiptForProductId(product_id)
     end
 
     def setup(window = nil, &block)
@@ -129,22 +137,24 @@ class MotionPaddle
       paddle.setProductId(product_id)
       paddle.setVendorId(vendor_id)
       paddle.setApiKey(api_key)
-      product_info = {KPADCurrentPrice  => current_price,
-                      KPADDevName       => dev_name,
-                      KPADCurrency      => currency,
-                      KPADImage         => image,
-                      KPADTrialText     => trial_text,
-                      KPADProductName   => product_name,
-                      KPADProductImage  => product_image }
-      if time_trial?
-        product_info.merge!({KPADTrialDuration => trial_duration})
+      if paddle_store?
+        product_info = {KPADCurrentPrice  => current_price,
+                        KPADDevName       => dev_name,
+                        KPADCurrency      => currency,
+                        KPADImage         => image,
+                        KPADTrialText     => trial_text,
+                        KPADProductName   => product_name,
+                        KPADProductImage  => product_image }
+        if time_trial?
+          product_info.merge!({KPADTrialDuration => trial_duration})
+        end
+        paddle.startLicensing(product_info, timeTrial: time_trial?, withWindow: window)
+        NSNotificationCenter.defaultCenter.addObserver(self, selector: 'activated:', name: KPADActivated, object: nil)
+        NSNotificationCenter.defaultCenter.addObserver(self, selector: 'continue:', name: KPADContinue, object: nil)
+        paddle.setDelegate(self)
+        # block.call unless block.nil?
+        listen(:activated, :continue, &block)
       end
-      paddle.startLicensing(product_info, timeTrial: time_trial?, withWindow: window)
-      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'activated:', name: KPADActivated, object: nil)
-      NSNotificationCenter.defaultCenter.addObserver(self, selector: 'continue:', name: KPADContinue, object: nil)
-      paddle.setDelegate(self)
-      # block.call unless block.nil?
-      listen(:activated, :continue, &block)
     end
 
     def listen(*names, &block)
@@ -157,7 +167,7 @@ class MotionPaddle
     end
 
     def psk_show(product_ids = nil, &block)
-      return unless enabled?
+      return unless enabled_paddle_store?
       psk = psk_instance
       psk.setDelegate(self)
       if product_ids && !product_ids.empty?
@@ -169,7 +179,7 @@ class MotionPaddle
     end
 
     def psk_show_product(product_id, &block)
-      return unless enabled?
+      return unless enabled_paddle_store?
       psk = psk_instance
       psk.setDelegate(self)
       psk.showProduct(product_id)
@@ -177,7 +187,7 @@ class MotionPaddle
       end
 
     def psk_purchase_product(product_id, &block)
-      return unless enabled?
+      return unless enabled_paddle_store?
       psk = psk_instance
       psk.setDelegate(self)
       psk.purchaseProduct(product_id)
@@ -185,35 +195,43 @@ class MotionPaddle
     end
 
     def trial_days_left
-      enabled? && paddle_instance.daysRemainingOnTrial
+      enabled_paddle_store? && paddle_instance.daysRemainingOnTrial
     end
 
     def activated?
-      enabled? && paddle_instance.productActivated
+      enabled_paddle_store? && paddle_instance.productActivated
     end
 
     def show_licencing
-      enabled? && paddle_instance.showLicencing
+      enabled_paddle_store? && paddle_instance.showLicencing
     end
 
     alias :show_licensing :show_licencing
 
     def activated_licence_code
-      enabled? && paddle_instance.activatedLicenceCode
+      enabled_paddle_store? && paddle_instance.activatedLicenceCode
     end
 
     alias :activated_license_code :activated_licence_code
 
     def activated_email
-      enabled? && paddle_instance.activatedEmail
+      enabled_paddle_store? && paddle_instance.activatedEmail
     end
 
     def deactivate_licence
-      enabled? && paddle_instance.deactivateLicence
+      enabled_paddle_store? && paddle_instance.deactivateLicence
     end
 
     alias :deactivate_license :deactivate_licence
 
+    def paddle_store?
+      self.plist['store'] == 'paddle'
+    end
+
+    def mas_store?
+      self.plist['store'] == 'mas'
+    end
+
     #internal
     def plist
       (@plist = NSBundle.mainBundle.objectForInfoDictionaryKey("MotionPaddle_#{NSBundle.mainBundle.infoDictionary['CFBundleShortVersionString']}")) && (@plist = @plist.first) unless @plist

data/lib/motion-paddle/version.rb

@@ -1,3 +1,3 @@
 module MotionPaddle
-  VERSION = '1.1.7'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-paddle
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors:
 - Eric Henderson