disco_app 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed90cb5423a1bc8af9fee9c49539fb826270afa2cf76f0865f936c9c95cc15e3
-  data.tar.gz: d976b5cf1f1237b2c4d4020107ae0c7ee715b797666ba8af0c4346b4135370ca
+  metadata.gz: e5341341dc5eed693f033ebff1b63c7c53d068838321446867753c87c39eb58c
+  data.tar.gz: f3b11e3a89df6491a290aa57376e8d9836ce2456026be50856c6e0e702db7ec2
 SHA512:
-  metadata.gz: 27abe4c9313cc7576ede08b42b5207312a627bc70c189b6adeca4aba4565289e6877a3fa6a8b4e3f45551d3818fbb4e3c3dcf8de837852483d977f47b0ed297c
-  data.tar.gz: '059fb5c0f3dde3dcb64607695c60c1c80ea08e357cf446460f5b0c716128f740fd86570226083b1f8259343f2d710126befa76c480e048db9f4517cbabf8df93'
+  metadata.gz: 935f6a935d67afa3d7d04ff62939eef451dbcce4d407a56e08b2bb7162311581b019aa1c0052595d7158179aa23f3d93ad91edbf52dac6055a5ec7c5ea997397
+  data.tar.gz: 3767fc325cf46e9bfaba54b38e952783b4c8c5070929007f71fd534807a2d8cce30129225f43883842f511a561cb3cf8187129f0cc90f49f43094f7568d464a7

data/app/assets/stylesheets/disco_app/disco/_grid.scss

@@ -33,6 +33,13 @@
   justify-content: center;
 }
 
+.next-grid--right-aligned {
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+  -ms-flex-pack: end;
+  justify-content: flex-end;
+}
+
 .next-grid__cell {
   @include flex(1, 1, 0%);
   padding: 10px;
@@ -41,6 +48,11 @@
   min-width: 0;
 }
 
+.next-grid__cell--third {
+  @include flex(0, 0, 33.333%);
+  max-width: 33.333%;
+}
+
 .next-grid__cell--no-flex {
   @include flex(0 0 auto);
 }

data/app/controllers/disco_app/webhooks_controller.rb

@@ -22,7 +22,7 @@ module DiscoApp
       end
 
       # Decode the body data and enqueue the appropriate job.
-      data = ActiveSupport::JSON::decode(request.body.read)
+      data = ActiveSupport::JSON::decode(request.body.read).with_indifferent_access
       job_class.perform_later(domain, data)
 
       render nothing: true

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

@@ -9,38 +9,12 @@ module DiscoApp::Concerns::AppInstalledJob
 
   # Perform application installation.
   #
-  # - Install webhooks, using a list generated from the base_webhook_topics and
-  #   webhook_topics methods.
+  # - Synchronise webhooks.
   # - Perform initial update of shop information.
   #
   def perform(domain)
-    (base_webhook_topics + webhook_topics).each do |topic|
-      ShopifyAPI::Webhook.create(topic: topic, address: webhooks_url, format: 'json')
-    end
-
+    DiscoApp::SynchroniseWebhooksJob.perform_now(domain)
     DiscoApp::ShopUpdateJob.perform_now(domain)
   end
 
-  protected
-
-    # Return a list of additional webhook topics to listen for. This method
-    # can be overridden in the application to provide a list of app-specific
-    # webhooks that should be created during installation.
-    def webhook_topics
-      []
-    end
-
-  private
-
-    # Return a list of webhook topics that will always be set up for the
-  # # application.
-    def base_webhook_topics
-      [:'app/uninstalled', :'shop/update']
-    end
-
-    # Return the absolute URL to the webhooks endpoint.
-    def webhooks_url
-      DiscoApp::Engine.routes.url_helpers.webhooks_url
-    end
-
 end

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

@@ -0,0 +1,49 @@
+module DiscoApp::Concerns::SynchroniseWebhooksJob
+  extend ActiveSupport::Concern
+
+  # Ensure the webhooks registered with our shop are the same as those listed
+  # in our application configuration.
+  def perform(shopify_domain)
+    # Get the full list of expected webhook topics.
+    expected_topics = [:'app/uninstalled', :'shop/update'] + topics
+
+    # 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')
+    end
+
+    # Remove any extraneous topics.
+    current_webhooks.each do |webhook|
+      unless expected_topics.include?(webhook.topic.to_sym)
+        webhook.delete
+      end
+    end
+  end
+
+  protected
+
+    # Return a list of additional webhook topics to listen for. This method
+    # can be overridden in the application to provide a list of app-specific
+    # webhooks that should be created during synchronisation.
+    def topics
+      []
+    end
+
+  private
+
+    # Return a list of currently registered topics.
+    def current_topics
+      current_webhooks.map(&:topic).map(&:to_sym)
+    end
+
+    # Return a list of current registered webhooks.
+    def current_webhooks
+      @current_webhooks ||= ShopifyAPI::Webhook.find(:all)
+    end
+
+    # Return the absolute URL to the webhooks endpoint.
+    def webhooks_url
+      DiscoApp::Engine.routes.url_helpers.webhooks_url
+    end
+
+end

