disco_app 0.5.6 → 0.6.0

data/test/support/test_file_fixtures.rb

@@ -0,0 +1,29 @@
+module DiscoApp::Test
+  module FileFixtures
+
+    # Return an XML fixture as an XML string.
+    def xml_fixture(path)
+      filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'xml', "#{path}.xml")
+      File.read(filename)
+    end
+
+    # Return a JSON fixture as an indifferent hash.
+    def json_fixture(path)
+      filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'json', "#{path}.json")
+      HashWithIndifferentAccess.new(ActiveSupport::JSON.decode(File.read(filename)))
+    end
+
+    # API fixtures are special-case JSON fixtures.
+    def api_fixture(path)
+      filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'api', "#{path}.json")
+      File.read(filename)
+    end
+
+    # Webhook fixtures are special-case JSON fixtures.
+    def webhook_fixture(path)
+      filename = File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'webhooks', "#{path}.json")
+      File.read(filename)
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -1,11 +1,24 @@
 # Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
+ENV['RAILS_ENV'] = 'test'
+ENV['DEFAULT_HOST'] = 'https://test.example.com'
+ENV['SHOPIFY_APP_NAME'] = 'Test Application'
+ENV['SHOPIFY_APP_API_KEY'] = 'f61b26d635309536c3c83c0adc3cb972'
+ENV['SHOPIFY_APP_SECRET'] = 'b607d1f8b992dccb017f9315f07af9c4'
+ENV['SHOPIFY_APP_REDIRECT_URI'] = 'https://test.example.com/shopify/auth/callback'
+ENV['SHOPIFY_APP_SCOPE'] = 'read_products'
+ENV['SHOPIFY_CHARGES_REAL'] = 'false'
 
 require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
 ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
 require "rails/test_help"
 
+# Require our additional test support helpers.
+require 'support/test_file_fixtures'
+
+# Require WebMock
+require 'webmock/minitest'
+
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
 Minitest.backtrace_filter = Minitest::BacktraceFilter.new
@@ -18,3 +31,21 @@ if ActiveSupport::TestCase.respond_to?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
   ActiveSupport::TestCase.fixtures :all
 end
+
+# Set up the base test class.
+class ActiveSupport::TestCase
+
+  # Include helper modules common to all tests.
+  include DiscoApp::Test::FileFixtures
+
+  def log_in_as(shop)
+    session[:shopify] = shop.id
+    session[:shopify_domain] = shop.shopify_domain
+  end
+
+  def log_out
+    session[:shopify] = nil
+    session[:shopify_domain] = nil
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Gavin Ballard
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.3
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.5.1
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: turbolinks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.18.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.2
+        version: 0.18.3
 - !ruby/object:Gem::Dependency
   name: rails_12factor
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: active_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.4
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.22.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.22.1
 description: Rails engine for Shopify applications.
 email:
 - gavin@gavinballard.com
@@ -186,9 +242,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- app/assets/images/disco_app/icon.svg
 - app/assets/javascripts/disco_app/disco_app.js
-- app/assets/stylesheets/disco_app/bootstrap-custom.scss
-- app/assets/stylesheets/disco_app/bootstrap-variables.scss
+- app/assets/stylesheets/disco_app/bootstrap/_custom.scss
+- app/assets/stylesheets/disco_app/bootstrap/_variables.scss
+- app/assets/stylesheets/disco_app/disco/_buttons.scss
+- app/assets/stylesheets/disco_app/disco/_cards.scss
+- app/assets/stylesheets/disco_app/disco/_forms.scss
+- app/assets/stylesheets/disco_app/disco/_sections.scss
+- app/assets/stylesheets/disco_app/disco/_type.scss
+- app/assets/stylesheets/disco_app/disco/mixins/_flexbox.scss
 - app/assets/stylesheets/disco_app/disco_app.scss
 - app/controllers/disco_app/app_proxy_controller.rb
 - app/controllers/disco_app/authenticated_controller.rb
@@ -199,26 +262,45 @@ files:
 - app/helpers/disco_app/application_helper.rb
 - app/jobs/disco_app/app_installed_job.rb
 - app/jobs/disco_app/app_uninstalled_job.rb
