RubyGems - disco_app - Versions diffs - 0.8.5 → 0.8.6 - Mend

disco_app 0.8.5 → 0.8.6

Files changed (59) hide show

data/app/views/layouts/admin.html.erb ADDED Viewed

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= yield(:title) %></title>
+  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+  <%= render 'layouts/admin/navbar' %>
+  <div class="container-fluid">
+    <div class="page-header">
+      <h1><%= yield(:title) %></h1>
+    </div>
+    <% flash.each do |message_type, message| %>
+        <div class="alert alert-<%= message_type %>"><%= message %></div>
+    <% end %>
+    <%= yield %>
+  </div>
+</body>
+</html>

data/config/routes.rb CHANGED Viewed

@@ -16,6 +16,21 @@ DiscoApp::Engine.routes.draw do
     get 'uninstalling' => :uninstalling, as: :uninstalling
   end
+  controller 'admin' do
+    get 'admin', to: redirect('/admin/shops')
+    get 'admin/shops' => 'admin/shops#index'
+  end
+  namespace :admin do
+    resources :shops, path: '/shops', only: [:index, :edit, :update]
+    resource :app_settings, only: [:edit, :update]
+    # JSON-API resources for admins."
+    namespace :resources do
+      jsonapi_resources :shops
+    end
+  end
   # Make the embedded app frame emulator available in development.
   if Rails.env.development?
     controller :frame do

data/db/migrate/20150525000000_create_shops_if_not_existent.rb CHANGED Viewed

@@ -5,7 +5,7 @@ class CreateShopsIfNotExistent < ActiveRecord::Migration
       create_table :shops  do |t|
         t.string :shopify_domain, null: false
         t.string :shopify_token, null: false
-        t.timestamps
+        t.timestamps null: false
       end
       add_index :shops, :shopify_domain, unique: true

data/db/migrate/20160112233706_create_disco_app_sessions.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 class CreateDiscoAppSessions < ActiveRecord::Migration
   def change
     create_table :disco_app_sessions do |t|
-      t.string :session_id, :null => false
+      t.string :session_id, null: false
       t.text :data
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :disco_app_sessions, :session_id, :unique => true

data/db/migrate/20160223111044_create_disco_app_settings.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class CreateDiscoAppSettings < ActiveRecord::Migration
+  def change
+    create_table :disco_app_app_settings do |t|
+      t.timestamps null: false
+    end
+  end
+end

data/lib/disco_app/engine.rb CHANGED Viewed

@@ -4,6 +4,7 @@ require 'jquery-rails'
 require 'turbolinks'
 require 'activerecord/session_store'
 require 'disco_app/session'
+require 'jsonapi-resources'
 module DiscoApp
   class Engine < ::Rails::Engine

data/lib/disco_app/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.8.5'
+  VERSION = '0.8.6'
 end

data/lib/generators/disco_app/adminify/adminify_generator.rb ADDED Viewed

@@ -0,0 +1,35 @@
+module DiscoApp
+  module Generators
+    class AdminifyGenerator < Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+      # Run disco_app:reactfy since the admin section needs react
+      def reactify_install
+        generate 'disco_app:reactify'
+      end
+      def configure_gems
+        gem 'active_link_to', '~> 1.0.2'
+      end
+      def add_env_variables
+        env_variables = <<-CONFIG.strip_heredoc
+          ADMIN_APP_USERNAME=
+          ADMIN_APP_PASSWORD=
+        CONFIG
+        append_to_file '.env', env_variables
+        append_to_file '.env.local', env_variables
+      end
+      # Run bundle install to add our new gems before running tasks.
+      def bundle_install
+        Bundler.with_clean_env do
+          run 'bundle install'
+        end
+      end
+    end
+  end
+end

data/lib/generators/disco_app/disco_app_generator.rb CHANGED Viewed

@@ -34,6 +34,7 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'activerecord-session_store', '~> 0.1.2'
     gem 'activeresource', github: 'shopify/activeresource', tag: '4.2-threadsafe'
     gem 'rails-bigint-pk', '~> 1.2.0'
+    gem 'acts_as_singleton', '~> 0.0.8'
     # Add gems for development and testing only.
     gem_group :development, :test do

data/lib/generators/disco_app/templates/controllers/home_controller.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
-  include DiscoApp::AuthenticatedController
+  include DiscoApp::Concerns::AuthenticatedController
   def index
   end
