mercadolibre 0.14.1 → 1.0.0

data/lib/mercadolibre/version.rb

@@ -1,3 +1,3 @@
 module Mercadolibre
-  VERSION = "0.14.1"
+  VERSION = '1.0.0'
 end

data/lib/mercadopago/api.rb

@@ -9,70 +9,105 @@ module Mercadopago
       @access_token = args[:access_token]
       @endpoint_url = 'https://api.mercadopago.com'
       @auth_url = 'https://auth.mercadopago.com.ar'
-      @debug = args[:debug]
     end
 
     include Mercadopago::Core::Auth
     include Mercadopago::Core::Payments
 
+    def get_last_response
+      @last_response
+    end
+
     private
 
     def get_request(action, params={}, headers={})
       begin
-        parse_response(RestClient.get("#{@endpoint_url}#{action}", {params: params}.merge(headers)))
+        api_response_kind = params.delete('api_response_kind')
+        api_response_kind = params.delete(:api_response_kind) if api_response_kind.nil?
+        api_response_kind = 'object' if api_response_kind.nil?
+
+        parse_response(api_response_kind, RestClient.get("#{@endpoint_url}#{action}", {params: params}.merge(headers)))
       rescue => e
-        parse_response(e.response)
+        parse_response('object', e.response)
       end
     end
 
     def post_request(action, params={}, headers={})
       begin
-        parse_response(RestClient.post("#{@endpoint_url}#{action}", params, headers))
+        api_response_kind = params.delete('api_response_kind')
+        api_response_kind = params.delete(:api_response_kind) if api_response_kind.nil?
+        api_response_kind = 'object' if api_response_kind.nil?
+
+        parse_response(api_response_kind, RestClient.post("#{@endpoint_url}#{action}", params, headers))
       rescue => e
-        parse_response(e.response)
+        parse_response('object', e.response)
       end
     end
 
     def put_request(action, params={}, headers={})
       begin
-        parse_response(RestClient.put("#{@endpoint_url}#{action}", params, headers))
+        api_response_kind = params.delete('api_response_kind')
+        api_response_kind = params.delete(:api_response_kind) if api_response_kind.nil?
+        api_response_kind = 'object' if api_response_kind.nil?
+
+        parse_response(api_response_kind, RestClient.put("#{@endpoint_url}#{action}", params, headers))
       rescue => e
-        parse_response(e.response)
+        parse_response('object', e.response)
       end
     end
 
     def patch_request(action, params={}, headers={})
       begin
-        parse_response(RestClient.patch("#{@endpoint_url}#{action}", params, headers))
+        api_response_kind = params.delete('api_response_kind')
+        api_response_kind = params.delete(:api_response_kind) if api_response_kind.nil?
+        api_response_kind = 'object' if api_response_kind.nil?
+
+        parse_response(api_response_kind, RestClient.patch("#{@endpoint_url}#{action}", params, headers))
       rescue => e
-        parse_response(e.response)
+        parse_response('object', e.response)
       end
     end
 
     def head_request(action, params={})
       begin
-        parse_response(RestClient.head("#{@endpoint_url}#{action}", params))
+        api_response_kind = params.delete('api_response_kind')
+        api_response_kind = params.delete(:api_response_kind) if api_response_kind.nil?
+        api_response_kind = 'object' if api_response_kind.nil?
+
+        parse_response(api_response_kind, RestClient.head("#{@endpoint_url}#{action}", params))
       rescue => e
-        parse_response(e.response)
+        parse_response('object', e.response)
       end
     end
 
     def delete_request(action, params={})
       begin
-        parse_response(RestClient.delete("#{@endpoint_url}#{action}", params))
+        api_response_kind = params.delete('api_response_kind')
+        api_response_kind = params.delete(:api_response_kind) if api_response_kind.nil?
+        api_response_kind = 'object' if api_response_kind.nil?
+
+        parse_response(api_response_kind, RestClient.delete("#{@endpoint_url}#{action}", params))
       rescue => e
-        parse_response(e.response)
+        parse_response('object', e.response)
       end
     end
 
