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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (65) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/components/disco_app/forms/model-form.es6.jsx +2 -7
  3. data/app/assets/javascripts/disco_app/components/custom/shop_row.js.jsx +2 -1
  4. data/app/assets/javascripts/disco_app/components/ui-kit/forms/base_form.es6.jsx +16 -44
  5. data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-checkbox.es6.jsx +10 -5
  6. data/app/controllers/disco_app/admin/application_controller.rb +2 -1
  7. data/app/controllers/disco_app/admin/concerns/sources_controller.rb +51 -0
  8. data/app/controllers/disco_app/admin/sources_controller.rb +3 -0
  9. data/app/controllers/disco_app/concerns/user_authenticated_controller.rb +17 -0
  10. data/app/controllers/disco_app/user_sessions_controller.rb +57 -0
  11. data/app/jobs/disco_app/concerns/app_installed_job.rb +1 -1
  12. data/app/jobs/disco_app/concerns/app_uninstalled_job.rb +1 -1
  13. data/app/jobs/disco_app/concerns/render_asset_group_job.rb +1 -1
  14. data/app/jobs/disco_app/concerns/shop_update_job.rb +1 -1
  15. data/app/jobs/disco_app/concerns/subscription_changed_job.rb +1 -1
  16. data/app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb +1 -1
  17. data/app/jobs/disco_app/concerns/synchronise_resources_job.rb +1 -1
  18. data/app/jobs/disco_app/concerns/synchronise_users_job.rb +15 -0
  19. data/app/jobs/disco_app/concerns/synchronise_webhooks_job.rb +1 -1
  20. data/app/jobs/disco_app/send_subscription_job.rb +1 -1
  21. data/app/jobs/disco_app/shop_job.rb +10 -3
  22. data/app/jobs/disco_app/synchronise_users_job.rb +3 -0
  23. data/app/models/disco_app/concerns/shop.rb +13 -4
  24. data/app/models/disco_app/concerns/source.rb +14 -0
  25. data/app/models/disco_app/concerns/subscription.rb +1 -1
  26. data/app/models/disco_app/concerns/synchronises.rb +9 -0
  27. data/app/models/disco_app/concerns/taggable.rb +7 -3
  28. data/app/models/disco_app/concerns/user.rb +20 -0
  29. data/app/models/disco_app/source.rb +3 -0
  30. data/app/models/disco_app/user.rb +3 -0
  31. data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb +4 -4
  32. data/app/services/disco_app/subscription_service.rb +8 -2
  33. data/app/views/disco_app/admin/sources/_form.html.erb +34 -0
  34. data/app/views/disco_app/admin/sources/edit.html.erb +7 -0
  35. data/app/views/disco_app/admin/sources/index.html.erb +32 -0
  36. data/app/views/disco_app/admin/sources/new.html.erb +7 -0
  37. data/app/views/disco_app/user_sessions/new.html.erb +12 -0
  38. data/app/views/layouts/admin/_nav_items.erb +7 -0
  39. data/config/routes.rb +4 -0
  40. data/db/migrate/20170315062548_create_disco_app_sources.rb +10 -0
  41. data/db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb +14 -0
  42. data/db/migrate/20170327214540_create_disco_app_users.rb +13 -0
  43. data/db/migrate/20170606160751_fix_disco_app_users_index.rb +6 -0
  44. data/lib/disco_app/version.rb +1 -1
  45. data/lib/generators/disco_app/disco_app_generator.rb +1 -1
  46. data/lib/generators/disco_app/templates/config/database.yml.tt +1 -0
  47. data/lib/tasks/users.rake +10 -0
  48. data/test/dummy/app/jobs/carts_update_job.rb +1 -1
  49. data/test/dummy/app/jobs/disco_app/app_uninstalled_job.rb +2 -2
  50. data/test/dummy/app/jobs/products_create_job.rb +1 -1
  51. data/test/dummy/app/jobs/products_delete_job.rb +1 -1
  52. data/test/dummy/app/jobs/products_update_job.rb +1 -1
  53. data/test/dummy/app/models/cart.rb +3 -3
  54. data/test/dummy/app/models/disco_app/shop.rb +1 -1
  55. data/test/dummy/config/database.yml +1 -0
  56. data/test/dummy/db/schema.rb +23 -2
  57. data/test/fixtures/api/subscriptions/valid_request.json +1 -1
  58. data/test/fixtures/api/widget_store/users.json +42 -0
  59. data/test/fixtures/disco_app/sources.yml +3 -0
  60. data/test/integration/synchronises_test.rb +3 -3
  61. data/test/jobs/disco_app/app_installed_job_test.rb +3 -3
  62. data/test/jobs/disco_app/app_uninstalled_job_test.rb +1 -1
  63. data/test/jobs/disco_app/synchronise_users_job_test.rb +26 -0
  64. metadata +27 -3
  65. data/test/dummy/config/database.gitlab-ci.yml +0 -24
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: disco_app
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.7.pre.puma.pre.3
4
+ version: 0.13.6.pre.puma.pre.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gavin Ballard
@@ -540,18 +540,22 @@ files:
540
540
  - app/controllers/disco_app/admin/concerns/authenticated_controller.rb
