disco_app 0.5.6 → 0.6.0

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

@@ -0,0 +1,31 @@
+//
+// Replicate the styles for Shopify Admin buttons.
+// --------------------------------------------------
+
+.btn {
+  line-height: 1;
+  padding: 8.5px 15px;
+}
+
+.btn-default {
+  &:hover, &:focus, &:active, &.active {
+    border-color: #d3dbe2;
+    background-color: #f5f6f7;
+  }
+}
+
+.btn-primary {
+  &:hover, &:focus, &:active, &.active {
+    border-color: #4293c2;
+    background-color: #4293c2;
+  }
+}
+
+.btn-disabled {
+  &, &:hover, &:focus, &:active {
+    cursor: default;
+    background: #fafbfc;
+    color: #c3cfd8;
+    border: 1px solid #d3dbe2;
+  }
+}

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

@@ -0,0 +1,43 @@
+//
+// Replicate the styles for Shopify Admin cards.
+// --------------------------------------------------
+
+.next-card {
+  background-color: #ffffff;
+  border-radius: 3px;
+  box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+}
+
+.next-card ~ .next-card {
+  margin-top: 20px;
+}
+
+.next-card__header {
+  padding: 20px 20px 0;
+
+  h1, h2, h3 {
+    margin-bottom: 0;
+    font-size: 18px;
+    line-height: 1.2em;
+  }
+}
+
+.next-card__footer {
+  padding: 0 20px 20px;
+}
+
+.next-card__section {
+  padding: 20px;
+}
+
+.next-card--aside,
+.next-card--disabled {
+  background-color: #f5f6f7;
+}
+
+.next-card--disabled {
+  .next-card__header,
+  .next-card__section {
+    color: #777777;
+  }
+}

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

