solidus_core 3.1.5 → 3.2.0.alpha

data/lib/spree/testing_support/dummy_app.rb

@@ -48,7 +48,6 @@ module DummyApp
   class Application < ::Rails::Application
     config.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}")
     # Make the test environment more production-like:
-    config.cache_classes = true
     config.action_controller.allow_forgery_protection = false
     config.action_controller.default_protect_from_forgery = false
     config.action_mailer.perform_caching = false
@@ -60,6 +59,10 @@ module DummyApp
     # https://github.com/solidusio/solidus/issues/4110
     config.action_controller.perform_caching = false
 
+    # It needs to be explicitly set from Rails 7
+    # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-6-1-to-rails-7-0-spring
+    config.cache_classes = true
+
     # Make debugging easier:
     config.consider_all_requests_local = true
     config.action_dispatch.show_exceptions = false
@@ -96,6 +99,7 @@ module DummyApp
           }
         }
         config.active_storage.service = :test
+        config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', Spree::RailsCompatibility.variant_processor).to_sym
       end
     end
 
@@ -134,6 +138,7 @@ Spree.user_class = 'Spree::LegacyUser'
 Spree.load_defaults(Spree.solidus_version)
 Spree.config do |config|
   config.mails_from = "store@example.com"
+  config.use_legacy_events = ENV['USE_LEGACY_EVENTS'].present?
 
   if ENV['DISABLE_ACTIVE_STORAGE']
     config.image_attachment_module = 'Spree::Image::PaperclipAttachment'

data/lib/spree/testing_support/factories/address_factory.rb

@@ -26,14 +26,19 @@ FactoryBot.define do
 
     state do |address|
       Spree::State.joins(:country).where('spree_countries.iso = (?)', country_iso_code).find_by(abbr: state_code) ||
-        address.association(:state, country_iso: country_iso_code, state_code: state_code)
+        address.association(
+          :state,
+          strategy: :create,
+          country_iso: country_iso_code,
+          state_code: state_code
+        )
     end
 
     country do |address|
       if address.state
         address.state.country
       else
-        address.association(:country, iso: country_iso_code)
+        address.association(:country, strategy: :create, iso: country_iso_code)
       end
     end
   end

data/lib/spree/testing_support/factories/inventory_unit_factory.rb

@@ -17,7 +17,7 @@ FactoryBot.define do
       stock_location { nil }
     end
 
-    variant
+    association :variant, strategy: :create
     line_item do
       if order
         build(:line_item, variant: variant, order: order)

data/lib/spree/testing_support/factories/order_factory.rb

@@ -19,7 +19,7 @@ FactoryBot.define do
     ship_address
     completed_at { nil }
     email { user.try(:email) }
-    store
+    association :store, strategy: :create
 
     transient do
       line_items_price { BigDecimal(10) }
@@ -68,6 +68,7 @@ FactoryBot.define do
 
       factory :completed_order_with_promotion do
         transient do
+          completed_at { Time.current }
           promotion { nil }
         end
 
@@ -79,7 +80,7 @@ FactoryBot.define do
           order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
 
           # Complete the order after the promotion has been activated
-          order.update_column(:completed_at, Time.current)
+          order.update_column(:completed_at, evaluator.completed_at)
           order.update_column(:state, "complete")
         end
       end
@@ -104,13 +105,16 @@ FactoryBot.define do
       end
 
       factory :completed_order_with_totals do
+        transient do
+          completed_at { Time.current }
+        end
         state { 'complete' }
 
-        after(:create) do |order|
+        after(:create) do |order, evaluator|
           order.shipments.each do |shipment|
             shipment.inventory_units.update_all state: 'on_hand', pending: false
           end
-          order.update_column(:completed_at, Time.current)
+          order.update_column(:completed_at, evaluator.completed_at)
         end
 
         factory :completed_order_with_pending_payment do

data/lib/spree/testing_support/factories/product_factory.rb

@@ -20,7 +20,10 @@ FactoryBot.define do
     sku { generate(:sku) }
     available_on { 1.year.ago }
     deleted_at { nil }
-    shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
+    shipping_category do |r|
+      Spree::ShippingCategory.first ||
+        r.association(:shipping_category, strategy: :create)
+    end
 
     # ensure stock item will be created for this products master
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }

data/lib/spree/testing_support/factories/store_credit_factory.rb

@@ -11,11 +11,11 @@ end
 
 FactoryBot.define do
   factory :store_credit, class: 'Spree::StoreCredit' do
-    user
-    association :created_by, factory: :user
-    association :category, factory: :store_credit_category
+    association :user, strategy: :create
+    association :created_by, factory: :user, strategy: :create
+    association :category, factory: :store_credit_category, strategy: :create
     amount { 150.00 }
     currency { "USD" }
-    association :credit_type, factory: :primary_credit_type
+    association :credit_type, factory: :primary_credit_type, strategy: :create
   end
 end

data/lib/spree/testing_support/factories/user_factory.rb

@@ -21,6 +21,12 @@ FactoryBot.define do
       end
     end
 
+    trait :with_orders do
+      after(:create) do |user, _|
+        create(:order, user: user)
+      end
+    end
+
     factory :admin_user do
       after(:create) do |user, _|
         admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')

data/lib/spree/testing_support/factory_bot.rb

@@ -44,7 +44,7 @@ module Spree
       def self.check_version
         require "factory_bot/version"
 
-        requirement = Gem::Requirement.new("~> 4.8")
+        requirement = Gem::Requirement.new(">= 4.8")
         version = Gem::Version.new(::FactoryBot::VERSION)
 
         unless requirement.satisfied_by? version

data/lib/spree/testing_support/order_walkthrough.rb

@@ -3,11 +3,11 @@
 module Spree
   module TestingSupport
     class OrderWalkthrough
-      def self.up_to(state)
-        new.up_to(state)
+      def self.up_to(state, user: nil)
+        new.up_to(state, user: user)
       end
 
-      def up_to(state)
+      def up_to(state, user: nil)
         # Need to create a valid zone too...
         @zone = ::FactoryBot.create(:zone)
         @country = ::FactoryBot.create(:country)
@@ -23,6 +23,7 @@ module Spree
         end
 
         order = Spree::Order.create!(
+          user: user,
           email: "solidus@example.com",
           store: Spree::Store.first || ::FactoryBot.create(:store)
         )
@@ -61,7 +62,7 @@ module Spree
       end
 
       def payment(order)
-        credit_card = ::FactoryBot.create(:credit_card)
+        credit_card = ::FactoryBot.create(:credit_card, user: order.user)
         order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
         # TODO: maybe look at some way of making this payment_state change automatic
         order.payment_state = 'paid'

data/lib/spree/testing_support/silence_deprecations.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.configure do |config|
+  config.around(:each, silence_deprecations: true) do |example|
+    Spree::Deprecation.silence do
+      example.run
+    end
+  end
+end

data/lib/tasks/payment_method.rake

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+namespace :payment_method do
+  desc "Deactivates old payment methods and fixes ActiveRecord::SubclassNotFound error, "\
+  "which happens after switching Payment Service Provider."
+  task deactivate_unsupported_payment_methods: :environment do
+    Spree::PaymentMethod.pluck(:id, :type).select do |id, type|
+      type.constantize
+    rescue NameError
+      fix_payment_method_record(id, type)
+    end
+  end
+
+  def fix_payment_method_record(id, previous_type)
+    connection = ActiveRecord::Base.connection
+    false_value = connection.quoted_false
+    connection.exec_update(<<-SQL
+      UPDATE spree_payment_methods
+      SET
+        type='#{Spree::PaymentMethod.name}',
+        type_before_removal='#{previous_type}',
+        active=#{false_value},
+        available_to_users=#{false_value},
+        available_to_admin=#{false_value}
+      WHERE id=#{id};
+    SQL
+    )
+  end
+end

data/lib/tasks/solidus/delete_prices_with_nil_amount.rake

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 namespace :solidus do
-  desc "Delete Spree::Price records which amount field is NULL"
+  desc "Delete Spree::Price records (including discarded) which amount field is NULL"
   task delete_prices_with_nil_amount: :environment do
-    Spree::Price.where(amount: nil).delete_all
+    Spree::Price.with_discarded.where(amount: nil).delete_all
   end
 end

data/lib/tasks/solidus/split_promotions_with_any_match_policy.rake

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  desc "Split Promotions with 'any' match policy"
+  task split_promotions_with_any_match_policy: :environment do
+    Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.each do |promotion|
+      if promotion.promotion_rules.length <= 1
+        promotion.update!(match_policy: :all)
+      elsif promotion.active?
+        promotion.rules.map do |rule|
+          new_promotion = promotion.dup
+          new_promotion.promotion_rules = [rule]
+          new_promotion.match_policy = "all"
+          new_promotion.promotion_actions = promotion.actions.map do |action|
+            new_action = action.dup
+            if action.respond_to?(:calculator)
+              new_action.calculator = action.calculator.dup
+            end
+            new_action.promotion = new_promotion
+            new_action.save!
+            new_action
+          end
+          new_promotion.expires_at = promotion.expires_at
+          new_promotion.starts_at = Time.current
+          new_promotion.save!
+        end
+        promotion.update!(expires_at: Time.current)
+      end
+    end
+
+    Spree::Order.where(completed_at: nil).each { |order| Spree::PromotionHandler::Cart.new(order).activate }
+  end
+end

data/solidus_core.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata['rubygems_mfa_required'] = 'true'
+
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(spec|script)/})
   end
@@ -25,7 +27,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
+    s.add_dependency rails_dep, ['>= 5.2', '< 7.1.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
@@ -39,9 +41,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'kt-paperclip', '~> 6.3'
+  s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
+  s.add_dependency 'psych', ['>= 3.1.0', '< 5.0']
   s.add_dependency 'ransack', '~> 2.0'
+  s.add_dependency 'sprockets-rails'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
+  s.add_dependency 'omnes', '~> 0.2.2'
 
   s.post_install_message = <<-MSG
 -------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0.alpha
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -334,16 +334,42 @@ dependencies:
   name: kt-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +384,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -372,6 +412,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: omnes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: Essential models, mailers, and classes for the Solidus e-commerce project.
 email: contact@solidus.io
 executables: []
@@ -641,6 +695,7 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/subscribers/spree/mailer_subscriber.rb
+- app/subscribers/spree/order_mailer_subscriber.rb
 - app/views/layouts/spree/base_mailer.html.erb
 - app/views/spree/carton_mailer/shipped_email.html.erb
 - app/views/spree/carton_mailer/shipped_email.text.erb
@@ -703,15 +758,18 @@ files:
 - db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
 - db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
 - db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
+- db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb
 - db/migrate/20210122110141_add_name_to_spree_addresses.rb
 - db/migrate/20210312061050_change_column_null_on_prices.rb
+- db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb
 - db/seeds.rb
 - lib/generators/solidus/install/install_generator.rb
+- lib/generators/solidus/install/install_generator/bundler_context.rb
+- lib/generators/solidus/install/install_generator/install_frontend.rb
+- lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
 - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js
-- lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/backend/all.css
-- lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/generators/solidus/update/templates/config/initializers/new_solidus_defaults.rb.tt
 - lib/generators/solidus/update/update_generator.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -728,6 +786,7 @@ files:
 - lib/solidus/migrations/promotions_with_code_handlers.rb
 - lib/solidus_core.rb
 - lib/spree/app_configuration.rb
+- lib/spree/bus.rb
 - lib/spree/config.rb
 - lib/spree/core.rb
 - lib/spree/core/active_merchant_dependencies.rb
@@ -812,10 +871,12 @@ files:
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
+- lib/spree/rails_compatibility.rb
 - lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
 - lib/spree/testing_support/blacklist_urls.rb
+- lib/spree/testing_support/bus_helpers.rb
 - lib/spree/testing_support/caching.rb
 - lib/spree/testing_support/capybara_ext.rb
 - lib/spree/testing_support/common_rake.rb
@@ -903,12 +964,15 @@ files:
 - lib/spree/testing_support/rake.rb
 - lib/spree/testing_support/sequences.rb
 - lib/spree/testing_support/shared_examples/gallery.rb
+- lib/spree/testing_support/silence_deprecations.rb
 - lib/spree/testing_support/translations.rb
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - lib/spree_core.rb
+- lib/tasks/payment_method.rake
 - lib/tasks/solidus/check_orders_with_invalid_email.rake
 - lib/tasks/solidus/delete_prices_with_nil_amount.rake
+- lib/tasks/solidus/split_promotions_with_any_match_policy.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
@@ -916,7 +980,8 @@ files:
 homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: |
   -------------------------------------------------------------
                   Thank you for using Solidus

data/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js

@@ -1,10 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require rails-ujs
-//= require spree/frontend
-//= require_tree .

data/lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css

@@ -1,9 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *
- *= require spree/frontend
- *= require_self
- *= require_tree .
-*/