disco_app 0.8.9 → 0.9.0

data/lib/disco_app/engine.rb

@@ -5,6 +5,7 @@ require 'turbolinks'
 require 'activerecord/session_store'
 require 'disco_app/session'
 require 'jsonapi-resources'
+require 'react-rails'
 
 module DiscoApp
   class Engine < ::Rails::Engine
@@ -19,7 +20,7 @@ module DiscoApp
 
     # Ensure our frame assets are included for precompilation.
     initializer 'disco_app.assets.precompile' do |app|
-      app.config.assets.precompile += %w(disco_app/icon.svg disco_app/frame.css disco_app/frame.js)
+      app.config.assets.precompile += %w(disco_app/icon.svg disco_app/admin.css disco_app/frame.css disco_app/frame.js)
     end
 
   end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.8.9'
+  VERSION = '0.9.0'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -35,10 +35,13 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'activeresource', github: 'shopify/activeresource', tag: '4.2-threadsafe'
     gem 'rails-bigint-pk', '~> 1.2.0'
     gem 'acts_as_singleton', '~> 0.0.8'
+    gem 'pg', '~> 0.18.3'
+    gem 'react-rails', '~> 1.6.0'
+    gem 'classnames-rails', '~> 2.1.5'
+    gem 'active_link_to', '~> 1.0.2'
 
     # Add gems for development and testing only.
     gem_group :development, :test do
-      gem 'sqlite3', '~> 1.3.11'
       gem 'dotenv-rails', '~> 2.0.2'
       gem 'minitest-reporters', '~> 1.0.19'
       gem 'guard', '~> 2.13.0'
@@ -47,11 +50,15 @@ class DiscoAppGenerator < Rails::Generators::Base
 
     # Add gems for production only.
     gem_group :production do
-      gem 'pg', '~> 0.18.3'
       gem 'rails_12factor', '~> 0.0.3'
     end
   end
 
+  # copy template for pg configuration
+  def update_database_config
+    template 'config/database.yml.tt'
+  end
+
   # Run bundle install to add our new gems before running tasks.
   def bundle_install
     Bundler.with_clean_env do
@@ -65,6 +72,10 @@ class DiscoAppGenerator < Rails::Generators::Base
     # Uncomment to ensure config.force_ssl = true in production.
     uncomment_lines 'config/environments/production.rb', /force_ssl/
 
+    # Set server side rendereing for components.js
+    application "config.react.server_renderer_options = {\nfiles: ['components.js'], # files to load for prerendering\n}"
+    application "# Enable server side react rendering"
+
     # Set defaults for various charge attributes.
     application "config.x.shopify_charges_default_trial_days = 14\n"
     application "config.x.shopify_charges_default_price = 10.00"
@@ -94,6 +105,12 @@ class DiscoAppGenerator < Rails::Generators::Base
     application "routes.default_url_options[:host] = ENV['DEFAULT_HOST']\n"
     application "# Set the default host for absolute URL routing purposes"
 
+    # Configure React in development and production.
+    application "config.react.variant = :development", env: :development
+    application "# Use development variant of React in development.", env: :development
+    application "config.react.variant = :production", env: :production
+    application "# Use production variant of React in production.", env: :production
+
     # Copy over the default puma configuration.
     copy_file 'config/puma.rb', 'config/puma.rb'
   end
@@ -108,6 +125,7 @@ class DiscoAppGenerator < Rails::Generators::Base
     generate 'shopify_app:install'
     generate 'shopify_app:home_controller'
     generate 'bigint_pk:install'
+    generate 'react:install'
   end
 
   # Copy template files to the appropriate location. In some cases, we'll be
@@ -125,6 +143,7 @@ class DiscoAppGenerator < Rails::Generators::Base
 
     # Copy assets
     copy_file 'assets/javascripts/application.js', 'app/assets/javascripts/application.js'
+    copy_file 'assets/javascripts/components.js', 'app/assets/javascripts/components.js'
     copy_file 'assets/stylesheets/application.scss', 'app/assets/stylesheets/application.scss'
 
     # Remove application.css
@@ -145,6 +164,11 @@ class DiscoAppGenerator < Rails::Generators::Base
     rake 'disco_app:install:migrations'
   end
 
+  # Create PG database
+  def create_database
+    rake 'db:create'
+  end
+
   # Run migrations.
   def migrate
     rake 'db:migrate'
@@ -161,4 +185,13 @@ class DiscoAppGenerator < Rails::Generators::Base
     prepend_to_file 'Gemfile', "ruby '2.3.0'\n"
   end
 
