mrkt 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4121a615d6e3099a58b81831bcfc5831aba8f331d22d3cfb98501ebcfb7c2272
-  data.tar.gz: b7b345f6f78c47bef04395b88924bc62231b1fd49a27ce9dd91564ca87557db4
+  metadata.gz: 34dfc8094a0255c4319a97e68c0dcdc82cf37b14dc69f2fdf7d82b294c68928e
+  data.tar.gz: 397c0742e14b8d66bb7d88cb8c4560d25b1bc6d95df350be0c1904158de311cb
 SHA512:
-  metadata.gz: a40cf98b97f10e619bb6066637567a946f26a6fef586c55bdfe7341ae102550be1d812e5e468cd13ca4cc12dfa772b9f697e431aeda728464e2150ea1148b4d7
-  data.tar.gz: 2fccf0ded04505d6c7a0049bff1040876e74540adab38543aa7b35aa667f7f266f52df739158921547031796ffc9a18c2b89fd35f2a4c0a7b13ff97f0de86048
+  metadata.gz: 1facd66a3aefe58fb704d0d9851c681983b3cef751a8add539ed8f5380b2e24554bd1e38cac15aa5bfc0af50f0c51164975601b743c2641f9dbec7fa8d35a985
+  data.tar.gz: 9733940bd3342322818ba1172a863aa6d3c5c737b85ce7c7b82dfa72ec48430dd01cce111e2adda79c57ec74d78b7fa298d9bae1be051b0212b085c7d5d679bf

data/.travis.yml

@@ -7,5 +7,7 @@ rvm:
 addons:
   code_climate:
     repo_token: 45cd2174f49b570406e294ff393d456c4ae8532cf16dd6430abb06d8a0722a28
+before_install:
+  - gem update --system
 after_success:
   - bundle exec codeclimate-test-reporter

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    mrkt (0.10.0)
+    mrkt (0.11.0)
       faraday (> 0.9.0, < 0.16.0)
       faraday_middleware (> 0.9.0, < 0.16.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
     byebug (11.0.1)
     codeclimate-test-reporter (1.0.9)
@@ -23,13 +23,13 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.8)
-    jaro_winkler (1.5.2)
+    hashdiff (1.0.0)
+    jaro_winkler (1.5.4)
     json (2.2.0)
     method_source (0.9.2)
-    multipart-post (2.0.0)
-    parallel (1.14.0)
-    parser (2.6.2.0)
+    multipart-post (2.1.1)
+    parallel (1.19.1)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -38,22 +38,22 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     psych (3.1.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     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)
+    rake (12.3.3)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     rubocop (0.66.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -62,7 +62,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     simplecov (0.13.0)
       docile (~> 1.1.0)
@@ -70,10 +70,10 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     unicode-display_width (1.5.0)
-    webmock (3.5.1)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -89,4 +89,4 @@ DEPENDENCIES
   webmock (~> 3.1)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

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

@@ -40,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

data/lib/mrkt/concerns/authentication.rb

@@ -39,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/version.rb

@@ -1,3 +1,3 @@
 module Mrkt
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.11.0'.freeze
 end

data/spec/concerns/authentication_spec.rb

@@ -29,6 +29,44 @@ describe Mrkt::Authentication do
       expect(client.authenticated?).to be true
     end
 
+    context 'with optional partner_id client option' do
+      before { remove_request_stub(@authentication_request_stub) }
+
+      let(:partner_id) { SecureRandom.uuid }
+
+      let(:client_options) do
+        {
+          host: host,
+          client_id: client_id,
+          client_secret: client_secret,
+          partner_id: partner_id
+        }
+      end
+
+      let(:query) do
+        {
+          client_id: client_id,
+          client_secret: client_secret,
+          partner_id: partner_id,
+          grant_type: 'client_credentials'
+        }
+      end
+
+      subject(:client) { Mrkt::Client.new(client_options) }
+
+      before do
+        stub_request(:get, "https://#{host}/identity/oauth/token")
+          .with(query: query)
+          .to_return(json_stub(authentication_stub))
+      end
+
+      it 'should authenticate and then be authenticated?' do
+        expect(client.authenticated?).to_not be true
+        client.authenticate!
+        expect(client.authenticated?).to be true
+      end
+    end
+
     context 'when the token has expired and @retry_authentication = true' do
       before { remove_request_stub(@authentication_request_stub) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrkt
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - KARASZI István
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Marketo REST API Facade