solidus_core 2.0.3 → 2.1.0.beta1

data/db/migrate/20120831092320_spree_one_two.rb

@@ -413,13 +413,6 @@ class SpreeOneTwo < ActiveRecord::Migration[4.2]
 
     add_index :spree_tokenized_permissions, [:permissable_id, :permissable_type], name: 'index_tokenized_name_and_type'
 
-    create_table :spree_trackers do |t|
-      t.string     :environment
-      t.string     :analytics_id
-      t.boolean    :active, default: true
-      t.timestamps null: true
-    end
-
     create_table :spree_users do |t|
       t.string     :encrypted_password,     limit: 128
       t.string     :password_salt,          limit: 128

data/db/migrate/20150723224133_remove_unnecessary_indexes.rb

@@ -28,7 +28,6 @@ class RemoveUnnecessaryIndexes < ActiveRecord::Migration[4.2]
     safe_remove_index :spree_tax_categories, :deleted_at
     safe_remove_index :spree_tax_rates, :show_rate_in_label
     safe_remove_index :spree_tax_rates, :included_in_price
-    safe_remove_index :spree_trackers, :active
     safe_remove_index :spree_variants, :is_master
     safe_remove_index :spree_variants, :deleted_at
     safe_remove_index :spree_zones, :default_tax
@@ -56,7 +55,6 @@ class RemoveUnnecessaryIndexes < ActiveRecord::Migration[4.2]
     safe_add_index :spree_tax_categories, :deleted_at
     safe_add_index :spree_tax_rates, :show_rate_in_label
     safe_add_index :spree_tax_rates, :included_in_price
-    safe_add_index :spree_trackers, :active
     safe_add_index :spree_variants, :is_master
     safe_add_index :spree_variants, :deleted_at
     safe_add_index :spree_zones, :default_tax

data/db/migrate/20160924135758_remove_is_default_from_prices.rb

@@ -0,0 +1,5 @@
+class RemoveIsDefaultFromPrices < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :spree_prices, :is_default, :boolean, default: true
+  end
+end

data/db/migrate/20161009141333_remove_currency_from_line_items.rb

@@ -0,0 +1,5 @@
+class RemoveCurrencyFromLineItems < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :spree_line_items, :currency, :string
+  end
+end

data/db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb

@@ -0,0 +1,28 @@
+class AddAvailableToColumnsAndRemoveDisplayOnFromPaymentMethods < ActiveRecord::Migration[5.0]
+  def up
+    add_column(:spree_payment_methods, :available_to_users, :boolean, default: true)
+    add_column(:spree_payment_methods, :available_to_admin, :boolean, default: true)
+    execute("UPDATE spree_payment_methods "\
+             "SET available_to_users=#{quoted_false} "\
+             "WHERE NOT (display_on='front_end' OR display_on='' OR display_on IS NULL)")
+    execute("UPDATE spree_payment_methods "\
+             "SET available_to_admin=#{quoted_false} "\
+             "WHERE NOT (display_on='back_end' OR display_on='' OR display_on IS NULL)")
+    remove_column(:spree_payment_methods, :display_on)
+  end
+
+  def down
+    add_column(:spree_payment_methods, :display_on, :string)
+    execute("UPDATE spree_payment_methods "\
+            "SET display_on='' "\
+            "WHERE (available_to_users=#{quoted_true} AND available_to_admin=#{quoted_true})")
+    execute("UPDATE spree_payment_methods "\
+            "SET display_on='front_end' "\
+            "WHERE (available_to_users=#{quoted_true} AND NOT available_to_admin=#{quoted_true})")
+    execute("UPDATE spree_payment_methods "\
+            "SET display_on='back_end' "\
+            "WHERE (available_to_admin=#{quoted_true} AND NOT available_to_users=#{quoted_true})")
+    remove_column(:spree_payment_methods, :available_to_users)
+    remove_column(:spree_payment_methods, :available_to_admin)
+  end
+end

data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb

