workarea-core 3.4.37 → 3.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92c8bfc7ed302168dc43867258156fc8022d861c8888d267509f06397be80a5
-  data.tar.gz: 48aaafb4e4ce343b8c5f86014531a86392d29a13042f8daf291d7be116fe27f1
+  metadata.gz: fb1a7c0e5cf9108b58d636eca7349f0ec61c1c24b91e3356d6978a70048fb745
+  data.tar.gz: 46609e92ace1945db58648ce33306fb2000532d9b1867bbf1a8530484e2a2ba0
 SHA512:
-  metadata.gz: 359c095f749b941148ef804d7534010a1e2b489e9dd3a6aef49c5ecffb59ac6a9c5cc9afa212b076bd21a40c64ff614414e812f9a432d9d0f6306fbd060b19a2
-  data.tar.gz: 1b8ac9254951ed01039219df5548b13655441785f99a3e119625b9964e5eeb6a5fde8772dd45d206a29f0b605416f78d6dbcbd745356327276086619701ce0fa
+  metadata.gz: 4320bf6ca0537e6aa5e5ca6c3c5afd68cd269579fc38f8acff6d669064c8d8aaf37b2afadc160edf8c55fb4857834cb9d9a38a1a6e9fdb9e2f36bae62781d286
+  data.tar.gz: 353ee66c41b45fe5695a19c444fb8f21e4c35140cdfa804f03b8da50bb6cd2e6e70d05e1ee06b61cc4577c666d68dca09f4e58915a04b1974f7b916eacc531b0

data/app/controllers/workarea/current_referrer.rb

@@ -9,6 +9,7 @@ module Workarea
       @current_referrer ||= TrafficReferrer.new(
         RefererParser::Parser.new.parse(referrer).slice(:source, :medium, :uri)
       )
+    rescue RefererParser::InvalidUriError
     end
   end
 end

data/app/controllers/workarea/impersonation.rb

@@ -50,7 +50,8 @@ module Workarea
     end
 
     def current_impersonation
-      @current_impersonation ||= User.find(cookies.signed[:user_id])
+      return @current_impersonation if defined?(@current_impersonation)
+      @current_impersonation = User.find(cookies.signed[:user_id]) rescue nil
     end
 
     def touch_impersonation

data/app/mailers/workarea/application_mailer.rb

@@ -7,7 +7,10 @@ module Workarea
     default from: -> (*) { Workarea.config.email_from }
 
     def default_url_options(options = {})
-      super.merge(host: Workarea.config.host)
+      # super isn't returning the configured options, so manually merge them in
+      super
+        .merge(Rails.application.config.action_mailer.default_url_options.to_h)
+        .merge(host: Workarea.config.host)
     end
   end
 end

data/app/models/workarea/checkout.rb

@@ -158,10 +158,14 @@ module Workarea
     # Used in auto completing an order for a logged in user.
     #
     # @param [Hash] parameters for updating
-    # @return [self]
+    # @return [Boolean] whether the update was successful.
     #
     def update(params = {})
-      steps.each { |s| s.new(self).update(params) }
+      return true if params.blank?
+
+      steps.reduce(true) do |result, step|
+        result &= step.new(self).update(params)
+      end
     end
 
     # Whether this checkout needs any further information

data/app/models/workarea/inquiry.rb

@@ -15,7 +15,8 @@ module Workarea
     validate :subject_exists
 
     def full_subject
-      Workarea.config.inquiry_subjects[subject]
+      I18n.t('workarea.inquiry.subjects')[subject.optionize.to_sym].presence ||
+        Workarea.config.inquiry_subjects[subject]
     end
 
     private

data/app/queries/workarea/search/admin_search.rb

@@ -11,6 +11,10 @@ module Workarea
       def self.available_sorts
         AdminSorting.available_sorts
       end
+
+      def default_admin_sort
+        [{ _score: :desc }, { updated_at: :desc }]
+      end
     end
   end
 end

data/app/queries/workarea/search/admin_sorting.rb

@@ -16,7 +16,7 @@ module Workarea
       end
 
       def default_admin_sort
