solidus_core 2.5.2 → 2.6.0.rc1

data/spec/models/spree/variant/vat_price_generator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
 RSpec.describe Spree::Variant::VatPriceGenerator do

data/spec/models/spree/variant_property_rule_condition_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::VariantPropertyRuleCondition, type: :model do

data/spec/models/spree/variant_property_rule_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::VariantPropertyRule, type: :model do

data/spec/models/spree/variant_property_rule_value_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::VariantPropertyRuleValue, type: :model do

data/spec/models/spree/variant_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'rails_helper'
 
@@ -792,7 +792,7 @@ RSpec.describe Spree::Variant, type: :model do
     subject { variant.display_image }
 
     context "variant has associated images" do
-      let(:attachment) { File.open(File.expand_path('../../../fixtures/thinking-cat.jpg', __FILE__)) }
+      let(:attachment) { File.open(File.expand_path('../../fixtures/thinking-cat.jpg', __dir__)) }
       let(:image_params) { { viewable_id: variant.id, viewable_type: 'Spree::Variant', attachment: attachment, alt: "position 1", position: 1 } }
       let!(:first_image) { Spree::Image.create(image_params) }
       let!(:second_image) { image_params.merge(alt: "position 2", position: 2) }

data/spec/models/spree/wallet_payment_source_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::WalletPaymentSource, type: :model do

data/spec/models/spree/wallet_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Wallet, type: :model do

data/spec/models/spree/zone_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Spree::Zone, type: :model do

data/spec/rails_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 ENV["RAILS_ENV"] ||= 'test'
 
 require 'spree/testing_support/dummy_app'
 DummyApp.setup(
-  gem_root: File.expand_path('../../', __FILE__),
+  gem_root: File.expand_path('..', __dir__),
   lib_name: 'solidus_core'
 )
 
@@ -21,7 +23,7 @@ require 'cancan/matchers'
 ActiveJob::Base.queue_adapter = :test
 
 RSpec.configure do |config|
-  config.fixture_path = File.join(File.expand_path(File.dirname(__FILE__)), "fixtures")
+  config.fixture_path = File.join(__dir__, "fixtures")
 
   config.infer_spec_type_from_file_location!
 

data/spec/shared_examples/calculator_shared_examples.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples_for 'a calculator with a description' do
   describe ".description" do
     subject { described_class.description }

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start('rails')

data/spec/support/big_decimal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BigDecimal
   def inspect
     "#<BigDecimal: #{self}>"

data/spec/support/concerns/default_price.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples_for "default_price" do
   let(:model)        { described_class }
   subject(:instance) { FactoryBot.build(model.name.demodulize.downcase.to_sym) }

data/spec/support/concerns/payment_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples "a payment source" do
   subject(:payment_source) { described_class.new }
 

data/spec/support/concerns/working_factories.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.shared_examples_for 'a working factory' do
   it "builds successfully" do
     expect(build(factory)).to be_a(factory_class)

data/spec/support/dummy_ability.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cancan'
 
 class DummyAbility

data/spec/support/shared_contexts/rake.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Rake task spec setup.
 #

metadata

@@ -1,127 +1,175 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.3.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.3.x
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +218,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: cancancan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: carmen
   requirement: !ruby/object:Gem::Requirement
@@ -185,19 +247,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: cancancan
+  name: discard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -302,26 +364,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: discard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Essential models, mailers, and classes for the Solidus e-commerce project.
 email: contact@solidus.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - LICENSE
 - README.md
 - Rakefile
@@ -448,6 +497,7 @@ files:
 - app/models/spree/promotion/rules/one_use_per_user.rb
 - app/models/spree/promotion/rules/option_value.rb
 - app/models/spree/promotion/rules/product.rb
+- app/models/spree/promotion/rules/store.rb
 - app/models/spree/promotion/rules/taxon.rb
 - app/models/spree/promotion/rules/user.rb
 - app/models/spree/promotion/rules/user_logged_in.rb
@@ -465,6 +515,7 @@ files:
 - app/models/spree/promotion_handler/shipping.rb
 - app/models/spree/promotion_rule.rb
 - app/models/spree/promotion_rule_role.rb
+- app/models/spree/promotion_rule_store.rb
 - app/models/spree/promotion_rule_taxon.rb
 - app/models/spree/promotion_rule_user.rb
 - app/models/spree/property.rb
@@ -539,6 +590,7 @@ files:
 - app/models/spree/store_payment_method.rb
 - app/models/spree/store_selector/by_server_name.rb
 - app/models/spree/store_selector/legacy.rb
+- app/models/spree/store_shipping_method.rb
 - app/models/spree/tax/item_tax.rb
 - app/models/spree/tax/order_adjuster.rb
 - app/models/spree/tax/order_tax.rb
@@ -619,19 +671,24 @@ files:
 - db/migrate/20170522143442_add_time_range_to_tax_rate.rb
 - db/migrate/20170608074534_rename_bogus_gateways.rb
 - db/migrate/20170831201542_remove_default_tax_from_spree_zones.rb
+- db/migrate/20180202190713_create_promotion_rule_stores.rb
+- db/migrate/20180202222641_create_store_shipping_methods.rb
+- db/migrate/20180313220213_add_available_locales_to_stores.rb
+- db/migrate/20180322142651_add_amount_remaining_to_store_credit_events.rb
+- db/migrate/20180328172631_add_join_characters_to_promotion_code_batch.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/migration.rb.tt
 - lib/generators/spree/dummy/dummy_generator.rb
-- lib/generators/spree/dummy/templates/rails/application.rb
+- lib/generators/spree/dummy/templates/rails/application.rb.tt
 - lib/generators/spree/dummy/templates/rails/boot.rb
 - lib/generators/spree/dummy/templates/rails/database.yml
 - lib/generators/spree/dummy/templates/rails/routes.rb
 - lib/generators/spree/dummy/templates/rails/script/rails
 - lib/generators/spree/dummy/templates/rails/test.rb
 - lib/generators/spree/install/install_generator.rb
-- lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/generators/spree/install/templates/config/initializers/spree.rb.tt
 - 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
@@ -722,6 +779,7 @@ files:
 - lib/spree/testing_support/dummy_app/database.yml
 - lib/spree/testing_support/dummy_app/migrations.rb
 - lib/spree/testing_support/dummy_app/rake_tasks.rb
+- lib/spree/testing_support/dummy_app/routes.rb
 - lib/spree/testing_support/dummy_app/views/layouts/application.html.erb
 - lib/spree/testing_support/extension_rake.rb
 - lib/spree/testing_support/factories.rb
@@ -1012,6 +1070,7 @@ files:
 - spec/models/spree/promotion/rules/one_use_per_user_spec.rb
 - spec/models/spree/promotion/rules/option_value_spec.rb
 - spec/models/spree/promotion/rules/product_spec.rb
+- spec/models/spree/promotion/rules/store_spec.rb
 - spec/models/spree/promotion/rules/taxon_spec.rb
 - spec/models/spree/promotion/rules/user_logged_in_spec.rb
 - spec/models/spree/promotion/rules/user_role_spec.rb
@@ -1135,7 +1194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.