541
541
  - app/controllers/disco_app/admin/concerns/plans_controller.rb
542
542
  - app/controllers/disco_app/admin/concerns/shops_controller.rb
543
+ - app/controllers/disco_app/admin/concerns/sources_controller.rb
543
544
  - app/controllers/disco_app/admin/concerns/subscriptions_controller.rb
544
545
  - app/controllers/disco_app/admin/plans_controller.rb
545
546
  - app/controllers/disco_app/admin/resources/shops_controller.rb
546
547
  - app/controllers/disco_app/admin/shops_controller.rb
548
+ - app/controllers/disco_app/admin/sources_controller.rb
547
549
  - app/controllers/disco_app/admin/subscriptions_controller.rb
548
550
  - app/controllers/disco_app/charges_controller.rb
549
551
  - app/controllers/disco_app/concerns/app_proxy_controller.rb
550
552
  - app/controllers/disco_app/concerns/authenticated_controller.rb
551
553
  - app/controllers/disco_app/concerns/carrier_request_controller.rb
554
+ - app/controllers/disco_app/concerns/user_authenticated_controller.rb
552
555
  - app/controllers/disco_app/frame_controller.rb
553
556
  - app/controllers/disco_app/install_controller.rb
554
557
  - app/controllers/disco_app/subscriptions_controller.rb
558
+ - app/controllers/disco_app/user_sessions_controller.rb
555
559
  - app/controllers/disco_app/webhooks_controller.rb
556
560
  - app/controllers/sessions_controller.rb
557
561
  - app/helpers/disco_app/application_helper.rb
@@ -564,6 +568,7 @@ files:
564
568
  - app/jobs/disco_app/concerns/subscription_changed_job.rb
565
569
  - app/jobs/disco_app/concerns/synchronise_carrier_service_job.rb
566
570
  - app/jobs/disco_app/concerns/synchronise_resources_job.rb
571
+ - app/jobs/disco_app/concerns/synchronise_users_job.rb
567
572
  - app/jobs/disco_app/concerns/synchronise_webhooks_job.rb
568
573
  - app/jobs/disco_app/render_asset_group_job.rb
569
574
  - app/jobs/disco_app/send_subscription_job.rb
@@ -572,6 +577,7 @@ files:
572
577
  - app/jobs/disco_app/subscription_changed_job.rb
573
578
  - app/jobs/disco_app/synchronise_carrier_service_job.rb
574
579
  - app/jobs/disco_app/synchronise_resources_job.rb
580
+ - app/jobs/disco_app/synchronise_users_job.rb
575
581
  - app/jobs/disco_app/synchronise_webhooks_job.rb
576
582
  - app/models/disco_app/app_settings.rb
577
583
  - app/models/disco_app/application_charge.rb
@@ -582,15 +588,19 @@ files:
582
588
  - app/models/disco_app/concerns/plan_code.rb
583
589
  - app/models/disco_app/concerns/renders_assets.rb
584
590
  - app/models/disco_app/concerns/shop.rb
591
+ - app/models/disco_app/concerns/source.rb
585
592
  - app/models/disco_app/concerns/subscription.rb
