disco_app 0.10.4 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c1382ade46bd8b42313b42c9909b4be0fe58413a16ffe7a648a790ef586013
-  data.tar.gz: b22447a345d05be4698c2853e3cbe9495a45e8562802ca173a8cbe657953675f
+  metadata.gz: d2699aebc167db360768aa4fa911174c22af550d15d9d3193d7748ce6a4dddf3
+  data.tar.gz: d11b08a1f24ffb3a64d306f03dd84132297c20ea9c51ba86c73f5f5450b4fa33
 SHA512:
-  metadata.gz: c06b73bcd5bef5ef52e56958ecaaabf57c94c58019eda073410d7626da493e4c782880ce8cc87b1ded926a34faf25e053949af8298809d69de9f33aad2acc81e
-  data.tar.gz: 80349c2dceb7d75b80034b017606503f041838658a080c8884b88256996b14364daebe948e8e06da7c4e333ed4ecf744c2f09b267291d8dc44a7695588567081
+  metadata.gz: 79865fb4cb2da60159930b27830937634e40f10749866fafc27a5fd47af56fcb4343a199d93416df7edd398441b860e0531831a14d167078b8468729ad10e382
+  data.tar.gz: 9edcce2afda59c4a59d850d9018b84ac645941dc1d330bc1ff1075b22c7c0324d9fdd249ae4b7ea9452b959d3f8c1cfb36d3b311c5f63e6b196e7395c395d24c

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

@@ -73,6 +73,12 @@ module DiscoApp::Concerns::Shop
       end
     end
 
+    # Return the shop's configured locale as a symbol. If none exists for some
+    # reason, 'en' is returned.
+    def locale
+      (data['primary_locale'] || 'en').to_sym
+    end
+
   end
 
 end

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

@@ -10,13 +10,17 @@ module DiscoApp::Concerns::Synchronises
       true
     end
 
+    def synchronise_by(shop, data)
+      { id: data[:id] }
+    end
+
     def synchronise(shop, data)
       data = data.with_indifferent_access
 
       return unless should_synchronise?(shop, data)
 
       begin
-        instance = self.find_or_create_by!(id: data[:id]) do |instance|
+        instance = self.find_or_create_by!(self.synchronise_by(shop, data)) do |instance|
           instance.shop = shop
           instance.data = data
         end

data/app/views/disco_app/install/installing.html.erb

@@ -2,6 +2,21 @@
   <meta http-equiv="refresh" content="5">
 <% end %>
 
-<p>
-  Installing, please wait...
-</p>
+<div class="ui-empty-state">
+  <section class="ui-empty-state__section">
+    <div class="ui-empty-state__subsection">
+      <h1 class="ui-empty-state__title">Installing <%= DiscoApp.configuration.app_name %></h1>
+      <h2 class="ui-empty-state__subtitle">Please wait...</h2>
+    </div>
+  </section>
+</div>
+
+<div class="ui-footer-help">
+  <div class="ui-footer-help__content">
+    <div>
+      <p>
+        Stuck on this page? <a href="mailto:help@discolabs.com?subject=<%= DiscoApp.configuration.app_name %> not installing for <%= @shop.shopify_domain %>!">Email us</a>.
+      </p>
+    </div>
+  </div>
+</div>

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.10.4'
+  VERSION = '0.10.5'
 end

data/test/dummy/app/jobs/carts_update_job.rb

@@ -0,0 +1,7 @@
+class CartsUpdateJob < DiscoApp::ShopJob
+
+  def perform(shop, cart_data)
+    Cart.synchronise(@shop, cart_data)
+  end
+
+end

data/test/dummy/app/models/cart.rb

@@ -0,0 +1,24 @@
+class Cart < ActiveRecord::Base
+  include DiscoApp::Concerns::Synchronises
+
+  belongs_to :shop, class_name: 'DiscoApp::Shop'
+
+  SHOPIFY_API_CLASS = ShopifyAPI::Cart
+
+  before_save :set_token
+
+  def self.synchronise_by(shop, data)
+    { token: data['token'] }
+  end
+
+  def total_price
+    data['line_items'].map { |line_item| line_item['line_price'].to_f }.sum
+  end
+
+  private
+
+    def set_token
+      self.token = data['token']
+    end
+
+end

