conekta 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a68bb2f380ee3e0534cc3a215d42ae7af1b83fb4
-  data.tar.gz: a3f6593ed38db4ea7ff3de98ace71a923aeb01ce
+  metadata.gz: 10843b196a15bc8eed5bb035b6eeadc130c5e700
+  data.tar.gz: fb7a22fc70af5e7ed2ea715feb27b06d87d21df9
 SHA512:
-  metadata.gz: 23cb696ada3783092181bc8b75d0f01d1ef333465c7588e52b20f4cc251df6214bf1ef9e81698f8cce52487da7ee890bf2e7efbe6d254f93bea663c68e79d945
-  data.tar.gz: 5e00322dfeb89947caa101410a01e0e2661c1c7e8b26e4b9b45e343400a2a13e5ed0f8017cf5e19fab8db6b381eb375ce8c71de815c036ffc91992bffca02d92
+  metadata.gz: 9b5319eafe9ed1073033fc58d435de0545feb09f492dc5208e90b60feb9455043c561bf9bf2d4b0159260ffc78e318a3dbd0f67587cb6f7d8dac8910705e74ff
+  data.tar.gz: be9b23b5ae1a3ff0d767e3e0dca26099073238c7e1b9c0921cfc7ecec32f8cff6d6cf391f9a642dc994bf144f7d641e1bd89afd22dd7b62cd7d7df25e27584fb

data/.gitignore

@@ -19,3 +19,4 @@ bin/
 tags
 *.swp
 *.un~
+.byebug_history

data/CHANGELOG

@@ -75,4 +75,12 @@
 
 == 0.5.8 2016-07-19
 
-* Add new models for parsing.
+* Add new models for parsing.
+
+== 1.0.0 2017-01-24
+
+* Add support for API 2.0.
+
+== 1.1.0 2017-01-24
+
+* Version bump.

data/Gemfile

@@ -4,5 +4,6 @@ gem 'rspec'
 gem 'faraday'
 gem 'json'
 gem 'i18n'
+
 # Specify your gem's dependencies in conekta.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 ![alt tag](https://raw.github.com/conekta/conekta-ruby/master/readme_files/cover.png)
 
-# Conekta Ruby v.0.5.8
+# Conekta Ruby v.1.1.0
 
 This is a ruby library that allows interaction with https://api.conekta.io API.
 
@@ -31,58 +31,80 @@ Conekta.api_key = '1tv5yJp3xnVZ7eK67m4h'
 Conekta.config do |c|
   c.locale = :es
   c.api_key = '1tv5yJp3xnVZ7eK67m4h'
-  c.api_version = '1.0.0'
+  c.api_version = '2.0.0'
 end
 
 begin
-  charge = Conekta::Charge.create({
-    amount: 51000,
-    currency: "MXN",
-    description: "Pizza Delivery",
-    reference_id: "orden_de_id_interno",
-    card: params[:conektaTokenId]
-    #"tok_a4Ff0dD2xYZZq82d9"
-  })
-  rescue Conekta::ParameterValidationError => e
-    puts e.message
-    #alguno de los parámetros fueron inválidos
-  rescue Conekta::ProcessingError => e
-    puts e.message
-    #la tarjeta no pudo ser procesada
-  rescue Conekta::Error => e
-    puts e.message
-    #un error ocurrió que no sucede en el flujo normal de cobros como por ejemplo un auth_key incorrecto
+  order = Conekta::Order.create(order_data_with_charges.
+          merge(customer_info: customer_info))
+rescue Conekta::ErrorList => error_list
+  for error_detail in error_list.details do
+    puts error_detail.message
   end
+end
 
