disco_app 0.9.2 → 0.9.3

data/app/assets/stylesheets/disco_app/ui-kit/_ui-kit.scss

@@ -394,31 +394,28 @@ hr.helper--divider {
   margin: 20px 0;
 }
 
-@font-face {
-  font-family: 'Golos-Bold';
-  src: url(/golos-bold.eot);
-}
-
-@font-face {
-  font-family: 'Golos-Bold';
-  src: url(/golos-bold.woff) format("woff"), url(/golos-bold.ttf) format("truetype");
-  font-weight: normal;
-  font-style: normal;
-}
-
 html {
-  font-size: 62.5%;
+  font-size: 87.5%;
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
   text-size-adjust: 100%;
+  text-rendering: optimizeLegibility;
 }
 
 body {
-  line-height: 18px;
-  font-size: 13px;
-  color: #31373d;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  text-rendering: optimizeLegibility;
+  color: rgba(0,0,0,0.9);
+  font-size: 1.07143rem;
+  line-height: 1.42857rem;
+  font-weight: 400;
+  text-transform: initial;
+  letter-spacing: initial;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  font-family: $font-family;
+
+  @media screen and (min-width: 640px) {
+    font-size: 1rem;
+  }
 }
 
 strong {
@@ -533,7 +530,7 @@ code {
 input {
   font-size: 13px;
   line-height: 18px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: $font-family;
 }
 
 del {
@@ -1327,6 +1324,37 @@ a.type--subdued:hover {
   padding-left: 20px;
 }
 
+.btn {
+  color: rgba(0,0,0,0.9);
+  font-size: 1.14286rem;
+  line-height: 1.71429rem;
+  font-weight: 400;
+  text-transform: initial;
+  letter-spacing: initial;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  line-height: 1.14286rem;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: inline-block;
+  padding: 9px 15px;
+  margin: 0;
+  border-radius: 3px;
+  height: auto;
+  white-space: nowrap;
+  text-transform: none;
+  font-family: inherit;
+  font-weight: normal;
+  position: relative;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  -webkit-appearance: none;
+  -webkit-tap-highlight-color: transparent;
+}
+
 .btn-default, .btn {
   background-color: #ffffff;
   color: #479ccf;
@@ -1507,30 +1535,6 @@ a.type--subdued:hover {
   background: rgba(49, 55, 61, 0.1);
 }
 
-.btn {
-  box-sizing: border-box;
-  cursor: pointer;
-  display: inline-block;
-  padding: 8.5px 15px;
-  margin: 0;
-  border-radius: 3px;
-  font-size: 13px;
-  line-height: 1;
-  height: auto;
-  white-space: nowrap;
-  text-transform: none;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-weight: normal;
-  position: relative;
-  vertical-align: middle;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  -webkit-appearance: none;
-  -webkit-tap-highlight-color: transparent;
-}
-
 .btn.has-loading::before {
   background-position: 50% 50% !important;
   background-repeat: no-repeat !important;
@@ -1636,7 +1640,7 @@ input[type="submit"].btn-disabled.btn--outline,
   z-index: 226;
   border-radius: 0;
   left: 0;
-  min-width: 230px;
+  min-width: 240px;
   padding: 20px 0 !important;
   text-align: center;
   top: 0;
@@ -2545,8 +2549,8 @@ input, textarea {
   max-width: 100%;
   vertical-align: top;
   height: 28px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-family: $font-family;
+  font-size: 14px;
   padding: 4px;
   margin: 0;
   border: 1px solid #d3dbe2;
@@ -2739,8 +2743,8 @@ textarea.is-expanded {
 
 select {
   margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-family: $font-family;
+  font-size: 14px;
   display: inline-block;
   color: #222;
   vertical-align: top;
@@ -3138,7 +3142,7 @@ input.attached-to-both {
   padding: 0;
 }
 
-.next-input, .next-input--stylized, .next-input--invisible {
+.next-input, .sp-input, .next-input--stylized, .next-input--invisible {
   display: inline-block;
   max-width: auto;
   min-width: 75px;
@@ -3205,16 +3209,21 @@ input[type=button].next-input--button {
   -moz-appearance: none;
 }
 
-.next-input, .next-input--stylized, .next-textarea {
+.next-input, .sp-input, .next-input--stylized, .next-textarea, .next-token-list--is-input {
   padding: 5px 10px;
   border: 1px solid #d3dbe2;
   border-radius: 3px;
-  font-size: 15px;
-  color: #31373d;
+  color: rgba(0,0,0,0.9);
+  font-size: 1.14286rem;
+  line-height: 1.71429rem;
+  font-weight: 400;
+  text-transform: initial;
+  letter-spacing: initial;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
   box-sizing: border-box;
   display: block;
   width: 100%;
-  line-height: 20px;
 }
 
 .next-input::-webkit-input-placeholder, .next-input--stylized::-webkit-input-placeholder, .next-textarea::-webkit-input-placeholder {
@@ -3244,10 +3253,19 @@ input[type=button].next-input--button {
 .next-label {
   display: block;
   margin-bottom: 5px;
-  color: #31373d;
-  font-size: 13px;
-  font-weight: normal;
+  color: rgba(0,0,0,0.9);
+  font-size: 1.07143rem;
+  line-height: 1.42857rem;
+  font-weight: 400;
+  text-transform: initial;
+  letter-spacing: initial;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
   cursor: pointer;
+
+  @media screen and (min-width: 640px) {
+    font-size: 1rem;
+  }
 }
 
 .next-label--inline {
@@ -3487,7 +3505,7 @@ input[type=checkbox].next-checkbox, .next-radio--styled, .next-checkbox--styled
   display: block;
   position: absolute;
   left: 0;
-  top: 0;
+  top: 0.15em;
   height: 16px;
   width: 16px;
   border: 1px solid #d3dbe2;
@@ -3646,17 +3664,22 @@ input[type=checkbox].next-checkbox {
   -webkit-appearance: none;
   -moz-appearance: none;
   width: 100%;
-  font-size: 15px;
+  color: rgba(0,0,0,0.9);
+  font-size: 1.14286rem;
+  line-height: 1.71429rem;
+  font-weight: 400;
+  text-transform: initial;
+  letter-spacing: initial;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
   background: transparent;
   padding: 5px 10px;
   padding-right: 32px;
-  border: none;
+  border: 0;
   box-sizing: border-box;
   height: auto;
-  line-height: 20px;
   max-width: none;
   display: block;
-  color: #31373d;
 }
 
 .next-select:focus {
@@ -3772,11 +3795,15 @@ input[type=checkbox].next-checkbox {
 }
 
 .next-heading {
-  color: #31373d;
-  margin: 0 0 20px 0;
-  font-weight: 400;
-  font-size: 18px;
-  line-height: 1.2em;
+  color: rgba(0,0,0,0.9);
+  font-size: 1.21429rem;
+  line-height: 1.71429rem;
+  font-weight: 600;
+  margin: 0 0 20px;
+
+  @media screen and (min-width: 640px) {
+    font-size: 1.14286rem;
+  }
 }
 
 .next-heading--1 {
@@ -5038,11 +5065,11 @@ td a.subdued:hover {
 }
 
 .ui-annotated-section__annotation {
+  color: rgba(0,0,0,0.56);
   -webkit-box-flex: 1;
   -webkit-flex: 1 0 240px;
   -ms-flex: 1 0 240px;
   flex: 1 0 240px;
-  color: #798c9c;
 }
 
 .ui-annotated-section__title {

data/app/assets/stylesheets/disco_app/ui-kit/_ui-tabs.scss

@@ -30,19 +30,30 @@
 }
 
 .next-tab {
+  color: rgba(0,0,0,0.56);
   padding: 15px 20px;
   text-decoration: none;
-  color: #798c9c;
   border-right: 1px solid #ebeef0;
   border-bottom: 1px solid #ebeef0;
   text-align: center;
   line-height: 1;
   cursor: pointer;
   position: relative;
-  font-size: 13px;
+  -webkit-box-flex: 1;
+  -webkit-flex-grow: 1;
+  -ms-flex-positive: 1;
   flex-grow: 1;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  -ms-flex-align: center;
   align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
   justify-content: center;
 
   &:focus,
@@ -54,8 +65,9 @@
   }
 
   &.next-tab--is-active {
+    font-weight: normal;
+    color: rgba(0,0,0,0.9);
     background-color: #ffffff;
-    color: #31373d;
     border-bottom-color: #ffffff;
     cursor: default;
     text-decoration: none;

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

@@ -6,11 +6,8 @@ module DiscoApp::Concerns::ShopUpdateJob
     # If we weren't provided with shop data (eg from a webhook), fetch it.
     shop_data ||= ActiveSupport::JSON::decode(ShopifyAPI::Shop.current.to_json)
 
-    # Ensure we can access shop data through symbols.
-    shop_data = HashWithIndifferentAccess.new(shop_data)
-
-    # Update model attributes present in both our model and the data hash.
-    @shop.update_attributes(shop_data.except(:id, :created_at).slice(*DiscoApp::Shop.column_names))
+    # Update attributes stored directly on the Shop model, along with the data hash itself.
+    @shop.update(shop_data.with_indifferent_access.slice(*DiscoApp::Shop.column_names).except(:id, :created_at).merge(data: shop_data))
   end
 
 end

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

@@ -23,19 +23,6 @@ module DiscoApp::Concerns::Shop
     # Alias 'with_shopify_session' as 'temp', as per our existing conventions.
     alias_method :temp, :with_shopify_session
 
-    # Return a hash of attributes that should be used to create a new charge for this shop.
-    # This method can be overridden by the inheriting Shop class in order to provide charges
-    # customised to a particular shop. Otherwise, the default settings configured in application.rb
-    # will be used.
-    def new_charge_attributes
-      {
-          type: Rails.configuration.x.shopify_charges_default_type,
-          name: DiscoApp.configuration.app_name,
-          price: Rails.configuration.x.shopify_charges_default_price,
-          trial_days: Rails.configuration.x.shopify_charges_default_trial_days,
-      }
-    end
-
     # Convenience method to check if this shop has a current subscription.
     def current_subscription?
       current_subscription.present?

data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb

@@ -5,8 +5,8 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
 
   included do
 
-    attributes :domain, :status, :email, :country_name
-    attributes :currency, :plan_display_name, :created_at
+    attributes :domain, :status, :created_at
+    attributes :email, :country_name, :currency, :plan_display_name
     attributes :current_subscription_id, :current_subscription_display_amount, :current_subscription_display_plan, :current_subscription_display_plan_code, :current_subscription_source
     attributes :installed_duration
 
@@ -45,6 +45,22 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
       []
     end
 
+    def email
+      @model.data['email']
+    end
+
+    def country_name
+      @model.data['country_name']
+    end
+
+    def currency
+      @model.data['currency']
+    end
+
+    def plan_display_name
+      @model.data['plan_display_name']
+    end
+
     def current_subscription_id
       if @model.current_subscription?
         @model.current_subscription.id

data/db/migrate/20160521135510_move_shop_to_synchronises.rb

@@ -0,0 +1,61 @@
+class MoveShopToSynchronises < ActiveRecord::Migration
+
+  class DiscoApp::Shop < ActiveRecord::Base
+  end
+
+  ATTRIBUTES_TO_MIGRATE = [
+    :email, :country_name, :currency, :money_format,
+    :money_with_currency_format, :plan_display_name,
+    :latitude, :longitude, :customer_email, :password_enabled, :phone,
+    :primary_locale, :ships_to_countries, :timezone, :iana_timezone,
+    :has_storefront
+  ]
+
+  def up
+    add_column :disco_app_shops, :data, :jsonb, default: {}
+
+    DiscoApp::Shop.find_each do |shop|
+      data = shop.data
+      ATTRIBUTES_TO_MIGRATE.each do |attribute|
+        data[attribute.to_s] = shop.send(attribute)
+      end
+      shop.update(data: data)
+    end
+
+    ATTRIBUTES_TO_MIGRATE.each do |attribute|
+      remove_column :disco_app_shops, attribute
+    end
+  end
+
+  def down
+    ATTRIBUTES_TO_MIGRATE.each do |attribute|
+      add_column :disco_app_shops, attribute, attribute_column_type(attribute)
+    end
+
+    DiscoApp::Shop.find_each do |shop|
+      shop.update(Hash[ATTRIBUTES_TO_MIGRATE.map do |attribute|
+        [attribute, shop.data[attribute.to_s]]
+      end])
+    end
+
+    remove_column :disco_app_shops, :data
+  end
+
+  private
+
+    def attribute_column_type(attribute)
+      case attribute
+        when :password_enabled
+          :boolean
+        when :has_storefront
+          :boolean
+        when :latitude
+          :decimal
+        when :longitude
+          :decimal
+        else
+          :string
+      end
+    end
+
+end

data/lib/disco_app/engine.rb

@@ -1,5 +1,4 @@
 require 'shopify_app'
-require 'bootstrap-sass'
 require 'jquery-rails'
 require 'turbolinks'
 require 'activerecord/session_store'

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -9,7 +9,7 @@ class DiscoAppGenerator < Rails::Generators::Base
   #  - Default simple Procfile for Heroku.
   #
   def copy_root_files
-    %w(.env .env.local .gitignore Procfile).each do |file|
+    %w(.env .env.local .gitignore Procfile CHECKS).each do |file|
       copy_file "root/#{file}", file
     end
   end
@@ -30,7 +30,6 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'shopify_app', '~> 6.4.1'
     gem 'sidekiq', '~> 4.0.2'
     gem 'puma', '~> 2.14.0'
-    gem 'bootstrap-sass', '~> 3.3.5.1'
     gem 'activerecord-session_store', '~> 0.1.2'
     gem 'activeresource', github: 'shopify/activeresource', tag: '4.2-threadsafe'
     gem 'rails-bigint-pk', '~> 1.2.0'
@@ -39,6 +38,10 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'react-rails', '~> 1.6.0'
     gem 'classnames-rails', '~> 2.1.5'
     gem 'active_link_to', '~> 1.0.2'
+    # Add premailer gem to Gemfile.
+    gem 'premailer-rails', '~> 1.8.2'
+    # Add explicit dependency on Nokogiri
+    gem 'nokogiri', '~> 1.6.7.2'
 
     # Add gems for development and testing only.
     gem_group :development, :test do
@@ -51,7 +54,13 @@ class DiscoAppGenerator < Rails::Generators::Base
     # Add gems for production only.
     gem_group :production do
       gem 'rails_12factor', '~> 0.0.3'
+      gem 'mailgun_rails', '~> 0.7.0'
     end
+
+    # Add monitoring gems to Gemfile
+    gem 'rollbar', '~> 2.8.0'
+    gem 'oj', '~> 2.14.5'
+    gem 'newrelic_rpm', '~> 3.15.2.317'
   end
 
   # copy template for pg configuration
@@ -113,6 +122,36 @@ class DiscoAppGenerator < Rails::Generators::Base
 
     # Copy over the default puma configuration.
     copy_file 'config/puma.rb', 'config/puma.rb'
+
+    # Mail configuration
+    configuration = <<-CONFIG.strip_heredoc
+
+        # Configure ActionMailer to use MailGun
+        if ENV['MAILGUN_API_KEY']
+          config.action_mailer.delivery_method = :mailgun
+          config.action_mailer.mailgun_settings = {
+            api_key: ENV['MAILGUN_API_KEY'],
+            domain: ENV['MAILGUN_API_DOMAIN']
+          }
+        end
+    CONFIG
+    application configuration, env: :production
+
+    # Monitoring configuration
+    copy_file 'initializers/rollbar.rb', 'config/initializers/rollbar.rb'
+    copy_file 'config/newrelic.yml', 'config/newrelic.yml'
+  end
+
+
+  # Add entries to .env and .env.local
+  def add_env_variables
+    configuration = <<-CONFIG.strip_heredoc
+
+      MAILGUN_API_KEY=
+      MAILGUN_API_DOMAIN=
+    CONFIG
+    append_to_file '.env', configuration
+    append_to_file '.env.local', configuration
   end
 
   # Set up routes.
@@ -182,7 +221,7 @@ class DiscoAppGenerator < Rails::Generators::Base
   # This should be the last operation, to allow all other operations to run in the initial Ruby version.
   def set_ruby_version
     copy_file 'root/.ruby-version', '.ruby-version'
-    prepend_to_file 'Gemfile', "ruby '2.3.0'\n"
+    prepend_to_file 'Gemfile', "ruby '2.3.1'\n"
   end
 
   private

data/lib/generators/disco_app/templates/root/CHECKS

@@ -0,0 +1,4 @@
+WAIT=5
+ATTEMPTS=6
+/login
+

data/lib/tasks/shops.rake

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

data/test/dummy/app/jobs/disco_app/app_uninstalled_job.rb

@@ -5,7 +5,7 @@ class DiscoApp::AppUninstalledJob < DiscoApp::ShopJob
   # 'Nowhere' on uninstallation.
   def perform(domain, shop_data)
     super(domain, shop_data)
-    @shop.update(country_name: 'Nowhere')
+    @shop.update(data: @shop.data.merge(country_name: 'Nowhere'))
   end
 
 end

data/test/dummy/app/models/disco_app/shop.rb

@@ -6,7 +6,7 @@ class DiscoApp::Shop < ActiveRecord::Base
   # Extend the Shop model to return the Shop's country as an ActiveUtils country.
   def country
     begin
-      ActiveUtils::Country.find(country_name)
+      ActiveUtils::Country.find(data['country_name'])
     rescue ActiveUtils::InvalidCountryCodeError
       nil
     end

data/test/dummy/config/database.gitlab-ci.yml

@@ -0,0 +1,24 @@
+development:
+  adapter: postgresql
+  host: postgres
+  encoding: unicode
+  pool: 10
+  username: disco_pguser
+  template: template1
+  password: disco_pgpassword
+  database: disco_app
+  port: 5432
+  sslmode: disable
+
+test:
+  adapter: postgresql
+  host: postgres
+  encoding: unicode
+  pool: 10
+  username: disco_pguser
+  template: template1
+  password: disco_pgpassword
+  database: disco_app
+  port: 5432
+  sslmode: disable
+

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160513140727) do
+ActiveRecord::Schema.define(version: 20160521135510) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -76,30 +76,15 @@ ActiveRecord::Schema.define(version: 20160513140727) do
   add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at", using: :btree
 
   create_table "disco_app_shops", force: :cascade do |t|
-    t.string   "shopify_domain",                         null: false
-    t.string   "shopify_token",                          null: false
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
-    t.integer  "status",                     default: 0
-    t.string   "email"
-    t.string   "country_name"
-    t.string   "currency"
-    t.string   "money_format"
-    t.string   "money_with_currency_format"
+    t.string   "shopify_domain",              null: false
+    t.string   "shopify_token",               null: false
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
+    t.integer  "status",         default: 0
     t.string   "domain"
     t.string   "plan_name"
-    t.string   "plan_display_name"
-    t.decimal  "latitude"
-    t.decimal  "longitude"
-    t.string   "customer_email"
-    t.boolean  "password_enabled"
-    t.string   "phone"
-    t.string   "primary_locale"
-    t.string   "ships_to_countries"
-    t.string   "timezone"
-    t.string   "iana_timezone"
-    t.boolean  "has_storefront"
     t.string   "name"
+    t.jsonb    "data",           default: {}
   end
 
   add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree

data/test/fixtures/disco_app/shops.yml

@@ -1,10 +1,10 @@
 widget_store:
   shopify_domain: widgets.myshopify.com
   shopify_token: 00000000000000000000000000000000
-  country_name: Australia
+  data: '{ "country_name": "Australia" }'
 
 widget_store_dev:
   shopify_domain: widgets-dev.myshopify.com
   shopify_token: 00000000000000000000000000000000
   status: 3
-  country_name: Australia
+  data: '{ "country_name": "Australia" }'