data/test/dummy/config/initializers/disco_app.rb

@@ -6,7 +6,7 @@ DiscoApp.configure do |config|
 
   # Set a list of webhook topics to listen for.
   # See https://help.shopify.com/api/reference/webhook.
-  config.webhook_topics = [:'orders/create', :'orders/paid']
+  config.webhook_topics = [:'orders/create', :'orders/paid', :'carts/create', :'carts/update']
 
   # Set the below if using an application proxy.
   config.app_proxy_prefix = ENV['SHOPIFY_APP_PROXY_PREFIX']

data/test/dummy/db/migrate/20161105054746_create_carts.rb

@@ -0,0 +1,13 @@
+class CreateCarts < ActiveRecord::Migration
+  def change
+    create_table :carts do |t|
+      t.integer :shop_id, limit: 8
+      t.string :token
+      t.jsonb :data
+
+      t.timestamps null: false
+    end
+    add_foreign_key :carts, :disco_app_shops, column: :shop_id
+    add_index :carts, :token, unique: true
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,11 +11,21 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160530160739) do
+ActiveRecord::Schema.define(version: 20161105054746) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "carts", force: :cascade do |t|
+    t.integer  "shop_id",    limit: 8
+    t.string   "token"
+    t.jsonb    "data"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
+  end
+
+  add_index "carts", ["token"], name: "index_carts_on_token", unique: true, using: :btree
+
   create_table "disco_app_app_settings", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -128,6 +138,7 @@ ActiveRecord::Schema.define(version: 20160530160739) do
     t.string  "background_color",           default: "#FFFFFF"
   end
 
+  add_foreign_key "carts", "disco_app_shops", column: "shop_id"
   add_foreign_key "disco_app_application_charges", "disco_app_shops", column: "shop_id"
   add_foreign_key "disco_app_application_charges", "disco_app_subscriptions", column: "subscription_id"
   add_foreign_key "disco_app_plan_codes", "disco_app_plans", column: "plan_id"

data/test/fixtures/carts.yml

@@ -0,0 +1,5 @@
+cart:
+  id: 632910393
+  shop: widget_store
+  token: efa1e7d02cfc60cf3ddadbed770ef1b6
+  data: {}

data/test/fixtures/disco_app/shops.yml

@@ -7,4 +7,4 @@ widget_store_dev:
   shopify_domain: widgets-dev.myshopify.com
   shopify_token: 00000000000000000000000000000000
   status: 3
-  data: '{ "country_name": "Australia" }'
+  data: '{ "country_name": "Sweden", "primary_locale": "sv" }'

data/test/fixtures/webhooks/cart_updated.json

@@ -0,0 +1,28 @@
+{
+  "created_at": "2016-11-05T04:34:40.353Z",
+  "updated_at": "2016-11-05T05:36:58.908Z",
+  "id": "efa1e7d02cfc60cf3ddadbed770ef1b6",
+  "token": "efa1e7d02cfc60cf3ddadbed770ef1b6",
+  "line_items": [
+    {
+      "id": 27132991496,
+      "properties": null,
+      "quantity": 2,
+      "variant_id": 27132991496,
+      "key": "27132991496:bf1f8c0342f4b55df844abfcc8536c49",
+      "title": "Douglas - Black/White - XS",
+      "price": "1600.00",
+      "original_price": "1600.00",
+      "discounted_price": "1600.00",
+      "line_price": "3200.00",
+      "original_line_price": "3200.00",
+      "total_discount": "0.00",
+      "discounts": [],
+      "sku": "300 60 041-XS",
+      "grams": 0,
+      "vendor": "Uniforms for the Dedicated",
+      "product_id": 8194697800,
+      "gift_card": false
+    }
+  ]
+}

data/test/integration/synchronises_test.rb

@@ -32,11 +32,18 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
     assert_equal 'IPod Nano - 8GB', @product.data['title']
   end
 
-  test 'existing product is deleted when product deleted webhook is receieved' do
+  test 'existing product is deleted when product deleted webhook is received' do
     post_webhook('product_deleted', :'products/delete')
     assert_equal 0, Product.count
   end
 
