acw 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda66f075833c1878fa3bd2f35a27d92eaf0a9290ee519b131997b90fd00bc29
-  data.tar.gz: 445c24100e91284c7bb62be7a66b8a8040f9f99c6c565d4e743e08f49229d781
+  metadata.gz: 3fa56b583e9d24bba42c1b75c166e1e92533525078f33d509593f06b03bded39
+  data.tar.gz: 82c5b800209aab1e0282918c9bda49768a96c95bb5ba6a7757156379da174f94
 SHA512:
-  metadata.gz: 1b793e49061b1dd95860830c270a9d91ba22c8a14a3e976b3c36904d37516054feee0ef47378ad6f6cd58f1604ef3f9f8087d6a817cb603b16606ad1a2deda98
-  data.tar.gz: 52c0e6116c71b98fbefea9be9da18a9baf75f8bba7b104a7239cd92f3e739f2898edd08d4dbf0351bb447deedb37385d96b81b6c9378c9cd9ff7cc1a3f20e8ed
+  metadata.gz: 575847d2ebddd5c197e85adf24efdc01eaf147ce10b6cc57d5dd7ef61fa51965865b20ce2cd3cc0c99beab07dfe03891f5c3f9b736112169cb442a73589fe19f
+  data.tar.gz: 8d7b0b30a4ffa3977f346cf0bb5a1dc1eb36a1ae22d1281877586bf279b4503fcb04b9d4117a7b77bf1791b78c1d0f4a30c65dc8917638c39bee4893554fca58

data/Gemfile.lock

@@ -1,22 +1,24 @@
 PATH
   remote: .
   specs:
-    acw (1.1.2)
-      faraday (>= 1.0)
+    acw (1.2.0)
+      excon (>= 0.73.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    coderay (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    faraday (1.2.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+    excon (0.78.1)
     hashdiff (1.0.1)
-    multipart-post (2.1.1)
+    method_source (1.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     public_suffix (4.0.4)
     rake (12.3.3)
     rspec (3.9.0)
@@ -32,7 +34,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    ruby2_keywords (0.0.2)
     safe_yaml (1.0.5)
     vcr (5.1.0)
     webmock (3.8.3)
@@ -46,6 +47,7 @@ PLATFORMS
 DEPENDENCIES
   acw!
   bundler (~> 2.0)
+  pry (~> 0.13.1)
   rake (~> 12.3.3)
   rspec (~> 3.0)
   vcr (~> 5.1)

data/acw.gemspec

@@ -28,11 +28,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'faraday', '>= 1.0'
+  # spec.add_dependency 'faraday', '>= 1.0'
+  spec.add_dependency 'excon', '>= 0.73.0'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake",    "~> 12.3.3"
   spec.add_development_dependency "rspec",   "~> 3.0"
   spec.add_development_dependency "vcr",     "~> 5.1"
   spec.add_development_dependency "webmock", "~> 3.8"
+  spec.add_development_dependency 'pry', '~> 0.13.1'
 end

data/lib/acw/client.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require 'faraday'
+require 'excon'
 require 'cgi'
 require 'json'
+require 'pry'
 
 module Acw
   class Client
+    API_VERSION = 3
     Result = Struct.new(:success?, :error, :value)
 
     def initialize(configs = {})
@@ -15,46 +17,49 @@ module Acw
     attr_reader :config
 
     def connection
-      @connection ||= Faraday.new(url: config[:url]) do |faraday|
-        faraday.headers['Accept'] = 'application/json'
-        faraday.headers['Content-Type'] = 'application/json'
-        faraday.headers['Api-Token'] = config[:token]
-        faraday
-      end
+      @connection ||= Excon.new(config[:url])
     end
 
     # CONTACTS
     def create_contact(args={})
       safe_http_call do
         params = { contact: args }
-        connection.post('contacts', params.to_json)
+        connection.post(
+          path: "/api/#{API_VERSION}/contacts",
+          headers: headers,
+          body: params.to_json
+        )
       end
     end
 
     def sync_contact(args = {})
       safe_http_call do
         params = { contact: args }
-        connection.post('contact/sync', params.to_json)
+        connection.post(
+          path: "/api/#{API_VERSION}/contact/sync",
+          headers: headers,
+          body: params.to_json
+        )
       end
     end
 
     def retrieve_contact(id)
       safe_http_call do
-        connection.get("contacts/#{id}")
+        connection.get(path: "/api/#{API_VERSION}/contacts/#{id}", headers: headers)
       end
     end
 
     def retrieve_contact_by_email(email)
       safe_http_call do
         uemail = CGI.escape email
-        connection.get("contacts?search=#{uemail}")
+        connection.get(path: "/api/#{API_VERSION}/contacts?search=#{uemail}", headers: headers)
       end
     end
 
     # LISTS
     def retrieve_lists
       safe_http_call do
-        connection.get('lists')
+        connection.get(path: "/api/#{API_VERSION}/lists", headers: headers)
       end
     end
 
@@ -62,25 +67,41 @@ module Acw
     def create_tag(args = {})
       safe_http_call do
         params = { 'tag': args }
-        connection.post('tags', params.to_json)
+        connection.post(
+          path: "/api/#{API_VERSION}/tags",
+          headers: headers,
+          body: params.to_json
+        )
       end
     end
 
     def add_contact_tag(args = {})
       safe_http_call do
         params = { 'contactTag': args }
-        connection.post('contactTags', params.to_json)
+        connection.post(
+          path: "/api/#{API_VERSION}/contactTags",
+          headers: headers,
+          body: params.to_json
+        )
       end
     end
 
     def remove_contact_tag(id)
       safe_http_call do
-        connection.delete("contactTags/#{id}")
+        connection.delete(path: "/api/#{API_VERSION}/contactTags/#{id}", headers: headers)
       end
     end
 
     private
 
+    def headers
+      {
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'Api-Token': config[:token]
+      }
+    end
+
     def safe_http_call
       response = yield
       raise response.body unless success_http_status(response.status)

data/lib/acw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Acw
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: acw
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Anchieta Júnior
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2020-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.73.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.73.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 description: Active Campaign Wrapper.
 email:
 - santosjr87@gmail.com
@@ -138,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Active Campaign Wrapper.