conekta 1.0.0 → 1.1.0

data/lib/conekta/payee.rb

@@ -7,6 +7,10 @@ module Conekta
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
     include Conekta::Operations::CreateMember
+
+    attr_accessor :email, :name, :phone, :livemode, :default_destination_id,
+                  :created_at
+
     def load_from(response=nil)
       if response
         super

data/lib/conekta/payment_source.rb

@@ -0,0 +1,30 @@
+module Conekta
+  class PaymentSource < Resource
+    include Conekta::Operations::Delete
+    include Conekta::Operations::Update
+    include Conekta::Operations::CustomAction
+
+    def _url
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+
+        raise exception
+      end
+
+      self.customer._url + self.class._url + "/" + id
+    end
+
+    def delete
+      self.delete_member('customer','payment_sources')
+    end
+  end
+end

data/lib/conekta/payout_method.rb

@@ -4,9 +4,18 @@ module Conekta
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
     def _url
-      raise Error.new(
-        I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
-        I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })) if (id.nil? || id.empty?)
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+        raise exception
+      end
       self.payee._url + self.class._url + "/" + id
     end
     def delete

data/lib/conekta/plan.rb

@@ -7,5 +7,10 @@ module Conekta
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
     include Conekta::Operations::CreateMember
+
+    attr_accessor :livemode, :created_at, :name, :amount, :currency,
+                  :interval, :frequency, :expiry_count, :trial_period_days,
+                  :created_at
+
   end
 end

data/lib/conekta/refund.rb

@@ -1,4 +1,6 @@
 module Conekta
   class Refund < Resource
+
+    attr_accessor :amount, :auth_code, :created_at
   end
 end

data/lib/conekta/requestor.rb

@@ -27,11 +27,17 @@ module Conekta
           (if meth == :get then req.params = params else req.body = params.to_json end) if params
         end
       rescue Exception => e
-        Error.error_handler(e, "")
+        if Conekta.api_version == "2.0.0"
+          json_response = {"details" => []}
+        else
+          json_response = {}
+        end
+        ErrorList.error_handler(json_response, nil)
       end
 
-      return Error.error_handler(JSON.parse(response.body), response.status) if response.status != 200
-      JSON.parse(response.body)
+      json_response = JSON.parse(response.body)
+      return ErrorList.error_handler(json_response, response.status) if response.status != 200
+      json_response
     end
 
     private
@@ -59,13 +65,17 @@ module Conekta
     end
 
     def conekta_headers
-      @conekta_headers ||= {
+      params = {
         bindings_version: Conekta::VERSION,
         lang: 'ruby',
         lang_version: RUBY_VERSION,
         publisher: 'conekta',
         uname: Uname.uname
       }
+
+      params.merge!(plugin: Conekta.plugin) if Conekta.plugin.to_s.length > 0
+
+      @conekta_headers ||= params
     end
   end
 end

data/lib/conekta/resource.rb

@@ -1,14 +1,36 @@
 module Conekta
   class Resource < ConektaObject
+
+    attr_accessor :id
+
+    def initialize(id=nil)
+      @id = id
+      super()
+    end
+
     def self._url()
-      "/#{CGI.escape(self.class_name.downcase)}s"
+      "/#{CGI.escape(underscored_class)}s"
     end
+
     def _url
-      raise Error.new(
-        I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
-        I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })) if (id.nil? || id.empty?)
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+        raise exception
+      end
 
       return [self.class._url, id].join('/')
     end
+
+    def self.underscored_class
+      Conekta::Util.underscore(self.to_s)
+    end
   end
 end

data/lib/conekta/return.rb

@@ -0,0 +1,25 @@
+module Conekta
+  class Return < Resource
+
+    attr_accessor :livemode, :amount, :currency, :charge_id, :reason,
+                  :created_at, :parent_id
+    def _url
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+
+        raise exception
+      end
+
+      "#{self.order._url}#{self.class._url}/#{id}"
+    end
+  end
+end

data/lib/conekta/shipping_contact.rb

@@ -0,0 +1,32 @@
+module Conekta
+  class ShippingContact < Resource
+    include Conekta::Operations::Delete
+    include Conekta::Operations::Update
+    include Conekta::Operations::CustomAction
+
+    attr_accessor :receiver, :phone, :between_streets, :parent_id, :default
+
+    def _url
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+                                "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+                                "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+                              })
+
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+
+        raise exception
+      end
+
+      self.customer._url + self.class._url + "/" + id
+    end
+
+    def delete
+      self.delete_member('customer', 'shipping_contacts')
+    end
+  end
+end

data/lib/conekta/shipping_line.rb

@@ -0,0 +1,33 @@
+module Conekta
+  class ShippingLine < Resource
+    include Conekta::Operations::Delete
+    include Conekta::Operations::Update
+    include Conekta::Operations::CustomAction
+
+    attr_accessor :description, :amount, :carrier, :shipping_line_method, :tracking_number,
+                  :parent_id, :metadata
+
+    def _url
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+
+        raise exception
+      end
+
+      "#{self.order._url}#{self.class._url}/#{id}"
+    end
+
+    def delete
+      self.delete_member('order', 'shipping_lines')
+    end
+  end
+end

data/lib/conekta/subscription.rb

@@ -2,10 +2,24 @@ module Conekta
   class Subscription < Resource
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
+
+    attr_accessor :created_at, :subscription_start, :canceled_at, :paused_at,
+                  :billing_cycle_start, :billing_cycle_end, :trial_start,
+                  :trial_end, :plan_id, :customer_id, :card_id
+
     def _url
