workarea-core 3.5.20 → 3.5.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6261fa607f871ebfb3c05fb63ba16c8fdd08cd08d3dd0e34971ad18b1868f21
-  data.tar.gz: de5b0e46393f51fd7b1259ed6acd2aac028a4f7d8f311e19f26ec0bf331bffb3
+  metadata.gz: 95264a0fb5c9e405852a21f6c8b590f54c97a64b9fb72bc97156dbc57ec36c01
+  data.tar.gz: 6811a1d019494db24af2cbc60ec987f71d58c96b27677bc5260780c939619be0
 SHA512:
-  metadata.gz: 9c8b791f8733b306e0411a309550e32055716ffd6abb952b9ce9e171bd7b3ade86a7cc6868a2d18a586c1ab847c18552b4f024dd9b2a4280a7eb2cd446fbd825
-  data.tar.gz: 033113c7e285a55c87f1fbf9b4a108d50767b9fa83041e7a9bb6bb8391164fd5a1986aa59ee1bd7c14ad0f55398d72a094cbbad4ab2c3e93dc37293be28385be
+  metadata.gz: 64268e7f2384a9812fd40613e5b0466a5e28945ad7b7f68a3cf33392ff27fb2b1030ce802b69f4d569ee08e5a8efac51cdb0c75359bec5376825018458eef126
+  data.tar.gz: 6aa1f3a86cc08c3d2f1ab9dab6bf0087c01533d53b3fc38f157e92a834cbc6cddfc9838a8351a0d4cd1e2d754cc274081e83dfe9b62aa9b6437c47e958762f23

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

@@ -18,17 +18,23 @@ module Workarea
 
       def live_entries
         @live_entries ||= @products.reduce([]) do |memo, product|
-          memo + Array.wrap(index_entries_for(product.without_release))
+          memo + live_entries_for(product)
         end
       end
 
       def release_entries
-        @release_entries ||= @products.reduce([]) do |results, product|
-          releases = ProductReleases.new(product).releases
+        @release_entries ||= @products.reduce([]) do |memo, product|
+          memo + release_entries_for(product)
+        end
+      end
+
+      def live_entries_for(product)
+        Array.wrap(index_entries_for(product.without_release))
+      end
 
-          results + releases.reduce([]) do |memo, release|
-            memo + Array.wrap(index_entries_for(product.in_release(release)))
-          end
+      def release_entries_for(product)
+        ProductReleases.new(product).releases.reduce([]) do |memo, release|
+          memo + Array.wrap(index_entries_for(product.in_release(release)))
         end
       end
 

data/config/initializers/05_scheduled_jobs.rb

@@ -1,4 +1,4 @@
-unless Workarea.config.skip_service_connections
+unless Workarea.skip_services?
   Sidekiq::Cron::Job.create(
     name: 'Workarea::CleanInventoryTransactions',
     klass: 'Workarea::CleanInventoryTransactions',

data/lib/workarea.rb

@@ -182,6 +182,16 @@ module Workarea
   def self.deprecation
     @deprecation ||= ActiveSupport::Deprecation.new('3.6', 'Workarea')
   end
+
+  # Whether the app should skip connecting to external services on boot,
+  # such as Mongo, Elasticsearch, or Redis. Note that this will break
+  # functionality relying on these services.
+  #
+  # @return [Boolean]
+  #
+  def self.skip_services?
+    !!(ENV['WORKAREA_SKIP_SERVICES'] =~ /true/)
+  end
 end
 
 require 'workarea/core'

data/lib/workarea/configuration.rb

@@ -940,7 +940,10 @@ module Workarea
 
       # Whether the app should skip connecting to external services on boot,
       # such as Mongo, Elasticsearch, or Redis.
-      config.skip_service_connections = ENV['WORKAREA_SKIP_SERVICES'].to_s =~ /true/
+      #
+      # @deprecated Use `Workarea.skip_services?` instead
+      #
+      config.skip_service_connections = Workarea.skip_services?
 
       # This is a feature flag, which enables localized active fields. If you're
       # upgrading, you can set this to false to avoid having to do a MongoDB

data/lib/workarea/configuration/administrable_options.rb

@@ -12,7 +12,8 @@ module Workarea
       private
 
       def check_fieldsets?(name)
-        ::Mongoid.clients.any? &&
+        !Workarea.skip_services? &&
+          ::Mongoid.clients.any? &&
           Configuration::Admin.fields.keys.include?(name.to_s)
       end
     end

data/lib/workarea/scheduled_jobs.rb

@@ -5,7 +5,7 @@ module Workarea
     # removing a previously scheduled job from initializers doesn't
     # actually stop the job from being enqueued.
     def self.clean
-      return if Workarea.config.skip_service_connections
+      return if Workarea.skip_services?
 
       Sidekiq::Cron::Job.all.each do |job|
         job.destroy unless const_defined?(job.klass)

data/lib/workarea/version.rb

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

data/lib/workarea/warnings.rb

@@ -26,7 +26,7 @@ find their preference.
 
     def check_mongo_notable_scan
       if (Rails.env.development? &&
-          !Workarea.config.skip_service_connections &&
+          !Workarea.skip_services? &&
           Configuration::Mongoid.indexes_enforced?)
         warn <<~eos
 **************************************************

data/test/lib/workarea/scheduled_jobs_test.rb

@@ -15,12 +15,8 @@ module Workarea
     end
 
     def test_redis_not_available
-      @_skip_services = Workarea.config.skip_service_connections
-      Workarea.config.skip_service_connections = true
-
+      Workarea.stubs(skip_services?: true)
       assert_nil(ScheduledJobs.clean)
-    ensure
-      Workarea.config.skip_service_connections = @_skip_services
     end
   end
 end

data/test/models/workarea/data_file/csv_test.rb

@@ -309,7 +309,8 @@ module Workarea
       end
 
       def test_blank_rows_are_ignored
-        model = Foo.new(id: nil)
+        model = Foo.new
+        Foo.fields.keys.each { |f| model.send("#{f}=", nil) }
 
         import = create_import(
           model_type: Foo.name,

data/test/workers/workarea/status_reporter_test.rb

@@ -12,8 +12,10 @@ module Workarea
 
       StatusReporter.new.perform
 
-      assert(2, ActionMailer::Base.deliveries.count)
+      assert_equal(2, ActionMailer::Base.deliveries.count)
+
       delivery_emails = ActionMailer::Base.deliveries.map(&:to).flatten
+
       assert(delivery_emails.include?('foo@workarea.com'))
       assert(delivery_emails.include?('bar@workarea.com'))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-core
 version: !ruby/object:Gem::Version
-  version: 3.5.20
+  version: 3.5.21
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler