processout 1.0.6 → 1.0.7

data/lib/processout/discount.rb

@@ -83,15 +83,15 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @project = data.fetch(:project, nil)
-      @subscription = data.fetch(:subscription, nil)
-      @coupon = data.fetch(:coupon, nil)
-      @amount = data.fetch(:amount, "")
-      @expires_at = data.fetch(:expires_at, "")
-      @metadata = data.fetch(:metadata, Hash.new)
-      @sandbox = data.fetch(:sandbox, false)
-      @created_at = data.fetch(:created_at, "")
+      self.id = data.fetch(:id, nil)
+      self.project = data.fetch(:project, nil)
+      self.subscription = data.fetch(:subscription, nil)
+      self.coupon = data.fetch(:coupon, nil)
+      self.amount = data.fetch(:amount, nil)
+      self.expires_at = data.fetch(:expires_at, nil)
+      self.metadata = data.fetch(:metadata, nil)
+      self.sandbox = data.fetch(:sandbox, nil)
+      self.created_at = data.fetch(:created_at, nil)
       
     end
 
@@ -104,6 +104,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -135,11 +138,33 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.project = data.fetch(:project, self.project)
+      self.subscription = data.fetch(:subscription, self.subscription)
+      self.coupon = data.fetch(:coupon, self.coupon)
+      self.amount = data.fetch(:amount, self.amount)
+      self.expires_at = data.fetch(:expires_at, self.expires_at)
+      self.metadata = data.fetch(:metadata, self.metadata)
+      self.sandbox = data.fetch(:sandbox, self.sandbox)
+      self.created_at = data.fetch(:created_at, self.created_at)
+      
+      self
+    end
+
     # Apply a new discount to the given subscription ID.
     # Params:
     # +subscription_id+:: ID of the subscription
     # +options+:: +Hash+ of options
     def apply(subscription_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/subscriptions/" + CGI.escape(subscription_id) + "/discounts"
       data    = {
@@ -168,6 +193,8 @@ module ProcessOut
     # +coupon_id+:: ID of the coupon
     # +options+:: +Hash+ of options
     def apply_coupon(subscription_id, coupon_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/subscriptions/" + CGI.escape(subscription_id) + "/discounts"
       data    = {
@@ -195,6 +222,8 @@ module ProcessOut
     # +discount_id+:: ID of the discount
     # +options+:: +Hash+ of options
     def find(subscription_id, discount_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/subscriptions/" + CGI.escape(subscription_id) + "/discounts/" + CGI.escape(discount_id) + ""
       data    = {

data/lib/processout/event.rb

@@ -55,12 +55,12 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @project = data.fetch(:project, nil)
-      @name = data.fetch(:name, "")
-      @data = data.fetch(:data, nil)
-      @sandbox = data.fetch(:sandbox, false)
-      @fired_at = data.fetch(:fired_at, "")
+      self.id = data.fetch(:id, nil)
+      self.project = data.fetch(:project, nil)
+      self.name = data.fetch(:name, nil)
+      self.data = data.fetch(:data, nil)
+      self.sandbox = data.fetch(:sandbox, nil)
+      self.fired_at = data.fetch(:fired_at, nil)
       
     end
 
@@ -73,6 +73,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -95,10 +98,29 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.project = data.fetch(:project, self.project)
+      self.name = data.fetch(:name, self.name)
+      self.data = data.fetch(:data, self.data)
+      self.sandbox = data.fetch(:sandbox, self.sandbox)
+      self.fired_at = data.fetch(:fired_at, self.fired_at)
+      
+      self
+    end
+
     # Get all the webhooks of the event.
     # Params:
     # +options+:: +Hash+ of options
     def fetch_webhooks(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/events/" + CGI.escape(@id) + "/webhooks"
       data    = {
@@ -127,6 +149,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def all(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/events"
       data    = {
@@ -156,6 +180,8 @@ module ProcessOut
     # +event_id+:: ID of the event
     # +options+:: +Hash+ of options
     def find(event_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/events/" + CGI.escape(event_id) + ""
       data    = {

data/lib/processout/gateway.rb

@@ -57,14 +57,14 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @name = data.fetch(:name, "")
-      @display_name = data.fetch(:display_name, "")
-      @logo_url = data.fetch(:logo_url, "")
-      @url = data.fetch(:url, "")
-      @flows = data.fetch(:flows, Array.new)
-      @tags = data.fetch(:tags, Array.new)
-      @description = data.fetch(:description, "")
+      self.id = data.fetch(:id, nil)
+      self.name = data.fetch(:name, nil)
+      self.display_name = data.fetch(:display_name, nil)
+      self.logo_url = data.fetch(:logo_url, nil)
+      self.url = data.fetch(:url, nil)
+      self.flows = data.fetch(:flows, nil)
+      self.tags = data.fetch(:tags, nil)
+      self.description = data.fetch(:description, nil)
       
     end
 
@@ -77,6 +77,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -105,6 +108,25 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.name = data.fetch(:name, self.name)
+      self.display_name = data.fetch(:display_name, self.display_name)
+      self.logo_url = data.fetch(:logo_url, self.logo_url)
+      self.url = data.fetch(:url, self.url)
+      self.flows = data.fetch(:flows, self.flows)
+      self.tags = data.fetch(:tags, self.tags)
+      self.description = data.fetch(:description, self.description)
+      
+      self
+    end
+
     
   end
 end

data/lib/processout/gateway_configuration.rb

@@ -56,11 +56,11 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @project = data.fetch(:project, nil)
-      @gateway = data.fetch(:gateway, nil)
-      @enabled = data.fetch(:enabled, false)
-      @public_keys = data.fetch(:public_keys, Hash.new)
+      self.id = data.fetch(:id, nil)
+      self.project = data.fetch(:project, nil)
+      self.gateway = data.fetch(:gateway, nil)
+      self.enabled = data.fetch(:enabled, nil)
+      self.public_keys = data.fetch(:public_keys, nil)
       
     end
 
@@ -73,6 +73,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -92,6 +95,22 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.project = data.fetch(:project, self.project)
+      self.gateway = data.fetch(:gateway, self.gateway)
+      self.enabled = data.fetch(:enabled, self.enabled)
+      self.public_keys = data.fetch(:public_keys, self.public_keys)
+      
+      self
+    end
+
     
   end
 end

data/lib/processout/invoice.rb

@@ -125,22 +125,22 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @project = data.fetch(:project, nil)
-      @transaction = data.fetch(:transaction, nil)
-      @customer = data.fetch(:customer, nil)
-      @subscription = data.fetch(:subscription, nil)
-      @url = data.fetch(:url, "")
-      @name = data.fetch(:name, "")
-      @amount = data.fetch(:amount, "")
-      @currency = data.fetch(:currency, "")
-      @metadata = data.fetch(:metadata, Hash.new)
-      @request_email = data.fetch(:request_email, false)
-      @request_shipping = data.fetch(:request_shipping, false)
-      @return_url = data.fetch(:return_url, "")
-      @cancel_url = data.fetch(:cancel_url, "")
-      @sandbox = data.fetch(:sandbox, false)
-      @created_at = data.fetch(:created_at, "")
+      self.id = data.fetch(:id, nil)
+      self.project = data.fetch(:project, nil)
+      self.transaction = data.fetch(:transaction, nil)
+      self.customer = data.fetch(:customer, nil)
+      self.subscription = data.fetch(:subscription, nil)
+      self.url = data.fetch(:url, nil)
+      self.name = data.fetch(:name, nil)
+      self.amount = data.fetch(:amount, nil)
+      self.currency = data.fetch(:currency, nil)
+      self.metadata = data.fetch(:metadata, nil)
+      self.request_email = data.fetch(:request_email, nil)
+      self.request_shipping = data.fetch(:request_shipping, nil)
+      self.return_url = data.fetch(:return_url, nil)
+      self.cancel_url = data.fetch(:cancel_url, nil)
+      self.sandbox = data.fetch(:sandbox, nil)
+      self.created_at = data.fetch(:created_at, nil)
       
     end
 
@@ -153,6 +153,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -205,11 +208,40 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.project = data.fetch(:project, self.project)
+      self.transaction = data.fetch(:transaction, self.transaction)
+      self.customer = data.fetch(:customer, self.customer)
+      self.subscription = data.fetch(:subscription, self.subscription)
+      self.url = data.fetch(:url, self.url)
+      self.name = data.fetch(:name, self.name)
+      self.amount = data.fetch(:amount, self.amount)
+      self.currency = data.fetch(:currency, self.currency)
+      self.metadata = data.fetch(:metadata, self.metadata)
+      self.request_email = data.fetch(:request_email, self.request_email)
+      self.request_shipping = data.fetch(:request_shipping, self.request_shipping)
+      self.return_url = data.fetch(:return_url, self.return_url)
+      self.cancel_url = data.fetch(:cancel_url, self.cancel_url)
+      self.sandbox = data.fetch(:sandbox, self.sandbox)
+      self.created_at = data.fetch(:created_at, self.created_at)
+      
+      self
+    end
+
     # Authorize the invoice using the given source (customer or token)
     # Params:
     # +source+:: Source used to authorization the payment. Can be a card, a token or a gateway request
     # +options+:: +Hash+ of options
     def authorize(source, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(@id) + "/authorize"
       data    = {
@@ -233,6 +265,8 @@ module ProcessOut
     # +source+:: Source used to authorization the payment. Can be a card, a token or a gateway request
     # +options+:: +Hash+ of options
     def capture(source, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(@id) + "/capture"
       data    = {
@@ -255,6 +289,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def fetch_customer(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(@id) + "/customers"
       data    = {
@@ -278,6 +314,8 @@ module ProcessOut
     # +customer_id+:: ID of the customer to be linked to the invoice
     # +options+:: +Hash+ of options
     def assign_customer(customer_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(@id) + "/customers"
       data    = {
@@ -300,6 +338,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def fetch_transaction(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(@id) + "/transactions"
       data    = {
@@ -322,6 +362,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def void(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(@id) + "/void"
       data    = {
@@ -344,6 +386,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def all(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices"
       data    = {
@@ -372,6 +416,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def create(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices"
       data    = {
@@ -404,6 +450,8 @@ module ProcessOut
     # +customer_id+:: ID of the customer
     # +options+:: +Hash+ of options
     def create_for_customer(customer_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices"
       data    = {
@@ -437,6 +485,8 @@ module ProcessOut
     # +invoice_id+:: ID of the invoice
     # +options+:: +Hash+ of options
     def find(invoice_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/invoices/" + CGI.escape(invoice_id) + ""
       data    = {

data/lib/processout/plan.rb

@@ -84,18 +84,18 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @project = data.fetch(:project, nil)
-      @name = data.fetch(:name, "")
-      @amount = data.fetch(:amount, "")
-      @currency = data.fetch(:currency, "")
-      @metadata = data.fetch(:metadata, Hash.new)
-      @interval = data.fetch(:interval, "")
-      @trial_period = data.fetch(:trial_period, "0d")
-      @return_url = data.fetch(:return_url, "")
-      @cancel_url = data.fetch(:cancel_url, "")
-      @sandbox = data.fetch(:sandbox, false)
-      @created_at = data.fetch(:created_at, "")
+      self.id = data.fetch(:id, nil)
+      self.project = data.fetch(:project, nil)
+      self.name = data.fetch(:name, nil)
+      self.amount = data.fetch(:amount, nil)
+      self.currency = data.fetch(:currency, nil)
+      self.metadata = data.fetch(:metadata, nil)
+      self.interval = data.fetch(:interval, nil)
+      self.trial_period = data.fetch(:trial_period, nil)
+      self.return_url = data.fetch(:return_url, nil)
+      self.cancel_url = data.fetch(:cancel_url, nil)
+      self.sandbox = data.fetch(:sandbox, nil)
+      self.created_at = data.fetch(:created_at, nil)
       
     end
 
@@ -108,6 +108,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -148,10 +151,35 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.project = data.fetch(:project, self.project)
+      self.name = data.fetch(:name, self.name)
+      self.amount = data.fetch(:amount, self.amount)
+      self.currency = data.fetch(:currency, self.currency)
+      self.metadata = data.fetch(:metadata, self.metadata)
+      self.interval = data.fetch(:interval, self.interval)
+      self.trial_period = data.fetch(:trial_period, self.trial_period)
+      self.return_url = data.fetch(:return_url, self.return_url)
+      self.cancel_url = data.fetch(:cancel_url, self.cancel_url)
+      self.sandbox = data.fetch(:sandbox, self.sandbox)
+      self.created_at = data.fetch(:created_at, self.created_at)
+      
+      self
+    end
+
     # Get all the plans.
     # Params:
     # +options+:: +Hash+ of options
     def all(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/plans"
       data    = {
@@ -180,6 +208,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def create(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/plans"
       data    = {
@@ -213,6 +243,8 @@ module ProcessOut
     # +plan_id+:: ID of the plan
     # +options+:: +Hash+ of options
     def find(plan_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/plans/" + CGI.escape(plan_id) + ""
       data    = {
@@ -234,10 +266,12 @@ module ProcessOut
       return_values[0]
     end
 
-    # Update the plan. This action won't affect subscriptions already linked to this plan.
+    # Save the updated plan attributes. This action won't affect subscriptions already linked to this plan.
     # Params:
     # +options+:: +Hash+ of options
-    def update(options = {})
+    def save(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/plans/" + CGI.escape(@id) + ""
       data    = {
@@ -266,6 +300,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def end(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/plans/" + CGI.escape(@id) + ""
       data    = {

data/lib/processout/product.rb

@@ -89,19 +89,19 @@ module ProcessOut
     def initialize(client, data = {})
       @client = client
 
-      @id = data.fetch(:id, "")
-      @project = data.fetch(:project, nil)
-      @url = data.fetch(:url, "")
-      @name = data.fetch(:name, "")
-      @amount = data.fetch(:amount, "")
-      @currency = data.fetch(:currency, "")
-      @metadata = data.fetch(:metadata, Hash.new)
-      @request_email = data.fetch(:request_email, false)
-      @request_shipping = data.fetch(:request_shipping, false)
-      @return_url = data.fetch(:return_url, "")
-      @cancel_url = data.fetch(:cancel_url, "")
-      @sandbox = data.fetch(:sandbox, false)
-      @created_at = data.fetch(:created_at, "")
+      self.id = data.fetch(:id, nil)
+      self.project = data.fetch(:project, nil)
+      self.url = data.fetch(:url, nil)
+      self.name = data.fetch(:name, nil)
+      self.amount = data.fetch(:amount, nil)
+      self.currency = data.fetch(:currency, nil)
+      self.metadata = data.fetch(:metadata, nil)
+      self.request_email = data.fetch(:request_email, nil)
+      self.request_shipping = data.fetch(:request_shipping, nil)
+      self.return_url = data.fetch(:return_url, nil)
+      self.cancel_url = data.fetch(:cancel_url, nil)
+      self.sandbox = data.fetch(:sandbox, nil)
+      self.created_at = data.fetch(:created_at, nil)
       
     end
 
@@ -114,6 +114,9 @@ module ProcessOut
     # Params:
     # +data+:: +Hash+ of data coming from the API
     def fill_with_data(data)
+      if data.nil?
+        return self
+      end
       if data.include? "id"
         self.id = data["id"]
       end
@@ -157,10 +160,36 @@ module ProcessOut
       self
     end
 
+    # Prefills the object with the data passed as Parameters
+    # Params:
+    # +data+:: +Hash+ of data
+    def prefill(data)
+      if data.nil?
+        return self
+      end
+      self.id = data.fetch(:id, self.id)
+      self.project = data.fetch(:project, self.project)
+      self.url = data.fetch(:url, self.url)
+      self.name = data.fetch(:name, self.name)
+      self.amount = data.fetch(:amount, self.amount)
+      self.currency = data.fetch(:currency, self.currency)
+      self.metadata = data.fetch(:metadata, self.metadata)
+      self.request_email = data.fetch(:request_email, self.request_email)
+      self.request_shipping = data.fetch(:request_shipping, self.request_shipping)
+      self.return_url = data.fetch(:return_url, self.return_url)
+      self.cancel_url = data.fetch(:cancel_url, self.cancel_url)
+      self.sandbox = data.fetch(:sandbox, self.sandbox)
+      self.created_at = data.fetch(:created_at, self.created_at)
+      
+      self
+    end
+
     # Create a new invoice from the product.
     # Params:
     # +options+:: +Hash+ of options
     def create_invoice(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/products/" + CGI.escape(@id) + "/invoices"
       data    = {
@@ -183,6 +212,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def all(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/products"
       data    = {
@@ -211,6 +242,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def create(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/products"
       data    = {
@@ -243,6 +276,8 @@ module ProcessOut
     # +product_id+:: ID of the product
     # +options+:: +Hash+ of options
     def find(product_id, options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/products/" + CGI.escape(product_id) + ""
       data    = {
@@ -268,6 +303,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def save(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/products/" + CGI.escape(@id) + ""
       data    = {
@@ -299,6 +336,8 @@ module ProcessOut
     # Params:
     # +options+:: +Hash+ of options
     def delete(options = {})
+      self.prefill(options)
+
       request = Request.new(@client)
       path    = "/products/" + CGI.escape(@id) + ""
       data    = {