solidus_core 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a431556798d4e71cf6ddd2705c1e9771a945218
-  data.tar.gz: a573024f06b38e92edb6e2ae89d3893a2259d690
+  metadata.gz: 28837b199c6bd4e7ce50f563024c4bba87df8ba2
+  data.tar.gz: 5ef299ef80511e203b2fe84419aa13fa6d7b255b
 SHA512:
-  metadata.gz: 81ca409e7263d31ea26aa9aac0c5952bd71d261da44dc0af933bd3257865323f00e528548e1ec9a4957c5fb47aadfd80f498b80a9ca37fdd32810c8cd3d6c9fb
-  data.tar.gz: 9ebb33484c741e1cd4631d05d0ed5569ab0c340e9672cb8b66d028379ff7a75eb0f4916b67c9ae3f68e6aa52cd1a318b6c2e80fa80c0531d426b18b6c0a2385f
+  metadata.gz: f296ea6422bf82a2a40ae202bb156f6af769e34eae871beb95b065b94f1fea614e33f277faa7be3841089f43725a1a3fe95e11e3cd2127d20f8361829a2a76a0
+  data.tar.gz: 87111e8518daa11b8290566aa98fe8ed1af95dc29ddd4b34074c76d4bb2f6d1203989a1f71e464b27b8faec661fe647f52823cc644b7dc43676f891bc218f6ca

data/app/models/spree/zone.rb

@@ -16,16 +16,18 @@ module Spree
     after_save :remove_previous_default
 
     scope :with_member_ids, ->(state_ids, country_ids) do
-      return none if !state_ids.present? && !country_ids.present?
-
-      spree_zone_members_table = Spree::ZoneMember.arel_table
-      matching_state =
-        spree_zone_members_table[:zoneable_type].eq("Spree::State").
-        and(spree_zone_members_table[:zoneable_id].in(state_ids))
-      matching_country =
-        spree_zone_members_table[:zoneable_type].eq("Spree::Country").
-        and(spree_zone_members_table[:zoneable_id].in(country_ids))
-      joins(:zone_members).where(matching_state.or(matching_country)).distinct
+      if !state_ids.present? && !country_ids.present?
+        none
+      else
+        spree_zone_members_table = Spree::ZoneMember.arel_table
+        matching_state =
+          spree_zone_members_table[:zoneable_type].eq("Spree::State").
+          and(spree_zone_members_table[:zoneable_id].in(state_ids))
+        matching_country =
+          spree_zone_members_table[:zoneable_type].eq("Spree::Country").
+          and(spree_zone_members_table[:zoneable_id].in(country_ids))
+        joins(:zone_members).where(matching_state.or(matching_country)).distinct
+      end
     end
 
     scope :for_address, ->(address) do

data/lib/spree/core/version.rb

@@ -5,7 +5,7 @@ module Spree
   end
 
   def self.solidus_version
-    "2.0.0"
+    "2.0.1"
   end
 
   def self.solidus_gem_version

data/lib/spree/testing_support/common_rake.rb

@@ -17,7 +17,8 @@ namespace :common do
 
     puts "Setting up dummy database..."
 
-    sh "bundle exec rake db:migrate VERBOSE=false"
+    sh "bin/rails db:environment:set RAILS_ENV=test"
+    sh "bin/rails db:drop db:create db:migrate VERBOSE=false RAILS_ENV=test"
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1409,7 +1409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.