+  test 'cart with token for id is updated when cart updated webhook is received' do
+    post_webhook('cart_updated', :'carts/update')
+
+    # Assert the cart data was correctly updated
+    assert_equal 3200.0, carts(:cart).total_price
+  end
+
   private
 
     def webhooks_url

data/test/models/disco_app/shop_test.rb

@@ -32,4 +32,12 @@ class DiscoApp::ShopTest < ActiveSupport::TestCase
     assert_equal 'UTC', disco_app_shops(:widget_store_dev).time_zone.name
   end
 
+  test 'locale helper returns correct locale when defined on shop model' do
+    assert_equal :sv, disco_app_shops(:widget_store_dev).locale
+  end
+
+  test 'locale helper returns correct en locale when no known locale defined' do
+    assert_equal :en, disco_app_shops(:widget_store).locale
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.5
 platform: ruby
 authors:
 - Gavin Ballard
@@ -582,11 +582,13 @@ files:
 - test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/controllers/proxy_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/jobs/carts_update_job.rb
 - test/dummy/app/jobs/disco_app/app_installed_job.rb
 - test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
 - test/dummy/app/jobs/products_create_job.rb
 - test/dummy/app/jobs/products_delete_job.rb
 - test/dummy/app/jobs/products_update_job.rb
+- test/dummy/app/models/cart.rb
 - test/dummy/app/models/disco_app/shop.rb
 - test/dummy/app/models/js_configuration.rb
 - test/dummy/app/models/product.rb
@@ -628,6 +630,7 @@ files:
 - test/dummy/config/secrets.yml
 - test/dummy/db/migrate/20160307182229_create_products.rb
 - test/dummy/db/migrate/20160530160739_create_asset_models.rb
+- test/dummy/db/migrate/20161105054746_create_carts.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -677,6 +680,7 @@ files:
 - test/fixtures/api/widget_store/webhooks.json
 - test/fixtures/assets/test.js
 - test/fixtures/assets/test.min.js
+- test/fixtures/carts.yml
 - test/fixtures/disco_app/application_charges.yml
 - test/fixtures/disco_app/plan_codes.yml
 - test/fixtures/disco_app/plans.yml
@@ -687,6 +691,7 @@ files:
 - test/fixtures/liquid/model.liquid
 - test/fixtures/products.yml
 - test/fixtures/webhooks/app_uninstalled.json
+- test/fixtures/webhooks/cart_updated.json
 - test/fixtures/webhooks/product_created.json
 - test/fixtures/webhooks/product_deleted.json
 - test/fixtures/webhooks/product_updated.json
@@ -750,6 +755,7 @@ test_files:
 - test/dummy/app/jobs/disco_app/app_installed_job.rb
 - test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
 - test/dummy/app/jobs/products_delete_job.rb
+- test/dummy/app/jobs/carts_update_job.rb
 - test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/controllers/disco_app/admin/shops_controller.rb
 - test/dummy/app/controllers/carrier_request_controller.rb
@@ -760,12 +766,14 @@ test_files:
 - test/dummy/app/models/product.rb
 - test/dummy/app/models/widget_configuration.rb
 - test/dummy/app/models/js_configuration.rb
+- test/dummy/app/models/cart.rb
 - test/dummy/app/views/assets/script_tag.js.erb
 - test/dummy/app/views/assets/widget.scss.erb
 - test/dummy/app/views/assets/test.js.erb
 - test/dummy/app/views/assets/widget.js.erb
 - test/dummy/app/views/snippets/widget.liquid.erb
 - test/dummy/app/views/home/index.html.erb
+- test/dummy/db/migrate/20161105054746_create_carts.rb
 - test/dummy/db/migrate/20160530160739_create_asset_models.rb
 - test/dummy/db/migrate/20160307182229_create_products.rb
 - test/dummy/db/schema.rb
@@ -846,6 +854,8 @@ test_files:
 - test/fixtures/disco_app/subscriptions.yml
 - test/fixtures/disco_app/plans.yml
 - test/fixtures/disco_app/recurring_application_charges.yml
+- test/fixtures/carts.yml
+- test/fixtures/webhooks/cart_updated.json
 - test/fixtures/webhooks/app_uninstalled.json
 - test/fixtures/webhooks/product_updated.json
 - test/fixtures/webhooks/product_created.json