@@ -0,0 +1,20 @@
+class AddAvailableToUsersAndRemoveDisplayOnFromShippingMethods < ActiveRecord::Migration[5.0]
+  def up
+    add_column(:spree_shipping_methods, :available_to_users, :boolean, default: true)
+    execute("UPDATE spree_shipping_methods "\
+             "SET available_to_users=#{quoted_false} "\
+             "WHERE display_on='back_end'")
+    remove_column(:spree_shipping_methods, :display_on)
+  end
+
+  def down
+    add_column(:spree_shipping_methods, :display_on, :string)
+    execute("UPDATE spree_shipping_methods "\
+            "SET display_on='both' "\
+            "WHERE (available_to_users=#{quoted_true}")
+    execute("UPDATE spree_shipping_methods "\
+            "SET display_on='back_end' "\
+            "WHERE (available_to_users=#{quoted_false})")
+    remove_column(:spree_shipping_methods, :available_to_users)
+  end
+end

data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt

@@ -1,3 +1,7 @@
+# This file was originally generated by the spree:custom_user generator
+# in solidus <%= Spree.solidus_version %>. You can customize the helper method
+# implementations for your custom auth solution.
+
 module Spree
   module CurrentUserHelpers
     def self.included(receiver)

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -30,7 +30,6 @@ module Spree
       opts[:database] = 'sqlite3' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
-      opts[:old_style_hash] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,
@@ -47,7 +46,6 @@ module Spree
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
       template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", force: true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", force: true
-      template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", force: true
 
       # FIXME: We aren't ready for rails 5 defaults
       remove_file "#{dummy_path}/config/initializers/new_framework_defaults.rb"

data/lib/spree/core.rb

@@ -77,7 +77,6 @@ require 'spree/localized_number'
 require 'spree/money'
 require 'spree/permitted_attributes'
 
-require 'spree/core/delegate_belongs_to'
 require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
@@ -97,8 +96,4 @@ require 'spree/core/stock_configuration'
 require 'spree/permission_sets'
 require 'spree/deprecation'
 
-require 'spree/mailer_previews/order_preview'
-require 'spree/mailer_previews/carton_preview'
-require 'spree/mailer_previews/reimbursement_preview'
-
 require 'spree/core/price_migrator'

data/lib/spree/core/controller_helpers/pricing.rb

@@ -13,7 +13,8 @@ module Spree
 
         def current_pricing_options
           Spree::Config.pricing_options_class.new(
-            currency: current_store.try!(:default_currency).presence || Spree::Config[:currency]
+            currency: current_store.try!(:default_currency).presence || Spree::Config[:currency],
+            country_iso: current_store.try!(:cart_tax_country_iso).presence
           )
         end
 

data/lib/spree/core/engine.rb

@@ -95,6 +95,7 @@ module Spree
           Spree::Promotion::Rules::NthOrder
           Spree::Promotion::Rules::OptionValue
           Spree::Promotion::Rules::FirstRepeatPurchaseSince
+          Spree::Promotion::Rules::UserRole
         ]
       end
 
@@ -119,6 +120,19 @@ module Spree
       initializer "spree.core.checking_migrations", before: :load_config_initializers do |_app|
         Migrations.new(config, engine_name).check
       end
+
+      # Load in mailer previews for apps to use in development.
+      # We need to make sure we call `Preview.all` before requiring our
+      # previews, otherwise any previews the app attempts to add need to be
+      # manually required.
+      if Rails.env.development?
+        initializer "spree.mailer_previews" do
+          ActionMailer::Preview.all
+          Dir[root.join("lib/spree/mailer_previews/**/*_preview.rb")].each do |file|
+            require_dependency file
+          end
+        end
+      end
     end
   end
 end

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "2.0.3"
+    "2.1.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/deprecation.rb

@@ -1,3 +1,3 @@
 module Spree
-  Deprecation = ActiveSupport::Deprecation.new('2.1', 'Solidus')
+  Deprecation = ActiveSupport::Deprecation.new('3.0', 'Solidus')
 end

data/lib/spree/localized_number.rb

