workarea-core 3.4.44 → 3.5.0.beta.1

data/config/initializers/{21_premailer.rb → 24_premailer.rb}

@@ -1,3 +1,4 @@
 Premailer::Rails.config.merge!(
+  remove_scripts: false,
   create_shorthands: false
 )

data/config/locales/en.yml

@@ -50,33 +50,12 @@ en:
         unit: instance
       csv:
         unit: row
-    duration:
-      years:
-        one: '%{count} year'
-        other: '%{count} years'
-      months:
-        one: '%{count} month'
-        other: '%{count} months'
-      weeks:
-        one: '%{count} week'
-        other: '%{count} weeks'
-      days:
-        one: '%{count} day'
-        other: '%{count} days'
-      hours:
-        one: '%{count} hour'
-        other: '%{count} hours'
-      minutes:
-        one: '%{count} minute'
-        other: '%{count} minutes'
-      seconds:
-        one: '%{count} second'
-        other: '%{count} seconds'
     errors:
       messages:
         contains_type: cannot contain 'type'
         not_a_date: must be a date
         invalid_credit_card_number: is not a valid credit card number
+        invalid_credit_card_issuer: '%{value} cards are not accepted. We accept %{issuers}.'
         expired_date: is an expired date
         incomplete: is incomplete
         must_be_future: must be in the future
@@ -91,14 +70,16 @@ en:
         must_be_unique: must be unique
         not_star_query: "cannot be '*'"
         undo_unpublished_release: cannot be set when Publish Date is blank
+        max_allowed_segments: You cannot have more than 15 total segments in Workarea.
+        unsupported_segmentation: aren't supported for pricing.
     facets:
       price_range:
         over: 'Over %{price}'
         under: 'Under %{price}'
+    fulfillment_sku:
+      name: "Fulfillment SKU %{id}"
     inventory_sku:
       name: "Inventory %{id}"
-    inquiry:
-      subjects: {}
     order:
       name: "Order %{id}"
       traffic_referrer:
@@ -108,6 +89,8 @@ en:
         search: search
         social: social
         unknown: unknown
+      errors:
+        count_limit: Orders cannot exceed %{size} items.
     messages:
       info: Info
       error: Error
@@ -131,10 +114,14 @@ en:
       description: Price Override
     pricing_sku:
       name: "Pricing %{id}"
+    release:
+      undo: Undo %{name}
     sorts:
       available: Available
       average_order_value: Average Order Total
+      country: Country
       destination: Destination
+      downloads: Most Downloaded
       end: End Date
       last_updated: Recently Updated
       modified: Last Updated
@@ -147,6 +134,7 @@ en:
       path: Path
       pending: Pending
       popularity: Most Popular
+      postal_code: Postal Code
       price_asc: Price, Low to High
       price_desc: Price, High to Low
       published_date: Published Date
@@ -154,6 +142,7 @@ en:
       query: Search Terms
       rating: Highest Rated
       redemptions: Most Redeemed
+      region: Region
       relevance: Relevance
       sales: Sales
       sku: SKU

data/lib/generators/workarea/content_block_type/templates/initializer.rb

@@ -1,3 +1,3 @@
-Workarea::Content.define_block_types do
+Workarea.define_content_block_types do
 
 end

data/lib/generators/workarea/install/USAGE

@@ -6,7 +6,6 @@ Example:
 
     This will create:
         config/initializers/workarea.rb
-        config/puma.rb
         db/seeds.rb
 
     This will modify:

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

@@ -37,14 +37,6 @@ module Workarea
       environment '# Run Sidekiq tasks synchronously so that Sidekiq is not required in Development', env: 'development'
     end
 
-    def configure_puma
-      remove_file 'config/puma.rb'
-      create_file 'config/puma.rb', <<~TEXT
-        require 'workarea/configuration/puma'
-        Workarea::Configuration::Puma.load(self)
-      TEXT
-    end
-
     def update_test_helper
       inject_into_file(
         'test/test_helper.rb',
@@ -63,19 +55,6 @@ 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',
+    'development' => 'localhost:3000',
     'production' => 'www.<%= app_name.dasherize %>.com' # TODO
   }[Rails.env]
 

data/lib/tasks/insights.rake

@@ -39,6 +39,7 @@ namespace :workarea do
       Workarea::Metrics::SearchByWeek.delete_all
       Workarea::Metrics::SearchForLastWeek.delete_all
       Workarea::Metrics::SkuByDay.delete_all
+      Workarea::Metrics::TenderByDay.delete_all
       Workarea::Metrics::TrafficReferrerByDay.delete_all
       Workarea::Metrics::User.delete_all
       Workarea::Insights::Base.delete_all

data/lib/tasks/migrate.rake

@@ -0,0 +1,106 @@
+namespace :workarea do
+  namespace :migrate do
+    desc 'Migrate the database from v3.4 to v3.5'
+    task v3_5: :environment do
+      count = 0
+
+      Workarea::Release.where(:undo_at.gte => Time.current).each do |release|
+        undo = release.build_undo(publish_at: release.undo_at).tap(&:save!)
+
+        release.changesets.each do |changeset|
+          changeset.build_undo(release: undo).save!
+        end
+
+        Workarea::Scheduler.delete(release.undo_job_id)
+
+        release.update_attributes!(undo_at: nil, undo_job_id: nil)
+        count += 1
+      end
+
+      Workarea::Release.all.each { |r| Workarea::IndexAdminSearch.perform(r) }
+
+      puts "✅ #{count} undo releases have been created."
+
+      count = 0
+
+      Workarea::Tax::Category.each_by(100) do |category|
+        category.rates.each_by(500) do |rate|
+          rate.postal_code_percentage = rate.percentage
+          rate.percentage = nil
+        end
+
+        category.save!
+        count += 1
+      end
+
+      puts "✅ #{count} tax categories updated."
+
+      Workarea::Catalog::Product.each_by(500) do |product|
+        next unless product.digital?
+
+        product.skus.each do |sku|
+          fulfillment = Workarea::Fulfillment::Sku.find_or_initialize_by(id: sku)
+          fulfillment.policy = 'ignore'
+          fulfillment.save!
+        end
+      end
+
+      puts "✅ #{count} fulfillment skus for digital product have been created."
+
+      count = 0
+      failed_ids = []
+      backup = Mongo::Collection.new(Mongoid::Clients.default.database, 'workarea_legacy_segments')
+
+      legacy_segments = Workarea::Segment.collection.find.to_a
+      legacy_segments.each do |doc|
+        backup.insert_one(doc)
+        Workarea::Segment.collection.delete_one(doc.slice('_id'))
+
+        segment = Workarea::Segment.new(
+          id: doc['_id'],
+          name: doc['name'],
+          subscribed_user_ids: doc['subscribed_user_ids'],
+          created_at: doc['created_at'],
+          updated_at: doc['updated_at']
+        )
+
+        doc['conditions'].each do |condition|
+          if condition['_type'] =~ /UserTag/
+            segment.rules << Workarea::Segment::Rules::Tags.new(tags: condition['tags'])
+          elsif condition['_type'] =~ /TotalSpent/
+            rule = Workarea::Segment::Rules::Revenue.new
+
+            if condition['operator'] == 'equals'
+              rule.minimum = rule.maximum = Money.demongoize(condition['amount'])
+            elsif condition['operator'] == 'less_than_or_equals'
+              rule.maximum = Money.demongoize(condition['amount'])
+            elsif condition['operator'] == 'less_than'
+              rule.maximum = (Money.demongoize(condition['amount']) - 0.01.to_m)
+            elsif condition['operator'] == 'greater_than_or_equals'
+              rule.minimum = Money.demongoize(condition['amount'])
+            elsif condition['operator'] == 'greater_than'
+              rule.minimum = (Money.demongoize(condition['amount']) + 0.01.to_m)
+            end
+
+            segment.rules << rule
+          end
+        end
+
+        if doc['conditions'].size == segment.rules.size && segment.save
+          count += 1
+        else
+          failed_ids << doc['_id']
+        end
+      end
+
+      puts "✅ #{count} segments have been migrated." if count > 0
+      if failed_ids.any?
+        puts "⛔️ #{failed_ids.count} segments failed to migrate."
+        puts "You can find copies of the original segments in the workarea_legacy_segments collection."
+        puts "The segments that failed are #{failed_ids.to_sentence}."
+      end
+
+      puts "\nMigration complete!"
+    end
+  end
+end

data/lib/tasks/search.rake

@@ -1,5 +1,10 @@
 namespace :workarea do
   namespace :search_index do
+    def setup
+      require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
+      Workarea.config.bulk_index_batch_size = ENV['BATCH_SIZE'].to_i if ENV['BATCH_SIZE'].present?
+    end
+
     desc 'Reindex all data'
     task all: :environment do
       Rake::Task['workarea:search_index:storefront'].invoke
@@ -9,17 +14,14 @@ namespace :workarea do
 
     desc 'Reindex admin'
     task admin: :environment do
-      require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
+      setup
       puts 'Indexing admin...'
-
-      Workarea::QueuesPauser.with_paused_queues do
-        Workarea::Search::Admin.reset_indexes!
-      end
+      Workarea::Search::Admin.reset_indexes!
 
       Mongoid.models.each do |klass|
         next unless Workarea::Search::Admin.for(klass.first).present?
 
-        klass.all.each_slice_of(100) do |models|
+        klass.all.each_slice_of(Workarea.config.bulk_index_batch_size) do |models|
           Workarea::BulkIndexAdmin.perform_by_models(models)
         end
       end
@@ -31,13 +33,11 @@ namespace :workarea do
 
     desc 'Reindex storefront'
     task storefront: :environment do
-      require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
+      setup
       puts 'Indexing storefront...'
 
-      Workarea::QueuesPauser.with_paused_queues do
-        Workarea::Search::Storefront.reset_indexes!
-        Workarea::Search::Storefront.ensure_dynamic_mappings
-      end
+      Workarea::Search::Storefront.reset_indexes!
+      Workarea::Search::Storefront.ensure_dynamic_mappings
 
       # This code finds all unique filters for products so we can index a sample
       # product for each to ensure the dynamic mappings get created.
@@ -65,12 +65,12 @@ namespace :workarea do
         Workarea::Search::Storefront::Product.new(product).save
       end
 
-      Workarea::Catalog::Category.all.each_by(100) do |category|
-        Workarea::Search::Storefront::Product.add_category(category)
+      Workarea::Catalog::Category.all.each_by(Workarea.config.bulk_index_batch_size) do |category|
+        Workarea::Search::Storefront::CategoryQuery.new(category).create
         Workarea::Search::Storefront::Category.new(category).save
       end
 
-      Workarea::Content::Page.all.each_by(100) do |page|
+      Workarea::Content::Page.all.each_by(Workarea.config.bulk_index_batch_size) do |page|
         Workarea::Search::Storefront::Page.new(page).save
       end
 
@@ -80,14 +80,12 @@ namespace :workarea do
 
     desc 'Reindex help'
     task help: :environment do
-      require 'sidekiq/testing/inline' unless ENV['INLINE'] == 'false'
+      setup
       puts 'Indexing help...'
 
-      Workarea::QueuesPauser.with_paused_queues do
-        Workarea::Search::Help.reset_indexes!
-      end
+      Workarea::Search::Help.reset_indexes!
 
-      Workarea::Help::Article.all.each_by(100) do |help_article|
+      Workarea::Help::Article.all.each_by(Workarea.config.bulk_index_batch_size) do |help_article|
         Workarea::Search::Help.new(help_article).save
       end
     end

data/lib/tasks/tests.rake

@@ -86,7 +86,7 @@ namespace :workarea do
               Workarea::Plugin.installed.map(&:root) +
               [Rails.root]
 
-    ENV['PERF_TEST'] = 'true'
+    ENV['PERF_TEST'] = true
     Rails::TestUnit::Runner.rake_run(
       roots
         .map { |r| FileList["#{r}/test/performance/**/*_test.rb"] }

data/lib/workarea.rb

@@ -29,7 +29,7 @@ module Workarea
   # A shortcut to the Rails' application config
   # relevant to Workarea.
   #
-  # @return [ActiveSupport::Configurable::Configuration]
+  # @return [Workarea::Configuration::AdministrableOptions]
   #
   def self.config
     @custom_config.presence || Configuration.config
@@ -81,8 +81,107 @@ module Workarea
       Fog::AWS::Storage.new(options)
     end
   end
+
+  # Use this to parse a referrer. It's globalized here because each instantiation
+  # will read a file, and we may need an instance on every request if there's a
+  # segment setup for referrer.
+  #
+  # @return [RefererParser::Parser]
+  #
+  def self.referrer_parser
+    @referrer_parser ||= RefererParser::Parser.new
+  end
+
+  # Define block types for use by administrators. A block type represents a
+  # row of content on the storefront, self-contained with its own styles and
+  # responsive logic.
+  #
+  # == Defining new block types
+  #
+  #    Workarea.define_content_block_types do
+  #      # Create a new block type called 2 Column Text
+  #      # The ID or slug for this type will be :2_column_text
+  #      block_type '2 Column Text' do
+  #        # Set a description, which will be shown to admin users when
+  #        # selecting a block type
+  #        description 'Provides 2 columns of text'
+  #
+  #        # Allows custom specification of which icon to use to display this
+  #        # block type in the admin when selecting a new block. The default
+  #        # is workarea/admin/content_block_types/#{block_type_id}
+  #        icon 'workarea/admin/content_block_types/columns'
+  #
+  #        # Tags are used for filtering content block types in the admin when
+  #        # creating a new block and selecting its type
+  #        tags %w(columns text)
+  #
+  #        # You can also specify a custom view model to be used in the store
+  #        # front when rendering. You could even share view models for
+  #        # different blocks
+  #        view_model 'Workarea::Storefront::ContentBlocks::ColumnsViewModel'
+  #
+  #        # If your block type requires developer-facing configuration, you
+  #        # you can specify any arbitrary attributes and they will be added
+  #        # to the #config hash on the block type. For example, configuration
+  #        # values tied to site design.
+  #        height 960
+  #        width 470
+  #
+  #        # Use fieldset to group fields together for admin display. The
+  #        # fieldset has no other use.
+  #        fieldset 'Left Column' do
+  #          # A field corresponds to one input in the admin and one key in
+  #          # the Workarea::Content::Block#data hash. It will be referenced
+  #          # by a systemized version of the name.
+  #
+  #          # The second argument must be a type. Out-of-the-box valid types
+  #          # include :asset, :category, :options, :products, :rich_text,
+  #          # :string, and :url.
+  #
+  #          # Options can be specific to the field type. All field types
+  #          # support :default and :required.
+  #          field 'Left Column Text', :text, required: true, default: 'Left Column'
+  #        end
+  #
+  #        fieldset 'Right Column' do
+  #          field 'Right Column Text', :text, required: true, default: 'Right Column'
+  #        end
+  #      end
+  #    end
+  #
+  # == Overriding values for existing block types
+  #
+  # To allow full customization, all details about a block type and its fields
+  # can be overridden. Here's an example of overriding details on the Product
+  # List block type which ships out of the box.
+  #
+  #    Workarea.define_content_block_types do
+  #      # Open the Product List block up again
+  #      block_type 'Product List' do
+  #        # Override the default on Title
+  #        field 'Title', :string, default: 'Staff Picks'
+  #        # Add a new field called description
+  #        field 'Description', :text, default: 'Top picks by our staff
+  #
+  #        # No need to touch other fields, they remain the same
+  #      end
+  #    end
+  #
+  # == Admin UI
+  # The admin UI for the block will be automatically generated based on the
+  # fields provided.
+  #
+  def self.define_content_block_types(&block)
+    Configuration::ContentBlocks.building_blocks << block
+  end
+
+  # Use this deprecation to warn about the next minor release.
+  #
+  # @return [ActiveSupport::Deprecation]
+  #
+  def self.deprecation
+    @deprecation ||= ActiveSupport::Deprecation.new('3.6', 'Workarea')
+  end
 end
 
 require 'workarea/core'
-require 'workarea/admin'
-require 'workarea/storefront'