-end
+end

data/test/controllers/disco_app/admin/shops_controller_test.rb ADDED Viewed

@@ -0,0 +1,54 @@
+require 'test_helper'
+class DiscoApp::Admin::ShopsControllerTest < ActionController::TestCase
+  include ActiveJob::TestHelper
+  def setup
+    ENV['ADMIN_APP_USERNAME'] = 'admin_app_username'
+    ENV['ADMIN_APP_PASSWORD'] = 'admin_app_password'
+    @routes = DiscoApp::Engine.routes
+  end
+  def teardown
+    ENV['ADMIN_APP_USERNAME'] = nil
+    ENV['ADMIN_APP_PASSWORD'] = nil
+  end
+  test 'can not access shops list without authorization' do
+    get(:index)
+    assert_response :unauthorized
+  end
+  test 'can not access shops list with incorrect username/password' do
+    authenticate('fakeuser', 'blah blah')
+    get(:index)
+    assert_response :unauthorized
+  end
+  test 'can not access shops list with blank username/password' do
+    authenticate('', '')
+    get(:index)
+    assert_response :unauthorized
+  end
+  test 'can not access shops list with blank username/password when env variables are blank' do
+    ENV['ADMIN_APP_USERNAME'] = ''
+    ENV['ADMIN_APP_PASSWORD'] = ''
+    authenticate('', '')
+    get(:index)
+    assert_response :unauthorized
+  end
+  test 'can access shops list with correct username/password' do
+    authenticate('admin_app_username', 'admin_app_password')
+    get(:index)
+    assert_response :ok
+  end
+  private
+    def authenticate(username, password)
+      request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(username, password)
+    end
+end

data/test/dummy/app/controllers/disco_app/admin/shops_controller.rb ADDED Viewed

@@ -0,0 +1,8 @@
+class DiscoApp::Admin::ShopsController < DiscoApp::Admin::ApplicationController
+  include DiscoApp::Admin::Concerns::ShopsController
+  def index
+    render text: 'ok'
+  end
+end

data/test/dummy/app/controllers/home_controller.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
-  include DiscoApp::AuthenticatedController
+  include DiscoApp::Concerns::AuthenticatedController
   def index
   end
-end
+end

data/test/dummy/app/controllers/proxy_controller.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 class ProxyController < ActionController::Base
-  include DiscoApp::AppProxyController
+  include DiscoApp::Concerns::AppProxyController
   def index
     render text: 'ok'

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

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

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

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

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

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

data/test/dummy/app/models/product.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class Product < ActiveRecord::Base
+  include DiscoApp::Concerns::Synchronises
+  belongs_to :shop, class_name: 'DiscoApp::Shop'
+end

data/test/dummy/config/database.codeship.yml ADDED Viewed

@@ -0,0 +1,23 @@
+development:
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  pool: 10
+  username: <%= ENV['PG_USER'] %>
+  template: template1
+  password: <%= ENV['PG_PASSWORD'] %>
+  database: development<%= ENV['TEST_ENV_NUMBER'] %>
+  port: 5432
+  sslmode: disable
+test:
+  adapter: postgresql
+  host: localhost
+  encoding: unicode
+  pool: 10
+  username: <%= ENV['PG_USER'] %>
+  template: template1
+  password: <%= ENV['PG_PASSWORD'] %>
+  database: test<%= ENV['TEST_ENV_NUMBER'] %>
+  port: 5432
+  sslmode: disable

data/test/dummy/config/database.yml CHANGED Viewed

@@ -1,25 +1,20 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
   pool: 5
   timeout: 5000
 development:
   <<: *default
-  database: db/development.sqlite3
+  host: localhost
+  port: 5432
+  database: disco_app
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  host: localhost
+  port: 5432
+  database: disco_app_test
 production:
   <<: *default
-  database: db/production.sqlite3

data/test/dummy/db/migrate/20160307182229_create_products.rb ADDED Viewed

@@ -0,0 +1,11 @@
+class CreateProducts < ActiveRecord::Migration
+  def change
+    create_table :products do |t|
+      t.integer :shop_id, limit: 8
+      t.jsonb :data
+      t.timestamps null: false
+    end
+    add_foreign_key :products, :disco_app_shops, column: :shop_id
+  end
+end

