disco_app 0.13.4 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 333b0540e47c1d1c0f35b1e10ad0b8039fae81c91a9e96648ca4e5d2abbbb526
-  data.tar.gz: 1749255c14c73a9c3835d4c9a1e140c9c695a97535445b16121eb9eb38e711ff
+  metadata.gz: 5cbe53474f9532175efcd1c15e0cea3a5673bead56896a9686e89dfc0678523c
+  data.tar.gz: fd20dc03f5c76e649505c2daf34005492a3a46929cd73f411139c004e178bfb3
 SHA512:
-  metadata.gz: 0367c1f61d48894dcc70a8f08d8bfe2f00fe4c7ba589a0969ff28e2043f538c8f413f9417b02268940b9b9ba9281fc12d0278402406128dee20a7ea14fa45308
-  data.tar.gz: 2da5c048070836eebd7fd577f01240cc70c8f4671d57d5f5be70143e23ab55029d5cecc514eb2b021129f626ef9703806c621dbd4c7610a3b05d7adeeb3a5553
+  metadata.gz: 5d2f69daede5c2304456a14d92cffaec906474b70095dd47e516f405cf58d206b4e04a36d5a336946a062c7d191f29b6667331429a955dfe9eeeeefbcaff44a7
+  data.tar.gz: 48ee3ac8fc12dfe21528562ff86fe2094037a3ca582a505927033b52e90a634057cf869621e535a92bb2667d4d6fb99e255cdb1e3be07e6cfc5ff63faafbfc05

data/app/jobs/disco_app/shop_job.rb

@@ -2,6 +2,9 @@
 # particular Shop's API session. The first argument to any job inheriting from
 # this class must be the domain of the relevant store, so that the appropriate
 # Shop model can be fetched and the temporary API session created.
+
+require 'rollbar'
+
 class DiscoApp::ShopJob < ActiveJob::Base
 
   queue_as :default
@@ -19,9 +22,13 @@ class DiscoApp::ShopJob < ActiveJob::Base
     end
 
     def shop_context(job, block)
-      @shop.with_api_context {
-        block.call(job.arguments)
-      }
+      Rollbar.scoped(rollbar_scope) do
+        @shop.with_api_context { block.call(job.arguments) }
+      end
+    end
+
+    def rollbar_scope
+      { person: { id: @shop.id, username: @shop.shopify_domain } }
     end
 
 end

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

@@ -66,7 +66,7 @@ module DiscoApp::Concerns::Shop
 
     # Convenience method to get the email of the shop's admin, to display in Rollbar.
     def email
-      self.data['email']
+      data[:email]
     end
 
     def installed_duration
@@ -77,7 +77,7 @@ module DiscoApp::Concerns::Shop
     # shop's "data" hash, return the default Rails zone (which should be UTC).
     def time_zone
       @time_zone ||= begin
-        Time.find_zone!(data['timezone'].to_s.gsub(/^\(.+\)\s/, ''))
+        Time.find_zone!(data[:timezone].to_s.gsub(/^\(.+\)\s/, ''))
       rescue ArgumentError
         Time.zone
       end
@@ -86,7 +86,7 @@ module DiscoApp::Concerns::Shop
     # Return the shop's configured locale as a symbol. If none exists for some
     # reason, 'en' is returned.
     def locale
-      (data['primary_locale'] || 'en').to_sym
+      (data[:primary_locale] || 'en').to_sym
     end
 
     # Return an instance of the Disco API client.
@@ -94,6 +94,11 @@ module DiscoApp::Concerns::Shop
       @api_client ||= DiscoApp::ApiClient.new(self, ENV['DISCO_API_URL'])
     end
 
+    # Override the "read" data attribute to allow indifferent access.
+    def data
+      read_attribute(:data).with_indifferent_access
+    end
+
   end
 
 end

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

@@ -58,4 +58,13 @@ module DiscoApp::Concerns::Synchronises
 
   end
 