+  private
+
+    # This method of finding the component.js manifest taken from the
+    # install generator in react-rails.
+    # See https://github.com/reactjs/react-rails/blob/3f0af13fa755d6e95969c17728d0354c234f3a37/lib/generators/react/install_generator.rb#L53-L55
+    def components
+      Pathname.new(destination_root).join('app/assets/javascripts', 'components.js')
+    end
+
 end

data/lib/generators/disco_app/templates/assets/javascripts/components.js

@@ -0,0 +1,3 @@
+//= require react-server
+//= require disco_app/components
+//= require_tree ./components

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

@@ -0,0 +1,20 @@
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+  timeout: 5000
+ 
+development:
+  <<: *default
+  host: localhost
+  port: 5432
+  database: <%= Rails.application.class.parent_name.downcase %>
+ 
+test:
+  <<: *default
+  host: localhost
+  port: 5432
+  database: <%= Rails.application.class.parent_name.downcase %>_test
+ 
+production:
+  <<: *default

data/lib/tasks/database.rake

@@ -0,0 +1,8 @@
+namespace :database do
+  desc "update postgres sequence numbers in case database has been migrated"
+  task update_sequences: :environment do
+    ActiveRecord::Base.connection.tables.each do |t|
+      ActiveRecord::Base.connection.reset_pk_sequence!(t)
+    end
+  end
+end

data/test/controllers/disco_app/charges_controller_test.rb

@@ -43,8 +43,15 @@ class DiscoApp::ChargesControllerTest < ActionController::TestCase
   end
 
   test 'user with unpaid current subscription can create new charge and is redirected to confirmation url' do
-    skip('some indeterminancy in this test')
-    stub_api_request(:post, "#{@shop.admin_url}/recurring_application_charges.json", 'widget_store/charges/create_second_recurring_application_charge')
+    res = { "recurring_application_charge": { "name": "Basic",
+                    "price": "9.99",
+                    "trial_days": 14,
+                    "return_url": /^https:\/\/test\.example\.com\/subscriptions\/304261385\/charges\/53297050(1|2)\/activate$/,
+                    "test": true 
+      } }
+    stub_request(:post, "#{@shop.admin_url}/recurring_application_charges.json")
+      .with(body: res
+    ).to_return(status: 201, body:api_fixture("widget_store/charges/create_second_recurring_application_charge_response").to_json)
 
     @current_subscription.active_charge.destroy
     post(:create, subscription_id: @current_subscription)

data/test/fixtures/api/widget_store/charges/create_recurring_application_charge_request.json

@@ -3,7 +3,7 @@
     "name": "Basic",
     "price": "9.99",
     "trial_days": 14,
-    "return_url": "https://test.example.com/subscriptions/304261385/charges/532970501/activate",
+    "return_url": /^https:\/\/test\.example\.com\/subscriptions\/304261385\/charges\/53297050(1|2)\/activate$/,
     "test": true
   }
 }

data/test/fixtures/api/widget_store/charges/create_second_recurring_application_charge_request.json

@@ -3,7 +3,7 @@
     "name": "Basic",
     "price": "9.99",
     "trial_days": 14,
-    "return_url": "https://test.example.com/subscriptions/304261385/charges/532970502/activate",
+    "return_url": /^https:\/\/test\.example\.com\/subscriptions\/304261385\/charges\/53297050(1|2)\/activate$/,
     "test": true
   }
 }

data/test/fixtures/disco_app/subscriptions.yml

@@ -10,6 +10,7 @@ current_widget_store_subscription:
   shop: widget_store
   plan: basic
   amount: 999
+  trial_period_days: 14
   status: <%= DiscoApp::Subscription.statuses[:active] %>
   subscription_type: 0
 

data/test/models/disco_app/subscription_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class DiscoApp::SubscriptionTest < ActiveSupport::TestCase
+
+  def setup
+    @shop = disco_app_shops(:widget_store)
+  end
+
+  def teardown
+    @shop = nil
+  end
+
+  test 'changing the amount on a subscription cancels its charge' do
+    assert @shop.current_subscription.active_charge?
+    @shop.current_subscription.update(amount: 1138)
+    assert_not @shop.current_subscription.active_charge?
+  end
+
+end

data/test/services/disco_app/charges_service_test.rb

@@ -30,8 +30,15 @@ class DiscoApp::ChargesServiceTest < ActiveSupport::TestCase
   end
 
   test 'creating a new charge for a recurring subscription is successful' do