data/test/dummy/db/schema.rb CHANGED Viewed

@@ -11,7 +11,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160113194418) do
+ActiveRecord::Schema.define(version: 20160307182229) do
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+  create_table "disco_app_app_settings", force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
   create_table "disco_app_plans", force: :cascade do |t|
     t.integer  "status"
@@ -26,19 +34,19 @@ ActiveRecord::Schema.define(version: 20160113194418) do
   create_table "disco_app_sessions", force: :cascade do |t|
     t.string   "session_id", null: false
     t.text     "data"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer  "shop_id"
   end
-  add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true
-  add_index "disco_app_sessions", ["updated_at"], name: "index_disco_app_sessions_on_updated_at"
+  add_index "disco_app_sessions", ["session_id"], name: "index_disco_app_sessions_on_session_id", unique: true, using: :btree
+  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"
-    t.datetime "updated_at"
+    t.datetime "created_at",                             null: false
+    t.datetime "updated_at",                             null: false
     t.integer  "status",                     default: 0
     t.string   "email"
     t.string   "country_name"
@@ -61,7 +69,7 @@ ActiveRecord::Schema.define(version: 20160113194418) do
     t.boolean  "has_storefront"
   end
-  add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true
+  add_index "disco_app_shops", ["shopify_domain"], name: "index_disco_app_shops_on_shopify_domain", unique: true, using: :btree
   create_table "disco_app_subscriptions", force: :cascade do |t|
     t.integer  "shop_id"
@@ -75,7 +83,16 @@ ActiveRecord::Schema.define(version: 20160113194418) do
     t.datetime "updated_at",  null: false
   end
-  add_index "disco_app_subscriptions", ["plan_id"], name: "index_disco_app_subscriptions_on_plan_id"
-  add_index "disco_app_subscriptions", ["shop_id"], name: "index_disco_app_subscriptions_on_shop_id"
+  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 "products", force: :cascade do |t|
+    t.integer  "shop_id",    limit: 8
+    t.jsonb    "data"
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
+  end
+  add_foreign_key "disco_app_sessions", "disco_app_shops", column: "shop_id", on_delete: :cascade
+  add_foreign_key "products", "disco_app_shops", column: "shop_id"
 end

data/test/fixtures/products.yml ADDED Viewed

@@ -0,0 +1,4 @@
+ipod:
+  id: 632910393
+  shop: widget_store
+  data: {}

data/test/fixtures/webhooks/product_created.json ADDED Viewed