+- app/jobs/disco_app/concerns/app_uninstalled_job.rb
 - app/jobs/disco_app/shop_job.rb
 - app/jobs/disco_app/shop_update_job.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/plan.rb
+- app/models/disco_app/session_storage.rb
 - app/models/disco_app/shop.rb
+- app/models/disco_app/subscription.rb
 - app/services/disco_app/charges_service.rb
+- app/services/disco_app/subscription_service.rb
+- app/services/disco_app/webhook_service.rb
 - app/views/disco_app/charges/activate.html.erb
 - app/views/disco_app/charges/create.html.erb
 - app/views/disco_app/charges/new.html.erb
 - app/views/disco_app/install/installing.html.erb
 - app/views/disco_app/install/uninstalling.html.erb
 - 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/application.html.erb
+- app/views/layouts/embedded_app.html.erb
+- app/views/sessions/new.html.erb
 - config/routes.rb
+- db/migrate/20150525000000_create_shops_if_not_existent.rb
 - db/migrate/20150525162112_add_status_to_shops.rb
 - db/migrate/20150525171422_add_meta_to_shops.rb
 - db/migrate/20150629210346_add_charge_status_to_shop.rb
 - db/migrate/20150814214025_add_more_meta_to_shops.rb
+- db/migrate/20151017231302_create_disco_app_plans.rb
+- db/migrate/20151017232027_create_disco_app_subscriptions.rb
+- db/migrate/20151017234409_move_shop_to_disco_app_engine.rb
 - lib/disco_app.rb
 - lib/disco_app/engine.rb
 - lib/disco_app/version.rb
 - lib/generators/disco_app/USAGE
 - lib/generators/disco_app/disco_app_generator.rb
+- lib/generators/disco_app/mailify/mailify_generator.rb
 - lib/generators/disco_app/reactify/reactify_generator.rb
 - lib/generators/disco_app/templates/assets/javascripts/application.js
 - lib/generators/disco_app/templates/assets/stylesheets/application.scss
@@ -226,23 +308,22 @@ files:
 - lib/generators/disco_app/templates/controllers/home_controller.rb
 - lib/generators/disco_app/templates/initializers/disco_app.rb
 - lib/generators/disco_app/templates/initializers/shopify_app.rb
-- lib/generators/disco_app/templates/jobs/app_installed_job.rb
-- lib/generators/disco_app/templates/jobs/app_uninstalled_job.rb
-- lib/generators/disco_app/templates/jobs/shop_update_job.rb
-- lib/generators/disco_app/templates/models/shop.rb
+- lib/generators/disco_app/templates/initializers/shopify_session_repository.rb
 - lib/generators/disco_app/templates/root/Procfile
 - lib/generators/disco_app/templates/views/home/index.html.erb
-- lib/generators/disco_app/templates/views/layouts/application.html.erb
-- lib/generators/disco_app/templates/views/layouts/embedded_app.html.erb
-- lib/generators/disco_app/templates/views/sessions/new.html.erb
+- test/controllers/disco_app/install_controller_test.rb
+- test/controllers/disco_app/webhooks_controller_test.rb
+- test/controllers/home_controller_test.rb
 - test/disco_app_test.rb
-- test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/application.scss
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
+- test/dummy/app/models/disco_app/shop.rb
+- test/dummy/app/views/home/index.html.erb
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
@@ -258,20 +339,36 @@ files:
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/disco_app.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/omniauth.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/shopify_app.rb
+- test/dummy/config/initializers/shopify_session_repository.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/fixtures/api/widget_store/shop.json
+- test/fixtures/disco_app/plans.yml
+- test/fixtures/disco_app/shops.yml
+- test/fixtures/disco_app/subscriptions.yml
+- test/fixtures/webhooks/app_uninstalled.json
 - test/integration/navigation_test.rb
-- test/lib/generators/disco_app/disco_app_generator_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
+- test/models/disco_app/shop_test.rb
+- test/models/disco_app/subscription_test.rb
+- test/services/disco_app/subscription_service_test.rb
+- test/support/test_file_fixtures.rb
 - test/test_helper.rb
 homepage: https://github.com/discolabs/disco_app/
 licenses:
