mrkt 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: beebfadd98f11b8793c2be39ed96246c24ca2a52
-  data.tar.gz: 4ff4f2b76abafae545b29ead006d4afbd90affb1
+SHA256:
+  metadata.gz: 4121a615d6e3099a58b81831bcfc5831aba8f331d22d3cfb98501ebcfb7c2272
+  data.tar.gz: b7b345f6f78c47bef04395b88924bc62231b1fd49a27ce9dd91564ca87557db4
 SHA512:
-  metadata.gz: 5cfa98036ebf42268a7cd349f17e09e38df7b8c9e06e8dad87094e588ce43f16e8e0671f2fa86fa7b7074ace75bce4de3629c601704ad6c2656c82e1c93da7b7
-  data.tar.gz: 36d67c8ad9811b8e8cd60dd18df61e0d6bc7cae124dc75904c44831d4bafe6d9e6a97782dfd8c39437bd12f7d8783f6b21d613b5d703527f7ec218b5caa6ef7d
+  metadata.gz: a40cf98b97f10e619bb6066637567a946f26a6fef586c55bdfe7341ae102550be1d812e5e468cd13ca4cc12dfa772b9f697e431aeda728464e2150ea1148b4d7
+  data.tar.gz: 2fccf0ded04505d6c7a0049bff1040876e74540adab38543aa7b35aa667f7f266f52df739158921547031796ffc9a18c2b89fd35f2a4c0a7b13ff97f0de86048

data/.rubocop.yml

@@ -1,16 +1,30 @@
 AllCops:
+  TargetRubyVersion: 2.3
   Exclude:
     - 'bin/**/*'
 Documentation:
   Enabled: false
 LineLength:
   Enabled: true
-  Max: 120
+  Max: 128
 MethodLength:
   Max: 20
 IndentHash:
   Enabled: false
 
+Layout/AlignHash:
+  Enabled: false
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Naming/AccessorMethodName:
+  Enabled: false
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+Metrics/ParameterLists:
+  Max: 6
 Style/ClassAndModuleChildren:
   Enabled: false
 Style/FrozenStringLiteralComment:

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
+  - 2.6.0
 addons:
   code_climate:
     repo_token: 45cd2174f49b570406e294ff393d456c4ae8532cf16dd6430abb06d8a0722a28

data/Gemfile.lock

@@ -1,90 +1,92 @@
 PATH
   remote: .
   specs:
