disco_app 0.12.7.pre.puma.pre.3 → 0.13.6.pre.puma.pre.3

data/app/views/disco_app/admin/sources/_form.html.erb

@@ -0,0 +1,34 @@
+<section class="section">
+  <div class="layout-content">
+    <section class="layout-content__main">
+      <div class="next-grid">
+        <div class="next-grid__cell">
+          <div class="next-card">
+
+            <header class="next-card__header">
+              <h1>Source</h1>
+            </header>
+
+            <section class="next-card__section">
+              <div class="form-group">
+                <%= f.label(:source, 'Source code') %>
+                <%= f.text_field(:source, placeholder: "Enter the source name in its acronyme form (eg: Bob Dylan => bd") %>
+              </div>
+
+              <div class="form-group">
+                <%= f.label(:status, 'Full source name') %>
+                <%= f.text_field(:name, placeholder: "Enter the full source name") %>
+              </div>
+            </section>
+          </div>
+        </div>
+      </div>
+      <hr />
+      <div class="row">
+        <div class="col-md-12">
+          <%= f.submit 'Save', { class: 'btn btn-primary' } %>
+        </div>
+      </div>
+    </section>
+  </div>
+</section>

data/app/views/disco_app/admin/sources/edit.html.erb

@@ -0,0 +1,7 @@
+<% provide(:title, 'Edit Source') %>
+
+<%= form_for(@source, url: admin_source_path(@source)) do |f| %>
+    <%= render 'form', f: f %>
+<% end %>
+
+<%= link_to 'Back', admin_sources_path, { class: 'btn btn-default' } %>

data/app/views/disco_app/admin/sources/index.html.erb

@@ -0,0 +1,32 @@
+<% provide(:title, 'Sources') %>
+
+<div class="next-grid">
+  <div class="next-grid__cell">
+    <div class="next-card">
+      <% unless @sources.empty? %>
+          <table class="table">
+            <thead>
+            <tr>
+              <th>Source</th>
+              <th>Source (Full name)</th>
+              <th></th>
+            </tr>
+            </thead>
+            <tbody>
+            <% @sources.each do |source| %>
+                <tr>
+                  <td><%= link_to(source.name, edit_admin_source_path(source)) %></td>
+                  <td><%= source.source %></td>
+                  <td><%= source.name %></td>
+                  <td><%= link_to 'Delete', admin_source_path(source), action: 'destroy', method: :delete,  data: {confirm: "About to delete the source: #{source.source}. Are you sure?"} %></td>
+                </tr>
+            <% end %>
+            </tbody>
+          </table>
+      <% end %>
+    </div>
+    <hr/>
+    <%= link_to 'Create new source', new_admin_source_path, { class: 'btn btn-primary' } %>
+  </div>
+</div>
+

data/app/views/disco_app/admin/sources/new.html.erb

@@ -0,0 +1,7 @@
+<% provide(:title, 'New Source') %>
+
+<%= form_for(@source, url: admin_sources_path) do |f| %>
+    <%= render 'form', f: f %>
+<% end %>
+
+<%= link_to 'Back', admin_sources_path, { class: 'btn btn-default' } %>

data/app/views/disco_app/user_sessions/new.html.erb

@@ -0,0 +1,12 @@
+<%= form_tag user_sessions_path, method: :post do %>
+  <div class="ui-empty-state">
+    <section class="ui-empty-state__section">
+      <div class="ui-empty-state__subsection">
+        <h2 class="ui-empty-state__subtitle">Login as a Shopify User to access this page</h2>
+      </div>
+      <div class="ui-empty-state__subsection">
+        <button type="submit" class="btn btn-large btn-primary">Login</button>
+      </div>
+    </section>
+  </div>
+<% end %>

data/app/views/layouts/admin/_nav_items.erb

@@ -12,6 +12,13 @@
   </a>
 </li>
 
+<li class="next-nav__item">
+  <a href="<%= admin_sources_path %>" class="next-nav__link <%= active_link_to_class(admin_sources_path, class_active: 'next-nav__link--is-selected', active: :inclusive) %>">
+    <svg class="next-icon next-icon--size-16 next-icon--no-nudge" role="img" aria-labelledby="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title"><title id="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title">Home</title><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#next-dashboard-16"></use></svg>
+    <span class="next-nav__text">Sources</span>
+  </a>
+</li>
+
 <li class="next-nav__item">
   <a href="<%= edit_admin_app_settings_path %>" class="next-nav__link <%= active_link_to_class(edit_admin_app_settings_path, class_active: 'next-nav__link--is-selected', active: :inclusive) %>">
     <svg class="next-icon next-icon--size-16 next-icon--no-nudge" role="img" aria-labelledby="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title"><title id="next-dashboard-16-17dbedf316126bf9bd81f6c6b7626199-title">Home</title><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#next-dashboard-16"></use></svg>

