workarea-core 3.4.36 → 3.4.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1373c61a73f6d680811a7d550880438838dfc1cf
-  data.tar.gz: 8896491055161cf76bbc7a754ca6915ab7d9efbf
+SHA256:
+  metadata.gz: cd6a06d43a5afb8d5f0b1cf56c81a9f98c7d354d491d5f34bc343c2eff550f94
+  data.tar.gz: 24b2c3a28a8566a643157312dcca780a094802e8e26acd4a464ad89d8489200c
 SHA512:
-  metadata.gz: 1af722113dc9bf6ae7efb1cae8abb3c961c2e9c6ac1232b9aee2c88629d0cf4d7d2b2865559750f314497e278c2973b25edccf957e1e0141741316f86d8b4d30
-  data.tar.gz: cb2186de83c1f83fef21b96356d0e0ea41f67bd848faa7db2fe8eba77d4e7848038570343c71f5ed178c4d093e19beb0b3fb2960b235a332bd508b565f4d5b3d
+  metadata.gz: a595de98f25b125a2518db893178ca1b950396f97f9de175e1592520ed18bbe9dda49a9cc8bc38dc7f25b8207489adea3cb2861a10d91adb6d3b5c7f6ed653b8
+  data.tar.gz: 414a2d37a8b2f29f0a5d463d8fb497ac01b6efe9231f3e254b4f3d3b6f1a05f3c9e9adc8552d9d6f22485f159eb3dc15ff818d7045381f5745171516c4712ac7

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/models/workarea/payment.rb

@@ -80,12 +80,7 @@ module Workarea
       build_credit_card unless credit_card
       credit_card.saved_card_id = nil
       credit_card.attributes = attrs.slice(
-        :month,
-        :year,
-        :saved_card_id,
-        :number,
-        :cvv,
-        :amount
+        *Workarea.config.credit_card_attributes
       )
       save
     end

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/configuration.rb

@@ -1289,6 +1289,17 @@ module Workarea
 
       # The number of results that will show per-type in the admin jump to
       config.jump_to_results_per_type = 5
+
+      # Attributes that will be sliced out of params and persisted on
+      # the credit card tender during checkout.
+      config.credit_card_attributes = %i[
+        month
+        year
+        saved_card_id
+        number
+        cvv
+        amount
+      ]
     end
   end
 end

data/lib/workarea/version.rb

@@ -2,7 +2,7 @@ module Workarea
   module VERSION
     MAJOR = 3
     MINOR = 4
-    PATCH = 36
+    PATCH = 41
     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/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.36
+  version: 3.4.41
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -882,22 +882,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.3
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.3
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.3
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -2614,8 +2614,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Core of the Workarea Commerce Platform