data/app/jobs/disco_app/synchronise_webhooks_job.rb

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

data/app/models/disco_app/concerns/shop.rb

@@ -17,7 +17,7 @@ module DiscoApp::Concerns::Shop
     # Define some useful scopes.
     scope :status, -> (status) { where status: status }
     scope :installed, -> { where status: statuses[:installed] }
-    scope :has_active_shopify_plan, -> { where.not(plan_name: [:cancelled, :frozen]) }
+    scope :has_active_shopify_plan, -> { where.not(plan_name: [:cancelled, :frozen, :fraudulent]) }
 
     # Alias 'with_shopify_session' as 'temp', as per our existing conventions.
     alias_method :temp, :with_shopify_session

data/lib/disco_app/support/file_fixtures.rb

@@ -0,0 +1,23 @@
+module DiscoApp::Test
+  module FileFixtures
+
+    # Return an XML fixture as an XML string.
+    def xml_fixture(path)
+      filename = Rails.root.join('test', 'fixtures', 'xml', "#{path}.xml")
+      File.read(filename)
+    end
+
+    # Return a JSON fixture as an indifferent hash.
+    def json_fixture(path, dir: 'json', parse: true)
+      filename = Rails.root.join('test', 'fixtures', dir, "#{path}.json")
+      return File.read(filename) unless parse
+      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
+    end
+
+    # Webhook fixtures are special-case JSON fixtures.
+    def webhook_fixture(path, parse: true)
+      json_fixture(path, dir: 'webhooks', parse: parse)
+    end
+
+  end
+end

data/lib/disco_app/test_help.rb

@@ -0,0 +1,11 @@
+require 'disco_app/support/file_fixtures'
+
+# Make our helper modules available inside fixtures.
+ActiveRecord::FixtureSet.context_class.send :include, DiscoApp::Test::FileFixtures
+
+# Include FileFixture helpers in base TestCase class.
+class ActiveSupport::TestCase
+
+  include DiscoApp::Test::FileFixtures
+
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -83,24 +83,6 @@ class DiscoAppGenerator < Rails::Generators::Base
     copy_file 'config/puma.rb', 'config/puma.rb'
   end
 
-  # Create Rakefiles
-  def create_rakefiles
-    rakefile 'start.rake' do
-      <<-RAKEFILE.strip_heredoc
-        task start: :environment do
-          system 'bundle exec rails server -b 127.0.0.1 -p 3000'
-        end
-      RAKEFILE
-    end
-    rakefile 'console.rake' do
-      <<-RAKEFILE.strip_heredoc
-        task console: :environment do
-          system 'bundle exec rails console'
-        end
-      RAKEFILE
-    end
-  end
-
   # Set up routes.
   def setup_routes
     route "mount DiscoApp::Engine, at: '/'"
@@ -135,6 +117,11 @@ class DiscoAppGenerator < Rails::Generators::Base
     remove_file 'app/views/layout/embedded_app.html.erb'
   end
 
+  # Add the Disco App test helper to test/test_helper.rb
+  def add_test_helper
+    inject_into_file 'test/test_helper.rb', "require 'disco_app/test_help'\n", { after: "require 'rails/test_help'\n" }
+  end
+
   # Copy engine migrations over.
   def install_migrations
     rake 'disco_app:install:migrations'

data/lib/tasks/start.rake

@@ -0,0 +1,3 @@
+task start: :environment do
+  system 'bundle exec rails server -b 127.0.0.1 -p 3000'
+end

data/lib/tasks/webhooks.rake

@@ -0,0 +1,10 @@
+namespace :webhooks do
+
+  desc 'Synchronise webhooks across all installed shops.'
+  task sync: :environment do
+    DiscoApp::Shop.installed.has_active_shopify_plan.each do |shop|
+      DiscoApp::SynchroniseWebhooksJob.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.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Gavin Ballard
@@ -278,8 +278,10 @@ 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_webhooks_job.rb
 - app/jobs/disco_app/shop_job.rb
 - app/jobs/disco_app/shop_update_job.rb
+- app/jobs/disco_app/synchronise_webhooks_job.rb
 - app/models/disco_app/concerns/plan.rb
 - app/models/disco_app/concerns/shop.rb
 - app/models/disco_app/concerns/subscription.rb
@@ -313,6 +315,8 @@ files:
 - db/migrate/20151017234409_move_shop_to_disco_app_engine.rb
 - lib/disco_app.rb
 - lib/disco_app/engine.rb
+- lib/disco_app/support/file_fixtures.rb
+- lib/disco_app/test_help.rb
 - lib/disco_app/version.rb
 - lib/generators/disco_app/USAGE
 - lib/generators/disco_app/disco_app_generator.rb
@@ -327,6 +331,8 @@ 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/start.rake
+- lib/tasks/webhooks.rake
 - test/controllers/disco_app/install_controller_test.rb
 - test/controllers/disco_app/webhooks_controller_test.rb
 - test/controllers/home_controller_test.rb