data/config/routes.rb

@@ -9,6 +9,9 @@ DiscoApp::Engine.routes.draw do
     post 'webhooks' => :process_webhook, as: :webhooks
   end
 
+  resources :user_sessions, only: [:new, :create, :destroy]
+  get 'auth/shopify_user/callback' => 'user_sessions#callback'
+
   resources :subscriptions, only: [:new, :create] do
     resources :charges, only: [:new, :create] do
       member do
@@ -33,6 +36,7 @@ DiscoApp::Engine.routes.draw do
       resources :subscriptions, only: [:edit, :update]
     end
     resources :plans
+    resources :sources
     resource :app_settings, only: [:edit, :update]
 
     # JSON-API resources for admins.

data/db/migrate/20170315062548_create_disco_app_sources.rb

@@ -0,0 +1,10 @@
+class CreateDiscoAppSources < ActiveRecord::Migration
+  def change
+    create_table :disco_app_sources do |t|
+      t.string :source, null: true
+      t.string :name, null: true
+      t.timestamps null: false
+    end
+    add_index :disco_app_sources, :source
+  end
+end

data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb

@@ -0,0 +1,14 @@
+class AddSourcesToShopSubscriptions < ActiveRecord::Migration
+  def change
+    add_column :disco_app_subscriptions, :source_id, :integer, limit: 8, index: true
+    add_foreign_key :disco_app_subscriptions, :disco_app_sources, column: :source_id
+
+    DiscoApp::Subscription.where.not(source: nil).find_each do |subscription|
+      DiscoApp::Source.find_or_create_by(source: subscription.source) do |new_source|
+        new_source.name = subscription.source
+      end
+    end
+
+    remove_column :disco_app_subscriptions, :source
+  end
+end

data/db/migrate/20170327214540_create_disco_app_users.rb

@@ -0,0 +1,13 @@
+class CreateDiscoAppUsers < ActiveRecord::Migration
+  def change
+    create_table :disco_app_users do |t|
+      t.integer :shop_id, limit: 8
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+
+      t.timestamps null: false
+    end
+    add_index :disco_app_users, :shop_id, unique: true
+  end
+end

data/db/migrate/20170606160751_fix_disco_app_users_index.rb

@@ -0,0 +1,6 @@
+class FixDiscoAppUsersIndex < ActiveRecord::Migration
+  def change
+    remove_index :disco_app_users, :shop_id
+    add_index :disco_app_users, [:id, :shop_id], unique: true
+  end
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.12.7-puma-3'
+  VERSION = '0.13.6-puma-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 CHECKS).each do |file|
+    %w(.env .env.local .gitignore .rubocop.yml .codeclimate.yml Procfile CHECKS).each do |file|
       copy_file "root/#{file}", file
     end
   end

data/lib/generators/disco_app/templates/config/database.yml.tt

@@ -3,6 +3,7 @@ default: &default
   encoding: unicode
   pool: 5
   timeout: 5000
+  prepared_statements: false
  
 development:
   <<: *default

data/lib/tasks/users.rake

@@ -0,0 +1,10 @@
+namespace :users do
+
+  desc 'Synchronise user data accross all installed shops'
+  task sync: :environment do
+    DiscoApp::Shop.installed.has_active_shopify_plan.shopify_plus.each do |shop|
+      DiscoApp::SynchroniseUsersJob.perform_later(shop)
+    end
+  end
+
+end

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

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

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

@@ -3,8 +3,8 @@ class DiscoApp::AppUninstalledJob < DiscoApp::ShopJob
 
   # Extend the perform method to change the country name of the shop to
   # 'Nowhere' on uninstallation.
-  def perform(domain, shop_data)
-    super(domain, shop_data)
+  def perform(_shop, shop_data)
+    super
     @shop.update(data: @shop.data.merge(country_name: 'Nowhere'))
   end
 

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