-  {
-    "id": "5286828b8ee31e64b7001739",
-    "livemode": false,
-    "created_at": 1384546955,
-    "status": "paid",
-    "currency": "MXN",
-    "description": "Some desc",
-    "reference_id": null,
-    "failure_code": null,
-    "failure_message": null,
-    "object": "charge",
-    "amount": 2000,
-    "fee": 371,
-    "payment_method": {
-      "name": "Mario Moreno",
-      "exp_month": "05",
-      "exp_year": "15",
-      "auth_code": "861491",
-      "object": "card_payment",
-      "last4": "4242",
-      "brand": "visa"
-    },
-    "details": {
-      "name": null,
-      "phone": null,
-      "email": null,
-      "line_items": []
+{
+  "livemode": false,
+  "amount": 35000,
+  "status": "created",
+  "currency": "MXN",
+  "capture": true,
+  "last_payment_info": {
+    "charge_id": "5887772aedbb6ea3a30056c5",
+    "payment_method": "OxxoPayment",
+    "status": "pending_payment"
+  },
+  "customer_info": {
+    "email": "hola@hola.com",
+    "phone": "+5213353319758",
+    "name": "John Constantine",
+    "first_paid_at": 0
+  },
+  "object": "order",
+  "id": "ord_2ftyJuymR9FZczvPg",
+  "metadata": {
+    "test": true
+  },
+  "created_at": 1485272874,
+  "updated_at": 1485272874,
+  "line_items": {
+    "0": {
+      "name": "Box of Cohiba S1s",
+      "description": "Imported From Mex.",
+      "unit_price": 35000,
+      "quantity": 1,
+      "tags": ["food", "mexican food"],
+      "type": "physical",
+      "object": "line_item",
+      "id": "line_item_2ftyJuymR9FZczvPe",
+      "parent_id": "ord_2ftyJuymR9FZczvPg",
+      "metadata": {}
+    }
+  },
+  "charges": {
+    "0": {
+      "id": "5887772aedbb6ea3a30056c5",
+      "livemode": false,
+      "created_at": 1485272874,
+      "currency": "MXN",
+      "payment_method": {
+        "barcode_url": "https://s3.amazonaws.com/cash_payment_barcodes/sandbox_reference.png",
+        "service_name": "OxxoPay",
+        "object": "cash_payment",
+        "type": "oxxo",
+        "expires_at": 1485276473,
+        "store_name": "OXXO",
+        "reference": "93345678901234"
+      },
+      "object": "charge",
+      "status": "pending_payment",
+      "amount": 35000,
+      "fee": 1421,
+      "customer_id": "",
+      "order_id": "ord_2ftyJuymR9FZczvPg"
     }
   }
+}
 ```
 
 License

data/lib/conekta.rb

@@ -12,41 +12,60 @@ require "conekta/operations/custom_action"
 require "conekta/operations/create_member"
 
 require "conekta/conekta_object"
+require "conekta/list"
 require "conekta/resource"
 require "conekta/requestor"
 require "conekta/util"
 require "conekta/error"
+require "conekta/error_list"
 
 require "conekta/event"
 require "conekta/charge"
 require "conekta/customer"
 require "conekta/card"
+require "conekta/discount_line"
+require "conekta/fiscal_entity"
 require "conekta/log"
 require "conekta/method"
+require "conekta/order"
 require "conekta/payment_method"
 require "conekta/payee"
 require "conekta/payout"
 require "conekta/payout_method"
+require "conekta/destination"
 require "conekta/plan"
+require "conekta/shipping_contact"
+require "conekta/shipping_line"
+require "conekta/payment_source"
 require "conekta/subscription"
+require "conekta/tax_line"
 require "conekta/token"
 require "conekta/webhook"
 require "conekta/webhook_log"
 require "conekta/refund"
 require "conekta/line_item"
+require "conekta/return"
 require "conekta/address"
 
 module Conekta
   I18n.load_path += Dir[File.join(File.expand_path('../..', __FILE__), 'locales', '*.{rb,yml}').to_s]
 
   @api_base = 'https://api.conekta.io'
-  @api_version = '1.0.0'
+  @api_version = '2.0.0'
   @locale = 'es'
 
   def self.config
     yield self
   end
 
+  def self.plugin
+    @plugin
+  end
+
+  def self.plugin=(plugin)
+    @plugin = plugin
+  end
+
   def self.api_base
     @api_base
   end

data/lib/conekta/address.rb

@@ -1,4 +1,5 @@
 module Conekta
   class Address < Resource
+    attr_accessor :street1, :street2, :street3, :city, :state, :zip, :country
   end
 end

data/lib/conekta/card.rb

@@ -3,10 +3,24 @@ module Conekta
     include Conekta::Operations::Delete
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
+
+    attr_accessor :created_at, :last4, :bin, :name,
+                  :exp_month, :exp_year, :brand,
+                  :parent_id, :default
+
     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 + self.class._url + "/" + id
     end
     def delete

data/lib/conekta/charge.rb

@@ -4,6 +4,13 @@ module Conekta
     include Conekta::Operations::Where
     include Conekta::Operations::Create
     include Conekta::Operations::CustomAction
+
+    attr_accessor :livemode, :amount, :created_at, :currency, :description,
+                  :reference_id, :failure_code, :failure_message, :fee,
+                  :monthly_installments, :device_fingerprint, :status,
+                  :exchange_rate, :foreign_currency, :amount_in_foreign_currency,
+                  :checkout_id, :checkout_order_count
+
     def capture
       custom_action(:post, 'capture')
     end

data/lib/conekta/conekta_object.rb

@@ -1,25 +1,29 @@
 module Conekta
   class ConektaObject < Hash
-    attr_reader :id
     attr_reader :values
-    def initialize(id=nil)
+
+    def initialize
       @values = Hash.new
-      @id = id.to_s
     end
+
     def set_val(k,v)
       @values[k] = v
       self[k] = v
     end
+
     def unset_key(k)
       @values.delete(k)
       self.delete(k)
     end
+
     def first
       self[0]
     end
+
     def last
       self[self.count - 1]
     end
+
     def load_from(response)
       if response.instance_of?(Array)
         response.each_with_index do |v, i|
@@ -32,9 +36,11 @@ module Conekta
         end
       end
     end
+
     def to_s
       @values.inspect
     end
+
     def inspect
       if self.respond_to? :each
         if self.class.class_name != "ConektaObject"
@@ -46,26 +52,33 @@ module Conekta
         super
       end
     end
+
     def self.class_name
       self.name.split('::')[-1]
     end
+
     def class_name
       self.class.name.split('::')[-1]
     end
+
     def create_attr(k,v)
       # Conflict with Resource Class Url
+      k = "_#{k}" if k.to_s == "method"
+
       if ! k.to_s.match(/-/) and ! k.to_s.match(/^[0-9]+/)
-        create_method( "#{k}=".to_sym ) { |val| 
+        create_method( "#{k}=".to_sym ) { |val|
             instance_variable_set( "@" + k, val)
         }
         self.send("#{k}=".to_sym, v)
         self.class.send(:remove_method, "#{k}=".to_sym)
-        create_method( k.to_sym ) { 
-          instance_variable_get( "@" + k ) 
+        create_method( k.to_sym ) {
+          instance_variable_get( "@" + k )
         }
       end
     end
+
     protected
+
     def to_hash
       hash = Hash.new
       self.values.each do |k,v|
@@ -73,13 +86,16 @@ module Conekta
       end
       hash
     end
-    def create_method( name, &block )
-        self.class.send( :define_method, name, &block )
+
+    def create_method(name, &block)
+        self.class.send(:define_method, name, &block)
     end
+
     def load_from_enumerable(k,v)
       if v.respond_to? :each and !v.instance_of?(ConektaObject)
         v = Conekta::Util.convert_to_conekta_object(k,v)
       end
+
       if self.instance_of?(ConektaObject)
         self[k] = v
       else
@@ -87,5 +103,6 @@ module Conekta
       end
       self.set_val(k,v)
     end
+
   end
 end

data/lib/conekta/customer.rb

@@ -7,26 +7,77 @@ module Conekta
     include Conekta::Operations::Update
     include Conekta::Operations::CustomAction
     include Conekta::Operations::CreateMember
+
+    attr_accessor :livemode, :name, :email, :phone, :default_shipping_contact_id,
+                  :default_fiscal_entity_id, :referrer, :account_age,
+                  :paid_transactions, :first_paid_at, :corporate, :default_payment_source_id,
+                  :fiscal_entities, :shipping_contacts, :subscription, :payment_sources, :cards
+
+    def initialize(id=nil)
+      @id = id
+      @payment_sources ||= List.new("PaymentSource", {})
+      @fiscal_entities ||= List.new("FiscalEntity", {})
+      @shipping_contacts ||= List.new("ShippingContacts", {})
+      super(id)
+    end
+
     def load_from(response=nil)
       if response
         super
       end
+
       customer = self
-      self.cards.each do |k,v|
-        if !v.respond_to? :deleted or !v.deleted
-          v.create_attr('customer', customer)
-          self.cards.set_val(k,v)
+
+      if Conekta.api_version == "2.0.0"
+        submodels = [:fiscal_entities, :payment_sources, :shipping_contacts]
+        create_submodels_lists(customer, submodels)
+      else
+        submodels = [:cards]
+
+        submodels.each do |submodel|
+          self.send(submodel).each do |k,v|
+            if !v.respond_to? :deleted or !v.deleted
+              v.create_attr('customer', customer)
+
+              self.send(submodel).set_val(k,v)
+            end
+          end
         end
       end
+
       if self.respond_to? :subscription and self.subscription
          self.subscription.create_attr('customer', customer)
       end
     end
+
     def create_card(params)
       self.create_member('cards', params)
     end
+
+    def create_payment_source(params)
+      self.create_member('payment_sources', params)
+    end
+
     def create_subscription(params)
       self.create_member('subscription', params)
     end
+
+    def create_fiscal_entity(params)
+      self.create_member('fiscal_entities', params)
+    end
+
+    def create_shipping_contact(params)
+      self.create_member('shipping_contacts', params)
+    end
+
+    def create_submodels_lists(customer, submodels)
+      submodels.each do |submodel|
+        self.send(submodel).each do |k, v|
+          v.create_attr('customer', customer)
+
+          self.send(submodel).set_val(k,v)
+        end if self.respond_to?(submodel) && !self.send(submodel).nil?
+      end
+    end
   end
 end