+  included do
+
+    # Override the "read" data attribute to allow indifferent access.
+    def data
+      read_attribute(:data).with_indifferent_access
+    end
+
+  end
+
 end

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

@@ -2,15 +2,19 @@ module DiscoApp::Concerns::Taggable
   extend ActiveSupport::Concern
 
   def tags
-    data['tags'].split(',').map(&:strip)
+    data[:tags].split(',').map(&:strip)
   end
 
   def add_tag(tag)
-    data['tags'] = (tags + [tag]).uniq.join(',')
+    data[:tags] = (tags + [tag]).uniq.join(',')
   end
 
   def remove_tag(tag)
-    data['tags'] = (tags - [tag]).uniq.join(',')
+    data[:tags] = (tags - [tag]).uniq.join(',')
+  end
+
+  def has_tag?(tag_to_check)
+    tags.any? { |tag| tag.casecmp(tag_to_check) }
   end
 
 end

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

@@ -5,13 +5,15 @@ module DiscoApp::Concerns::User
     belongs_to :shop
 
     def self.create_from_auth(shopify_user, shop)
-      user = self.find_or_create_by(id: shopify_user.id, shop: shop)
+      user = self.find_or_create_by!(id: shopify_user.id, shop: shop)
       user.update(
         first_name: shopify_user.first_name || '',
         last_name: shopify_user.last_name || '',
         email: shopify_user.email
       )
       user
+    rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
+      retry
     end
 
   end

data/app/resources/disco_app/admin/resources/concerns/shop_resource.rb

@@ -46,19 +46,19 @@ module DiscoApp::Admin::Resources::Concerns::ShopResource
     end
 
     def email
-      @model.data['email']
+      @model.data[:email]
     end
 
     def country_name
-      @model.data['country_name']
+      @model.data[:country_name]
     end
 
     def currency
-      @model.data['currency']
+      @model.data[:currency]
     end
 
     def plan_display_name
-      @model.data['plan_display_name']
+      @model.data[:plan_display_name]
     end
 
     def current_subscription_id

data/db/migrate/20170606160751_fix_disco_app_users_index.rb

@@ -0,0 +1,6 @@
+class FixDiscoAppUsersIndex < ActiveRecord::Migration
+  def change
+    remove_index :disco_app_users, :shop_id
+    add_index :disco_app_users, [:id, :shop_id], unique: true
+  end
+end

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.13.4'
+  VERSION = '0.13.5'
 end

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

@@ -3,6 +3,7 @@ default: &default
   encoding: unicode
   pool: 5
   timeout: 5000
+  prepared_statements: false
  
 development:
   <<: *default

data/test/dummy/app/models/cart.rb

@@ -8,17 +8,17 @@ class Cart < ActiveRecord::Base
   before_save :set_token
 
   def self.synchronise_by(shop, data)
-    { token: data['token'] }
+    { token: data[:token] }
   end
 
   def total_price
-    data['line_items'].map { |line_item| line_item['line_price'].to_f }.sum
+    data[:line_items].map { |line_item| line_item[:line_price].to_f }.sum
   end
 
   private
 
     def set_token
-      self.token = data['token']
+      self.token = data[:token]
     end
 
 end

data/test/dummy/app/models/disco_app/shop.rb

@@ -11,7 +11,7 @@ class DiscoApp::Shop < ActiveRecord::Base
   # Extend the Shop model to return the Shop's country as an ActiveUtils country.
   def country
     begin
-      ActiveUtils::Country.find(data['country_name'])
+      ActiveUtils::Country.find(data[:country_name])
     rescue ActiveUtils::InvalidCountryCodeError
       nil
     end

data/test/dummy/config/database.yml

@@ -3,6 +3,7 @@ default: &default
   encoding: unicode
   pool: 5
   timeout: 5000
