tokyo_api 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd1545cc1b4afe1f6eafc3340d94c7ddb37c0cd90e7fe503141379bb9376e53
-  data.tar.gz: a9fdad05531bea8f72116ae4acfecf1e63ce175bb746ee174f14dae41f4c8053
+  metadata.gz: 5502304c73c869022683e520632e96fc836a552bfb98b876498476121bfb620e
+  data.tar.gz: 517684ab971c1d9ed655991090a11c87688414cefee2df384b1d4e642dcbc627
 SHA512:
-  metadata.gz: af6a4d89de242ddea6be9ea408d8294467cd6188421a777f489032b3b35fdb872e220ba4b319695895fc8a93b3519cf910d2891d17f8e3310e9674d61f5642c1
-  data.tar.gz: ae88b3862d4cd5e703f7dcb87c6e2f9a2b9fb96cb7697441a1596fd307054d1ee9439110ffb8792abaab9ad2bf726a182547306a506ad144807cc66c2e34c7c6
+  metadata.gz: 0e0b6958e59a6fa7c3ede1d910b3a75fe002bd1741d999b7330bfa79d071590ef12bad60af9769fb9c4af43f3b06e05fbc271dc8996a4ee1bf8b60f713f3f1ce
+  data.tar.gz: d10d735108fefa5a62bde79320e3a4184f62f108e878d813c2e7f0de3631aa0f6f91529298e701aacf0302f20bfe7967498a0dbea06dcc473973c7317897d115

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.2

data/lib/tokyo_api/identity.rb

@@ -8,22 +8,46 @@ module TokyoApi
       client.get_request("#{normalized_base_path}full_user/#{url_escape(id)}").body
     end
 
-    def tokyo_identity_user_path(id, required_fields: nil)
+    def tokyo_identity_user_path(id, with_subscription_status: false, required_fields: nil, opt_in_public_ids: nil, minimum_consent_level: nil)
       path = "/#{normalized_base_path}user/#{url_escape(id)}"
 
+      params = []
       unless required_fields.nil?
-        path << "?#{required_fields_param(required_fields)}"
+        params << required_fields_param(required_fields)
       end
+
+      if with_subscription_status
+        params << 'with_subscription_status=true'
+        additional_subscription_parameters = path_for_subscription_status_params(opt_in_public_ids, minimum_consent_level)
+        unless additional_subscription_parameters.blank?
+          params << additional_subscription_parameters
+        end
+      end
+
+      if params.any?
+        path << "?#{params.join('&')}"
+      end
+
       path
     end
 
     def subscription_status_path(id, opt_in_public_ids: nil, minimum_consent_level: nil)
       raise 'must provide opt_in_public_ids' if opt_in_public_ids.nil?
 
-      path = "/#{normalized_base_path}subscription_status/#{url_escape(id)}?opt_in_public_ids=#{url_escape(opt_in_public_ids.join(','))}"
+      "/#{normalized_base_path}subscription_status/#{url_escape(id)}?#{path_for_subscription_status_params(opt_in_public_ids, minimum_consent_level)}"
+    end
+
+    private
+
+    def path_for_subscription_status_params(opt_in_public_ids, minimum_consent_level)
+      path = ''
+
+      if opt_in_public_ids.present?
+        path = "opt_in_public_ids=#{url_escape(opt_in_public_ids.join(','))}"
+      end
 
       if minimum_consent_level
-        path = "#{path}&minimum_consent_level=#{url_escape(minimum_consent_level)}"
+        path << "&minimum_consent_level=#{url_escape(minimum_consent_level)}"
       end
 
       path

data/lib/tokyo_api/krautbuster.rb

@@ -25,8 +25,11 @@ module TokyoApi
       end
     end
 
-    def user_path(session_id, petition_id:, required_fields: nil)
+    def user_path(session_id, petition_id:, with_subscription_status: false, required_fields: nil)
       path = "/#{normalized_base_path}user/#{url_escape(session_id)}?petition_id=#{url_escape(petition_id)}"