-    skip('some indeterminancy in this test')
-    stub_api_request(:post, "#{@shop.admin_url}/recurring_application_charges.json", 'widget_store/charges/create_recurring_application_charge')
+    res = { "recurring_application_charge": { "name": "Basic",
+                    "price": "9.99",
+                    "trial_days": 14,
+                    "return_url": /^https:\/\/test\.example\.com\/subscriptions\/304261385\/charges\/53297050(1|2)\/activate$/,
+                    "test": true 
+      } }
+    stub_request(:post, "#{@shop.admin_url}/recurring_application_charges.json")
+      .with(body: res
+    ).to_return(status: 201, body:api_fixture("widget_store/charges/create_recurring_application_charge_response").to_json)
 
     new_charge = DiscoApp::ChargesService.create(@shop, @subscription)
     assert_equal 654381179, new_charge.shopify_id

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+# Prevent warnings from showing up during testing.
+$VERBOSE=nil
+
 # Configure Rails Environment
 ENV['RAILS_ENV'] = 'test'
 ENV['DEFAULT_HOST'] = 'https://test.example.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Gavin Ballard
@@ -192,6 +192,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: react-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: classnames-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -285,42 +313,67 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - app/assets/images/disco_app/icon.svg
+- app/assets/images/disco_app/icons.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/components/custom/filterable_shop_list.js.jsx
+- app/assets/javascripts/disco_app/components/custom/inline-radio-options.es6.jsx
+- app/assets/javascripts/disco_app/components/custom/rules-editor.es6.jsx
+- app/assets/javascripts/disco_app/components/custom/shop_filter_tab.js.jsx
+- app/assets/javascripts/disco_app/components/custom/shop_filter_tabs.js.jsx
+- app/assets/javascripts/disco_app/components/custom/shop_list.js.jsx
+- app/assets/javascripts/disco_app/components/custom/shop_row.js.jsx
+- app/assets/javascripts/disco_app/components/custom/shopify_admin_link.js.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/cards/card-section.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/cards/card.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/cards/cart-section-title.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/base_form.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/base_input.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/button.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/input-radio.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/input-select.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/input-text.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/input-textarea.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/icons/icon-chevron.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/icons/next-icon.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/input_select.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-annotated-section.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-empty-state.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-footer-help.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-page-actions.es6.jsx
 - app/assets/javascripts/disco_app/disco_app.js
 - app/assets/javascripts/disco_app/frame.js
 - app/assets/javascripts/disco_app/shopify-turbolinks.js
-- 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/_grid.scss
-- app/assets/stylesheets/disco_app/disco/_sections.scss
-- app/assets/stylesheets/disco_app/disco/_tables.scss
-- app/assets/stylesheets/disco_app/disco/_tabs.scss
-- app/assets/stylesheets/disco_app/disco/_type.scss
-- app/assets/stylesheets/disco_app/disco/mixins/_flexbox.scss
+- app/assets/javascripts/disco_app/ui-kit.js
+- app/assets/stylesheets/disco_app/admin.scss
+- app/assets/stylesheets/disco_app/admin/_header.scss
+- app/assets/stylesheets/disco_app/admin/_layout.scss
+- app/assets/stylesheets/disco_app/admin/_nav.scss
 - app/assets/stylesheets/disco_app/disco_app.scss
 - app/assets/stylesheets/disco_app/frame.scss
 - app/assets/stylesheets/disco_app/frame/_buttons.scss
 - 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/assets/stylesheets/disco_app/mixins/_flexbox.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-empty-state.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-footer-help.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-icons.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-kit.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-layout.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-page-actions.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-tabs.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-type.scss
 - 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/plans_controller.rb
 - app/controllers/disco_app/admin/concerns/shops_controller.rb
+- app/controllers/disco_app/admin/concerns/subscriptions_controller.rb
 - app/controllers/disco_app/admin/plans_controller.rb
 - app/controllers/disco_app/admin/resources/shops_controller.rb
 - app/controllers/disco_app/admin/shops_controller.rb
+- app/controllers/disco_app/admin/subscriptions_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
@@ -367,10 +420,12 @@ files:
 - app/services/disco_app/webhook_service.rb
 - app/views/disco_app/admin/app_settings/edit.html.erb
 - app/views/disco_app/admin/plans/_form.html.erb
+- app/views/disco_app/admin/plans/_plan_code_fields.html.erb
 - app/views/disco_app/admin/plans/edit.html.erb
 - app/views/disco_app/admin/plans/index.html.erb
 - app/views/disco_app/admin/plans/new.html.erb
 - app/views/disco_app/admin/shops/index.html.erb
+- app/views/disco_app/admin/subscriptions/edit.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
@@ -379,10 +434,11 @@ files:
 - 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/_icons.html.erb
 - app/views/disco_app/shared/_section.html.erb
 - app/views/disco_app/subscriptions/new.html.erb
 - app/views/layouts/admin.html.erb
-- app/views/layouts/admin/_navbar.html.erb
+- app/views/layouts/admin/_nav_items.erb
 - app/views/layouts/application.html.erb
 - app/views/layouts/embedded_app.html.erb
 - app/views/layouts/embedded_app_modal.html.erb