-        [{ _score: :desc },  { updated_at: :desc }]
+        [{ updated_at: :desc }, { _score: :desc }]
       end
 
       def user_selected_sort

data/config/locales/en.yml

@@ -97,6 +97,8 @@ en:
         under: 'Under %{price}'
     inventory_sku:
       name: "Inventory %{id}"
+    inquiry:
+      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:

data/lib/generators/workarea/install/install_generator.rb

@@ -63,6 +63,19 @@ module Workarea
       remove_file 'public/favicon.ico'
     end
 
+    def add_development_mailer_port
+      development_port = <<-CODE
+
+  config.action_mailer.default_url_options = { port: 3000 }
+      CODE
+
+      inject_into_file(
+        'config/environments/development.rb',
+        development_port,
+        before: /^end/
+      )
+    end
+
     private
 
     def app_name

data/lib/generators/workarea/install/templates/initializer.rb.erb

@@ -4,7 +4,7 @@ Workarea.configure do |config|
 
   config.host = {
     'test' => 'www.example.com',
-    'development' => 'localhost:3000',
+    'development' => 'localhost',
     'production' => 'www.<%= app_name.dasherize %>.com' # TODO
   }[Rails.env]
 

data/lib/workarea/core.rb

@@ -140,6 +140,7 @@ require 'workarea/ext/mongoid/find_ordered'
 require 'workarea/ext/sprockets/ruby_processor'
 require 'workarea/ext/jbuilder/jbuilder_append_partials'
 require 'workarea/ext/jbuilder/jbuilder_cache'
+require 'workarea/ext/referer_parser/parser.decorator'
 
 if Rails.env.development?
   require 'workarea/ext/freedom_patches/routes_reloader'

data/lib/workarea/ext/referer_parser/parser.decorator

@@ -0,0 +1,43 @@
+module RefererParser
+  # This code is actually in `master` branch of
+  # https://github.com/snowplow-referer-parser/ruby-referer-parser but
+  # has not yet been released. It's used to allow through android-app://
+  # URLs.
+  decorate Parser do
+    # Given a string or URI, return a hash of data
+    def parse(obj)
+      url = obj.is_a?(URI) ? obj : URI.parse(obj.to_s)
+
+      unless ['android-app', 'http', 'https'].include?(url.scheme)
+        raise InvalidUriError, "Only Android-App, HTTP, and HTTPS schemes are supported -- #{url.scheme}"
+      end
+
+      data = { known: false, uri: url.to_s }
+
+      domain, name_key = domain_and_name_key_for(url)
+      if domain && name_key
+        referer_data = @name_hash[name_key]
+        data[:known] = true
+        data[:source] = referer_data[:source]
+        data[:medium] = referer_data[:medium]
+        data[:domain] = domain
+
+        # Parse parameters if the referer uses them
+        if url.query && referer_data[:parameters]
+          query_params = CGI.parse(url.query)
+          referer_data[:parameters].each do |param|
+            # If there is a matching parameter, get the first non-blank value
+            unless (values = query_params[param]).empty?
+              data[:term] = values.reject { |v| v.strip == '' }.first
+              break if data[:term]
+            end
+          end
+        end
+      end
+
+      data
+    rescue URI::InvalidURIError
+      raise InvalidUriError.new("Unable to parse URI, not a URI? -- #{obj.inspect}", $ERROR_INFO)
+    end
+  end
+end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 37
+    PATCH = 42
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/test/generators/workarea/install_generator_test.rb

@@ -88,5 +88,11 @@ module Workarea
     def test_favicon
       assert_no_file 'public/favicon.ico'
     end
+
+    def test_development_mailer_port
+      assert_file 'config/environments/development.rb' do |file|
+        assert_match(%(config.action_mailer.default_url_options = { port: 3000 }), file)
+      end
+    end
   end
 end

data/test/lib/workarea/ext/referer_parser/parser_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+module RefererParser
+  class ParserTest < Workarea::TestCase
+    def test_parse_android_app_referrers
+      referrers = [
+        'android-app://com.linkedin.android',
+        'android-app://org.telegram.plus',
+        'android-app://com.twitter.android'
+      ]
+
+      referrers.each do |uri|
+        referrer = Parser.new.parse(uri)
+
+        refute(referrer[:known])
+        assert_equal(uri, referrer[:uri])
+      end
+    end
+  end
+end