+      if with_subscription_status
+        path << '&with_subscription_status=true'
+      end
       unless required_fields.nil?
         path << "&#{required_fields_param(required_fields)}"
       end

data/spec/identity_spec.rb

@@ -53,6 +53,43 @@ describe TokyoApi::Identity do
         expect(subject.identity.tokyo_identity_user_path('-123456', required_fields: ['email', 'fish & chips'])).to eq('/identity/user/-123456?required_fields=email,fish+%26+chips')
       end
     end
+
+    context 'with_subscription_status and associated arguments' do
+      it 'should not include query string parameter if argument is missing' do
+        expect(subject.identity.tokyo_identity_user_path('123abc456')).not_to match /.+with_subscription_status=.+/
+      end
+
+      it 'should not include query string parameter if argument is false' do
+        expect(subject.identity.tokyo_identity_user_path('123abc456', with_subscription_status: false)).not_to match /.+with_subscription_status=.+/
+      end
+
+      it 'should not include opt_in_public_ids and minimum_consent_level if with_subscription_status is false' do
+        tokyo_path = subject.identity.tokyo_identity_user_path('123abc456',
+                                                                with_subscription_status: false,
+                                                                opt_in_public_ids: ['policy-1.5'],
+                                                                minimum_consent_level: 'explicit')
+
+        expect(tokyo_path).not_to match /.+opt_in_public_ids=.+/
+        expect(tokyo_path).not_to match /.+minimum_consent_level=.+/
+      end
+
+      it 'should include query string parameter if argument is true' do
+        expect(subject.identity.tokyo_identity_user_path('123abc456', with_subscription_status: true)).to match /.+with_subscription_status=.+/
+      end
+
+      it 'should include opt_in_public_ids and minimum_consent_level if with_subscription_status is true' do
+        tokyo_path = subject.identity.tokyo_identity_user_path('123abc456',
+                                                                required_fields: [:first_name, :last_name, :email, :postal, :phone],
+                                                                with_subscription_status: true,
+                                                                opt_in_public_ids: ['policy-1.5'],
+                                                                minimum_consent_level: 'explicit')
+
+        expect(tokyo_path).to match /.+with_subscription_status=true.*/
+        expect(tokyo_path).to match /.+opt_in_public_ids=.+/
+        expect(tokyo_path).to match /.+minimum_consent_level=.+/
+        expect { URI::parse(tokyo_path) }.not_to raise_error
+      end
+    end
   end
 
   describe '#subscription_status_path' do

data/spec/krautbuster_spec.rb

@@ -86,6 +86,20 @@ describe TokyoApi::Krautbuster do
         expect(subject.krautbuster.user_path('123abc456', petition_id: 'save-the-trees', required_fields: ['email', 'fish & chips'])).to eq '/krautbuster/user/123abc456?petition_id=save-the-trees&required_fields=email,fish+%26+chips'
       end
     end
+
+    context 'with_subscription_status argument' do
+      it 'should not include query string parameter if argument is missing' do
+        expect(subject.krautbuster.user_path('123abc456', petition_id: 'save-the-trees')).not_to match /.+with_subscription_status=.+/
+      end
+
+      it 'should not include query string parameter if argument is false' do
+        expect(subject.krautbuster.user_path('123abc456', petition_id: 'save-the-trees', with_subscription_status: false)).not_to match /.+with_subscription_status=.+/
+      end
+
+      it 'should include query string parameter if argument is true' do
+        expect(subject.krautbuster.user_path('123abc456', petition_id: 'save-the-trees', with_subscription_status: true)).to match /.+with_subscription_status=true.*/
+      end
+    end
   end
 
   describe '#subscription_status_path' do

data/tokyo_api.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: tokyo_api 1.1.0 ruby lib
+# stub: tokyo_api 1.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "tokyo_api".freeze
-  s.version = "1.1.0"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tokyo_api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Nathan Woodhull