processout 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91568f94fbbbde39daed4271894d95fbff2c70eb
-  data.tar.gz: c12c9dc2ea971eb3efba6ac05d0910e251c9282b
+  metadata.gz: e0a9ad7b4c761856cc0b61cdf83574b257b3fced
+  data.tar.gz: e8b2ac9780fc385076ac1aa7ed37230a761ec478
 SHA512:
-  metadata.gz: 271f12c007a02332cfdcd3698b95fabc6ab9462d8fcdfcee02bc24d4aeaf4d8e97e0e0f795b1150ee2f030ff72cc021d0b195d02300cb4f8236e047a412730ef
-  data.tar.gz: 45d072130a20cda395f44e3e5292f9a5c4c2236d4da5f8836f05afbeae0f5b55da376e57adf864c8ee92488cfd52394693bcd768fb969c2682503567423321da
+  metadata.gz: f88f795322e08c68800c720da6b50a9b8ffd9d7238cba2da74b18a158c0273641abc0d59150b41f907ccf4bafbcb3f6d55f0184095091e3ad63d5e12411a3972
+  data.tar.gz: 6380bf6fda3a98467a81441176dd16ab9abd220186ab8ebd697962c626736b2a141f4de69e78ca011d635b3a2e7253ef000ee450e2a256b110aa7b9ce8f7e0b0

data/lib/processout/subscription.rb

@@ -9,6 +9,7 @@ module ProcessOut
     
     attr_reader :id
     attr_reader :project
+    attr_reader :plan_id
     attr_reader :plan
     attr_reader :customer
     attr_reader :token
@@ -48,6 +49,10 @@ module ProcessOut
       
     end
     
+    def plan_id=(val)
+      @plan_id = val
+    end
+    
     def plan=(val)
       if val.instance_of? Plan
         @plan = val
@@ -167,6 +172,7 @@ module ProcessOut
 
       self.id = data.fetch(:id, nil)
       self.project = data.fetch(:project, nil)
+      self.plan_id = data.fetch(:plan_id, nil)
       self.plan = data.fetch(:plan, nil)
       self.customer = data.fetch(:customer, nil)
       self.token = data.fetch(:token, nil)
@@ -210,6 +216,9 @@ module ProcessOut
       if data.include? "project"
         self.project = data["project"]
       end
+      if data.include? "plan_id"
+        self.plan_id = data["plan_id"]
+      end
       if data.include? "plan"
         self.plan = data["plan"]
       end
@@ -289,6 +298,7 @@ module ProcessOut
       end
       self.id = data.fetch(:id, self.id)
       self.project = data.fetch(:project, self.project)
+      self.plan_id = data.fetch(:plan_id, self.plan_id)
       self.plan = data.fetch(:plan, self.plan)
       self.customer = data.fetch(:customer, self.customer)
       self.token = data.fetch(:token, self.token)
@@ -516,6 +526,7 @@ module ProcessOut
       request = Request.new(@client)
       path    = "/subscriptions"
       data    = {
+        "plan_id" => @plan_id, 
         "cancel_at" => @cancel_at, 
         "name" => @name, 
         "amount" => @amount, 
@@ -525,7 +536,6 @@ module ProcessOut
         "trial_end_at" => @trial_end_at, 
         "return_url" => @return_url, 
         "cancel_url" => @cancel_url, 
-        "plan_id" => options.fetch(:plan_id, nil), 
         "source" => options.fetch(:source, nil), 
         "prorate" => options.fetch(:prorate, nil), 
         "customer_id" => customer_id
@@ -609,62 +619,6 @@ module ProcessOut
       
 
       
-      return_values[0]
-    end
-
-    # Update the subscription's plan.
-    # Params:
-    # +plan_id+:: ID of the new plan to be applied on the subscription
-    # +prorate+:: Define if proration should be done when updating the plan
-    # +options+:: +Hash+ of options
-    def update_plan(plan_id, prorate, options = {})
-      self.prefill(options)
-
-      request = Request.new(@client)
-      path    = "/subscriptions/" + CGI.escape(@id) + ""
-      data    = {
-        "plan_id" => plan_id, 
-        "prorate" => prorate
-      }
-
-      response = Response.new(request.put(path, data, options))
-      return_values = Array.new
-      
-      body = response.body
-      body = body["subscription"]
-      
-      
-      return_values.push(self.fill_with_data(body))
-      
-
-      
-      return_values[0]
-    end
-
-    # Apply a source to the subscription to activate or update the subscription's source.
-    # Params:
-    # +source+:: Source to be applied on the subscription and used to pay future invoices. Can be a card, a token or a gateway request
-    # +options+:: +Hash+ of options
-    def apply_source(source, options = {})
-      self.prefill(options)
-
-      request = Request.new(@client)
-      path    = "/subscriptions/" + CGI.escape(@id) + ""
-      data    = {
-        "source" => source
-      }
-
-      response = Response.new(request.put(path, data, options))
-      return_values = Array.new
-      
-      body = response.body
-      body = body["subscription"]
-      
-      
-      return_values.push(self.fill_with_data(body))
-      
-
-      
       return_values[0]
     end
 
@@ -677,13 +631,13 @@ module ProcessOut
       request = Request.new(@client)
       path    = "/subscriptions/" + CGI.escape(@id) + ""
       data    = {
+        "plan_id" => @plan_id, 
         "name" => @name, 
         "amount" => @amount, 
         "interval" => @interval, 
         "trial_end_at" => @trial_end_at, 
         "metadata" => @metadata, 
         "coupon_id" => options.fetch(:coupon_id, nil), 
-        "plan_id" => options.fetch(:plan_id, nil), 
         "source" => options.fetch(:source, nil), 
         "prorate" => options.fetch(:prorate, nil), 
         "proration_date" => options.fetch(:proration_date, nil)

data/lib/processout/version.rb

@@ -1,3 +1,3 @@
 module ProcessOut
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: processout
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Manuel HUEZ