-    mrkt (0.9.0)
-      faraday (> 0.9.0, < 0.14.0)
-      faraday_middleware (> 0.9.0, < 0.13.0)
+    mrkt (0.10.0)
+      faraday (> 0.9.0, < 0.16.0)
+      faraday_middleware (> 0.9.0, < 0.16.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    ast (2.3.0)
-    byebug (9.0.6)
-    codeclimate-test-reporter (1.0.7)
-      simplecov
-    coderay (1.1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
+    byebug (11.0.1)
+    codeclimate-test-reporter (1.0.9)
+      simplecov (<= 0.13)
+    coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
     docile (1.1.5)
-    faraday (0.10.1)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.1)
+    faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    json (2.1.0)
-    method_source (0.8.2)
+    hashdiff (0.3.8)
+    jaro_winkler (1.5.2)
+    json (2.2.0)
+    method_source (0.9.2)
     multipart-post (2.0.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
+    parallel (1.14.0)
+    parser (2.6.2.0)
+      ast (~> 2.4.0)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (2.0.5)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    psych (3.1.0)
+    public_suffix (3.0.3)
+    rainbow (3.0.0)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.45.0)
-      parser (>= 2.3.1.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.66.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.5, != 2.5.1.1)
+      psych (>= 3.1.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    safe_yaml (1.0.4)
-    simplecov (0.14.1)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-progressbar (1.10.0)
+    safe_yaml (1.0.5)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
-    unicode-display_width (1.3.0)
-    webmock (1.21.0)
+    simplecov-html (0.10.2)
+    unicode-display_width (1.5.0)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
-  codeclimate-test-reporter (~> 1.0.0)
+  codeclimate-test-reporter (~> 1.0)
   mrkt!
-  pry-byebug (~> 3.4.0)
-  rake (~> 10.0)
+  pry-byebug (~> 3.7)
+  rake (~> 12.3)
   rspec (~> 3.2)
-  rubocop (~> 0.45.0)
-  simplecov (~> 0.14.1)
-  webmock (~> 1.21.0)
+  rubocop (~> 0.66.0)
+  webmock (~> 3.1)
 
 BUNDLED WITH
-   1.15.4
+   1.17.2

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 KARASZI István
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/mrkt.rb

@@ -13,6 +13,8 @@ require 'mrkt/concerns/import_custom_objects'
 require 'mrkt/concerns/crud_custom_objects'
 require 'mrkt/concerns/crud_custom_activities'
 require 'mrkt/concerns/crud_programs'
+require 'mrkt/concerns/crud_asset_static_lists'
+require 'mrkt/concerns/crud_asset_folders'
 
 module Mrkt
   class Client
@@ -28,6 +30,8 @@ module Mrkt
     include CrudCustomObjects
     include CrudCustomActivities
     include CrudPrograms
+    include CrudAssetStaticLists
+    include CrudAssetFolders
 
     attr_accessor :debug
 
@@ -49,13 +53,19 @@ module Mrkt
       @options = options
     end
 
-    %i(get post delete).each do |http_method|
-      define_method(http_method) do |path, payload = {}, &block|
+    def merge_params(params, optional)
+      params.merge(optional.keep_if { |_key, value| value })
+    end
+
+    %i[get post delete].each do |http_method|
+      define_method(http_method) do |path, params = {}, optional = {}, &block|
         authenticate!
 
+        payload = merge_params(params, optional)
+
         resp = connection.send(http_method, path, payload) do |req|
           add_authorization(req)
-          block.call(req) unless block.nil?
+          block&.call(req)
         end
 
         resp.body

data/lib/mrkt/concerns/authentication.rb

@@ -5,15 +5,9 @@ module Mrkt
 
       authenticate
 
-      if !authenticated? && @retry_authentication
-        @retry_authentication_count.times do
-          sleep(@retry_authentication_wait_seconds) if @retry_authentication_wait_seconds > 0
-          authenticate
-          break if authenticated?
-        end
-      end
+      retry_authentication if !authenticated? && @retry_authentication
 
-      fail Mrkt::Errors::AuthorizationError, 'Client not authenticated' unless authenticated?
+      raise Mrkt::Errors::AuthorizationError, 'Client not authenticated' unless authenticated?
     end
 
     def authenticated?
@@ -24,6 +18,15 @@ module Mrkt
       @valid_until && Time.now < @valid_until
     end
 
+    def retry_authentication
+      @retry_authentication_count.times do
+        sleep(@retry_authentication_wait_seconds) if @retry_authentication_wait_seconds.positive?
+        authenticate
+
+        break if authenticated?
+      end
+    end
+
     def authenticate
       connection.get('/identity/oauth/token', authentication_params).tap do |response|
         data = response.body

data/lib/mrkt/concerns/connection.rb

@@ -11,16 +11,13 @@ module Mrkt
         conn.request :multipart
         conn.request :url_encoded
 
-        if @debug
-          conn.response :logger, @logger, (@log_options || {})
-        end
-
+        conn.response :logger, @logger, (@log_options || {}) if @debug
         conn.response :mkto, content_type: /\bjson$/
 
         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 Faraday.default_adapter
+        conn.adapter @options.fetch(:adapter, Faraday.default_adapter)
       end
     end
   end

data/lib/mrkt/concerns/crud_activities.rb

@@ -1,29 +1,32 @@
 module Mrkt
   module CrudActivities
     def get_activity_types
-      get("/rest/v1/activities/types.json")
+      get('/rest/v1/activities/types.json')
     end
 
     def get_paging_token(since_datetime)
-      params = {
-        sinceDatetime: since_datetime.iso8601
-      }
-      get("/rest/v1/activities/pagingtoken.json", params)
+      get('/rest/v1/activities/pagingtoken.json', sinceDatetime: since_datetime.iso8601)
     end
 
     def get_activities(next_page_token, activity_type_ids: [], lead_ids: [])
       params = {
         nextPageToken: next_page_token
       }
+
       params[:activityTypeIds] = activity_type_ids.join(',') unless blank?(activity_type_ids)
       params[:leadIds] = lead_ids.join(',') unless blank?(lead_ids)
-      get("/rest/v1/activities.json", params)
+
+      get('/rest/v1/activities.json', params)
+    end
+
+    def get_deleted_leads(next_page_token)
+      get('/rest/v1/activities/deletedleads.json', nextPageToken: next_page_token)
     end
 
     private
 
     def blank?(value)
-      !value || value == "" || value.empty?
+      !value || value == '' || value.empty?
     end
   end
 end

data/lib/mrkt/concerns/crud_asset_folders.rb

@@ -0,0 +1,43 @@
+module Mrkt
+  module CrudAssetFolders
+    def create_folder(name, parent, description: nil)
+      post('/rest/asset/v1/folders.json') do |req|
+        params = {
+          name: name,
+          parent: JSON.generate(parent)
+        }
+
+        optional = {
+          description: description
+        }
+
+        req.body = merge_params(params, optional)
+      end
+    end
+
+    def get_folder_by_id(id, type: nil)
+      params = {}
+      params[:type] = type if type
+
+      get("/rest/asset/v1/folder/#{id}.json", params)
+    end
+
+    def get_folder_by_name(name, type: nil, root: nil, work_space: nil)
+      params = {
+        name: name
+      }
+
+      optional = {
+        root: root&.to_json,
+        type: type,
+        workSpace: work_space
+      }
+
+      get('/rest/asset/v1/folder/byName.json', params, optional)
+    end
+
+    def delete_folder(id)
+      post("/rest/asset/v1/folder/#{id}/delete.json")
+    end
+  end
+end

data/lib/mrkt/concerns/crud_asset_static_lists.rb

@@ -0,0 +1,30 @@
+module Mrkt
+  module CrudAssetStaticLists
+    def create_static_list(name, folder, description: nil)
+      post('/rest/asset/v1/staticLists.json') do |req|
+        params = {
+          name: name,
+          folder: JSON.generate(folder)
+        }
+
+        optional = {
+          description: description
+        }
+
+        req.body = merge_params(params, optional)
+      end
+    end
+
+    def get_static_list_by_id(id)
+      get("/rest/asset/v1/staticList/#{id}.json")
+    end
+
+    def get_static_list_by_name(name)
+      get('/rest/asset/v1/staticList/byName.json', name: name)
+    end
+
+    def delete_static_list(id)
+      post("/rest/asset/v1/staticList/#{id}/delete.json")
+    end
+  end
+end

data/lib/mrkt/concerns/crud_campaigns.rb

@@ -1,15 +1,13 @@
 module Mrkt
   module CrudCampaigns
     def request_campaign(id, lead_ids, tokens = {})
-      post("/rest/v1/campaigns/#{id}/trigger.json") do |req|
-        params = {
+      post_json("/rest/v1/campaigns/#{id}/trigger.json") do
+        {
           input: {
             leads: map_lead_ids(lead_ids),
             tokens: tokens
           }
         }
-
-        json_payload(req, params)
       end
     end
   end