mrkt 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6240df5d2fc5e237cb846da72b226f71b836d86e466aff3ee96854ff0c9087f
-  data.tar.gz: a20eea282f97ad58e45d780bfc88c32305bae0c127feb819be7f93aa26010dc5
+  metadata.gz: 8b9a26db5da0ff83b251b40c276517013a120bccac5e0723d2cb23f751bc9817
+  data.tar.gz: 74a55a3fde8f192301e8995c7391fc5f88c7f8d9fa0163a1f2ef633cf9ade4bf
 SHA512:
-  metadata.gz: 5e4878202b8cf696c8e9434688f21c648770f32a393d7128efe1b90e89c1e78d76b00c447c83c295f72cdc8399f7ffe6a526b7a972a45107abe1c0ea53a42217
-  data.tar.gz: 14c64d83473c35eaec901b1be3e921d1de1e211cf8db989fa91bb3e2fa389303d27bdf6adc7af77bcedcc9de6aaf8aaaa3adefb04f0748d12f680d29fcdcd716
+  metadata.gz: 365eaf2f0ea0ffc9a9a47af40b9834bab11de69438bb44a42dc23720f19b705b8918c097164c49cc2d82ce02dfb8b1add9f761cb6ae3ee99df69091493fb3b32
+  data.tar.gz: 7a184f5ce07e10e3e88f9cfe988adfdf2633271e229f55da2290e04ac78b3282a46eb77c87d01f00c3e3493e77920abf7a38bc1be8edf3cc565224aa8ecb8bff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mrkt (1.0.0)
+    mrkt (1.0.1)
       faraday (~> 1.0)
       faraday_middleware (~> 1.0)
 

data/lib/mrkt/concerns/connection.rb

@@ -1,4 +1,4 @@
-require 'mrkt/faraday_middleware'
+require 'mrkt/faraday'
 
 module Mrkt
   module Connection
@@ -7,7 +7,7 @@ module Mrkt
     end
 
     def init_connection
-      Faraday.new(url: "https://#{@host}") do |conn|
+      ::Faraday.new(options) do |conn|
         conn.request :multipart
         conn.request :url_encoded
 
@@ -17,8 +17,17 @@ module Mrkt
         conn.options.timeout = @options[:read_timeout] if @options.key?(:read_timeout)
         conn.options.open_timeout = @options[:open_timeout] if @options.key?(:open_timeout)
 
-        conn.adapter @options.fetch(:adapter, Faraday.default_adapter)
+        conn.adapter @options.fetch(:adapter, ::Faraday.default_adapter)
       end
     end
+
+    def options
+      {
+        url: "https://#{@host}",
+        request: {
+          params_encoder: Mrkt::Faraday::ParamsEncoder
+        }
+      }
+    end
   end
 end

data/lib/mrkt/concerns/crud_activities.rb

@@ -13,8 +13,8 @@ module Mrkt
         nextPageToken: next_page_token
       }
 
-      params[:activityTypeIds] = activity_type_ids.join(',') unless blank?(activity_type_ids)
-      params[:leadIds] = lead_ids.join(',') unless blank?(lead_ids)
+      params[:activityTypeIds] = activity_type_ids unless blank?(activity_type_ids)
+      params[:leadIds] = lead_ids unless blank?(lead_ids)
 
       get('/rest/v1/activities.json', params)
     end

data/lib/mrkt/concerns/crud_custom_objects.rb

@@ -2,7 +2,7 @@ module Mrkt
   module CrudCustomObjects
     def get_list_of_custom_objects(names = nil)
       params = {}
-      params[:names] = names.join(',') if names
+      params[:names] = names if names
 
       get('/rest/v1/customobjects.json', params)
     end

data/lib/mrkt/concerns/crud_leads.rb

@@ -2,7 +2,7 @@ module Mrkt
   module CrudLeads
     def get_lead_by_id(id, fields: nil)
       optional = {
-        fields: fields&.join(',')
+        fields: fields
       }
 
       get("/rest/v1/lead/#{id}.json", {}, optional)
