mrkt 0.9.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: beebfadd98f11b8793c2be39ed96246c24ca2a52
-  data.tar.gz: 4ff4f2b76abafae545b29ead006d4afbd90affb1
+SHA256:
+  metadata.gz: 8b9a26db5da0ff83b251b40c276517013a120bccac5e0723d2cb23f751bc9817
+  data.tar.gz: 74a55a3fde8f192301e8995c7391fc5f88c7f8d9fa0163a1f2ef633cf9ade4bf
 SHA512:
-  metadata.gz: 5cfa98036ebf42268a7cd349f17e09e38df7b8c9e06e8dad87094e588ce43f16e8e0671f2fa86fa7b7074ace75bce4de3629c601704ad6c2656c82e1c93da7b7
-  data.tar.gz: 36d67c8ad9811b8e8cd60dd18df61e0d6bc7cae124dc75904c44831d4bafe6d9e6a97782dfd8c39437bd12f7d8783f6b21d613b5d703527f7ec218b5caa6ef7d
+  metadata.gz: 365eaf2f0ea0ffc9a9a47af40b9834bab11de69438bb44a42dc23720f19b705b8918c097164c49cc2d82ce02dfb8b1add9f761cb6ae3ee99df69091493fb3b32
+  data.tar.gz: 7a184f5ce07e10e3e88f9cfe988adfdf2633271e229f55da2290e04ac78b3282a46eb77c87d01f00c3e3493e77920abf7a38bc1be8edf3cc565224aa8ecb8bff

data/.rubocop.yml

@@ -1,17 +1,71 @@
 AllCops:
+  TargetRubyVersion: 2.5
   Exclude:
     - 'bin/**/*'
-Documentation:
+    - 'vendor/**/*'
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+Layout/FirstHashElementIndentation:
   Enabled: false
-LineLength:
+Layout/HashAlignment:
+  Enabled: false
+Layout/LineLength:
+  Max: 128
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
   Enabled: true
-  Max: 120
-MethodLength:
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+
+Metrics/AbcSize:
+  Max: 17
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
+Metrics/MethodLength:
   Max: 20
-IndentHash:
+Metrics/ParameterLists:
+  Max: 6
+
+Naming/AccessorMethodName:
   Enabled: false
 
+Style/AccessorGrouping:
+  Enabled: true
+Style/BisectedAttrAccessor:
+  Enabled: true
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/ExponentialNotation:
+  Enabled: true
 Style/FrozenStringLiteralComment:
   Enabled: false
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantAssignment:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true

data/.travis.yml

@@ -1,12 +1,21 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=45cd2174f49b570406e294ff393d456c4ae8532cf16dd6430abb06d8a0722a28
+    - COVERAGE=on
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-addons:
-  code_climate:
-    repo_token: 45cd2174f49b570406e294ff393d456c4ae8532cf16dd6430abb06d8a0722a28
-after_success:
-  - bundle exec codeclimate-test-reporter
+  - 2.5
+  - 2.6
+  - 2.7
+before_install:
+  - gem update --system
+  - bundle update --bundler
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+script:
+  - bundle exec rspec
+  - bundle exec rubocop
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile.lock

@@ -1,90 +1,95 @@
 PATH
   remote: .
   specs:
-    mrkt (0.9.0)
-      faraday (> 0.9.0, < 0.14.0)
-      faraday_middleware (> 0.9.0, < 0.13.0)
+    mrkt (1.0.1)
+      faraday (~> 1.0)
+      faraday_middleware (~> 1.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.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    docile (1.1.5)
-    faraday (0.10.1)
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.1)
-      faraday (>= 0.7.4, < 1.0)
-    json (2.1.0)
-    method_source (0.8.2)
-    multipart-post (2.0.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.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)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    gem-release (2.1.1)
+    hashdiff (1.0.1)
+    json (2.3.1)
+    method_source (1.0.0)
+    multipart-post (2.1.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    public_suffix (4.0.5)
+    rainbow (3.0.0)
+    rake (12.3.3)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       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.9.0)
+    rspec-support (3.9.3)
+    rubocop (0.87.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.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)
-      docile (~> 1.1.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
+    simplecov (0.17.1)
+      docile (~> 1.1)
       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.7.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
-  codeclimate-test-reporter (~> 1.0.0)
+  gem-release (~> 2.1)
   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.87.1)
+  simplecov (~> 0.17.1)
+  webmock (~> 3.1)
 
 BUNDLED WITH
-   1.15.4
+   1.17.3

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/README.md

@@ -32,6 +32,7 @@ Get the following from your Marketo admin:
 * hostname, i.e. `'123-abc-123.mktorest.com'`
 * client id, e.g. `'4567e1cdf-0fae-4685-a914-5be45043f2d8'`
 * client secret, e.g. `'7Gn0tuiHZiDHnzeu9P14uDQcSx9xIPPt'`
+* partner id, e.g. `'335b1c91511b8d8b49c7bbf66f53288f16f37b60_a0147938d3135f8ddb5a75850ea3c39313fd23c4'` (optional)
 
 
 ## Usage
@@ -42,7 +43,9 @@ Get the following from your Marketo admin:
 client = Mrkt::Client.new(
   host: '123-abc-123.mktorest.com',
   client_id:  '4567e1cdf-0fae-4685-a914-5be45043f2d8',
-  client_secret: '7Gn0tuiHZiDHnzeu9P14uDQcSx9xIPPt')
+  client_secret: '7Gn0tuiHZiDHnzeu9P14uDQcSx9xIPPt',
+  partner_id: '335b1c91511b8d8b49c7bbf66f53288f16f37b60_a0147938d3135f8ddb5a75850ea3c39313fd23c4' # optional 
+)
 ```
 
 If you need verbosity during troubleshooting, enable debug mode:

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
 
@@ -36,6 +40,7 @@ module Mrkt
 
       @client_id = options.fetch(:client_id)
       @client_secret = options.fetch(:client_secret)
+      @partner_id = options[:partner_id]
 
       @retry_authentication = options.fetch(:retry_authentication, false)
       @retry_authentication_count = options.fetch(:retry_authentication_count, 3).to_i
@@ -49,13 +54,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
@@ -36,15 +39,27 @@ module Mrkt
     end
 
     def authentication_params
+      merge_params(required_authentication_params, optional_authentication_params)
+    end
+
+    def add_authorization(req)
+      req.headers[:authorization] = "Bearer #{@token}"
+    end
+
+    private
+
+    def optional_authentication_params
+      {
+        partner_id: @partner_id
+      }
+    end
+
+    def required_authentication_params
       {
         grant_type: 'client_credentials',
         client_id: @client_id,
         client_secret: @client_secret
       }
     end
-
-    def add_authorization(req)
-      req.headers[:authorization] = "Bearer #{@token}"
-    end
   end
 end

data/lib/mrkt/concerns/connection.rb

@@ -1,4 +1,4 @@
-require 'mrkt/faraday_middleware'
+require 'mrkt/faraday'
 
 module Mrkt
   module Connection
@@ -7,21 +7,27 @@ 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
 
-        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
+
+    def options
+      {
+        url: "https://#{@host}",
+        request: {
+          params_encoder: Mrkt::Faraday::ParamsEncoder
+        }
+      }
+    end
   end
 end