-      raise Error.new(
-        I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
-        I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })) if (id.nil? || id.empty?)
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+        raise exception
+      end
       self.customer._url + "/subscription"
     end
     def pause

data/lib/conekta/tax_line.rb

@@ -0,0 +1,30 @@
+module Conekta
+  class TaxLine < Resource
+    include Conekta::Operations::Delete
+    include Conekta::Operations::Update
+    include Conekta::Operations::CustomAction
+
+    attr_accessor :description, :amount, :parent_id, :metadata
+
+    def _url
+      if (id.nil? || id.to_s.empty?)
+        exception = Error.new({
+          "message" => I18n.t('error.resource.id',  { resource: self.class.class_name, locale: :en }),
+          "message_to_purchaser" => I18n.t('error.resource.id_purchaser',  { locale: Conekta.locale.to_sym })
+        })
+        if Conekta.api_version == "2.0.0"
+          error_list = Conekta::ErrorList.new
+          error_list.details << exception
+          exception = error_list
+        end
+        raise exception
+      end
+
+      "#{self.order._url}#{self.class._url}/#{id}"
+    end
+
+    def delete
+      self.delete_member('order', 'tax_lines')
+    end
+  end
+end

data/lib/conekta/token.rb

@@ -2,5 +2,7 @@ module Conekta
   class Token < Resource
     include Conekta::Operations::Find
     include Conekta::Operations::Create
+
+    attr_accessor :livemode, :used
   end
 end

data/lib/conekta/util.rb

@@ -1,5 +1,6 @@
 module Conekta
   module Util
+
     def self.types
       @types ||= {
         'bank_transfer_payment' => PaymentMethod,
@@ -14,6 +15,7 @@ module Conekta
         'payee' => Payee,
         'payout' => Payout,
         'payout_method' => PayoutMethod,
+        'destination' => Destination,
         'plan' => Plan,
         'subscription' => Subscription,
         'token' => Token,
@@ -21,16 +23,34 @@ module Conekta
         'webhook_log' => WebhookLog,
         'refund' => Refund,
         'line_item' => LineItem,
-        'address' => Address
+        'address' => Address,
+        'order' => Order,
+        'payment_source' => PaymentSource,
+        'tax_line' => TaxLine,
+        'shipping_line' => ShippingLine,
+        'discount_line' => DiscountLine,
+        'fiscal_entity' => FiscalEntity,
+        'shipping_contact' => ShippingContact,
+        'list' => List,
+        'return' => Return
       }
     end
+
     def self.convert_to_conekta_object(name,resp)
-      if resp.kind_of?(Hash) 
+      return resp if name == "data" # event data should not be parsed into objects
+      if resp.kind_of?(Hash)
         if resp.has_key?('object') and types[resp['object']]
-          instance = types[resp['object']].new()
+          if resp['object'] == "list"
+            instance = types[resp['object']].new(name, resp)
+          else
+            instance = types[resp['object']].new()
+          end
+
           instance.load_from(resp)
+
           return instance
         elsif name.instance_of? String
+          name = "shippin_line_method" if name == "method"
           name = "event_data" if camelize(name) == "Data"
           name = "obj" if camelize(name) == "Object"
           if !Object.const_defined?(camelize(name))
@@ -38,10 +58,13 @@ module Conekta
           else
             instance = constantize(camelize(name)).new
           end
+
           instance.load_from(resp)
+
           return instance
         end
       end
+
       if resp.kind_of?(Array)
         instance = ConektaObject.new
         instance.load_from(resp)
@@ -56,10 +79,21 @@ module Conekta
       end
       return instance
     end
+
+    def self.underscore(str)
+      str.split(/::/).last.
+        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        gsub(/([a-z\d])([A-Z])/,'\1_\2').
+        tr("-", "_").
+        downcase
+    end
+
     protected
+
     def self.camelize(str)
       str.split('_').map{|e| e.capitalize}.join
     end
+
     def self.constantize(camel_cased_word)
       names = camel_cased_word.split('::')
 

data/lib/conekta/version.rb

@@ -1,3 +1,3 @@
 module Conekta
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/conekta/webhook.rb

@@ -6,5 +6,7 @@ module Conekta
     include Conekta::Operations::Delete
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
+
+    attr_accessor :url, :status, :production_enabled, :development_enabled, :subscribed_events
   end
 end

data/spec/conekta/1.0.0/card_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Conekta::Card do
+  include_context "API 1.0.0"
+  let(:customer_data) do
+    {
+      email: "hola@hola.com",
+      name:  "John Constantine",
+      cards: ["tok_test_visa_4242"]
+    }
+  end
+
+  let(:customer) do
+    Conekta::Customer.create(customer_data)
+  end
+
+  let(:card) { customer.cards.first }
+
+  context "deleting cards" do
+    it "successful card delete" do
+      card.delete
+
+      expect(card.deleted).to eq(true)
+    end
+  end
+
+  context "updating cards" do
+    it "successful card update" do
+      card.update(active: false)
+
+      expect(card.active).to eq(false)
+    end
+
+    it "unsuccessful card update" do
+      expect {
+        card.update(token: "tok_test_visa_4241")
+      }.to raise_error(Conekta::ParameterValidationError)
+    end
+  end
+end