@@ -0,0 +1,167 @@
+{
+  "id": 632910392,
+  "title": "IPod Nano - 8GB",
+  "body_html": "<p>It's the small iPod with one very big idea: Video. Now the world's most popular music player, available in 4GB and 8GB models, lets you enjoy TV shows, movies, video podcasts, and more. The larger, brighter display means amazing picture quality. In six eye-catching colors, iPod nano is stunning all around. And with models starting at just $149, little speaks volumes.<\/p>",
+  "vendor": "Apple",
+  "product_type": "Cult Products",
+  "created_at": "2015-09-02T14:50:32-04:00",
+  "handle": "ipod-nano",
+  "updated_at": "2015-09-02T14:50:32-04:00",
+  "published_at": "2007-12-31T19:00:00-05:00",
+  "template_suffix": null,
+  "published_scope": "web",
+  "tags": "Emotive, Flash Memory, MP3, Music",
+  "variants": [
+    {
+      "id": 808950810,
+      "product_id": 632910392,
+      "title": "Pink",
+      "sku": "IPOD2008PINK",
+      "position": 1,
+      "grams": 200,
+      "inventory_policy": "continue",
+      "fulfillment_service": "manual",
+      "inventory_management": "shopify",
+      "price": "199.00",
+      "compare_at_price": null,
+      "option1": "Pink",
+      "option2": null,
+      "option3": null,
+      "created_at": "2015-09-02T14:50:32-04:00",
+      "updated_at": "2015-09-02T14:50:32-04:00",
+      "taxable": true,
+      "requires_shipping": true,
+      "barcode": "1234_pink",
+      "inventory_quantity": 10,
+      "old_inventory_quantity": 10,
+      "image_id": 562641783,
+      "weight": 0.2,
+      "weight_unit": "kg"
+    },
+    {
+      "id": 49148385,
+      "product_id": 632910392,
+      "title": "Red",
+      "sku": "IPOD2008RED",
+      "position": 2,
+      "grams": 200,
+      "inventory_policy": "continue",
+      "fulfillment_service": "manual",
+      "inventory_management": "shopify",
+      "price": "199.00",
+      "compare_at_price": null,
+      "option1": "Red",
+      "option2": null,
+      "option3": null,
+      "created_at": "2015-09-02T14:50:32-04:00",
+      "updated_at": "2015-09-02T14:50:32-04:00",
+      "taxable": true,
+      "requires_shipping": true,
+      "barcode": "1234_red",
+      "inventory_quantity": 20,
+      "old_inventory_quantity": 20,
+      "image_id": null,
+      "weight": 0.2,
+      "weight_unit": "kg"
+    },
+    {
+      "id": 39072856,
+      "product_id": 632910392,
+      "title": "Green",
+      "sku": "IPOD2008GREEN",
+      "position": 3,
+      "grams": 200,
+      "inventory_policy": "continue",
+      "fulfillment_service": "manual",
+      "inventory_management": "shopify",
+      "price": "199.00",
+      "compare_at_price": null,
+      "option1": "Green",
+      "option2": null,
+      "option3": null,
+      "created_at": "2015-09-02T14:50:32-04:00",
+      "updated_at": "2015-09-02T14:50:32-04:00",
+      "taxable": true,
+      "requires_shipping": true,
+      "barcode": "1234_green",
+      "inventory_quantity": 30,
+      "old_inventory_quantity": 30,
+      "image_id": null,
+      "weight": 0.2,
+      "weight_unit": "kg"
+    },
+    {
+      "id": 457924702,
+      "product_id": 632910392,
+      "title": "Black",
+      "sku": "IPOD2008BLACK",
+      "position": 4,
+      "grams": 200,
+      "inventory_policy": "continue",
+      "fulfillment_service": "manual",
+      "inventory_management": "shopify",
+      "price": "199.00",
+      "compare_at_price": null,
+      "option1": "Black",
+      "option2": null,
+      "option3": null,
+      "created_at": "2015-09-02T14:50:32-04:00",
+      "updated_at": "2015-09-02T14:50:32-04:00",
+      "taxable": true,
+      "requires_shipping": true,
+      "barcode": "1234_black",
+      "inventory_quantity": 40,
+      "old_inventory_quantity": 40,
+      "image_id": null,
+      "weight": 0.2,
+      "weight_unit": "kg"
+    }
+  ],
+  "options": [
+    {
+      "id": 594680422,
+      "product_id": 632910392,
+      "name": "Color",
+      "position": 1,
+      "values": [
+        "Pink",
+        "Red",
+        "Green",
+        "Black"
+      ]
+    }
+  ],
+  "images": [
+    {
+      "id": 850703190,
+      "product_id": 632910392,
+      "position": 1,
+      "created_at": "2015-09-02T14:50:32-04:00",
+      "updated_at": "2015-09-02T14:50:32-04:00",
+      "src": "https:\/\/cdn.shopify.com\/s\/files\/1\/0006\/9093\/3842\/products\/ipod-nano.png?v=1441219832",
+      "variant_ids": [
+      ]
+    },
+    {
+      "id": 562641783,
+      "product_id": 632910392,
+      "position": 2,
+      "created_at": "2015-09-02T14:50:32-04:00",
+      "updated_at": "2015-09-02T14:50:32-04:00",
+      "src": "https:\/\/cdn.shopify.com\/s\/files\/1\/0006\/9093\/3842\/products\/ipod-nano-2.png?v=1441219832",
+      "variant_ids": [
+        808950810
+      ]
+    }
+  ],
+  "image": {
+    "id": 850703190,
+    "product_id": 632910392,
+    "position": 1,
+    "created_at": "2015-09-02T14:50:32-04:00",
+    "updated_at": "2015-09-02T14:50:32-04:00",
+    "src": "https:\/\/cdn.shopify.com\/s\/files\/1\/0006\/9093\/3842\/products\/ipod-nano.png?v=1441219832",
+    "variant_ids": [
+    ]
+  }
+}

data/test/fixtures/webhooks/product_deleted.json ADDED Viewed

@@ -0,0 +1,3 @@
+{
+  "id": 632910393
+}