disco_app 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6733d6f14a6a34189871a0255a65ca91527f864eb9e79ffff55e60aa4dc92a5d
-  data.tar.gz: a2988c764253a7e52a6ee67d1d27d57443296dc5c38534697d736fcb39c6575f
+  metadata.gz: a0c6b01c549910c77034c7919306f6e56fa865539febeceabb830dafb962df79
+  data.tar.gz: b7d9a8d7fcd1c30edaa545ff5c90bf1fe52f7e9d9707d6ec627ac0865216bb3f
 SHA512:
-  metadata.gz: 4a2f55c26a2f1bdb55825784a3eb35015c3cb5dc4999a28ba73f8ed7d8a12d482259c5675f70650f1b3530a259da29dba4a221d7df282c15df721981a5a8bd7d
-  data.tar.gz: f7205e93ab775c08e91a692874e84bd5914f2db122e73123862c88b2854dec7b98f72cac97d7e2f9f6c65d05e67d3ec03e346a5e9d59e9aef07732b1e1819574
+  metadata.gz: ead80f00f63df3bda1d53c3e5a64c4677f6fe638b7b346435d19d649e81bb3d87bf9a4a7adc16216993bbf3705c2b2e2308698747e1cf34afcb54b4846f4f16a
+  data.tar.gz: 3b9cc45b96bf4a34a48a8b11369f70bbaf0b216c95c1447b951388c5ef68ee46d52f1bd5e23cd9a5a2579853790b02a074e2d5312f070960214de1441a1fcd99

data/app/assets/javascripts/disco_app/components/custom/rules-editor.es6.jsx

@@ -270,16 +270,31 @@ RulesEditor.EQUALS_STRING = {
   relation: 'is_equal_to',
   type: 'text'
 };
+RulesEditor.NOT_EQUALS_STRING = {
+  label: 'is not equal to',
+  relation: 'is_not_equal_to',
+  type: 'text'
+};
 RulesEditor.EQUALS_COUNTRY_CODE = {
   label: 'is equal to',
   relation: 'is_equal_to',
   type: 'country_code'
 };
+RulesEditor.NOT_EQUALS_COUNTRY_CODE = {
+  label: 'is not equal to',
+  relation: 'is_not_equal_to',
+  type: 'country_code'
+};
 RulesEditor.CONTAINS_STRING = {
   label: 'contains',
   relation: 'contains_string',
   type: 'text'
 };
+RulesEditor.DOES_NOT_CONTAIN_STRING = {
+  label: 'does not contain',
+  relation: 'does_not_contain_string',
+  type: 'text'
+};
 RulesEditor.EQUALS_TAG = {
   label: 'is equal to',
   relation: 'find_in_set',

data/app/assets/javascripts/disco_app/components/ui-kit/forms/button.es6.jsx

@@ -1,11 +1,12 @@
-const Button = ({ children, disabled, onClick }) => {
+const Button = ({ children, disabled, name=false, onClick = ()=>{}, primary = false, type = 'button' }) => {
 
   const className = classNames({
-    'btn': true
+    'btn': true,
+    'btn-primary': primary
   });
 
   return(
-    <button type="button" disabled={disabled} className={className} onClick={onClick}>
+    <button type={type} name={name} disabled={disabled} className={className} onClick={onClick}>
       {children}
     </button>
   )

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-checkbox.es6.jsx

@@ -0,0 +1,30 @@
+const InputCheckbox = ({ label, name, value, checked, inline, isLast, onChange }) => {
+
+  const id = `${name}[${value}]`;
+
+  const wrapperClassName = classNames({
+    'next-input-wrapper': true,
+    'inline': inline,
+    'sr': !isLast
+  });
+
+  const labelClassName = classNames({
+    'next-label': true,
+    'next-label--switch': true,
+    'inline': inline,
+    'fw-normal': inline
+  });
+
+  const handleChange = (e) => {
+    onChange && onChange(e.target.value);
+  };
+
+  return(
+    <div className={wrapperClassName}>
+      <label htmlFor={id} className={labelClassName}>{label}</label>
+      <input id={id} className="next-checkbox" type="checkbox" value={value} name={name} checked={checked} onChange={handleChange} />
+      <span className="next-checkbox--styled" />
+    </div>
+  )
+
+};

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-text.es6.jsx

@@ -14,7 +14,7 @@ class InputText extends BaseInput {
     });
 
     const handleChange = (e) => {
-      onChange(e.target.value);
+      onChange && onChange(e.target.value);
     };
 
     let helpElement = null;

data/app/controllers/disco_app/webhooks_controller.rb

@@ -6,10 +6,10 @@ module DiscoApp
     def process_webhook
       # Get the topic and domain for this webhook.
       topic = request.headers['HTTP_X_SHOPIFY_TOPIC']
-      domain = request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN']
+      shopify_domain = request.headers['HTTP_X_SHOPIFY_SHOP_DOMAIN']
 
       # Ensure a domain was provided in the headers.
-      unless domain
+      unless shopify_domain
         head :bad_request
       end
 
@@ -23,7 +23,7 @@ module DiscoApp
 
       # Decode the body data and enqueue the appropriate job.
       data = ActiveSupport::JSON::decode(request.body.read).with_indifferent_access
-      job_class.perform_later(domain, data)
+      job_class.perform_later(shopify_domain, data)
 
       render nothing: true
     end

data/app/jobs/disco_app/concerns/app_uninstalled_job.rb

@@ -12,7 +12,7 @@ module DiscoApp::Concerns::AppUninstalledJob
   # - Mark any recurring application charges as cancelled.
   # - Remove any stored sessions for the shop.
   #
-  def perform(domain, shop_data)
+  def perform(shop, shop_data)
     DiscoApp::ChargesService.cancel_recurring_charges(@shop)
     @shop.sessions.delete_all
   end

data/app/models/disco_app/concerns/can_be_liquified.rb

@@ -7,7 +7,7 @@ module DiscoApp::Concerns::CanBeLiquified
 
     # Return this model as an array of Liquid {% assign %} statements.
     def as_liquid
-      as_json.map { |k, v| "{% assign #{liquid_model_name}_#{k} = #{as_liquid_value(v)} %}" }
+      as_json.map { |k, v| "{% assign #{liquid_model_name}_#{k} = #{as_liquid_value(k, v)} %}" }
     end
 
     # Render this model as a series of concatenated Liquid {% assign %} statements.
@@ -24,17 +24,20 @@ module DiscoApp::Concerns::CanBeLiquified
     private
 
       # Return given value as a string expression that will be evaluated in Liquid to result in the correct value type.
-      def as_liquid_value(value)
+      def as_liquid_value(key, value)
         if value.is_a? Numeric or (!!value == value)
           return value.to_s
         end
         if value.nil?
-          return "nil"
+          return 'nil'
         end
         if value.is_a? Array
-          return "\"#{value.map { |e| (e.is_a? String) ? CGI::escapeHTML(e) : e }.join(SPLIT_ARRAY_SEPARATOR)}\" | split: \"#{SPLIT_ARRAY_SEPARATOR}\""
+          return "'#{value.map { |e| (e.is_a? String) ? CGI::escapeHTML(e) : e }.join(SPLIT_ARRAY_SEPARATOR)}' | split: '#{SPLIT_ARRAY_SEPARATOR}'"
         end
-        "\"#{CGI::escapeHTML(value.to_s)}\""
+        if value.is_a? String and key.end_with? '_html'
+          return "'#{value.to_s.gsub("'", "'")}'"
+        end
+        "'#{CGI::escapeHTML(value.to_s)}'"
       end
 
   end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
 end

data/lib/generators/disco_app/disco_app_generator.rb

@@ -30,7 +30,7 @@ class DiscoAppGenerator < Rails::Generators::Base
     gem 'shopify_app', '~> 6.4.1'
     gem 'sidekiq', '~> 4.0.2'
     gem 'puma', '~> 2.14.0'
-    gem 'activerecord-session_store', '~> 0.1.2'
+    gem 'activerecord-session_store', '~> 1.0.0'
     gem 'activeresource', github: 'shopify/activeresource', tag: '4.2-threadsafe'
     gem 'rails-bigint-pk', '~> 1.2.0'
     gem 'acts_as_singleton', '~> 0.0.8'
@@ -80,6 +80,10 @@ class DiscoAppGenerator < Rails::Generators::Base
     # Uncomment to ensure config.force_ssl = true in production.
     uncomment_lines 'config/environments/production.rb', /force_ssl/
 
+    # Set time zone to UTC
+    application "config.time_zone = 'UTC'"
+    application "# Ensure UTC is the default timezone"
+
     # 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"

data/test/fixtures/liquid/model.liquid

@@ -1,7 +1,8 @@
 {% assign model_numeric = 42 %}
 {% assign model_boolean = true %}
 {% assign model_empty = nil %}
-{% assign model_string = "The cat's pyjamas are "great"." %}
-{% assign model_array_of_numerics = "1@!@2@!@3" | split: "@!@" %}
-{% assign model_array_of_strings = "A@!@B@!@C" | split: "@!@" %}
-{% assign model_hash = "{}" %}
+{% assign model_string = 'The cat's pyjamas are "great".' %}
+{% assign model_string_html = 'The cat&#39;s pyjamas are <strong style="color: red;">great</strong>.' %}
+{% assign model_array_of_numerics = '1@!@2@!@3' | split: '@!@' %}
+{% assign model_array_of_strings = 'A@!@B@!@C' | split: '@!@' %}
+{% assign model_hash = '{}' %}

data/test/models/disco_app/can_be_liquified_test.rb

@@ -25,6 +25,7 @@ class DiscoApp::CanBeLiquifiedTest < ActiveSupport::TestCase
       boolean: true,
       empty: nil,
       string: "The cat's pyjamas are \"great\".",
+      string_html: "The cat's pyjamas are <strong style=\"color: red;\">great</strong>.",
       array_of_numerics: [1, 2, 3],
       array_of_strings: ['A', 'B', 'C'],
       hash: {}
@@ -48,7 +49,7 @@ class DiscoApp::CanBeLiquifiedTest < ActiveSupport::TestCase
     # Return an asset fixture as a string.
     def liquid_fixture(path)
       filename = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'fixtures', 'liquid', "#{path}")
-      File.read(filename)
+      File.read(filename).strip
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Gavin Ballard
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: omniauth-shopify-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -360,6 +360,7 @@ files:
 - 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-checkbox.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