disco_app 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa5a75b03995277ab80d6bd150044085e1f7c7fad16340838ee717d292fcf38e
-  data.tar.gz: 218728b186a4210cf8f3411f8272b049eca6936f3ab123b82560b72b71634bc3
+  metadata.gz: '06960bd40f8d13cfc0976f62ef2dad843f3d6ce3fd6360fe3d39decf27474ffa'
+  data.tar.gz: c7629e5dc53f093f18f7336bb1e56b19317da51a15c35831dbe5622c454d92b5
 SHA512:
-  metadata.gz: 748b9644cd88061e016a169438bb8ad318f41d587fb67ee8a001f02632cccb108e3cc7ff3d613d0efd75557d1c6bcf8a3e4aa81851ba8b8a25a8efff9de959e9
-  data.tar.gz: 93e97fbd2f46744b30babe64fe32ae1f94a328af7aef7952883734915919ea14cd884988cc862afdeaa9931bfc2af452aed13f34e2d5cbd0a73604473bba1a5f
+  metadata.gz: 94a757245376dc817637b122fe6e6d0d89f8a983ed38cd51ada10d46348d5fb35082c20f54da371eb9ac95689701c3558024fdf673257f6424f4643310a5d64e
+  data.tar.gz: 56c7869198c5eb5074336694b8e2b3d0c1963f46314859486f2310bba201a80b03257a427afcf59c9713d727b5c4dd0ad34850e2dcc7e492785da3365a63b74f

data/app/jobs/disco_app/concerns/app_installed_job.rb

@@ -10,12 +10,12 @@ module DiscoApp::Concerns::AppInstalledJob
   # Perform application installation.
   #
   # - Synchronise webhooks.
-  # - Synchronise carrier services.
+  # - Synchronise carrier service, if required.
   # - Perform initial update of shop information.
   #
   def perform(domain)
     DiscoApp::SynchroniseWebhooksJob.perform_now(domain)
-    DiscoApp::SynchroniseCarrierServicesJob.perform_now(domain)
+    DiscoApp::SynchroniseCarrierServiceJob.perform_now(domain)
     DiscoApp::ShopUpdateJob.perform_now(domain)
   end
 

data/app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb

@@ -0,0 +1,51 @@
+module DiscoApp::Concerns::SynchroniseCarrierServiceJob
+  extend ActiveSupport::Concern
+
+  # Ensure that any carrier service required by our app is registered.
+  def perform(shopify_domain)
+    # Don't proceed unless we have a name and callback url.
+    return unless carrier_service_name and callback_url
+
+    # Don't proceed if the carrier service is already registered.
+    return if current_carrier_service_names.include?(carrier_service_name)
+
+    # Otherwise, register the carrier service.
+    ShopifyAPI::CarrierService.create(
+      name: carrier_service_name,
+      callback_url: callback_url,
+      service_discovery: true,
+      format: 'json'
+    )
+
+    # De-activate and extraneous carrier services.
+    current_carrier_services.each do |carrier_service|
+      unless carrier_service.name == carrier_service_name
+        carrier_service.active = false
+        carrier_service.save
+      end
+    end
+  end
+
+  protected
+
+    def carrier_service_name
+      Rails.application.config.x.shopify_app_name
+    end
+
+    def callback_url
+      nil
+    end
+
+  private
+
+    # Return a list of currently registered callback URLs.
+    def current_carrier_service_names
+      current_carrier_services.map(&:name)
+    end
+
+    # Return a list of currently registered carrier services.
+    def current_carrier_services
+      @current_carrier_service ||= ShopifyAPI::CarrierService.find(:all)
+    end
+
+end

data/app/jobs/disco_app/synchronise_carrier_service_job.rb

@@ -0,0 +1,3 @@
+class DiscoApp::SynchroniseCarrierServiceJob < DiscoApp::ShopJob
+  include DiscoApp::Concerns::SynchroniseCarrierServiceJob
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/tasks/carrier_service.rake

@@ -0,0 +1,10 @@
+namespace :carrier_service do
+
+  desc 'Synchronise carrier service across all installed shops.'
+  task sync: :environment do
+    DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
+      DiscoApp::SynchroniseCarrierServiceJob.perform_later(shop.shopify_domain)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Gavin Ballard
@@ -278,11 +278,11 @@ files:
 - app/jobs/disco_app/concerns/app_installed_job.rb
 - app/jobs/disco_app/concerns/app_uninstalled_job.rb
 - app/jobs/disco_app/concerns/shop_update_job.rb
-- app/jobs/disco_app/concerns/synchronise_carrier_services_job.rb
+- app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb
 - app/jobs/disco_app/concerns/synchronise_webhooks_job.rb
 - app/jobs/disco_app/shop_job.rb
 - app/jobs/disco_app/shop_update_job.rb
-- app/jobs/disco_app/synchronise_carrier_services_job.rb
+- app/jobs/disco_app/synchronise_carrier_service_job.rb
 - app/jobs/disco_app/synchronise_webhooks_job.rb
 - app/models/disco_app/concerns/plan.rb
 - app/models/disco_app/concerns/shop.rb
@@ -333,7 +333,7 @@ files:
 - lib/generators/disco_app/templates/initializers/shopify_session_repository.rb
 - lib/generators/disco_app/templates/root/Procfile
 - lib/generators/disco_app/templates/views/home/index.html.erb
-- lib/tasks/carrier_services.rake
+- lib/tasks/carrier_service.rake
 - lib/tasks/start.rake
 - lib/tasks/webhooks.rake
 - test/controllers/disco_app/install_controller_test.rb

data/app/jobs/disco_app/concerns/synchronise_carrier_services_job.rb

@@ -1,47 +0,0 @@
-module DiscoApp::Concerns::SynchroniseCarrierServicesJob
-  extend ActiveSupport::Concern
-
-  # Ensure the carrier services registered with our shop are the same as those
-  # listed in our application configuration.
-  def perform(shopify_domain)
-    # Registered any carrier services that haven't been registered yet.
-    (callback_urls - current_callback_urls).each do |callback_url|
-      ShopifyAPI::CarrierService.create(
-        name: carrier_service_name,
-        callback_url: callback_url,
-        service_discovery: true,
-        format: 'json'
-      )
-    end
-
-    # Remove any extraneous carrier services.
-    current_carrier_services.each do |carrier_service|
-      unless callback_urls.include?(carrier_service.callback_url)
-        carrier_service.delete
-      end
-    end
-  end
-
-  protected
-
-    def carrier_service_name
-      Rails.application.config.x.shopify_app_name
-    end
-
-    def callback_urls
-      []
-    end
-
-  private
-
-    # Return a list of currently registered callback URLs.
-    def current_callback_urls
-      current_carrier_services.map(&:callback_url)
-    end
-
-    # Return a list of currently registered carrier services.
-    def current_carrier_services
-      @current_carrier_service ||= ShopifyAPI::CarrierService.find(:all)
-    end
-
-end

data/app/jobs/disco_app/synchronise_carrier_services_job.rb

@@ -1,3 +0,0 @@
-class DiscoApp::SynchroniseCarrierServicesJob < DiscoApp::ShopJob
-  include DiscoApp::Concerns::SynchroniseCarrierServicesJob
-end

data/lib/tasks/carrier_services.rake

@@ -1,10 +0,0 @@
-namespace :carrier_services do
-
-  desc 'Synchronise carrier services across all installed shops.'
-  task sync: :environment do
-    DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
-      DiscoApp::SynchroniseCarrierServicesJob.perform_later(shop.shopify_domain)
-    end
-  end
-
-end