@@ -308,11 +405,15 @@ test_files:
 - test/dummy/bin/bundle
 - test/dummy/Rakefile
 - test/dummy/config.ru
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/application.scss
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/jobs/disco_app/app_uninstalled_job.rb
+- test/dummy/app/controllers/home_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/models/disco_app/shop.rb
+- test/dummy/app/views/home/index.html.erb
+- test/dummy/db/schema.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/assets.rb
@@ -320,7 +421,11 @@ test_files:
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/disco_app.rb
+- test/dummy/config/initializers/shopify_app.rb
+- test/dummy/config/initializers/shopify_session_repository.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/omniauth.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config/routes.rb
@@ -331,8 +436,21 @@ test_files:
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
 - test/dummy/config/application.rb
-- test/dummy/README.rdoc
-- test/lib/generators/disco_app/disco_app_generator_test.rb
+- test/fixtures/api/widget_store/shop.json
+- test/fixtures/disco_app/shops.yml
+- test/fixtures/disco_app/subscriptions.yml
+- test/fixtures/disco_app/plans.yml
+- test/fixtures/webhooks/app_uninstalled.json
+- test/support/test_file_fixtures.rb
 - test/test_helper.rb
 - test/disco_app_test.rb
+- test/jobs/disco_app/app_uninstalled_job_test.rb
+- 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/home_controller_test.rb
 - test/integration/navigation_test.rb
+- test/models/disco_app/plan_test.rb
+- test/models/disco_app/shop_test.rb
+- test/models/disco_app/subscription_test.rb
+- test/services/disco_app/subscription_service_test.rb

data/app/assets/stylesheets/disco_app/bootstrap-variables.scss

@@ -1,12 +0,0 @@
-/*!
- * bootstrap-variables.scss
- * Set custom values for Bootstrap variables.
- */
-
-// Grid - change to a 24-column grid for enhanced flexibility.
-$grid-columns: 24;
-$grid-gutter-width: 12px;
-
-// Colors
-$brand-primary: #479ccf;
-$brand-danger: #ff5d5d;

data/lib/generators/disco_app/templates/jobs/app_installed_job.rb

@@ -1,2 +0,0 @@
-class AppInstalledJob < DiscoApp::AppInstalledJob
-end

data/lib/generators/disco_app/templates/jobs/app_uninstalled_job.rb

@@ -1,2 +0,0 @@
-class AppUninstalledJob < DiscoApp::AppUninstalledJob
-end

data/lib/generators/disco_app/templates/jobs/shop_update_job.rb

@@ -1,2 +0,0 @@
-class ShopUpdateJob < DiscoApp::ShopUpdateJob
-end

data/lib/generators/disco_app/templates/models/shop.rb

@@ -1,3 +0,0 @@
-class Shop < ActiveRecord::Base
-  include DiscoApp::Shop
-end

data/test/dummy/README.rdoc

@@ -1,28 +0,0 @@
-== README
-
-This README would normally document whatever steps are necessary to get the
-application up and running.
-
-Things you may want to cover:
-
-* Ruby version
-
-* System dependencies
-
-* Configuration
-
-* Database creation
-
-* Database initialization
-
-* How to run the test suite
-
-* Services (job queues, cache servers, search engines, etc.)
-
-* Deployment instructions
-
-* ...
-
-
-Please feel free to use a different markup language if you do not plan to run
-<tt>rake doc:app</tt>.

data/test/dummy/app/assets/stylesheets/application.css

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
- *
- *= require_tree .
- *= require_self
- */

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/test/lib/generators/disco_app/disco_app_generator_test.rb

@@ -1,16 +0,0 @@
-require 'test_helper'
-require 'generators/disco_app/disco_app_generator'
-
-module DiscoApp
-  class DiscoAppGeneratorTest < Rails::Generators::TestCase
-    tests DiscoAppGenerator
-    destination Rails.root.join('tmp/generators')
-    setup :prepare_destination
-
-    # test "generator runs without errors" do
-    #   assert_nothing_raised do
-    #     run_generator ["arguments"]
-    #   end
-    # end
-  end
-end