@@ -11,7 +11,7 @@ module Mrkt
     def get_leads(filter_type, filter_values, fields: nil, batch_size: nil, next_page_token: nil)
       params = {
         filterType: filter_type,
-        filterValues: filter_values.join(',')
+        filterValues: filter_values
       }
 
       optional = {
@@ -47,18 +47,20 @@ module Mrkt
     end
 
     def associate_lead(id, cookie)
-      params = Faraday::Utils::ParamsHash.new
-      params[:cookie] = cookie
+      params = Mrkt::Faraday::ParamsEncoder.encode(cookie: cookie)
 
-      post_json("/rest/v1/leads/#{id}/associate.json?#{params.to_query}")
+      post_json("/rest/v1/leads/#{id}/associate.json?#{params}")
     end
 
     def merge_leads(winning_lead_id, losing_lead_ids, merge_in_crm: false)
-      params = Faraday::Utils::ParamsHash.new
+      params = {}
+
       params[:mergeInCRM] = merge_in_crm
-      params[:leadIds] = losing_lead_ids.join(',') if losing_lead_ids
+      params[:leadIds] = losing_lead_ids if losing_lead_ids
+
+      query_params = Mrkt::Faraday::ParamsEncoder.encode(params)
 
-      post_json("/rest/v1/leads/#{winning_lead_id}/merge.json?#{params.to_query}")
+      post_json("/rest/v1/leads/#{winning_lead_id}/merge.json?#{query_params}")
     end
 
     def describe_lead

data/lib/mrkt/concerns/import_custom_objects.rb

@@ -3,7 +3,7 @@ module Mrkt
     def import_custom_object(file, custom_object, format = 'csv')
       params = {
         format: format,
-        file: Faraday::UploadIO.new(file, 'text/csv')
+        file: ::Faraday::UploadIO.new(file, 'text/csv')
       }
 
       post("/bulk/v1/customobjects/#{custom_object}/import.json", params)

data/lib/mrkt/concerns/import_leads.rb

@@ -3,7 +3,7 @@ module Mrkt
     def import_lead(file, format = 'csv', lookup_field: nil, list_id: nil, partition_name: nil)
       params = {
         format: format,
-        file: Faraday::UploadIO.new(file, 'text/csv')
+        file: ::Faraday::UploadIO.new(file, 'text/csv')
       }
 
       optional = {

data/lib/mrkt/faraday.rb

@@ -0,0 +1,4 @@
+require 'faraday'
+
+require 'mrkt/faraday/params_encoder'
+require 'mrkt/faraday_middleware'

data/lib/mrkt/faraday/params_encoder.rb

@@ -0,0 +1,20 @@
+module Mrkt
+  module Faraday
+    class ParamsEncoder
+      class << self
+        def encode(hash)
+          new_hash = hash.transform_values { |v| encode_value(v) }
+          ::Faraday::NestedParamsEncoder.encode(new_hash)
+        end
+
+        def decode(string)
+          ::Faraday::NestedParamsEncoder.decode(string)
+        end
+
+        def encode_value(value)
+          value.respond_to?(:join) ? value.join(',') : value
+        end
+      end
+    end
+  end
+end

data/lib/mrkt/faraday_middleware.rb

@@ -1,11 +1,7 @@
-require 'faraday'
+require 'mrkt/faraday_middleware/response'
 
 module Mrkt
-  module FaradayMiddleware
-    autoload :Response, 'mrkt/faraday_middleware/response'
-  end
-
-  if Faraday::Middleware.respond_to? :register_middleware
-    Faraday::Response.register_middleware mkto: -> { Mrkt::FaradayMiddleware::Response }
+  if ::Faraday::Middleware.respond_to?(:register_middleware)
+    ::Faraday::Response.register_middleware(mkto: Mrkt::FaradayMiddleware::Response)
   end
 end

data/lib/mrkt/version.rb

@@ -1,3 +1,3 @@
 module Mrkt
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/concerns/crud_leads_spec.rb

@@ -211,7 +211,7 @@ describe Mrkt::CrudLeads do
     subject { client.merge_leads(id, losing_lead_ids) }
 
     before do
-      params = Faraday::Utils::ParamsHash.new
+      params = ::Faraday::Utils::ParamsHash.new
       params[:mergeInCRM] = false
       params[:leadIds] = losing_lead_ids.join(',') if losing_lead_ids
 

data/spec/faraday/params_encoder_spec.rb

@@ -0,0 +1,24 @@
+describe Mrkt::Faraday::ParamsEncoder do
+  describe '.encode' do
+    let(:params) do
+      {
+        string: 'foobar',
+        number: 1,
+        boolean: true,
+        array: [1, 2, 3]
+      }
+    end
+
+    subject { described_class.encode(params) }
+
+    it { is_expected.to eq(Faraday::Utils::ParamsHash.new.merge(params.merge(array: '1,2,3')).to_query) }
+  end
+
+  describe '.decode' do
+    let(:value) { 'foo=foo&bar=bar' }
+
+    subject { described_class.decode(value) }
+
+    it { is_expected.to eq('foo' => 'foo', 'bar' => 'bar') }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrkt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - KARASZI István
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -185,6 +185,8 @@ files:
 - lib/mrkt/concerns/import_custom_objects.rb
 - lib/mrkt/concerns/import_leads.rb
 - lib/mrkt/errors.rb
+- lib/mrkt/faraday.rb
+- lib/mrkt/faraday/params_encoder.rb
 - lib/mrkt/faraday_middleware.rb
 - lib/mrkt/faraday_middleware/response.rb
 - lib/mrkt/version.rb
@@ -202,6 +204,7 @@ files:
 - spec/concerns/import_custom_objects_spec.rb
 - spec/concerns/import_leads_spec.rb
 - spec/errors_spec.rb
+- spec/faraday/params_encoder_spec.rb
 - spec/mkto_rest_spec.rb
 - spec/spec_helper.rb
 - spec/support/initialized_client.rb
@@ -243,6 +246,7 @@ test_files:
 - spec/concerns/import_custom_objects_spec.rb
 - spec/concerns/import_leads_spec.rb
 - spec/errors_spec.rb
+- spec/faraday/params_encoder_spec.rb
 - spec/mkto_rest_spec.rb
 - spec/spec_helper.rb
 - spec/support/initialized_client.rb