@@ -16,9 +16,10 @@ module Spree
       non_number_characters = /[^0-9\-#{separator}]/
 
       # strip everything else first
-      number.gsub!(non_number_characters, '')
+      number = number.gsub(non_number_characters, '')
+
       # then replace the locale-specific decimal separator with the standard separator if necessary
-      number.gsub!(separator, '.') unless separator == '.'
+      number = number.gsub(separator, '.') unless separator == '.'
 
       number.to_d
     end

data/lib/spree/permission_sets/configuration_display.rb

@@ -14,7 +14,6 @@ module Spree
           can [:display, :admin], Spree::ShippingCategory
           can [:display, :admin], Spree::StockLocation
           can [:display, :admin], Spree::StockMovement
-          can [:display, :admin], Spree::Tracker
           can [:display, :admin], Spree::RefundReason
           can [:display, :admin], Spree::ReimbursementType
           can [:display, :admin], Spree::ReturnReason

data/lib/spree/permission_sets/configuration_management.rb

@@ -14,7 +14,6 @@ module Spree
         can :manage, Spree::ShippingCategory
         can :manage, Spree::StockLocation
         can :manage, Spree::StockMovement
-        can :manage, Spree::Tracker
         can :manage, Spree::RefundReason
         can :manage, Spree::ReimbursementType
         can :manage, Spree::ReturnReason

data/lib/spree/permission_sets/product_display.rb

@@ -9,7 +9,6 @@ module Spree
         can [:display, :admin], Spree::ProductProperty
         can [:display, :admin], Spree::OptionType
         can [:display, :admin], Spree::Property
-        can [:display, :admin], Spree::Prototype
         can [:display, :admin], Spree::Taxonomy
         can [:display, :admin], Spree::Taxon
       end

data/lib/spree/permission_sets/product_management.rb

@@ -9,7 +9,6 @@ module Spree
         can :manage, Spree::ProductProperty
         can :manage, Spree::OptionType
         can :manage, Spree::Property
-        can :manage, Spree::Prototype
         can :manage, Spree::Taxonomy
         can :manage, Spree::Taxon
         can :manage, Spree::Classification

data/lib/spree/permission_sets/user_management.rb

@@ -4,10 +4,8 @@ module Spree
       def activate!
         can [:admin, :display, :create, :update, :save_in_address_book, :remove_from_address_book, :addresses, :orders, :items], Spree.user_class
 
-        # due to how cancancan filters by associations,
-        # we have to define this twice, once for `accessible_by`
-        can :update_email, Spree.user_class, spree_roles: { id: nil }
-        # and once for `can?`
+        # Note: This does not work with accessible_by.
+        # See https://github.com/solidusio/solidus/pull/1263
         can :update_email, Spree.user_class do |user|
           user.spree_roles.none?
         end

data/lib/spree/permitted_attributes.rb

@@ -70,7 +70,7 @@ module Spree
 
     @@product_attributes = [
       :name, :description, :available_on, :permalink, :meta_description,
-      :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
+      :meta_keywords, :price, :sku, :deleted_at,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
       :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
@@ -102,7 +102,8 @@ module Spree
       :quantity, :stock_item, :stock_item_id, :originator, :action]
 
     @@store_attributes = [:name, :url, :seo_title, :meta_keywords,
-                          :meta_description, :default_currency, :mail_from_address]
+                          :meta_description, :default_currency,
+                          :mail_from_address, :cart_tax_country_iso]
 
     @@taxonomy_attributes = [:name]
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -107,18 +107,6 @@ module CapybaraExt
       raise "AJAX request took longer than 5 seconds." if counter >= 50
     end
   end
-
-  def accept_alert
-    page.evaluate_script('window.confirm = function() { return true; }')
-    yield
-  end
-
-  def dismiss_alert
-    page.evaluate_script('window.confirm = function() { return false; }')
-    yield
-    # Restore existing default
-    page.evaluate_script('window.confirm = function() { return true; }')
-  end
 end
 
 RSpec::Matchers.define :have_meta do |name, expected|

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

@@ -11,7 +11,7 @@ FactoryGirl.define do
     end
 
     firstname 'John'
-    lastname 'Doe'
+    lastname nil
     company 'Company'
     address1 '10 Lovely Street'
     address2 'Northwest'

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

@@ -12,6 +12,5 @@ FactoryGirl.define do
     variant do
       (product || create(:product)).master
     end
-    currency { order.currency }
   end
 end

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

@@ -27,6 +27,10 @@ FactoryGirl.define do
 
       refunds { build_list :refund, 1, amount: refund_amount }
     end
+
+    initialize_with do
+      order.payments.new(attributes)
+    end
   end
 
   factory :check_payment, class: Spree::Payment do

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