-    def parse_response(response)
-      result = {
-        headers: response.headers,
-        body: (JSON.parse(response.body) rescue response.body),
-        status_code: response.code
-      }
+    def parse_response(api_response_kind, response)
+      @last_response = response
 
-      p "DEBUG: #{result}" if @debug
+      result = OpenStruct.new
+      result.status_code = response.code
+
+      if api_response_kind == 'object'
+        result.headers = (JSON.parse(response.headers.to_json, object_class: OpenStruct) rescue response.headers)
+        result.body = (JSON.parse(response.body, object_class: OpenStruct) rescue response.body)
+      elsif api_response_kind == 'hash'
+        result.headers = response.headers
+        result.body = (JSON.parse(response.body) rescue response.body)
+      else
+        result.headers = response.headers
+        result.body = response.body
+      end
 
       result
     end

data/lib/mercadopago/core/auth.rb

@@ -18,13 +18,11 @@ module Mercadopago
           client_secret: @app_secret,
           code: auth_code,
           redirect_uri: @callback_url
-        })[:body]
+        })
 
-        @access_token = response['access_token']
-
-        Mercadopago::Entity::Auth.new(response.merge({
-          expired_at: (Time.now + response['expires_in'].to_i)
-        }))
+        @access_token = response.body.access_token
+        response.body.expiration_time = (Time.now + response.body.expires_in.to_i)
+        response.body
       end
 
       def update_token(refresh_token)
@@ -33,13 +31,11 @@ module Mercadopago
           client_id: @app_key,
           client_secret: @app_secret,
           refresh_token: refresh_token
-        })[:body]
-
-        @access_token = response['access_token']
+        })
 
-        Mercadopago::Entity::Auth.new(response.merge({
-          expired_at: (Time.now + response['expires_in'].to_i)
-        }))
+        @access_token = response.body.access_token
+        response.body.expiration_time = (Time.now + response.body.expires_in.to_i)
+        response.body
       end
 
       def create_token
@@ -52,13 +48,11 @@ module Mercadopago
           grant_type: 'client_credentials',
           client_id: @app_key,
           client_secret: @app_secret
-        }, headers)[:body]
-
-        @access_token = response['access_token']
+        }, headers)
 
-        Mercadopago::Entity::Auth.new(response.merge({
-          expired_at: (Time.now + response['expires_in'].to_i)
-        }))
+        @access_token = response.body.access_token
+        response.body.expiration_time = (Time.now + response.body.expires_in.to_i)
+        response.body
       end
     end
   end

data/lib/mercadopago/core/payments.rb

@@ -3,20 +3,13 @@ module Mercadopago
     module Payments
       def get_payment(payment_id)
         filters = { access_token: @access_token }
-        r = get_request("/v1/payments/#{payment_id}", filters)
-
-        Mercadopago::Entity::Payment.new(r[:body])
+        get_request("/v1/payments/#{payment_id}", filters).body
       end
 
       def search_payments(filters={})
         filters.merge!({ access_token: @access_token })
 
-        response = get_request('/v1/payments/search', filters)[:body]
-
-        {
-          results: response['results'].map { |r| Mercadopago::Entity::Payment.new(r) },
-          paging: response['paging']
-        }
+        get_request('/v1/payments/search', filters).body
       end
 
       def request_payment(attrs={})
@@ -24,9 +17,7 @@ module Mercadopago
 
         headers = { content_type: :json }
 
-        result = post_request("/money_requests?access_token=#{@access_token}", payload, headers)
-
-        Mercadopago::Entity::MoneyRequest.new(result[:body])
+        post_request("/money_requests?access_token=#{@access_token}", payload, headers).body
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercadolibre
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Matias Hick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,91 +66,17 @@ files:
 - lib/mercadolibre/api.rb
 - lib/mercadolibre/core/auth.rb
 - lib/mercadolibre/core/categories_and_listings.rb
+- lib/mercadolibre/core/collections.rb
 - lib/mercadolibre/core/items_and_searches.rb
 - lib/mercadolibre/core/locations_and_currencies.rb
 - lib/mercadolibre/core/order_management.rb
 - lib/mercadolibre/core/questions.rb
 - lib/mercadolibre/core/shippings.rb
 - lib/mercadolibre/core/users.rb
