disco_app 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5341341dc5eed693f033ebff1b63c7c53d068838321446867753c87c39eb58c
-  data.tar.gz: f3b11e3a89df6491a290aa57376e8d9836ce2456026be50856c6e0e702db7ec2
+  metadata.gz: 8f7c3fa69d7d40efc67ae58e4094b26dddbe43dd88ca7e14cfccecceca75d39b
+  data.tar.gz: 2a6af21f5c3b4c449ceed89c87179af6114a27708e469e19cd2dc66af1a92013
 SHA512:
-  metadata.gz: 935f6a935d67afa3d7d04ff62939eef451dbcce4d407a56e08b2bb7162311581b019aa1c0052595d7158179aa23f3d93ad91edbf52dac6055a5ec7c5ea997397
-  data.tar.gz: 3767fc325cf46e9bfaba54b38e952783b4c8c5070929007f71fd534807a2d8cce30129225f43883842f511a561cb3cf8187129f0cc90f49f43094f7568d464a7
+  metadata.gz: 14633c37030a784960030d6b7ab1550834c55ebf04567bf116f0f471ca542bac63904cab028ca7ca81c31da476abfa85784715518cad8afc384a3c12f4e18ea0
+  data.tar.gz: 2e7690604315c2d9a2988c5f9d907916ae1662be99e378e40474fdc496d8b2981258e6c74d6fb1d9452547e907762fe2c2e237ab878e7a4b8801741660a553b2

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

@@ -47,9 +47,15 @@ module DiscoApp::Concerns::Shop
     end
 
     # Return the absolute URL to the shop's storefront.
-    # @TODO: Account for HTTPS.
     def url
-      "http://#{domain}"
+      "#{protocol}://#{domain}"
+    end
+
+    # Return the protocol the shop's storefront uses.
+    # @TODO: Consider when we may want to allow https: here. For now, automatic
+    # redirection should do most of the work.
+    def protocol
+      'http'
     end
 
     # Return the absolute URL to the shop's admin.

data/lib/disco_app/version.rb

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

data/lib/generators/disco_app/disco_app_generator.rb

@@ -61,7 +61,8 @@ class DiscoAppGenerator < Rails::Generators::Base
     application "# Set defaults for charges created by the application"
 
     # Set the "real charges" config variable to false explicitly by default.
-    # Only in production do we read from the environment variable and potentially have it become true.
+    # Only in production do we read from the environment variable and
+    # potentially have it become true.
     application "config.x.shopify_charges_real = false\n"
     application "# Explicitly prevent real charges being created by default"
     application "config.x.shopify_charges_real = ENV['SHOPIFY_CHARGES_REAL'] == 'true'\n", env: :production
@@ -71,11 +72,18 @@ class DiscoAppGenerator < Rails::Generators::Base
     application "config.active_job.queue_adapter = :sidekiq\n", env: :production
     application "# Use Sidekiq as the active job backend", env: :production
 
-    # Ensure the application configuration uses the DEFAULT_HOST environment variable to set up support for reverse
-    # routing absolute URLS (needed when generating Webhook URLs for example).
+    # Ensure the application configuration uses the DEFAULT_HOST environment
+    # variable to set up support for reverse routing absolute URLS (needed when
+    # generating Webhook URLs for example).
     application "routes.default_url_options[:host] = ENV['DEFAULT_HOST']\n"
     application "# Set the default host for absolute URL routing purposes"
 
+    # Add loading of the default application proxy prefix to set up support for
+    # reverse routings absolute proxy URLS.
+    application "config.x.shopify_app_proxy_prefix = ENV['SHOPIFY_APP_PROXY_PREFIX']\n"
+    application "# Set the application proxy path for absolute URL routing purposes"
+
+    # Add the Shopify application name to the configuration.
     application "config.x.shopify_app_name = ENV['SHOPIFY_APP_NAME']\n"
     application "# Set the name of the application"
 
@@ -113,8 +121,8 @@ class DiscoAppGenerator < Rails::Generators::Base
     remove_file 'app/assets/stylesheets/application.css'
 
     # Remove the layout files created by ShopifyApp
-    remove_file 'app/views/layout/application.html.erb'
-    remove_file 'app/views/layout/embedded_app.html.erb'
+    remove_file 'app/views/layouts/application.html.erb'
+    remove_file 'app/views/layouts/embedded_app.html.erb'
   end
 
   # Add the Disco App test helper to test/test_helper.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Gavin Ballard