data/test/mailers/workarea/application_mailer_test.rb

@@ -21,5 +21,15 @@ module Workarea
         assert_equal([changed_email], changed_mail.from)
       end
     end
+
+    def test_default_url_options
+      @current_options = Rails.application.config.action_mailer.default_url_options.deep_dup
+      Rails.application.config.action_mailer.default_url_options = { port: 12345 }
+
+      assert_equal(12345, ApplicationMailer.new.default_url_options[:port])
+
+    ensure
+      Rails.application.config.action_mailer.default_url_options = @current_options
+    end
   end
 end

data/test/models/workarea/checkout_test.rb

@@ -51,6 +51,63 @@ module Workarea
       refute_equal(payment_id, checkout.payment.object_id)
     end
 
+    def test_update
+      create_shipping_service
+      checkout = Checkout.new(@order)
+
+      checkout.start_as(:guest)
+
+      refute(
+        checkout.update(
+          email: 'test@workarea.com',
+          shipping_address: {
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          },
+          billing_address: {
+            first_name: 'Ben',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          }
+        )
+      )
+
+      assert(
+        checkout.update(
+          email: 'test@workarea.com',
+          shipping_address: {
+            first_name: 'Ben',
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          },
+          billing_address: {
+            first_name: 'Ben',
+            last_name: 'Crouse',
+            street: '22 S. 3rd St.',
+            street_2: 'Second Floor',
+            city: 'Philadelphia',
+            region: 'PA',
+            postal_code: '19106',
+            country: 'US'
+          }
+        )
+      )
+    end
+
     def test_continue_as
       checkout = Checkout.new(@order)
       checkout.continue_as(@user)

data/test/queries/workarea/search/admin_search_test.rb

@@ -81,6 +81,16 @@ module Workarea
         assert_equal(results.reverse, search.results)
       end
 
+      def test_default_sort_by_score
+        # Unlike other admin searches (primarily indexes), we want searching to
+        # default sort by score. Testing scores directly is unreliable so just
+        # do a simple check here.
+        assert_equal(
+          [{ _score: :desc }, { updated_at: :desc }],
+          AdminSearch.new.default_admin_sort
+        )
+      end
+
       def test_selected_sorting
         results = [
           create_product(name: 'A', variants: []),

data/workarea-core.gemspec

@@ -90,7 +90,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'referer-parser', '~> 0.3.0'
   s.add_dependency 'serviceworker-rails', '~> 0.5.5'
   s.add_dependency 'logstasher', '~> 1.2.2'
-  s.add_dependency 'chartkick', '~> 3.3.0'
+  s.add_dependency 'chartkick', '~> 3.4.0'
   s.add_dependency 'puma', '>= 4.3.1'
   s.add_dependency 'rack' , '>= 2.1.4'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.4.37
+  version: 3.4.42
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -1086,14 +1086,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -1873,6 +1873,7 @@ files:
 - lib/workarea/ext/mongoid/list_field.rb
 - lib/workarea/ext/mongoid/moped_bson.rb
 - lib/workarea/ext/mongoid/timestamps_timeless.rb
+- lib/workarea/ext/referer_parser/parser.decorator
 - lib/workarea/ext/sprockets/ruby_processor.rb
 - lib/workarea/ext/sprockets/task.rb
 - lib/workarea/geolocation.rb
@@ -2017,6 +2018,7 @@ files:
 - test/lib/workarea/ext/mongoid/except_test.rb
 - test/lib/workarea/ext/mongoid/find_ordered_test.rb
 - test/lib/workarea/ext/mongoid/list_field_test.rb
+- test/lib/workarea/ext/referer_parser/parser_test.rb
 - test/lib/workarea/geolocation_test.rb
 - test/lib/workarea/lint/inconsistent_details_test.rb
 - test/lib/workarea/lint/products_missing_images_test.rb