-- lib/mercadolibre/entity/address.rb
-- lib/mercadolibre/entity/address_agency.rb
-- lib/mercadolibre/entity/answer.rb
-- lib/mercadolibre/entity/atm_transfer_reference.rb
-- lib/mercadolibre/entity/auth.rb
-- lib/mercadolibre/entity/billing_info.rb
-- lib/mercadolibre/entity/card_configuration.rb
-- lib/mercadolibre/entity/card_issuer.rb
-- lib/mercadolibre/entity/category.rb
-- lib/mercadolibre/entity/category_settings.rb
-- lib/mercadolibre/entity/city.rb
-- lib/mercadolibre/entity/collector.rb
-- lib/mercadolibre/entity/cost_components.rb
-- lib/mercadolibre/entity/country.rb
-- lib/mercadolibre/entity/currency.rb
-- lib/mercadolibre/entity/currency_conversion_ratio.rb
-- lib/mercadolibre/entity/featured_item.rb
-- lib/mercadolibre/entity/feedback.rb
-- lib/mercadolibre/entity/feedback_reply.rb
-- lib/mercadolibre/entity/geolocation.rb
-- lib/mercadolibre/entity/gtin.rb
-- lib/mercadolibre/entity/item.rb
-- lib/mercadolibre/entity/item_attribute.rb
-- lib/mercadolibre/entity/item_description.rb
-- lib/mercadolibre/entity/item_payment_method.rb
-- lib/mercadolibre/entity/item_picture.rb
-- lib/mercadolibre/entity/item_shipping.rb
-- lib/mercadolibre/entity/listing_exposure.rb
-- lib/mercadolibre/entity/listing_price.rb
-- lib/mercadolibre/entity/listing_type.rb
-- lib/mercadolibre/entity/mediation.rb
-- lib/mercadolibre/entity/mediation_interaction.rb
-- lib/mercadolibre/entity/municipality.rb
-- lib/mercadolibre/entity/neighborhood.rb
-- lib/mercadolibre/entity/order.rb
-- lib/mercadolibre/entity/order_coupon.rb
-- lib/mercadolibre/entity/order_feedback.rb
-- lib/mercadolibre/entity/order_item.rb
-- lib/mercadolibre/entity/order_note.rb
-- lib/mercadolibre/entity/order_shipping.rb
-- lib/mercadolibre/entity/payment.rb
-- lib/mercadolibre/entity/payment_method.rb
-- lib/mercadolibre/entity/payment_plan.rb
-- lib/mercadolibre/entity/payment_promotion.rb
-- lib/mercadolibre/entity/phone.rb
-- lib/mercadolibre/entity/product_identifier.rb
-- lib/mercadolibre/entity/question.rb
-- lib/mercadolibre/entity/search_location.rb
-- lib/mercadolibre/entity/shipment.rb
-- lib/mercadolibre/entity/shipment_status_history.rb
-- lib/mercadolibre/entity/shipping_delivery.rb
-- lib/mercadolibre/entity/shipping_item.rb
-- lib/mercadolibre/entity/shipping_option.rb
-- lib/mercadolibre/entity/shipping_speed.rb
-- lib/mercadolibre/entity/site.rb
-- lib/mercadolibre/entity/site_domain.rb
-- lib/mercadolibre/entity/site_trend.rb
-- lib/mercadolibre/entity/state.rb
-- lib/mercadolibre/entity/user.rb
-- lib/mercadolibre/entity/zip_code.rb
 - lib/mercadolibre/version.rb
 - lib/mercadopago/api.rb
 - lib/mercadopago/core/auth.rb
 - lib/mercadopago/core/payments.rb
-- lib/mercadopago/entity/additional_info.rb
-- lib/mercadopago/entity/address.rb
-- lib/mercadopago/entity/auth.rb
-- lib/mercadopago/entity/collector.rb
-- lib/mercadopago/entity/fee_detail.rb
-- lib/mercadopago/entity/identification.rb
-- lib/mercadopago/entity/money_request.rb
-- lib/mercadopago/entity/order.rb
-- lib/mercadopago/entity/payer.rb
-- lib/mercadopago/entity/payment.rb
-- lib/mercadopago/entity/phone.rb
-- lib/mercadopago/entity/refund.rb
-- lib/mercadopago/entity/shipments.rb
-- lib/mercadopago/entity/source.rb
-- lib/mercadopago/entity/transaction_details.rb
 homepage: https://github.com/unformattmh/mercadolibre
 licenses:
 - MIT

