rdstation-ruby-client 2.7.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f95c666afffacdbac2a2903c5b8909999bb24bba716f89d4646ee19c165bc262
-  data.tar.gz: 1beded8e2c402f5bb89523e3e20d5ee8ed485f6687819317f558f958bdd90353
+  metadata.gz: 440807bc5aafd6c15cb69ad4c7ef4b50fbdcbddfac9e3441f4fff97675cf4ee3
+  data.tar.gz: 3c419ba39fd059e44d072c19b595147099f90295e69a946c02da95e4e856103e
 SHA512:
-  metadata.gz: 4803cf2a2f16e6982c84d84d9109c03130f8df4ff4d92ecfc9b5500e96383afdf6527b7dd834d7d1256d9947ab67f4aeed6d70591a2a86c3edf9b10ad7cced70
-  data.tar.gz: 344733aa7473f0d0db3391e26fc4a00648b9123ded0a5713549ab67462fdc528ef1a3256774d728aa2df6490cbdc989e65c2538e9a81c3f9829ab6f0622c303f
+  metadata.gz: c75f8c5d1957ccef3016093d1768e64b27e71ff7e47274efc9c6ee013cecb88befebfd2c38a476d4aecf68f1d92709747b882542ce9ea5bcd16cbc0faa7eee85
+  data.tar.gz: b66553b5cf10bc85f3f6c40704ebc999b3bd61ece59ef431bd903803e60cd29f27f88ea55750f4b650016c0173c88001ead4f305cfc313338fc1849d4b1fc05b

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## 2.8.1
+
+- Makes the retryable_request method also retry when a `RDStation::Error::Unauthorized` error happen
+
+## 2.8.0
+
+### Additions
+
+#### 1. New Analytics client: conversions
+
+Usage example:
+
+```ruby
+client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'refresh_token')
+query_params =  { start_date:'2022-11-13', end_date:'2022-11-15', assets_type:['LandingPage'] }
+client.analytics.conversions(query_params)
+```
+
+#### 2. New landing_pages client
+
+Usage example:
+
+```ruby
+client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'refresh_token')
+client.landing_pages.all
+```
+
 ## 2.7.0
 
 ### Additions
@@ -8,7 +35,7 @@ Usage example:
 
 ```ruby
 client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'refresh_token')
-query_parms =  { start_date:'2022-11-02', end_date:'2022-11-08' }
+query_params =  { start_date:'2022-11-02', end_date:'2022-11-08' }
 client.analytics.email_marketing(query_params)
 ```
 

data/README.md

@@ -19,7 +19,8 @@ Upgrading? Check the [migration guide](#Migration-guide) before bumping to a new
    7. [Emails](#Emails)
    8. [Segmentations](#Segmentations)
    9. [Analytics](#Analytics)
-   10. [Errors](#Errors)
+   10.[LandingPages](#LandingPages)
+   11.[Errors](#Errors)
 3. [Changelog](#Changelog)
 4. [Migration guide](#Migration-guide)
    1. [Upgrading from 1.2.x to 2.0.0](#Upgrading-from-1.2.x-to-2.0.0)
@@ -345,16 +346,37 @@ client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'ref
 client.segmentations.contacts(segmentation_id)
 ```
 ### Analytics
-Endpoints to [Analytics](https://developers.rdstation.com/reference/get_platform-analytics-emails) information in your RD Station account.
+Endpoints to [Analytics](https://developers.rdstation.com/reference/estatisticas) information in your RD Station account.
 
-#### List all email marketing analytics data
+#### => List all EMAIL MARKETING analytics data
+Endpoints to [Analytics - Email marketing](https://developers.rdstation.com/reference/get_platform-analytics-emails) information in your RD Station account.
 - NOTE: The query params `start_date`(yyyy-mm-dd)  and `end_date`(yyyy-mm-dd) are required
 
 ```ruby
 client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'refresh_token')
-query_parms =  { start_date:'2022-11-02', end_date:'2022-11-08' }
+query_params =  { start_date:'2022-11-02', end_date:'2022-11-08' }
 client.analytics.email_marketing(query_params)
 ```
+
+#### => List CONVERSIONS analytics data
+Endpoints to [Analytics - Conversions](https://developers.rdstation.com/reference/get_platform-analytics-conversions) information in your RD Station account.
+- NOTE: The query params `start_date`(yyyy-mm-dd) and `end_date`(yyyy-mm-dd) are required.
+
+```ruby
+client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'refresh_token')
+query_params =  { start_date:'2022-11-13', end_date:'2022-11-15', assets_type:['LandingPage'] }
+client.analytics.conversions(query_params)
+```
+
+### LandingPages
+Endpoints to [LandingPages](https://developers.rdstation.com/reference/get_platform-landing-pages) information in your RD Station account.
+#### List all landing_pages
+
+```ruby
+client = RDStation::Client.new(access_token: 'access_token', refresh_token: 'refresh_token')
+client.landing_pages.all
+```
+
 ### Errors
 
 Each endpoint may raise errors accoording to the HTTP response code from RDStation:

data/lib/rdstation/analytics.rb

@@ -11,15 +11,22 @@ module RDStation
 
     def email_marketing(query_params={})
       retryable_request(@authorization) do |authorization|
-        response = self.class.get(base_url, headers: authorization.headers, query: query_params)
+        response = self.class.get(base_url('emails'), headers: authorization.headers, query: query_params)
+        ApiResponse.build(response)
+      end
+    end
+
+    def conversions(query_params={})
+      retryable_request(@authorization) do |authorization|
+        response = self.class.get(base_url('conversions'), headers: authorization.headers, query: query_params)
         ApiResponse.build(response)
       end
     end
 
     private
 
-    def base_url
-      "#{RDStation.host}/platform/analytics/emails"
+    def base_url(path='')
+      "#{RDStation.host}/platform/analytics/#{path}"
     end
   end
-end
+end

data/lib/rdstation/client.rb

@@ -36,6 +36,10 @@ module RDStation
       @analytics ||= RDStation::Analytics.new(authorization: @authorization)
     end
 
+    def landing_pages
+      @landing_pages ||= RDStation::LandingPages.new(authorization: @authorization)
+    end
+
     private
 
     def warn_deprecation

data/lib/rdstation/landing_pages.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RDStation
+  class LandingPages
+    include HTTParty
+    include ::RDStation::RetryableRequest
+
+    def initialize(authorization:)
+      @authorization = authorization
+    end
+
+    def all(query_params={})
+      retryable_request(@authorization) do |authorization|
+        response = self.class.get(base_url, headers: authorization.headers, query: query_params)
+        ApiResponse.build(response)
+      end
+    end
+
+    private
+
+    def base_url(path='')
+      "#{RDStation.host}/platform/landing_pages/#{path}"
+    end
+  end
+end

data/lib/rdstation/retryable_request.rb

@@ -7,7 +7,7 @@ module RDStation
       retries = 0
       begin
         yield authorization
-      rescue ::RDStation::Error::ExpiredAccessToken => e
+      rescue ::RDStation::Error::ExpiredAccessToken, ::RDStation::Error::Unauthorized => e
         raise if !retry_possible?(authorization) || retries >= MAX_RETRIES
 
         retries += 1

data/lib/rdstation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RDStation
-  VERSION = '2.7.0'
+  VERSION = '2.8.1'
 end

data/lib/rdstation-ruby-client.rb

@@ -16,6 +16,7 @@ require 'rdstation/webhooks'
 require 'rdstation/segmentations'
 require 'rdstation/emails'
 require 'rdstation/analytics'
+require 'rdstation/landing_pages'
 
 # Error handling
 require 'rdstation/error'

data/spec/lib/rdstation/analytics_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe RDStation::Analytics do
     described_class.new(authorization: RDStation::Authorization.new(access_token: 'access_token'))
   end
 
-  let(:analytics_endpoint) { 'https://api.rd.services/platform/analytics/emails' }
-
   let(:headers) do
     {
       Authorization: 'Bearer access_token',
@@ -23,6 +21,7 @@ RSpec.describe RDStation::Analytics do
   end
 
   describe '#email_marketing' do
+    let(:analytics_endpoint) { 'https://api.rd.services/platform/analytics/emails' }
     let(:analytics_list) do
       {
         account_id: 1,
@@ -104,4 +103,82 @@ RSpec.describe RDStation::Analytics do
       end
     end
   end
+
+  describe '#conversions' do
+    let(:analytics_endpoint) { 'https://api.rd.services/platform/analytics/conversions' }
+    let(:analytics_list) do
+      {
+        account_id: 3127612,
+        query_date: {
+          start_date: "2022-11-17",
+          end_date: "2022-11-17"
+        },
+        assets_type: "[LandingPage]",
+        conversions: [
+          {
+            asset_id: 1495004,
+            asset_identifier: "Como aumentar suas taxas de conversão",
+            asset_type: "LandingPage",
+            asset_created_at: "2022-06-30T19:11:05.191Z",
+            asset_updated_at: "2022-06-30T20:11:05.191Z",
+            visits_count: 1500,
+            conversions_count: 150,
+            conversion_rate: 10
+          }
+        ]
+      }.to_json
+    end
+
+    it 'calls retryable_request' do
+      expect(analytics_client).to receive(:retryable_request)
+      analytics_client.conversions
+    end
+
+    context 'when the request is successful' do
+      before do
+        stub_request(:get, analytics_endpoint)
+          .with(headers: headers)
+          .to_return(status: 200, body: analytics_list.to_json)
+      end
+
+      it 'returns all email marketing analytics data' do
+        response = analytics_client.conversions
+        expect(response).to eq(analytics_list)
+      end
+    end
+
+    context 'when the request contains query params' do
+      let(:query_params) do
+        {
+          start_date:'2022-11-17',
+          end_date:'2022-11-17',
+          asset_id: '1495004'
+        }
+      end
+
+      before do
+        stub_request(:get, analytics_endpoint)
+          .with(headers: headers, query: query_params)
+          .to_return(status: 200, body: analytics_list.to_json)
+      end
+
+      it 'returns conversions analytics data filtered by the query params' do
+        response = analytics_client.conversions(query_params)
+        expect(response).to eq(analytics_list)
+      end
+    end
+
+    context 'when the response contains errors' do
+      before do
+        stub_request(:get, analytics_endpoint)
+          .with(headers: headers)
+          .to_return(status: 400, body: { 'errors' => ['all errors'] }.to_json)
+      end
+
+      it 'calls raise_error on error handler' do
+        analytics_client.conversions
+        expect(error_handler).to have_received(:raise_error)
+      end
+    end
+  end
 end

data/spec/lib/rdstation/landing_pages_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+RSpec.describe RDStation::LandingPages do
+  let(:landing_pages_client) do
+    described_class.new(authorization: RDStation::Authorization.new(access_token: 'access_token'))
+  end
+  let(:landing_pages_endpoint) { 'https://api.rd.services/platform/landing_pages/' }
+
+  let(:headers) do
+    {
+      Authorization: 'Bearer access_token',
+      'Content-Type': 'application/json'
+    }
+  end
+  let(:error_handler) do
+    instance_double(RDStation::ErrorHandler, raise_error: 'mock raised errors')
+  end
+
+  before do
+    allow(RDStation::ErrorHandler).to receive(:new).and_return(error_handler)
+  end
+
+  describe '#all' do
+    let(:landing_pages_list) do
+      [
+        {
+          id: 1,
+          title: "Minha Primeira Landing Page",
+          created_at: "2021-09-22T14:14:04.510-03:00",
+          upated_at: "2021-09-24T14:14:04.510-03:00",
+          conversion_identifier: "dia-das-mães-2022",
+          status: "PUBLISHED",
+          has_active_experiment: false,
+          had_experiment: false
+        }
+      ].to_json
+    end
+
+    it 'calls retryable_request' do
+      expect(landing_pages_client).to receive(:retryable_request)
+      landing_pages_client.all
+    end
+
+    context 'when the request is successful' do
+      before do
+        stub_request(:get, landing_pages_endpoint)
+          .with(headers: headers)
+          .to_return(status: 200, body: landing_pages_list.to_json)
+      end
+
+      it 'returns all email marketing analytics data' do
+        response = landing_pages_client.all
+        expect(response).to eq(landing_pages_list)
+      end
+    end
+
+    context 'when the request contains query params' do
+      let(:query_params) { { page: 1 } }
+
+      before do
+        stub_request(:get, landing_pages_endpoint)
+          .with(headers: headers, query: query_params)
+          .to_return(status: 200, body: landing_pages_list.to_json)
+      end
+
+      it 'returns email marketing analytics data filtered by the query params' do
+        response = landing_pages_client.all(query_params)
+        expect(response).to eq(landing_pages_list)
+      end
+    end
+
+    context 'when the response contains errors' do
+      before do
+        stub_request(:get, landing_pages_endpoint)
+          .with(headers: headers)
+          .to_return(status: 400, body: { 'errors' => ['all errors'] }.to_json)
+      end
+
+      it 'calls raise_error on error handler' do
+        landing_pages_client.all
+        expect(error_handler).to have_received(:raise_error)
+      end
+    end
+  end
+end

data/spec/lib/rdstation/retryable_request_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe RDStation::RetryableRequest do
                                             and_return(new_credentials)
         end
 
-        it 'refreshes the access_token and retries the request' do
+        it 'refreshes the access_token and retries the request when an ExpiredAccessToken error happen' do
           dummy_request = double("dummy_request")
           expect(dummy_request).to receive(:call).twice do |auth|
             expired_token = ::RDStation::Error::ExpiredAccessToken.new({'error_message' => 'x'})
@@ -74,6 +74,24 @@ RSpec.describe RDStation::RetryableRequest do
           end.not_to raise_error
         end
 
+        it 'refreshes the access_token and retries the request an Unauthorized error happen' do
+          dummy_request = double("dummy_request")
+          expect(dummy_request).to receive(:call).twice do |auth|
+            expired_token = ::RDStation::Error::Unauthorized.new({'error_message' => 'x'})
+            raise expired_token unless auth.access_token == new_access_token
+          end
+        
+          expect(RDStation.configuration.access_token_refresh_callback)
+            .to receive(:call)
+            .once do |authorization|
+              expect(authorization.access_token).to eq new_access_token
+            end
+
+          expect do
+            subject.retryable_request(auth) { |yielded_auth| dummy_request.call(yielded_auth) }
+          end.not_to raise_error
+        end
+
         context 'and keeps raising retryable exception event after token refreshed' do
           it 'retries only once' do
             dummy_request = double("dummy_request")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdstation-ruby-client
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Paulo L F Casaretto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,6 +163,7 @@ files:
 - lib/rdstation/error_handler/unauthorized.rb
 - lib/rdstation/events.rb
 - lib/rdstation/fields.rb
+- lib/rdstation/landing_pages.rb
 - lib/rdstation/retryable_request.rb
 - lib/rdstation/segmentations.rb
 - lib/rdstation/version.rb
@@ -190,6 +191,7 @@ files:
 - spec/lib/rdstation/error_spec.rb
 - spec/lib/rdstation/events_spec.rb
 - spec/lib/rdstation/fields_spec.rb
+- spec/lib/rdstation/landing_pages_spec.rb
 - spec/lib/rdstation/retryable_request_spec.rb
 - spec/lib/rdstation/segmentations_spec.rb
 - spec/lib/rdstation/webhooks_spec.rb
@@ -241,6 +243,7 @@ test_files:
 - spec/lib/rdstation/error_spec.rb
 - spec/lib/rdstation/events_spec.rb
 - spec/lib/rdstation/fields_spec.rb
+- spec/lib/rdstation/landing_pages_spec.rb
 - spec/lib/rdstation/retryable_request_spec.rb
 - spec/lib/rdstation/segmentations_spec.rb
 - spec/lib/rdstation/webhooks_spec.rb