@@ -1,23 +1,30 @@
 FactoryGirl.define do
   factory :payment_method, aliases: [:credit_card_payment_method], class: Spree::Gateway::Bogus do
     name 'Credit Card'
+    available_to_admin true
+    available_to_users true
   end
 
   factory :check_payment_method, class: Spree::PaymentMethod::Check do
     name 'Check'
+    available_to_admin true
+    available_to_users true
   end
 
   # authorize.net was moved to spree_gateway.
   # Leaving this factory in place with bogus in case anyone is using it.
   factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do
     name 'Credit Card'
+    available_to_admin true
+    available_to_users true
   end
 
   factory :store_credit_payment_method, class: Spree::PaymentMethod::StoreCredit do
     name          "Store Credit"
     description   "Store Credit"
     active        true
-    display_on    'none'
+    available_to_admin false
+    available_to_users false
     auto_capture  true
   end
 end

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

@@ -9,9 +9,9 @@ FactoryGirl.define do
 
   factory :user, class: Spree.user_class do
     email { generate(:random_email) }
-    login { email }
+    login { email } if Spree.user_class.attribute_method? :login
     password 'secret'
-    password_confirmation { password }
+    password_confirmation { password } if Spree.user_class.attribute_method? :password_confirmation
     authentication_token { generate(:user_authentication_token) } if Spree.user_class.attribute_method? :authentication_token
 
     trait :with_api_key do

data/solidus_core.gemspec

@@ -12,12 +12,13 @@ Gem::Specification.new do |s|
   s.author      = 'Solidus Team'
   s.email       = 'contact@solidus.io'
   s.homepage    = 'http://solidus.io'
-  s.license     = 'BSD-3'
+  s.license     = 'BSD-3-Clause'
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version     = '>= 2.2.2'
+  s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'activemerchant', '~> 1.48'
   s.add_dependency 'acts_as_list', '~> 0.3'
@@ -26,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'cancancan', '~> 1.10'
   s.add_dependency 'ffaker', '~> 2.0'
   s.add_dependency 'friendly_id', '~> 5.0'
-  s.add_dependency 'highline', '~> 1.6.18' # Necessary for the install generator
+  s.add_dependency 'highline', '~> 1.7' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 0.15', '>= 0.15.1'
   s.add_dependency 'monetize', '~> 1.1'
   s.add_dependency 'paperclip', '~> 4.2'

data/spec/helpers/base_helper_spec.rb

@@ -50,26 +50,6 @@ describe Spree::BaseHelper, type: :helper do
     end
   end
 
-  # Regression test for https://github.com/spree/spree/issues/1436
-  context "defining custom image helpers" do
-    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
-    before do
-      Spree::Image.class_eval do
-        attachment_definitions[:attachment][:styles][:very_strange] = '1x1'
-      end
-    end
-
-    it "should not raise errors when style exists" do
-      Spree::Deprecation.silence do
-        very_strange_image(product)
-      end
-    end
-
-    it "should raise NoMethodError when style is not exists" do
-      expect { another_strange_image(product) }.to raise_error(NoMethodError)
-    end
-  end
-
   # Regression test for https://github.com/spree/spree/issues/2034
   context "flash_message" do
     let(:flash) { { "notice" => "ok", "foo" => "foo", "bar" => "bar" } }
@@ -142,26 +122,6 @@ describe Spree::BaseHelper, type: :helper do
     end
   end
 
-  # Regression test for https://github.com/spree/spree/issues/5384
-  context "custom image helpers conflict with inproper statements" do
-    let(:product) { mock_model(Spree::Product, images: [], variant_images: []) }
-    before do
-      Spree::Image.class_eval do
-        attachment_definitions[:attachment][:styles][:foobar] = '1x1'
-      end
-    end
-
-    it "should not raise errors when helper method called" do
-      Spree::Deprecation.silence do
-        foobar_image(product)
-      end
-    end
-
-    it "should raise NoMethodError when statement with name equal to style name called" do
-      expect { foobar(product) }.to raise_error(NoMethodError)
-    end
-  end
-
   context "pretty_time" do
     it "prints in a format" do
       expect(pretty_time(DateTime.new(2012, 5, 6, 13, 33))).to eq "May 06, 2012  1:33 PM"