@@ -0,0 +1,23 @@
+//
+// Replicate the styles for Shopify Admin forms.
+// --------------------------------------------------
+
+.form-control {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+
+  font-size: 15px;
+  line-height: 20px;
+
+  &:focus {
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+}
+
+.help-block {
+  font-style: italic;
+  font-size: 13px;
+  color: #95a7b7;
+  margin-top: 5px;
+}

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

@@ -0,0 +1,61 @@
+//
+// Replicate the styles for Shopify Admin sections
+// and flexbox layout.
+// --------------------------------------------------
+
+
+//== Layout
+//
+//## Simple Flexbox layout utilities.
+
+.layout-content {
+  display: flex;
+}
+
+.layout-content__sidebar {
+  padding: 20px;
+  @include flex(1, 1, 25%);
+  max-width: 25%
+}
+
+.layout-content__main {
+  padding: 20px;
+  @include flex(1, 1, 0%);
+}
+
+.layout-content__first {
+  padding-right: 0;
+}
+
+
+//== Section
+//
+//## Simple Flexbox layout utilities.
+
+//** Main section wrapper.
+.section {
+  margin: 0;
+  padding: 0;
+  border-bottom: 1px solid #e6e6e6;
+}
+
+//** Section "summary" to the left of the section.
+.section-summary {
+  padding: 20px 20px 20px 30px;
+
+  h1, h2 {
+    line-height: 1.325;
+    margin-top: -4px;
+    font-size: 18px;
+    margin-bottom: 10px;
+  }
+
+  p {
+    color: #798c9c;
+    margin-bottom: 15px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+}

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

@@ -0,0 +1,21 @@
+//
+// Replicate the styles for Shopify Admin typography.
+// --------------------------------------------------
+
+
+//== Headings
+//
+//## Heading styles.
+
+h1, .h1,
+h2, .h2,
+h3, .h3,
+h4, .h4,
+h5, .h5,
+h6, .h6 {
+  margin: 0 0 20px 0;
+}
+
+p {
+  margin: 0;
+}

data/app/assets/stylesheets/disco_app/disco/mixins/_flexbox.scss

@@ -0,0 +1,394 @@
+// Flexbox Mixins
+// http://philipwalton.github.io/solved-by-flexbox/
+// https://github.com/philipwalton/solved-by-flexbox
+//
+// Copyright (c) 2013 Brian Franco
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// This is a set of mixins for those who want to mess around with flexbox
+// using the native support of current browsers. For full support table
+// check: http://caniuse.com/flexbox
+//
+// Basically this will use:
+//
+// * Fallback, old syntax (IE10, mobile webkit browsers - no wrapping)
+// * Final standards syntax (FF, Safari, Chrome, IE11, Opera)
+//
+// This was inspired by:
+//
+// * http://dev.opera.com/articles/view/advanced-cross-browser-flexbox/
+//
+// With help from:
+//
+// * http://w3.org/tr/css3-flexbox/
+// * http://the-echoplex.net/flexyboxes/
+// * http://msdn.microsoft.com/en-us/library/ie/hh772069(v=vs.85).aspx
+// * http://css-tricks.com/using-flexbox/
+// * http://dev.opera.com/articles/view/advanced-cross-browser-flexbox/
+// * https://developer.mozilla.org/en-us/docs/web/guide/css/flexible_boxes
+
+//----------------------------------------------------------------------
+
+// Flexbox Containers
+//
+// The 'flex' value causes an element to generate a block-level flex
+// container box.
+//
+// The 'inline-flex' value causes an element to generate a inline-level
+// flex container box.
+//
+// display: flex | inline-flex
+//
+// http://w3.org/tr/css3-flexbox/#flex-containers
+//
+// (Placeholder selectors for each type, for those who rather @extend)
+
+@mixin flexbox {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -moz-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+%flexbox { @include flexbox; }
+
+//----------------------------------
+
+@mixin inline-flex {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -moz-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+}
+
+%inline-flex { @include inline-flex; }
+
+//----------------------------------------------------------------------
+
+// Flexbox Direction
+//
+// The 'flex-direction' property specifies how flex items are placed in
+// the flex container, by setting the direction of the flex container's
+// main axis. This determines the direction that flex items are laid out in.
+//
+// Values: row | row-reverse | column | column-reverse
+// Default: row
+//
+// http://w3.org/tr/css3-flexbox/#flex-direction-property
+
+@mixin flex-direction($value: row) {
+  @if $value == row-reverse {
+    -webkit-box-direction: reverse;
+    -webkit-box-orient: horizontal;
+  } @else if $value == column {
+    -webkit-box-direction: normal;
+    -webkit-box-orient: vertical;
+  } @else if $value == column-reverse {
+    -webkit-box-direction: reverse;
+    -webkit-box-orient: vertical;
+  } @else {
+    -webkit-box-direction: normal;
+    -webkit-box-orient: horizontal;
+  }
+  -webkit-flex-direction: $value;
+  -moz-flex-direction: $value;
+  -ms-flex-direction: $value;
+  flex-direction: $value;
+}
+// Shorter version:
+@mixin flex-dir($args...) { @include flex-direction($args...); }
+
+//----------------------------------------------------------------------
+
+// Flexbox Wrap
+//
+// The 'flex-wrap' property controls whether the flex container is single-line
+// or multi-line, and the direction of the cross-axis, which determines
+// the direction new lines are stacked in.
+//
+// Values: nowrap | wrap | wrap-reverse
+// Default: nowrap
+//
+// http://w3.org/tr/css3-flexbox/#flex-wrap-property
+
+@mixin flex-wrap($value: nowrap) {
+  // No Webkit Box fallback.
+  -webkit-flex-wrap: $value;
+  -moz-flex-wrap: $value;
+  @if $value == nowrap {
+    -ms-flex-wrap: none;
+  } @else {
+    -ms-flex-wrap: $value;
+  }
+  flex-wrap: $value;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Flow (shorthand)
+//
+// The 'flex-flow' property is a shorthand for setting the 'flex-direction'
+// and 'flex-wrap' properties, which together define the flex container's
+// main and cross axes.
+//
+// Values: <flex-direction> | <flex-wrap>
+// Default: row nowrap
+//
+// http://w3.org/tr/css3-flexbox/#flex-flow-property
+
+@mixin flex-flow($values: (row nowrap)) {
+  // No Webkit Box fallback.
+  -webkit-flex-flow: $values;
+  -moz-flex-flow: $values;
+  -ms-flex-flow: $values;
+  flex-flow: $values;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Order
+//
+// The 'order' property controls the order in which flex items appear within
+// their flex container, by assigning them to ordinal groups.
+//
+// Default: 0
+//
+// http://w3.org/tr/css3-flexbox/#order-property
+
+@mixin order($int: 0) {
+  -webkit-box-ordinal-group: $int + 1;
+  -webkit-order: $int;
+  -moz-order: $int;
+  -ms-flex-order: $int;
+  order: $int;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Grow
+//
+// The 'flex-grow' property sets the flex grow factor. Negative numbers
+// are invalid.
+//
+// Default: 0
+//
+// http://w3.org/tr/css3-flexbox/#flex-grow-property
+
+@mixin flex-grow($int: 0) {
+  -webkit-box-flex: $int;
+  -webkit-flex-grow: $int;
+  -moz-flex-grow: $int;
+  -ms-flex-positive: $int;
+  flex-grow: $int;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Shrink
+//
+// The 'flex-shrink' property sets the flex shrink factor. Negative numbers
+// are invalid.
+//
+// Default: 1
+//
+// http://w3.org/tr/css3-flexbox/#flex-shrink-property
+
+@mixin flex-shrink($int: 1) {
+  -webkit-flex-shrink: $int;
+  -moz-flex-shrink: $int;
+  -ms-flex-negative: $int;
+  flex-shrink: $int;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Basis
+//
+// The 'flex-basis' property sets the flex basis. Negative lengths are invalid.
+//
+// Values: Like "width"
+// Default: auto
+//
+// http://www.w3.org/TR/css3-flexbox/#flex-basis-property
+
+@mixin flex-basis($value: auto) {
+  -webkit-flex-basis: $value;
+  -moz-flex-basis: $value;
+  -ms-flex-preferred-size: $value;
+  flex-basis: $value;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox "Flex" (shorthand)
+//
+// The 'flex' property specifies the components of a flexible length: the
+// flex grow factor and flex shrink factor, and the flex basis. When an
+// element is a flex item, 'flex' is consulted instead of the main size
+// property to determine the main size of the element. If an element is
+// not a flex item, 'flex' has no effect.
+//
+// Values: none | <flex-grow> <flex-shrink> || <flex-basis>
+// Default: See individual properties (1 1 0).
+//
+// http://w3.org/tr/css3-flexbox/#flex-property
+
+@mixin flex($fg: 1, $fs: null, $fb: null) {
+
+  // Set a variable to be used by box-flex properties
+  $fg-boxflex: $fg;
+
+  // Box-Flex only supports a flex-grow value so let's grab the
+  // first item in the list and just return that.
+  @if type-of($fg) == 'list' {
+    $fg-boxflex: nth($fg, 1);
+  }
+
+  -webkit-box-flex: $fg-boxflex;
+  -webkit-flex: $fg $fs $fb;
+  -moz-box-flex: $fg-boxflex;
+  -moz-flex: $fg $fs $fb;
+  -ms-flex: $fg $fs $fb;
+  flex: $fg $fs $fb;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Justify Content
+//
+// The 'justify-content' property aligns flex items along the main axis
+// of the current line of the flex container. This is done after any flexible
+// lengths and any auto margins have been resolved. Typically it helps distribute
+// extra free space leftover when either all the flex items on a line are
+// inflexible, or are flexible but have reached their maximum size. It also
+// exerts some control over the alignment of items when they overflow the line.
+//
+// Note: 'space-*' values not supported in older syntaxes.
+//
+// Values: flex-start | flex-end | center | space-between | space-around
+// Default: flex-start
+//
+// http://w3.org/tr/css3-flexbox/#justify-content-property
+
+@mixin justify-content($value: flex-start) {
+  @if $value == flex-start {
+    -webkit-box-pack: start;
+    -ms-flex-pack: start;
+  } @else if $value == flex-end {
+    -webkit-box-pack: end;
+    -ms-flex-pack: end;
+  } @else if $value == space-between {
+    -webkit-box-pack: justify;
+    -ms-flex-pack: justify;
+  } @else if $value == space-around {
+    -ms-flex-pack: distribute;
+  } @else {
+    -webkit-box-pack: $value;
+    -ms-flex-pack: $value;
+  }
+  -webkit-justify-content: $value;
+  -moz-justify-content: $value;
+  justify-content: $value;
+}
+// Shorter version:
+@mixin flex-just($args...) { @include justify-content($args...); }
+
+//----------------------------------------------------------------------
+
+// Flexbox Align Items
+//
+// Flex items can be aligned in the cross axis of the current line of the
+// flex container, similar to 'justify-content' but in the perpendicular
+// direction. 'align-items' sets the default alignment for all of the flex
+// container's items, including anonymous flex items. 'align-self' allows
+// this default alignment to be overridden for individual flex items. (For
+// anonymous flex items, 'align-self' always matches the value of 'align-items'
+// on their associated flex container.)
+//
+// Values: flex-start | flex-end | center | baseline | stretch
+// Default: stretch
+//
+// http://w3.org/tr/css3-flexbox/#align-items-property
+
+@mixin align-items($value: stretch) {
+  @if $value == flex-start {
+    -webkit-box-align: start;
+    -ms-flex-align: start;
+  } @else if $value == flex-end {
+    -webkit-box-align: end;
+    -ms-flex-align: end;
+  } @else {
+    -webkit-box-align: $value;
+    -ms-flex-align: $value;
+  }
+  -webkit-align-items: $value;
+  -moz-align-items: $value;
+  align-items: $value;
+}
+
+//----------------------------------
+
+// Flexbox Align Self
+//
+// Values: auto | flex-start | flex-end | center | baseline | stretch
+// Default: auto
+
+@mixin align-self($value: auto) {
+  // No Webkit Box Fallback.
+  -webkit-align-self: $value;
+  -moz-align-self: $value;
+  @if $value == flex-start {
+    -ms-flex-item-align: start;
+  } @else if $value == flex-end {
+    -ms-flex-item-align: end;
+  } @else {
+    -ms-flex-item-align: $value;
+  }
+  align-self: $value;
+}
+
+//----------------------------------------------------------------------
+
+// Flexbox Align Content
+//
+// The 'align-content' property aligns a flex container's lines within the
+// flex container when there is extra space in the cross-axis, similar to
+// how 'justify-content' aligns individual items within the main-axis. Note,
+// this property has no effect when the flexbox has only a single line.
+//
+// Values: flex-start | flex-end | center | space-between | space-around | stretch
+// Default: stretch
+//
+// http://w3.org/tr/css3-flexbox/#align-content-property
+
+@mixin align-content($value: stretch) {
+  // No Webkit Box Fallback.
+  -webkit-align-content: $value;
+  -moz-align-content: $value;
+  @if $value == flex-start {
+    -ms-flex-line-pack: start;
+  } @else if $value == flex-end {
+    -ms-flex-line-pack: end;
+  } @else {
+    -ms-flex-line-pack: $value;
+  }
+  align-content: $value;
+}

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

@@ -1,7 +1,13 @@
-/*!
- * disco_app/disco_app.scss
- * Base styles for Disco applications.
- */
+//
+// Styles for Disco applications.
+// --------------------------------------------------
+
 @import 'bootstrap-sprockets';
-@import 'bootstrap-variables';
-@import 'bootstrap-custom';
+@import 'bootstrap/variables';
+@import 'bootstrap/custom';
+@import 'disco/mixins/flexbox';
+@import 'disco/type';
+@import 'disco/sections';
+@import 'disco/cards';
+@import 'disco/buttons';
+@import 'disco/forms';

data/app/controllers/disco_app/authenticated_controller.rb

@@ -14,7 +14,7 @@ module DiscoApp
 
       def shopify_shop
         if shop_session
-          @shop = ::Shop.find_by!(shopify_domain: @shop_session.url)
+          @shop = Shop.find_by!(shopify_domain: @shop_session.url)
         else
           redirect_to_login
         end

data/app/controllers/disco_app/install_controller.rb

@@ -4,7 +4,7 @@ module DiscoApp
 
     # Start the installation process for the current shop, then redirect to the installing screen.
     def install
-      ::AppInstalledJob.perform_later(@shop.shopify_domain)
+      AppInstalledJob.perform_later(@shop.shopify_domain)
       redirect_to action: :installing
     end
 

data/app/controllers/disco_app/webhooks_controller.rb

@@ -8,10 +8,16 @@ module DiscoApp
       topic = request.headers['HTTP_X_SHOPIFY_TOPIC']
       domain = request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN']
 
+      # Ensure a domain was provided in the headers.
+      unless domain
+        head :bad_request
+      end
+
       # Try to find a matching background job task for the given topic using class name.
-      begin
-        job_class = "#{topic}_job".gsub('/', '_').classify.constantize
-      rescue NameError
+      job_class = DiscoApp::WebhookService.find_job_class(topic)
+
+      # Return bad request if we couldn't match a job class.
+      unless job_class.present?
         head :bad_request
       end
 
@@ -26,15 +32,11 @@ module DiscoApp
 
       # Verify a webhook request.
       def verify_webhook
-        data = request.body.read.to_s
-        hmac_header = request.headers['HTTP_X_SHOPIFY_HMAC_SHA256']
-        digest  = OpenSSL::Digest::Digest.new('sha256')
-        calculated_hmac = Base64.encode64(OpenSSL::HMAC.digest(digest, ShopifyApp.configuration.secret, data)).strip
-        unless calculated_hmac == hmac_header
+        unless DiscoApp::WebhookService.is_valid_hmac?(request.body.read.to_s, ShopifyApp.configuration.secret, request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'])
           head :unauthorized
         end
         request.body.rewind
       end
 
   end
-end
+end

data/app/jobs/disco_app/app_installed_job.rb

@@ -13,7 +13,7 @@ module DiscoApp
       end
 
       # Perform initial update of shop information.
-      ::ShopUpdateJob.perform_now(domain)
+      DiscoApp::ShopUpdateJob.perform_now(domain)
 
     end
 

data/app/jobs/disco_app/app_uninstalled_job.rb

@@ -1,18 +1,3 @@
-module DiscoApp
-  class AppUninstalledJob < DiscoApp::ShopJob
-
-    before_enqueue { @shop.awaiting_uninstall! }
-    before_perform { @shop.uninstalling! }
-    after_perform { @shop.uninstalled! }
-
-    def perform(domain, shop_data)
-
-      # Mark the shop's charge status as "cancelled" unless charges have been waived.
-      unless @shop.charge_waived?
-        @shop.charge_cancelled!
-      end
-
-    end
-
-  end
+class DiscoApp::AppUninstalledJob < DiscoApp::ShopJob
+  include DiscoApp::Concerns::AppUninstalledJob
 end