@@ -419,15 +475,15 @@ 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
 - lib/generators/disco_app/monitorify/templates/config/newrelic.yml
 - lib/generators/disco_app/monitorify/templates/initializers/rollbar.rb
-- lib/generators/disco_app/reactify/reactify_generator.rb
 - lib/generators/disco_app/templates/assets/javascripts/application.js
+- lib/generators/disco_app/templates/assets/javascripts/components.js
 - lib/generators/disco_app/templates/assets/stylesheets/application.scss
+- lib/generators/disco_app/templates/config/database.yml.tt
 - lib/generators/disco_app/templates/config/puma.rb
 - lib/generators/disco_app/templates/controllers/home_controller.rb
 - lib/generators/disco_app/templates/initializers/disco_app.rb
@@ -437,6 +493,7 @@ files:
 - lib/generators/disco_app/templates/root/Procfile
 - lib/generators/disco_app/templates/views/home/index.html.erb
 - lib/tasks/carrier_service.rake
+- lib/tasks/database.rake
 - lib/tasks/sessions.rake
 - lib/tasks/start.rake
 - lib/tasks/webhooks.rake
@@ -533,6 +590,7 @@ files:
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/session_test.rb
 - test/models/disco_app/shop_test.rb
+- test/models/disco_app/subscription_test.rb
 - test/services/disco_app/charges_service_test.rb
 - test/services/disco_app/subscription_service_test.rb
 - test/support/test_file_fixtures.rb
@@ -659,5 +717,6 @@ test_files:
 - test/models/disco_app/plan_test.rb
 - test/models/disco_app/shop_test.rb
 - test/models/disco_app/session_test.rb
+- test/models/disco_app/subscription_test.rb
 - test/services/disco_app/charges_service_test.rb
 - test/services/disco_app/subscription_service_test.rb

data/app/assets/javascripts/disco_app/components/shop_row.js.jsx

@@ -1,27 +0,0 @@
-var ShopRow = (props) => {
-
-    var shop = props.shop,
-        editShopUrl = props.editShopUrl.replace(':id', shop.id),
-        shopifyDomain = shop.attributes['shopify_domain'],
-        countryName = shop.attributes['country_name'],
-        currency = shop.attributes['currency'],
-        domainName = shop.attributes['domain'],
-        planName = shop.attributes['plan_display_name'],
-        prettyCreatedDate = shop.attributes['pretty_created_at'],
-        installedDuration = shop.attributes['installed_duration'];
-
-    return (
-        <tr>
-            <td><a href={editShopUrl}>#{shop.id}</a></td>
-            <td>{shopifyDomain}</td>
-            <td>{shop.attributes.status}</td>
-            <td>{shop.attributes.email}</td>
-            <td>{countryName}</td>
-            <td>{shop.attributes.currency}</td>
-            <td>{shop.attributes.domain}</td>
-            <td>{planName}</td>
-            <td>{prettyCreatedDate}</td>
-            <td>{installedDuration}</td>
-        </tr>
-    )
-};

data/app/assets/stylesheets/disco_app/bootstrap/_custom.scss

@@ -1,54 +0,0 @@
-//
-// Select the Bootstrap components to pull in.
-// --------------------------------------------------
-
-// Core variables and mixins
-@import "bootstrap/variables";
-@import "bootstrap/mixins";
-
-// Reset and dependencies
-@import "bootstrap/normalize";
-//@import "bootstrap/print";
-//@import "bootstrap/glyphicons";
-
-// Core CSS
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-//@import "bootstrap/code";
-@import "bootstrap/grid";
-//@import "bootstrap/tables";
-@import "bootstrap/forms";
-@import "bootstrap/buttons";
-
-// Components
-@import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
-@import "bootstrap/button-groups";
-@import "bootstrap/input-groups";
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-//@import "bootstrap/breadcrumbs";
-//@import "bootstrap/pagination";
-//@import "bootstrap/pager";
-@import "bootstrap/labels";
-@import "bootstrap/badges";
-//@import "bootstrap/jumbotron";
-@import "bootstrap/thumbnails";
-@import "bootstrap/alerts";
-@import "bootstrap/progress-bars";
-@import "bootstrap/media";
-@import "bootstrap/list-group";
-@import "bootstrap/panels";
-//@import "bootstrap/responsive-embed";
-//@import "bootstrap/wells";
-@import "bootstrap/close";
-
-// Components w/ JavaScript
-//@import "bootstrap/modals";
-//@import "bootstrap/tooltip";
-//@import "bootstrap/popovers";
-//@import "bootstrap/carousel";
-
-// Utility classes
-@import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";