@@ -1,6 +1,6 @@
 class ProductsCreateJob < DiscoApp::ShopJob
 
-  def perform(shop, product_data)
+  def perform(_shop, product_data)
     Product.synchronise(@shop, product_data)
   end
 

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

@@ -1,6 +1,6 @@
 class ProductsDeleteJob < DiscoApp::ShopJob
 
-  def perform(shop, product_data)
+  def perform(_shop, product_data)
     Product.synchronise_deletion(@shop, product_data)
   end
 

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

@@ -1,6 +1,6 @@
 class ProductsUpdateJob < DiscoApp::ShopJob
 
-  def perform(shop, product_data)
+  def perform(_shop, product_data)
     Product.synchronise(@shop, product_data)
   end
 

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

@@ -8,17 +8,17 @@ class Cart < ActiveRecord::Base
   before_save :set_token
 
   def self.synchronise_by(shop, data)
-    { token: data['token'] }
+    { token: data[:token] }
   end
 
   def total_price
-    data['line_items'].map { |line_item| line_item['line_price'].to_f }.sum
+    data[:line_items].map { |line_item| line_item[:line_price].to_f }.sum
   end
 
   private
 
     def set_token
-      self.token = data['token']
+      self.token = data[:token]
     end
 
 end

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

@@ -11,7 +11,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(data['country_name'])
+      ActiveUtils::Country.find(data[:country_name])
     rescue ActiveUtils::InvalidCountryCodeError
       nil
     end

data/test/dummy/config/database.yml

@@ -3,6 +3,7 @@ default: &default
   encoding: unicode
   pool: 5
   timeout: 5000
+  prepared_statements: false
 
 development:
   <<: *default

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: 20161105054746) do
+ActiveRecord::Schema.define(version: 20170606160751) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -99,6 +99,15 @@ ActiveRecord::Schema.define(version: 20161105054746) do
 
   add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
 
+  create_table "disco_app_sources", force: :cascade do |t|
+    t.string   "source"
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "disco_app_sources", ["source"], name: "index_disco_app_sources_on_source", using: :btree
+
   create_table "disco_app_subscriptions", force: :cascade do |t|
     t.integer  "shop_id"
     t.integer  "plan_id"
@@ -111,13 +120,24 @@ ActiveRecord::Schema.define(version: 20161105054746) do
     t.datetime "cancelled_at"
     t.integer  "amount",                      default: 0
     t.integer  "plan_code_id",      limit: 8
-    t.string   "source"
     t.integer  "trial_period_days"
+    t.integer  "source_id",         limit: 8
   end
 
   add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id", using: :btree
   add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id", using: :btree
 
+  create_table "disco_app_users", force: :cascade do |t|
+    t.integer  "shop_id",    limit: 8
+    t.string   "first_name"
+    t.string   "last_name"
+    t.string   "email"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
+  end
+
+  add_index "disco_app_users", ["id", "shop_id"], name: "index_disco_app_users_on_id_and_shop_id", unique: true, using: :btree
+
   create_table "js_configurations", force: :cascade do |t|
     t.integer "shop_id", limit: 8
     t.string  "label",             default: "Default"
@@ -146,6 +166,7 @@ ActiveRecord::Schema.define(version: 20161105054746) do
   add_foreign_key "disco_app_recurring_application_charges", "disco_app_subscriptions", column: "subscription_id"
   add_foreign_key "disco_app_sessions", "disco_app_shops", column: "shop_id", on_delete: :cascade
   add_foreign_key "disco_app_subscriptions", "disco_app_plan_codes", column: "plan_code_id"
+  add_foreign_key "disco_app_subscriptions", "disco_app_sources", column: "source_id"
   add_foreign_key "js_configurations", "disco_app_shops", column: "shop_id"
   add_foreign_key "products", "disco_app_shops", column: "shop_id"
   add_foreign_key "widget_configurations", "disco_app_shops", column: "shop_id"

data/test/fixtures/api/subscriptions/valid_request.json

@@ -24,8 +24,8 @@
     "cancelled_at": null,
     "amount": 999,
     "plan_code_id": null,
-    "source": null,
     "trial_period_days": 14,