data/lib/mercadolibre/entity/address.rb

@@ -1,40 +0,0 @@
-module Mercadolibre
-  module Entity
-    class Address
-      def self.attr_list
-        [:country, :state, :city, :neighborhood, :municipality, :types, :street_name,
-         :address_line, :id, :zip_code, :longitude, :street_number, :latitude, :comment,
-         :latitude, :longitude, :geolocation_type, :agency, :is_valid_for_carrier,
-         :search_location]
-      end
-
-      attr_reader *attr_list
-
-      def initialize(attributes={})
-        attributes.each do |k, v|
-          if k.to_s == 'state'
-            self.state = State.new(v) unless v.nil?
-          elsif k.to_s == 'city'
-            self.city = City.new(v) unless v.nil?
-          elsif k.to_s == 'country'
-            self.country = Country.new(v) unless v.nil?
-          elsif k.to_s == 'neighborhood'
-            self.neighborhood = Neighborhood.new(v) unless v.nil?
-          elsif k.to_s == 'municipality'
-            self.municipality = Municipality.new(v) unless v.nil?
-          elsif k.to_s == 'agency'
-            self.agency = AddressAgency.new(v) unless v.nil?
-          elsif k.to_s == 'search_location'
-            self.search_location = SearchLocation.new(v) unless v.nil?
-          else
-            self.send("#{k}=", v) if self.respond_to?(k)
-          end
-        end
-      end
-
-      private
-
-      attr_writer *attr_list
-    end
-  end
-end

data/lib/mercadolibre/entity/address_agency.rb

@@ -1,21 +0,0 @@
-module Mercadolibre
-  module Entity
-    class AddressAgency
-      def self.attr_list
-        [:carrier_id, :agency_id, :description, :phone, :open_hours]
-      end
-
-      attr_reader *attr_list
-
-      def initialize(attributes={})
-        attributes.each do |k, v|
-          self.send("#{k}=", v) if self.respond_to?(k)
-        end
-      end
-
-      private
-
-      attr_writer *attr_list
-    end
-  end
-end

data/lib/mercadolibre/entity/answer.rb

@@ -1,25 +0,0 @@
-module Mercadolibre
-  module Entity
-    class Answer
-      def self.attr_list
-        [:text, :status, :date_created]
-      end
-
-      attr_reader *attr_list
-
-      def initialize(attributes={})
-        attributes.each do |k, v|
-          if k.to_s == 'date_created'
-            self.date_created = Time.parse(v) unless v.nil?
-          else
-            self.send("#{k}=", v) if self.respond_to?(k)
-          end
-        end
-      end
-
-      private
-
-      attr_writer *attr_list
-    end
-  end
-end

data/lib/mercadolibre/entity/atm_transfer_reference.rb

@@ -1,21 +0,0 @@
-module Mercadolibre
-  module Entity
-    class AtmTransferReference
-      def self.attr_list
-        [:company_id, :transaction_id]
-      end
-
-      attr_reader *attr_list
-
-      def initialize(attributes={})
-        attributes.each do |k, v|
-          self.send("#{k}=", v) if self.respond_to?(k)
-        end
-      end
-
-      private
-
-      attr_writer *attr_list
-    end
-  end
-end

data/lib/mercadolibre/entity/auth.rb

@@ -1,21 +0,0 @@
-module Mercadolibre
-  module Entity
-    class Auth
-      def self.attr_list
-        [:access_token, :refresh_token, :live_mode, :user_id, :token_type, :scope, :expires_in, :expired_at]
-      end
-
-      attr_reader *attr_list
-
-      def initialize(attributes={})
-        attributes.each do |k, v|
-          self.send("#{k}=", v) if self.respond_to?(k)
-        end
-      end
-
-      private
-
-      attr_writer *attr_list
-    end
-  end
-end