586
593
  - app/models/disco_app/concerns/synchronises.rb
587
594
  - app/models/disco_app/concerns/taggable.rb
595
+ - app/models/disco_app/concerns/user.rb
588
596
  - app/models/disco_app/plan.rb
589
597
  - app/models/disco_app/plan_code.rb
590
598
  - app/models/disco_app/recurring_application_charge.rb
591
599
  - app/models/disco_app/session_storage.rb
592
600
  - app/models/disco_app/shop.rb
601
+ - app/models/disco_app/source.rb
593
602
  - app/models/disco_app/subscription.rb
603
+ - app/models/disco_app/user.rb
594
604
  - app/resources/disco_app/admin/resources/concerns/shop_resource.rb
595
605
  - app/resources/disco_app/admin/resources/shop_resource.rb
596
606
  - app/services/disco_app/carrier_request_service.rb
@@ -606,6 +616,10 @@ files:
606
616
  - app/views/disco_app/admin/plans/index.html.erb
607
617
  - app/views/disco_app/admin/plans/new.html.erb
608
618
  - app/views/disco_app/admin/shops/index.html.erb
619
+ - app/views/disco_app/admin/sources/_form.html.erb
620
+ - app/views/disco_app/admin/sources/edit.html.erb
621
+ - app/views/disco_app/admin/sources/index.html.erb
622
+ - app/views/disco_app/admin/sources/new.html.erb
609
623
  - app/views/disco_app/admin/subscriptions/edit.html.erb
610
624
  - app/views/disco_app/charges/activate.html.erb
611
625
  - app/views/disco_app/charges/create.html.erb
@@ -618,6 +632,7 @@ files:
618
632
  - app/views/disco_app/shared/_icons.html.erb
619
633
  - app/views/disco_app/shared/_section.html.erb
620
634
  - app/views/disco_app/subscriptions/new.html.erb
635
+ - app/views/disco_app/user_sessions/new.html.erb
621
636
  - app/views/layouts/admin.html.erb
622
637
  - app/views/layouts/admin/_nav_items.erb
623
638
  - app/views/layouts/application.html.erb
@@ -626,6 +641,10 @@ files:
626
641
  - app/views/shopify_app/sessions/new.html.erb
627
642
  - config/routes.rb
628
643
  - db/migrate/20150525000000_create_shops_if_not_existent.rb
644
+ - db/migrate/20170315062548_create_disco_app_sources.rb
645
+ - db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb
646
+ - db/migrate/20170327214540_create_disco_app_users.rb
647
+ - db/migrate/20170606160751_fix_disco_app_users_index.rb
629
648
  - lib/disco_app.rb
630
649
  - lib/disco_app/configuration.rb
631
650
  - lib/disco_app/constants.rb
@@ -657,6 +676,7 @@ files:
657
676
  - lib/tasks/sessions.rake
658
677
  - lib/tasks/shops.rake
659
678
  - lib/tasks/start.rake
679
+ - lib/tasks/users.rake
660
680
  - lib/tasks/webhooks.rake
661
681
  - test/clients/disco_app/api_client_test.rb
662
682
  - test/controllers/disco_app/admin/shops_controller_test.rb
@@ -701,7 +721,6 @@ files:
701
721
  - test/dummy/config/application.rb
702
722
  - test/dummy/config/boot.rb
703
723
  - test/dummy/config/database.codeship.yml
704
- - test/dummy/config/database.gitlab-ci.yml
705
724
  - test/dummy/config/database.yml
706
725
  - test/dummy/config/environment.rb
707
726
  - test/dummy/config/environments/development.rb
@@ -18649,6 +18668,7 @@ files:
18649
18668
  - test/fixtures/api/widget_store/products/write_metafields_single_namespace_request.json
18650
18669
  - test/fixtures/api/widget_store/products/write_metafields_single_namespace_response.json
18651
18670
  - test/fixtures/api/widget_store/shop.json
18671
+ - test/fixtures/api/widget_store/users.json
18652
18672
  - test/fixtures/api/widget_store/webhooks.json
18653
18673
  - test/fixtures/assets/test.js
