disco_app 0.8.5 → 0.8.6

data/test/fixtures/webhooks/product_updated.json

@@ -0,0 +1,167 @@
+{
+  "id": 632910393,
+  "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/integration/synchronises_test.rb

@@ -0,0 +1,55 @@
+require 'test_helper'
+
+class SynchronisesTest < ActionDispatch::IntegrationTest
+  fixtures :all
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+    @product = products(:ipod)
+    @routes = DiscoApp::Engine.routes
+  end
+
+  def teardown
+    @shop = nil
+  end
+
+  test 'new product is created when product created webhook is received' do
+    post_webhook('product_created', :'products/create')
+
+    # Assert the product was created locally, with the correct attributes.
+    product = Product.find(632910392)
+    assert_equal 'IPod Nano - 8GB', product.data['title']
+  end
+
+  test 'existing product is updated when product updated webhook is received' do
+    assert_equal({}, @product.data)
+
+    post_webhook('product_updated', :'products/update')
+
+    # 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']
+  end
+
+  test 'existing product is deleted when product deleted webhook is receieved' do
+    post_webhook('product_deleted', :'products/delete')
+    assert_equal 0, Product.count
+  end
+
+  private
+
+    def webhooks_url
+      DiscoApp::Engine.routes.url_helpers.webhooks_url
+    end
+
+    def post_webhook(fixture_name, webhook_topic)
+      body = webhook_fixture(fixture_name)
+      post(webhooks_url, body, {
+        HTTP_X_SHOPIFY_TOPIC: webhook_topic,
+        HTTP_X_SHOPIFY_SHOP_DOMAIN: @shop.shopify_domain,
+        HTTP_X_SHOPIFY_HMAC_SHA256: DiscoApp::WebhookService.calculated_hmac(body, ShopifyApp.configuration.secret)
+      })
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Gavin Ballard
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5.1
+        version: 4.2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.5.1
+        version: 4.2.5.2
 - !ruby/object:Gem::Dependency
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.11
+- !ruby/object:Gem::Dependency
+  name: jsonapi-resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +286,11 @@ files:
 - Rakefile
 - app/assets/images/disco_app/icon.svg
 - app/assets/javascripts/disco_app/components.js
+- app/assets/javascripts/disco_app/components/filterable_shop_list.js.jsx
+- app/assets/javascripts/disco_app/components/shop_filter_tab.js.jsx
+- app/assets/javascripts/disco_app/components/shop_filter_tabs.js.jsx
+- app/assets/javascripts/disco_app/components/shop_list.js.jsx
+- app/assets/javascripts/disco_app/components/shop_row.js.jsx
 - app/assets/javascripts/disco_app/components/shopify_admin_link.js.jsx
 - app/assets/javascripts/disco_app/disco_app.js
 - app/assets/javascripts/disco_app/frame.js
@@ -293,10 +312,17 @@ files:
 - app/assets/stylesheets/disco_app/frame/_forms.scss
 - app/assets/stylesheets/disco_app/frame/_layout.scss
 - app/assets/stylesheets/disco_app/frame/_type.scss
-- app/controllers/disco_app/app_proxy_controller.rb
-- app/controllers/disco_app/authenticated_controller.rb
-- app/controllers/disco_app/carrier_request_controller.rb
+- app/controllers/disco_app/admin/app_settings_controller.rb
+- app/controllers/disco_app/admin/application_controller.rb
+- app/controllers/disco_app/admin/concerns/app_settings_controller.rb
+- app/controllers/disco_app/admin/concerns/authenticated_controller.rb
+- app/controllers/disco_app/admin/concerns/shops_controller.rb
+- app/controllers/disco_app/admin/resources/shops_controller.rb
+- app/controllers/disco_app/admin/shops_controller.rb
 - app/controllers/disco_app/charges_controller.rb
+- app/controllers/disco_app/concerns/app_proxy_controller.rb
+- app/controllers/disco_app/concerns/authenticated_controller.rb
+- app/controllers/disco_app/concerns/carrier_request_controller.rb
 - app/controllers/disco_app/frame_controller.rb
 - app/controllers/disco_app/install_controller.rb
 - app/controllers/disco_app/webhooks_controller.rb
@@ -312,19 +338,25 @@ files:
 - app/jobs/disco_app/shop_update_job.rb
 - app/jobs/disco_app/synchronise_carrier_service_job.rb
 - app/jobs/disco_app/synchronise_webhooks_job.rb
+- app/models/disco_app/app_settings.rb
+- app/models/disco_app/concerns/app_settings.rb
 - app/models/disco_app/concerns/plan.rb
 - app/models/disco_app/concerns/shop.rb
 - app/models/disco_app/concerns/subscription.rb
-- app/models/disco_app/concerns/synchronises_with_shopify.rb
+- app/models/disco_app/concerns/synchronises.rb
 - app/models/disco_app/plan.rb
 - app/models/disco_app/session_storage.rb
 - app/models/disco_app/shop.rb
 - app/models/disco_app/subscription.rb
+- app/resources/disco_app/admin/resources/concerns/shop_resource.rb
+- app/resources/disco_app/admin/resources/shop_resource.rb
 - app/services/disco_app/carrier_request_service.rb
 - app/services/disco_app/charges_service.rb
 - app/services/disco_app/proxy_service.rb
 - app/services/disco_app/subscription_service.rb
 - app/services/disco_app/webhook_service.rb
+- app/views/disco_app/admin/app_settings/edit.html.erb
+- app/views/disco_app/admin/shops/index.html.erb
 - app/views/disco_app/charges/activate.html.erb
 - app/views/disco_app/charges/create.html.erb
 - app/views/disco_app/charges/new.html.erb
@@ -334,6 +366,8 @@ files:
 - app/views/disco_app/proxy_errors/404.html.erb
 - app/views/disco_app/shared/_card.html.erb
 - app/views/disco_app/shared/_section.html.erb
+- app/views/layouts/admin.html.erb
+- app/views/layouts/admin/_navbar.html.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/embedded_app.html.erb
 - app/views/layouts/embedded_app_modal.html.erb
@@ -349,6 +383,7 @@ files:
 - db/migrate/20151017234409_move_shop_to_disco_app_engine.rb
 - db/migrate/20160112233706_create_disco_app_sessions.rb
 - db/migrate/20160113194418_add_shop_id_to_disco_app_sessions.rb
+- db/migrate/20160223111044_create_disco_app_settings.rb
 - lib/disco_app.rb
 - lib/disco_app/configuration.rb
 - lib/disco_app/engine.rb
@@ -357,6 +392,7 @@ files:
 - lib/disco_app/test_help.rb
 - lib/disco_app/version.rb
 - lib/generators/disco_app/USAGE
+- lib/generators/disco_app/adminify/adminify_generator.rb
 - lib/generators/disco_app/disco_app_generator.rb
 - lib/generators/disco_app/mailify/mailify_generator.rb
 - lib/generators/disco_app/monitorify/monitorify_generator.rb
@@ -377,6 +413,7 @@ files:
 - lib/tasks/sessions.rake
 - lib/tasks/start.rake
 - lib/tasks/webhooks.rake
+- test/controllers/disco_app/admin/shops_controller_test.rb
 - test/controllers/disco_app/install_controller_test.rb
 - test/controllers/disco_app/webhooks_controller_test.rb
 - test/controllers/home_controller_test.rb
@@ -386,11 +423,16 @@ files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.scss
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/disco_app/admin/shops_controller.rb
 - 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/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/disco_app/shop.rb
+- test/dummy/app/models/product.rb
 - test/dummy/app/views/home/index.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
@@ -399,6 +441,7 @@ files:
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/database.codeship.yml
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
@@ -419,6 +462,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/migrate/20160307182229_create_products.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -429,8 +473,12 @@ files:
 - test/fixtures/disco_app/plans.yml
 - test/fixtures/disco_app/shops.yml
 - test/fixtures/disco_app/subscriptions.yml
+- test/fixtures/products.yml
 - test/fixtures/webhooks/app_uninstalled.json
-- test/integration/navigation_test.rb
+- test/fixtures/webhooks/product_created.json
+- test/fixtures/webhooks/product_deleted.json
+- test/fixtures/webhooks/product_updated.json
+- test/integration/synchronises_test.rb
 - test/jobs/disco_app/app_installed_job_test.rb
 - test/jobs/disco_app/app_uninstalled_job_test.rb
 - test/models/disco_app/plan_test.rb
@@ -477,13 +525,19 @@ test_files:
 - test/dummy/config.ru
 - test/dummy/app/assets/stylesheets/application.scss
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/jobs/products_create_job.rb
+- test/dummy/app/jobs/products_update_job.rb
 - test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
+- test/dummy/app/jobs/products_delete_job.rb
 - test/dummy/app/controllers/home_controller.rb
+- test/dummy/app/controllers/disco_app/admin/shops_controller.rb
 - test/dummy/app/controllers/proxy_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/disco_app/shop.rb
+- test/dummy/app/models/product.rb
 - test/dummy/app/views/home/index.html.erb
+- test/dummy/db/migrate/20160307182229_create_products.rb
 - test/dummy/db/schema.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/initializers/filter_parameter_logging.rb
@@ -500,6 +554,7 @@ test_files:
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/database.codeship.yml
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/environments/development.rb
@@ -513,6 +568,10 @@ test_files:
 - test/fixtures/disco_app/subscriptions.yml
 - test/fixtures/disco_app/plans.yml
 - test/fixtures/webhooks/app_uninstalled.json
+- test/fixtures/webhooks/product_updated.json
+- test/fixtures/webhooks/product_created.json
+- test/fixtures/webhooks/product_deleted.json
+- test/fixtures/products.yml
 - test/support/test_file_fixtures.rb
 - test/test_helper.rb
 - test/disco_app_test.rb
@@ -520,9 +579,10 @@ test_files:
 - test/jobs/disco_app/app_installed_job_test.rb
 - test/controllers/disco_app/install_controller_test.rb
 - test/controllers/disco_app/webhooks_controller_test.rb
+- test/controllers/disco_app/admin/shops_controller_test.rb
 - test/controllers/proxy_controller_test.rb
 - test/controllers/home_controller_test.rb
-- test/integration/navigation_test.rb
+- test/integration/synchronises_test.rb
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/shop_test.rb
 - test/models/disco_app/session_test.rb

data/app/controllers/disco_app/app_proxy_controller.rb

@@ -1,42 +0,0 @@
-module DiscoApp
-  module AppProxyController
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :verify_proxy_signature
-      before_action :shopify_shop
-      after_action :add_liquid_header
-
-      rescue_from ActiveRecord::RecordNotFound do |exception|
-        render_error 404
-      end
-    end
-
-    private
-
-      def verify_proxy_signature
-        unless proxy_signature_is_valid?
-          head :unauthorized
-        end
-      end
-
-      def proxy_signature_is_valid?
-        return true if DiscoApp.configuration.skip_proxy_verification?
-        DiscoApp::ProxyService.proxy_signature_is_valid?(request.query_string, ShopifyApp.configuration.secret)
-      end
-
-      def shopify_shop
-        @shop = Shop.find_by_shopify_domain!(params[:shop])
-      end
-
-      def add_liquid_header
-        response.headers['Content-Type'] = 'application/liquid'
-      end
-
-      def render_error(status)
-        add_liquid_header
-        render "disco_app/proxy_errors/#{status}", status: status
-      end
-
-  end
-end

data/app/controllers/disco_app/authenticated_controller.rb

@@ -1,44 +0,0 @@
-module DiscoApp
-  module AuthenticatedController
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :login_again_if_different_shop
-      before_action :shopify_shop
-      before_action :verify_status
-      around_filter :shopify_session
-      layout 'embedded_app'
-    end
-
-    private
-
-      def shopify_shop
-        if shop_session
-          @shop = Shop.find_by!(shopify_domain: @shop_session.url)
-        else
-          redirect_to_login
-        end
-      end
-
-      def verify_status
-        if not (@shop.charge_active? or @shop.charge_waived?)
-          redirect_if_not_current_path(disco_app.new_charge_path)
-        elsif @shop.charge_accepted?
-          redirect_if_not_current_path(disco_app.activate_charge_path)
-        elsif @shop.never_installed? or @shop.uninstalled?
-          redirect_if_not_current_path(disco_app.install_path)
-        elsif @shop.awaiting_install? or @shop.installing?
-          redirect_if_not_current_path(disco_app.installing_path)
-        elsif @shop.awaiting_uninstall? or @shop.uninstalling?
-          redirect_if_not_current_path(disco_app.uninstalling_path)
-        end
-      end
-
-      def redirect_if_not_current_path(target)
-        if request.path != target
-          redirect_to target
-        end
-      end
-
-  end
-end

data/app/controllers/disco_app/carrier_request_controller.rb

@@ -1,23 +0,0 @@
-module DiscoApp
-  module CarrierRequestController
-    extend ActiveSupport::Concern
-
-    included do
-      before_action :verify_carrier_request
-    end
-
-    private
-
-      def verify_carrier_request
-        unless carrier_request_signature_is_valid?
-          head :unauthorized
-        end
-      end
-
-      def carrier_request_signature_is_valid?
-        return true if DiscoApp.configuration.skip_carrier_request_verification?
-        DiscoApp::CarrierRequestService.is_valid_hmac?(request.body.read.to_s, ShopifyApp.configuration.secret, request.headers['HTTP_X_SHOPIFY_HMAC_SHA256'])
-      end
-
-  end
-end

data/test/integration/navigation_test.rb

@@ -1,10 +0,0 @@
-require 'test_helper'
-
-class NavigationTest < ActionDispatch::IntegrationTest
-  fixtures :all
-
-  # test "the truth" do
-  #   assert true
-  # end
-end
-