spree_core 2.1.11 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1886c1d9bce1f40f23efbb1a7f18530c9e56cbd6
-  data.tar.gz: 549cec9fec5776a637f495c9786b5d6e2ba26eb4
+  metadata.gz: 413409a6e11793b4c41aac79f57541c2b4b6c8b4
+  data.tar.gz: 61e14410d4987119dd34a5694b97acefb0578cb3
 SHA512:
-  metadata.gz: db93efd09b801fb7b788bc1802a9690d9d8c1f743f3b65323e0af85f73c89d07872a8bf93cc509f6018474374b6c13a14ac2ffdb9e37a5dacfcb71dc54700c3c
-  data.tar.gz: eaee07e9bf0ff69fd338b229f9a223ca63ebb23c6fe2b6dc6fc1bbee3de41851eaa3def0761f904d00e7ebdeaff300ea4bd26f8e944b246b7c5b313a85860ae2
+  metadata.gz: 2c6a19efdbfd4a44dde5cf6a42532c2c59e95fe94e6700aaf6816b47312a46ee1987376cb13646701ba0c8b0195c842abf8cc129e40cb23faf63b71372a52294
+  data.tar.gz: a69ffad30b460d6e910f825c0b60e346030a0c120d361bdbebd27ff324eb9783e34d243cca4d7a8ac4c80aca0ed031bfc5639f3a08fd608529e4ad6752f6b0cd

data/app/models/spree/credit_card.rb

@@ -129,8 +129,8 @@ module Spree
         if month.to_i < 1 || month.to_i > 12
           errors.add(:base, :expiry_invalid)
         else
-          time = Time.zone.parse("#{year}-#{month}-1")
-          if time < Time.zone.now.to_time.beginning_of_month
+          current = Time.current
+          if year.to_i < current.year or (year.to_i == current.year and month.to_i < current.month)
             errors.add(:base, :card_expired)
           end
         end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.1.11"
+    "2.1.12"
   end
 end

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

@@ -7,7 +7,7 @@ FactoryGirl.define do
   factory :credit_card, class: TestCard do
     verification_value 123
     month 12
-    year { Time.now.year }
+    year { 1.year.from_now.year }
     number '4111111111111111'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.11
+  version: 2.1.12
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant