spree_core 4.0.7 → 4.1.0.rc1

data/lib/spree/permitted_attributes.rb

@@ -39,7 +39,7 @@ module Spree
     ]
 
     @@checkout_attributes = [
-      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, 
+      :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing,
       :user_id, :bill_address_id, :ship_address_id
     ]
 
@@ -97,7 +97,8 @@ module Spree
     ]
 
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
-                          :meta_description, :default_currency, :mail_from_address]
+                          :meta_description, :default_currency, :mail_from_address,
+                          :facebook, :twitter, :instagram]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -32,51 +32,6 @@ module CapybaraExt
     end
   end
 
-  def select2_search(value, options)
-    options[:from] = select2_from_label(options[:from])
-    targetted_select2_search(value, options)
-  end
-
-  def targetted_select2_search(value, options)
-    select2_el = find(:css, options[:from])
-    select2_el.click
-    page.document.find('.select2-search input.select2-input,
-                        .select2-search-field input.select2-input.select2-focused').send_keys(value)
-    select_select2_result(value)
-  end
-
-  def select2(value, options)
-    options[:from] = select2_from_label(options[:from])
-    targetted_select2(value, options)
-  end
-
-  def select2_from_label(from)
-    label = find(:label, from, class: '!select2-offscreen')
-    within label.first(:xpath, './/..') do
-      "##{find('.select2-container')['id']}"
-    end
-  end
-
-  def select2_no_label(value, options = {})
-    raise "Must pass a hash containing 'from'" if !options.is_a?(Hash) || !options.key?(:from)
-
-    placeholder = options[:from]
-    click_link placeholder
-
-    select_select2_result(value)
-  end
-
-  def targetted_select2(value, options)
-    # find select2 element and click it
-    find(options[:from]).find('a').click
-    select_select2_result(value)
-  end
-
-  def select_select2_result(value)
-    # results are in a div appended to the end of the document
-    page.document.find('div.select2-result-label', match: :first, text: %r{#{Regexp.escape(value)}}i).click
-  end
-
   # arg delay in seconds
   def wait_for_ajax(delay = Capybara.default_max_wait_time)
     Timeout.timeout(delay) do

data/lib/spree/testing_support/common_rake.rb

@@ -15,7 +15,7 @@ namespace :common do
     Rails.env = 'test'
 
     Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
-    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_views=false', "--user_class=#{args[:user_class]}"]
+    Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--auto-accept', '--migrate=false', '--seed=false', '--sample=false', '--quiet', '--copy_storefront=false', "--user_class=#{args[:user_class]}"]
 
     puts 'Setting up dummy database...'
     system("bundle exec rake db:drop db:create > #{File::NULL}")

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

@@ -5,5 +5,8 @@ FactoryBot.define do
     url               { 'www.example.com' }
     mail_from_address { 'spree@example.org' }
     default_currency  { 'USD' }
+    facebook          { 'spreecommerce' }
+    twitter           { 'spreecommerce' }
+    instagram         { 'spreecommerce' }
   end
 end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,7 +1,7 @@
 class OrderWalkthrough
   def self.up_to(state)
     # A default store must exist to provide store settings
-    FactoryBot.create(:store) unless Spree::Store.exists?
+    store = Spree::Store.default || FactoryBot.create(:store, default: true)
 
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
@@ -18,7 +18,7 @@ class OrderWalkthrough
     unless Spree::ShippingMethod.exists?
       FactoryBot.create(:shipping_method).tap do |sm|
         sm.calculator.preferred_amount = 10
-        sm.calculator.preferred_currency = Spree::Config[:currency]
+        sm.calculator.preferred_currency = store.default_currency
         sm.calculator.save
       end
     end
@@ -53,7 +53,11 @@ class OrderWalkthrough
   end
 
   def self.payment(order)
-    order.payments.create!(payment_method: Spree::PaymentMethod.first, amount: order.total)
+    FactoryBot.create :payment,
+      order: order,
+      payment_method: Spree::PaymentMethod.first,
+      amount: order.total
+
     # TODO: maybe look at some way of making this payment_state change automatic
     order.payment_state = 'paid'
     order.next!

data/spree_core.gemspec

@@ -6,23 +6,17 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
-  s.homepage    = 'http://spreecommerce.org'
-  s.license     = 'BSD-3-Clause'
-
-  s.metadata = {
-    "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
-    "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://guides.spreecommerce.org/",
-    "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
-  }
 
   s.required_ruby_version     = '>= 2.5.0'
   s.required_rubygems_version = '>= 1.8.23'
 
+  s.author      = 'Sean Schofield'
+  s.email       = 'sean@spreecommerce.com'
+  s.homepage    = 'http://spreecommerce.org'
+  s.license     = 'BSD-3-Clause'
+
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
   s.require_path = 'lib'
 
@@ -34,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'ffaker', '~> 2.9'
   s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.4.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
-  s.add_dependency 'kaminari', '~> 1.2.1'
+  s.add_dependency 'kaminari', '>= 1.0.1', '< 1.2.0'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
@@ -45,10 +39,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'
   s.add_dependency 'stringex'
-  s.add_dependency 'twitter_cldr', '~> 4.3'
+  s.add_dependency 'twitter_cldr', '>= 4.3', '< 6.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '~> 4.9.4'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
   s.add_dependency 'image_processing', '~> 1.2'
 
   s.add_development_dependency 'email_spec', '~> 2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.1.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -144,16 +144,22 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -298,16 +304,22 @@ dependencies:
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -340,16 +352,22 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.9.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.11.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -394,7 +412,6 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
-- app/finders/spree/addresses/find.rb
 - app/finders/spree/countries/find.rb
 - app/finders/spree/credit_cards/find.rb
 - app/finders/spree/line_items/find_by_variant.rb
@@ -402,6 +419,8 @@ files:
 - app/finders/spree/orders/find_current.rb
 - app/finders/spree/products/find.rb
 - app/finders/spree/taxons/find.rb
+- app/finders/spree/variants/option_types_finder.rb
+- app/finders/spree/variants/visible_finder.rb
 - app/helpers/spree/base_helper.rb
 - app/helpers/spree/products_helper.rb
 - app/mailers/spree/base_mailer.rb
@@ -601,9 +620,10 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/paginators/spree/shared/paginate.rb
-- app/services/spree/account/addresses/base.rb
-- app/services/spree/account/addresses/create.rb
-- app/services/spree/account/addresses/update.rb
+- app/presenters/spree/product_summary_presenter.rb
+- app/presenters/spree/variant_presenter.rb
+- app/presenters/spree/variants/option_types_presenter.rb
+- app/presenters/spree/variants/options_presenter.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/create.rb
 - app/services/spree/cart/estimate_shipping_rates.rb
@@ -922,6 +942,9 @@ files:
 - db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb
 - db/migrate/20190305121659_add_iso_and_iso3_validation_on_presence_and_uniqueness.rb
 - db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
+- db/migrate/20191005121504_add_store_id_to_payment_methods.rb
+- db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
+- db/migrate/20200102141311_add_social_to_spree_stores.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -929,6 +952,7 @@ files:
 - lib/generators/spree/custom_user/templates/initializer.rb.tt
 - lib/generators/spree/custom_user/templates/migration.rb.tt
 - lib/generators/spree/dummy/dummy_generator.rb
+- lib/generators/spree/dummy/templates/initializers/bullet.rb
 - lib/generators/spree/dummy/templates/initializers/devise.rb
 - lib/generators/spree/dummy/templates/rails/application.rb
 - lib/generators/spree/dummy/templates/rails/boot.rb
@@ -941,6 +965,8 @@ files:
 - lib/generators/spree/dummy_model/templates/model.rb.tt
 - lib/generators/spree/install/install_generator.rb
 - lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/generators/spree/install/templates/config/initializers/spree_storefront.rb
+- lib/generators/spree/install/templates/config/spree_storefront.yml
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js
 - lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
@@ -969,7 +995,6 @@ files:
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_generator.rb
 - lib/spree/core/version.rb
-- lib/spree/database_type_utilities.rb
 - lib/spree/dependencies_helper.rb
 - lib/spree/i18n.rb
 - lib/spree/i18n/base.rb
@@ -1061,12 +1086,8 @@ files:
 homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
-metadata:
-  bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.0.7
-  documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.0.7
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1081,8 +1102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.
 test_files: []

data/app/finders/spree/addresses/find.rb

@@ -1,17 +0,0 @@
-module Spree
-  module Addresses
-    class Find
-      def initialize(scope:, params:)
-        @scope = scope
-      end
-
-      def execute
-        scope
-      end
-
-      private
-
-      attr_reader :scope
-    end
-  end
-end

data/app/services/spree/account/addresses/base.rb

@@ -1,39 +0,0 @@
-module Spree
-  module Account
-    module Addresses
-      class Base
-        prepend Spree::ServiceModule::Base
-
-        private
-
-        attr_accessor :country
-
-        def fill_country_and_state_ids(params)
-          replace_country_iso_with_id(params)
-          fill_state_id(params)
-        end
-
-        def replace_country_iso_with_id(params)
-          iso = params[:country_iso]
-          return params unless iso.present?
-
-          country = Spree::Country.by_iso(iso)
-          params[:country_id] = country&.id
-          params.delete(:country_iso)
-          params
-        end
-
-        def fill_state_id(params)
-          state_name = params[:state_name]
-          return params unless state_name.present?
-
-          country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
-          return params unless country
-
-          params[:state_id] = country.states.find_by(name: state_name)&.id
-          params
-        end
-      end
-    end
-  end
-end

data/app/services/spree/account/addresses/create.rb

@@ -1,18 +0,0 @@
-module Spree
-  module Account
-    module Addresses
-      class Create < ::Spree::Account::Addresses::Base
-        def call(user:, address_params:)
-          fill_country_and_state_ids(address_params)
-
-          address = user.addresses.new(address_params)
-          if address.save
-            success(address)
-          else
-            failure(address)
-          end
-        end
-      end
-    end
-  end
-end

data/app/services/spree/account/addresses/update.rb

@@ -1,18 +0,0 @@
-module Spree
-  module Account
-    module Addresses
-      class Update < ::Spree::Account::Addresses::Base
-        def call(address:, address_params:)
-          address_params[:country_id] ||= address.country_id
-          fill_country_and_state_ids(address_params)
-
-          if address.update(address_params)
-            success(address)
-          else
-            failure(address)
-          end
-        end
-      end
-    end
-  end
-end