discourse_subscription_client 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03fe5f25d9d530751ddc8530ff74fb3bca6eef434172769f621beb0ddaebf8bb
-  data.tar.gz: 39a728c0ffecdbbfb5d4b6b69983b49fa533dd410ccecd72dfb52aa19657d3ed
+  metadata.gz: f18845628b38637a55730279c38b6eb79a781ee92397249f87f59535273c1223
+  data.tar.gz: 0d5ee97121224e465853bca566e636feab9e9f11bbfb7f0c55ddcf7133639919
 SHA512:
-  metadata.gz: ce4bf56aecb3056ecdda3888508088511417f5739334203dc16d0504324bb4acdb8314de6fdc9818cf14942367e26594c4c91d911eec060cc0d2deb2dac0d72b
-  data.tar.gz: c26396551c3dea1b80770918dbc64d4b7ff423e6b0e674ce856c87a46114b11a8ac074cad7631ac47e4cc61350749a34470e925757fea992dba22cfc9623e300
+  metadata.gz: 4925d0d4fa305be65af680a5b4e6d59ff4edcd1625308642f2ee76bf5a0e9fbeffb90781ff9d4742e47730bfadde65137cc4584c0136575d2b4ccde34860bbb4
+  data.tar.gz: 1b9219ddd8859ed418547d1f723b357cdcef1a552be53b3db9e9b7c0b57d1f7990bf9c9efc1940c0c8de0fe1423e066ec09bacb75af9611c616ef2d8b7423d7d

data/lib/discourse_subscription_client/subscriptions.rb

@@ -54,24 +54,20 @@ module DiscourseSubscriptionClient
       return (supplier.deactivate_all_subscriptions! && @result.connection_error(supplier)) if response.nil?
 
       subscription_data = @result.retrieve_subscriptions(supplier, response)
-      return supplier.deactivate_all_subscriptions! if @result.errors.any?
+      return supplier.deactivate_all_subscriptions! if subscription_data.blank?
 
       # deactivate any of the supplier's subscriptions not retrieved from supplier
-      if supplier.subscriptions.present?
-        supplier.subscriptions.each do |subscription|
-          has_match = false
-          subscription_data.each do |data|
-            if data_matches_subscription(data, subscription)
-              data.subscription = subscription
-              has_match = true
-            end
+      supplier.subscriptions.each do |subscription|
+        has_match = false
+        subscription_data.each do |data|
+          if data_matches_subscription(data, subscription)
+            data.subscription = subscription
+            has_match = true
           end
-          subscription.deactivate! unless has_match
         end
+        subscription.deactivate! unless has_match
       end
 
-      return @result.no_subscriptions(supplier) if subscription_data.blank?
-
       subscription_data.each do |data|
         if data.subscription.present?
           data.subscription.update(subscribed: true)

data/lib/discourse_subscription_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiscourseSubscriptionClient
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_subscription_client
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Angus McLeod