disco_app 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f7c3fa69d7d40efc67ae58e4094b26dddbe43dd88ca7e14cfccecceca75d39b
-  data.tar.gz: 2a6af21f5c3b4c449ceed89c87179af6114a27708e469e19cd2dc66af1a92013
+  metadata.gz: aa5a75b03995277ab80d6bd150044085e1f7c7fad16340838ee717d292fcf38e
+  data.tar.gz: 218728b186a4210cf8f3411f8272b049eca6936f3ab123b82560b72b71634bc3
 SHA512:
-  metadata.gz: 14633c37030a784960030d6b7ab1550834c55ebf04567bf116f0f471ca542bac63904cab028ca7ca81c31da476abfa85784715518cad8afc384a3c12f4e18ea0
-  data.tar.gz: 2e7690604315c2d9a2988c5f9d907916ae1662be99e378e40474fdc496d8b2981258e6c74d6fb1d9452547e907762fe2c2e237ab878e7a4b8801741660a553b2
+  metadata.gz: 748b9644cd88061e016a169438bb8ad318f41d587fb67ee8a001f02632cccb108e3cc7ff3d613d0efd75557d1c6bcf8a3e4aa81851ba8b8a25a8efff9de959e9
+  data.tar.gz: 93e97fbd2f46744b30babe64fe32ae1f94a328af7aef7952883734915919ea14cd884988cc862afdeaa9931bfc2af452aed13f34e2d5cbd0a73604473bba1a5f

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

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

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

@@ -0,0 +1,47 @@
+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/concerns/synchronise_webhooks_job.rb

@@ -9,7 +9,11 @@ module DiscoApp::Concerns::SynchroniseWebhooksJob
 
     # Registered any webhooks that haven't been registered yet.
     (expected_topics - current_topics).each do |topic|
-      ShopifyAPI::Webhook.create(topic: topic, address: webhooks_url, format: 'json')
+      ShopifyAPI::Webhook.create(
+        topic: topic,
+        address: webhooks_url,
+        format: 'json'
+      )
     end
 
     # Remove any extraneous topics.

data/app/jobs/disco_app/synchronise_carrier_services_job.rb

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

data/lib/disco_app/version.rb

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

data/lib/generators/disco_app/disco_app_generator.rb

@@ -4,12 +4,12 @@ class DiscoAppGenerator < Rails::Generators::Base
 
   # Copy a number of template files to the top-level directory of our application:
   #
-  #  - .env and .env.sample for settings environment variables in development with dotenv-rails;
+  #  - .env and .env.local for settings environment variables in development with dotenv-rails;
   #  - Slightly customised version of the default Rails .gitignore;
   #  - Default simple Procfile for Heroku.
   #
   def copy_root_files
-    %w(.env .env.sample .gitignore Procfile).each do |file|
+    %w(.env .env.local .gitignore Procfile).each do |file|
       copy_file "root/#{file}", file
     end
   end

data/lib/generators/disco_app/mailify/mailify_generator.rb

@@ -38,7 +38,7 @@ module DiscoApp
         application configuration, env: :production
       end
 
-      # Add entries to .env and .env.sample
+      # Add entries to .env and .env.local
       def add_env_variables
         configuration = <<-CONFIG.strip_heredoc
 
@@ -46,7 +46,7 @@ module DiscoApp
           MAILGUN_API_DOMAIN=
         CONFIG
         append_to_file '.env', configuration
-        append_to_file '.env.sample', configuration
+        append_to_file '.env.local', configuration
       end
 
     end

data/lib/tasks/carrier_services.rake

@@ -0,0 +1,10 @@
+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

data/test/fixtures/api/widget_store/webhooks.json

@@ -0,0 +1 @@
+[]

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -12,6 +12,7 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
   end
 
   test 'app installed job performs shop update job' do
+    stub_request(:get, "#{@shop.admin_url}/webhooks.json").to_return(status: 200, body: api_fixture('widget_store/webhooks'))
     stub_request(:post, "#{@shop.admin_url}/webhooks.json").to_return(status: 200)
     stub_request(:get, "#{@shop.admin_url}/shop.json").to_return(status: 200, body: api_fixture('widget_store/shop'))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Gavin Ballard
@@ -278,9 +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_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_webhooks_job.rb
 - app/models/disco_app/concerns/plan.rb
 - app/models/disco_app/concerns/shop.rb
@@ -331,6 +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/start.rake
 - lib/tasks/webhooks.rake
 - test/controllers/disco_app/install_controller_test.rb
@@ -379,6 +382,7 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/fixtures/api/widget_store/shop.json
+- test/fixtures/api/widget_store/webhooks.json
 - test/fixtures/disco_app/plans.yml
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/subscriptions.yml
@@ -458,6 +462,7 @@ test_files:
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/application.rb
+- test/fixtures/api/widget_store/webhooks.json
 - test/fixtures/api/widget_store/shop.json
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/subscriptions.yml