18654
18674
  - test/fixtures/assets/test.min.js
@@ -18658,6 +18678,7 @@ files:
18658
18678
  - test/fixtures/disco_app/plans.yml
18659
18679
  - test/fixtures/disco_app/recurring_application_charges.yml
18660
18680
  - test/fixtures/disco_app/shops.yml
18681
+ - test/fixtures/disco_app/sources.yml
18661
18682
  - test/fixtures/disco_app/subscriptions.yml
18662
18683
  - test/fixtures/js_configurations.yml
18663
18684
  - test/fixtures/liquid/model.liquid
@@ -18673,6 +18694,7 @@ files:
18673
18694
  - test/jobs/disco_app/app_uninstalled_job_test.rb
18674
18695
  - test/jobs/disco_app/send_subscription_job_test.rb
18675
18696
  - test/jobs/disco_app/synchronise_carrier_service_job_test.rb
18697
+ - test/jobs/disco_app/synchronise_users_job_test.rb
18676
18698
  - test/jobs/disco_app/synchronise_webhooks_job_test.rb
18677
18699
  - test/models/disco_app/can_be_liquified_test.rb
18678
18700
  - test/models/disco_app/has_metafields_test.rb
@@ -18752,7 +18774,6 @@ test_files:
18752
18774
  - test/dummy/config/database.yml
18753
18775
  - test/dummy/config/database.codeship.yml
18754
18776
  - test/dummy/config/boot.rb
18755
- - test/dummy/config/database.gitlab-ci.yml
18756
18777
  - test/dummy/config/initializers/shopify_app.rb
18757
18778
  - test/dummy/config/initializers/backtrace_silencers.rb
18758
18779
  - test/dummy/config/initializers/mime_types.rb
@@ -36668,6 +36689,7 @@ test_files:
36668
36689
  - test/fixtures/disco_app/shops.yml
36669
36690
  - test/fixtures/disco_app/plan_codes.yml
36670
36691
  - test/fixtures/disco_app/subscriptions.yml
36692
+ - test/fixtures/disco_app/sources.yml
36671
36693
  - test/fixtures/disco_app/recurring_application_charges.yml
36672
36694
  - test/fixtures/disco_app/plans.yml
36673
36695
  - test/fixtures/widget_configurations.yml
@@ -36694,6 +36716,7 @@ test_files:
36694
36716
  - test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_response.json
36695
36717
  - test/fixtures/api/widget_store/charges/get_accepted_application_charge_response.json
36696
36718
  - test/fixtures/api/widget_store/charges/create_recurring_application_charge_response.json
36719
+ - test/fixtures/api/widget_store/users.json
36697
36720
  - test/fixtures/api/widget_store/shop.json
36698
36721
  - test/fixtures/api/widget_store/carrier_services_create.json
36699
36722
  - test/fixtures/api/widget_store/assets/create_widget_liquid_request.json
@@ -36725,6 +36748,7 @@ test_files:
36725
36748
  - test/fixtures/carts.yml
36726
36749
  - test/fixtures/js_configurations.yml
36727
36750
  - test/test_helper.rb
36751
+ - test/jobs/disco_app/synchronise_users_job_test.rb
36728
36752
  - test/jobs/disco_app/synchronise_webhooks_job_test.rb
36729
36753
  - test/jobs/disco_app/app_uninstalled_job_test.rb
36730
36754
  - test/jobs/disco_app/synchronise_carrier_service_job_test.rb
data/test/dummy/config/database.gitlab-ci.yml DELETED
@@ -1,24 +0,0 @@
1
- development:
2
- adapter: postgresql
3
- host: postgres
4
- encoding: unicode
5
- pool: 10
6
- username: disco_pguser
7
- template: template1
8
- password: disco_pgpassword
9
- database: disco_app
10
- port: 5432
11
- sslmode: disable
12
-
13
- test:
14
- adapter: postgresql
15
- host: postgres
16
- encoding: unicode
17
- pool: 10
18
- username: disco_pguser
19
- template: template1
20
- password: disco_pgpassword
21
- database: disco_app
22
- port: 5432
23
- sslmode: disable
24
-