+    "source_id": null,
     "active_charge": {
       "id":332186283,
       "shop_id":605094243,

data/test/fixtures/api/widget_store/users.json

@@ -0,0 +1,42 @@
+{
+  "users": [
+    {
+      "id": 799407056,
+      "first_name": "Steve",
+      "email": "steve@apple.com",
+      "url": "www.apple.com",
+      "im": null,
+      "screen_name": null,
+      "phone": null,
+      "last_name": "Jobs",
+      "account_owner": true,
+      "receive_announcements": 1,
+      "bio": null,
+      "permissions": [
+        "full"
+      ],
+      "user_type": "regular",
+      "phone_validated?": false,
+      "tfa_enabled?": false
+    },
+    {
+      "id": 930143300,
+      "first_name": "noaccesssteve",
+      "email": "noaccesssteve@jobs.com",
+      "url": "www.apple.com",
+      "im": null,
+      "screen_name": null,
+      "phone": null,
+      "last_name": "Jobs",
+      "account_owner": false,
+      "receive_announcements": 1,
+      "bio": null,
+      "permissions": [
+        "limited"
+      ],
+      "user_type": "regular",
+      "phone_validated?": false,
+      "tfa_enabled?": false
+    }
+  ]
+}

data/test/fixtures/disco_app/sources.yml

@@ -0,0 +1,3 @@
+source_1:
+  source: 'smp'
+  name: 'smpodcast'

data/test/integration/synchronises_test.rb

@@ -18,7 +18,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
 
     # Assert the product was created locally, with the correct attributes.
     product = Product.find(632910392)
-    assert_equal 'IPod Nano - 8GB', product.data['title']
+    assert_equal 'IPod Nano - 8GB', product.data[:title]
   end
 
   test 'existing product is updated when product updated webhook is received' do
@@ -29,7 +29,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
     # Assert the product was updated locally, with the correct attributes.
     @product.reload
     assert_equal 632910393, @product.id
-    assert_equal 'IPod Nano - 8GB', @product.data['title']
+    assert_equal 'IPod Nano - 8GB', @product.data[:title]
   end
 
   test 'existing product is deleted when product deleted webhook is received' do
@@ -53,7 +53,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
     # Assert the product was updated locally, with the correct attributes.
     @product.reload
     assert_equal 632910393, @product.id
-    assert_equal 'IPod Nano - 8GB', @product.data['title']
+    assert_equal 'IPod Nano - 8GB', @product.data[:title]
   end
 
   private

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -27,7 +27,7 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
 
     # Assert the update shop job was performed.
     @shop.reload
-    assert_equal 'United States', @shop.data['country_name']
+    assert_equal 'United States', @shop.data[:country_name]
   end
 
   test 'app installed job automatically subscribes stores to the correct default plan' do
@@ -45,13 +45,13 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
     @shop.current_subscription.destroy
 
     perform_enqueued_jobs do
-      DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smpodcast')
+      DiscoApp::AppInstalledJob.perform_later(@shop, 'PODCAST', 'smp')
     end
 
     # Assert the shop was subscribed to the development plan.
     assert_equal disco_app_plans(:development), @shop.current_subscription.plan
     assert_equal disco_app_plan_codes(:podcast_dev), @shop.current_subscription.plan_code
-    assert_equal 'smpodcast', @shop.current_subscription.source
+    assert_equal 'smpodcast', @shop.current_subscription.source.name
   end
 
 end

data/test/jobs/disco_app/app_uninstalled_job_test.rb

@@ -25,6 +25,6 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
   test 'app uninstalled job can be extended using concerns' do
     assert_performed_jobs 2
     @shop.reload
-    assert_equal 'Nowhere', @shop.data['country_name'] # Assert extended method called.
+    assert_equal 'Nowhere', @shop.data[:country_name] # Assert extended method called.
   end
 end

data/test/jobs/disco_app/synchronise_users_job_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class DiscoApp::SynchroniseUsersJobTest < ActionController::TestCase
+  include ActiveJob::TestHelper
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    stub_request(:get, "#{@shop.admin_url}/users.json").to_return(status: 200, body: api_fixture('widget_store/users').to_json)
+  end
+
+  def teardown
+    @shop = nil
+    WebMock.reset!
+  end
+
+  test 'Successfully synchronise users via background job' do
+    perform_enqueued_jobs do
+      DiscoApp::SynchroniseUsersJob.perform_later(@shop)
+    end
+    user = DiscoApp::User.first
+    assert_equal 'Steve', user.first_name
+    assert_equal 'Jobs', user.last_name
+    assert_equal 'steve@apple.com', user.email
+  end
+
+end