+  prepared_statements: false
 
 development:
   <<: *default

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170327214540) do
+ActiveRecord::Schema.define(version: 20170606160751) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -136,7 +136,7 @@ ActiveRecord::Schema.define(version: 20170327214540) do
     t.datetime "updated_at",           null: false
   end
 
-  add_index "disco_app_users", ["shop_id"], name: "index_disco_app_users_on_shop_id", unique: true, using: :btree
+  add_index "disco_app_users", ["id", "shop_id"], name: "index_disco_app_users_on_id_and_shop_id", unique: true, using: :btree
 
   create_table "js_configurations", force: :cascade do |t|
     t.integer "shop_id", limit: 8

data/test/integration/synchronises_test.rb

@@ -18,7 +18,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
 
     # Assert the product was created locally, with the correct attributes.
     product = Product.find(632910392)
-    assert_equal 'IPod Nano - 8GB', product.data['title']
+    assert_equal 'IPod Nano - 8GB', product.data[:title]
   end
 
   test 'existing product is updated when product updated webhook is received' do
@@ -29,7 +29,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
     # 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']
+    assert_equal 'IPod Nano - 8GB', @product.data[:title]
   end
 
   test 'existing product is deleted when product deleted webhook is received' do
@@ -53,7 +53,7 @@ class SynchronisesTest < ActionDispatch::IntegrationTest
     # 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']
+    assert_equal 'IPod Nano - 8GB', @product.data[:title]
   end
 
   private

data/test/jobs/disco_app/app_installed_job_test.rb

@@ -27,7 +27,7 @@ class DiscoApp::AppInstalledJobTest < ActionController::TestCase
 
     # Assert the update shop job was performed.
     @shop.reload
-    assert_equal 'United States', @shop.data['country_name']
+    assert_equal 'United States', @shop.data[:country_name]
   end
 
   test 'app installed job automatically subscribes stores to the correct default plan' do

data/test/jobs/disco_app/app_uninstalled_job_test.rb

@@ -25,6 +25,6 @@ class DiscoApp::AppUninstalledJobTest < ActionController::TestCase
   test 'app uninstalled job can be extended using concerns' do
     assert_performed_jobs 2
     @shop.reload
-    assert_equal 'Nowhere', @shop.data['country_name'] # Assert extended method called.
+    assert_equal 'Nowhere', @shop.data[:country_name] # Assert extended method called.
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.13.5
 platform: ruby
 authors:
 - Gavin Ballard
@@ -642,6 +642,7 @@ files:
 - db/migrate/20170315062548_create_disco_app_sources.rb
 - db/migrate/20170315062629_add_sources_to_shop_subscriptions.rb
 - db/migrate/20170327214540_create_disco_app_users.rb
+- db/migrate/20170606160751_fix_disco_app_users_index.rb
 - lib/disco_app.rb
 - lib/disco_app/configuration.rb
 - lib/disco_app/constants.rb
@@ -717,7 +718,6 @@ files:
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.codeship.yml
-- test/dummy/config/database.gitlab-ci.yml
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
@@ -912,7 +912,6 @@ test_files:
 - test/dummy/config/environment.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
-- test/dummy/config/database.gitlab-ci.yml
 - test/dummy/config/application.rb
 - test/fixtures/liquid/model.liquid
 - test/fixtures/api/subscriptions/valid_request.json

data/test/dummy/config/database.gitlab-ci.yml

@@ -1,24 +0,0 @@
-development:
-  adapter: postgresql
-  host: postgres
-  encoding: unicode
-  pool: 10
-  username: disco_pguser
-  template: template1
-  password: disco_pgpassword
-  database: disco_app
-  port: 5432
-  sslmode: disable
-
-test:
-  adapter: postgresql
-  host: postgres
-  encoding: unicode
-  pool: 10
-  username: disco_pguser
-  template: template1
-  password: disco_pgpassword
-  database: disco_app
-  port: 5432
-  sslmode: disable
-