spree_core 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d2afeeba8bb057bcc78631c40187c1a5e77670
-  data.tar.gz: 80cbb5297dc213e88e6e6a77d159a1ef6c5bea9a
+  metadata.gz: f10756db13ed5d6d5984d269af218f2ccc7f7d4a
+  data.tar.gz: 85728381ad5af005d31a82260b10f11d15c6a9e6
 SHA512:
-  metadata.gz: 062f9429e4900f53a5f5925a29188ecdd56a63820f84fdbe43454a83393011c8e144b7e6349732a21cef8cf6fc02de2a94a7dc5b52eef0ddc78fb20aa4653404
-  data.tar.gz: ace59dff074f95170b53c700edf77f15313e9b52eb42666f656fe0acdc99dff915b79f4330df4e6783326de0fce2d71def5e1bd2df26b4923cbf7c841b5930ec
+  metadata.gz: 2797ef84ec18533481db667260412257ff2263ac6dcca19c404e3fd6eac1f9e345ad71bd61457eab3b1992a74074203681ea94b924133bd9ff0778976ffb99c4
+  data.tar.gz: 2142a9ccd940c194ce71c6bc4ed9be2352f406a7e9b8022985e8d8ae1c0c9030024c43dde98b34dda5c546b5ddddd7710f041b6b9672478e4f4fdfff32caf4f1

data/app/models/spree/ability.rb

@@ -60,7 +60,7 @@ module Spree
       end
 
       # Include any abilities registered by extensions, etc.
-      Ability.abilities.each do |clazz|
+      Ability.abilities.merge(abilities_to_register).each do |clazz|
         ability = clazz.send(:new, user)
         @rules = rules + ability.send(:rules)
       end
@@ -68,5 +68,13 @@ module Spree
       # Protect admin role
       cannot [:update, :destroy], Role, name: ['admin']
     end
+
+    private
+
+    # you can override this method to register your abilities
+    # this method has to return array of classes
+    def abilities_to_register
+      []
+    end
   end
 end

data/app/models/spree/credit_card.rb

@@ -38,12 +38,18 @@ module Spree
     attr_accessor :track_data
 
     CARD_TYPES = {
-      visa: /^4[0-9]{12}(?:[0-9]{3})?$/,
-      master: /(^5[1-5][0-9]{14}$)|(^6759[0-9]{2}([0-9]{10})$)|(^6759[0-9]{2}([0-9]{12})$)|(^6759[0-9]{2}([0-9]{13})$)/,
-      diners_club: /^3(?:0[0-5]|[68][0-9])[0-9]{11}$/,
-      american_express: /^3[47][0-9]{13}$/,
-      discover: /^6(?:011|5[0-9]{2})[0-9]{12}$/,
-      jcb: /^(?:2131|1800|35\d{3})\d{11}$/
+      visa: /^4\d{12}(\d{3})?(\d{3})?$/,
+      master: /^(5[1-5]\d{4}|677189|222[1-9]\d{2}|22[3-9]\d{3}|2[3-6]\d{4}|27[01]\d{3}|2720\d{2})\d{10}$/,
+      discover: /^(6011|65\d{2}|64[4-9]\d)\d{12}|(62\d{14})$/,
+      american_express: /^3[47]\d{13}$/,
+      diners_club: /^3(0[0-5]|[68]\d)\d{11}$/,
+      jcb: /^35(28|29|[3-8]\d)\d{12}$/,
+      switch: /^6759\d{12}(\d{2,3})?$/,
+      solo: /^6767\d{12}(\d{2,3})?$/,
+      dankort: /^5019\d{12}$/,
+      maestro: /^(5[06-8]|6\d)\d{10,17}$/,
+      forbrugsforeningen: /^600722\d{10}$/,
+      laser: /^(6304|6706|6709|6771(?!89))\d{8}(\d{4}|\d{6,7})?$/
     }
 
     def expiry=(expiry)

data/app/models/spree/gateway/bogus.rb

@@ -1,7 +1,7 @@
 module Spree
   class Gateway::Bogus < Gateway
     TEST_VISA = ['4111111111111111','4012888888881881','4222222222222']
-    TEST_MC   = ['5500000000000004','5555555555554444','5105105105105100']
+    TEST_MC   = ['5500000000000004','5555555555554444','5105105105105100','2223000010309703']
     TEST_AMEX = ['378282246310005','371449635398431','378734493671000','340000000000009']
     TEST_DISC = ['6011000000000004','6011111111111117','6011000990139424']
 

data/app/models/spree/promotion.rb

@@ -39,7 +39,9 @@ module Spree
     self.whitelisted_ransackable_attributes = ['path', 'promotion_category_id', 'code']
 
     def self.with_coupon_code(coupon_code)
-      where("lower(#{table_name}.code) = ?", coupon_code.strip.downcase).first
+      where("lower(#{table_name}.code) = ?", coupon_code.strip.downcase)
+        .includes(:promotion_actions).where.not(spree_promotion_actions: { id: nil })
+        .first
     end
 
     def self.active

data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb

@@ -0,0 +1,67 @@
+class AddMissingIndexesOnSpreeTables < ActiveRecord::Migration
+  def change
+    if table_exists?(:spree_promotion_rules_users) && !index_exists?(:spree_promotion_rules_users,
+                                                                     [:user_id, :promotion_rule_id],
+                                                                     name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id')
+      add_index :spree_promotion_rules_users,
+                [:user_id, :promotion_rule_id],
+                name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id'
+    end
+
+    if table_exists?(:spree_products_promotion_rules) && !index_exists?(:spree_products_promotion_rules,
+                                                                        [:promotion_rule_id, :product_id],
+                                                                        name: 'index_products_promotion_rules_on_promotion_rule_and_product')
+      add_index :spree_products_promotion_rules,
+                [:promotion_rule_id, :product_id],
+                name: 'index_products_promotion_rules_on_promotion_rule_and_product'
+    end
+
+    unless index_exists? :spree_orders, :canceler_id
+      add_index :spree_orders, :canceler_id
+    end
+
+    unless index_exists? :spree_orders, :store_id
+      add_index :spree_orders, :store_id
+    end
+
+    if table_exists?(:spree_orders_promotions) && !index_exists?(:spree_orders_promotions, [:promotion_id, :order_id])
+      add_index :spree_orders_promotions, [:promotion_id, :order_id]
+    end
+
+    if table_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes, :prototype_id)
+      add_index :spree_properties_prototypes, :prototype_id
+    end
+
+    if table_exists?(:spree_properties_prototypes) && !index_exists?(:spree_properties_prototypes,
+                                                                     [:prototype_id, :property_id],
+                                                                     name: 'index_properties_prototypes_on_prototype_and_property')
+      add_index :spree_properties_prototypes,
+                [:prototype_id, :property_id],
+                name: 'index_properties_prototypes_on_prototype_and_property'
+    end
+
+    if table_exists?(:spree_taxons_prototypes) && !index_exists?(:spree_taxons_prototypes, [:prototype_id, :taxon_id])
+      add_index :spree_taxons_prototypes, [:prototype_id, :taxon_id]
+    end
+
+    if table_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes, :prototype_id)
+      add_index :spree_option_types_prototypes, :prototype_id
+    end
+
+    if table_exists?(:spree_option_types_prototypes) && !index_exists?(:spree_option_types_prototypes,
+                                                                       [:prototype_id, :option_type_id],
+                                                                       name: 'index_option_types_prototypes_on_prototype_and_option_type')
+      add_index :spree_option_types_prototypes,
+                [:prototype_id, :option_type_id],
+                name: 'index_option_types_prototypes_on_prototype_and_option_type'
+    end
+
+    if table_exists?(:spree_option_values_variants) && !index_exists?(:spree_option_values_variants,
+                                                                       [:option_value_id, :variant_id],
+                                                                       name: 'index_option_values_variants_on_option_value_and_variant')
+      add_index :spree_option_values_variants,
+                [:option_value_id, :variant_id],
+                name: 'index_option_values_variants_on_option_value_and_variant'
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.1"
+    "3.1.2"
   end
 end

data/spec/models/spree/ability_spec.rb

@@ -38,6 +38,18 @@ describe Spree::Ability, :type => :model do
     end
   end
 
+  context '#abilities_to_register' do
+    it 'adds the ability to the list of abilities' do
+      allow_any_instance_of(Spree::Ability).to receive(:abilities_to_register) { [FooAbility] }
+      expect(Spree::Ability.new(user).abilities).to include FooAbility
+    end
+
+    it 'applies the registered abilities permissions' do
+      allow_any_instance_of(Spree::Ability).to receive(:abilities_to_register) { [FooAbility] }
+      expect(Spree::Ability.new(user).can?(:update, mock_model(Spree::Order, id: 1))).to be true
+    end
+  end
+
   context 'for general resource' do
     let(:resource) { Object.new }
 

data/spec/models/spree/credit_card_spec.rb

@@ -222,6 +222,10 @@ describe Spree::CreditCard, type: :model do
       credit_card.cc_type = ''
       expect(credit_card.cc_type).to eq('master')
 
+      credit_card.number = '2223000010309703'
+      credit_card.cc_type = ''
+      expect(credit_card.cc_type).to eq('master')
+
       credit_card.number = '378282246310005'
       credit_card.cc_type = ''
       expect(credit_card.cc_type).to eq('american_express')

data/spec/models/spree/promotion_spec.rb

@@ -539,11 +539,31 @@ describe Spree::Promotion, :type => :model do
   # Regression test for #4081
   describe "#with_coupon_code" do
     context "and code stored in uppercase" do
-      let!(:promotion) { create(:promotion, :code => "MY-COUPON-123") }
+      let!(:promotion) { create(:promotion, :with_order_adjustment, code: "MY-COUPON-123") }
       it "finds the code with lowercase" do
         expect(Spree::Promotion.with_coupon_code("my-coupon-123")).to eql promotion
       end
     end
+
+    context "and there are multiple coupons with the same code" do
+      context "and only one has any actions" do
+        let!(:promotion_without_actions) { create(:promotion, code: "MY-COUPON-123").actions.clear }
+        let!(:promotion) { create(:promotion, :with_order_adjustment, code: "MY-COUPON-123") }
+
+        it "then returns the one with an action" do
+          expect(Spree::Promotion.with_coupon_code("MY-COUPON-123").actions.exists?).to be
+        end
+      end
+
+      context "and all of them has actions" do
+        let!(:first_promotion) { create(:promotion, :with_order_adjustment, code: "MY-COUPON-123") }
+        let!(:second_promotion) { create(:promotion, :with_order_adjustment, code: "MY-COUPON-123") }
+
+        it "then returns the first one with an action" do
+          expect(Spree::Promotion.with_coupon_code("MY-COUPON-123").id).to eq(first_promotion.id)
+        end
+      end
+    end
   end
 
   describe '#used_by?' do

data/spec/models/spree/zone_spec.rb

@@ -62,7 +62,9 @@ describe Spree::Zone, :type => :model do
 
       context "when both zones have the same number of members" do
         it "should return the zone that was created first" do
-          expect(Spree::Zone.match(address)).to eq(country_zone)
+          Timecop.scale(100) do
+            expect(Spree::Zone.match(address)).to eq(country_zone)
+          end
         end
       end
 

data/spree_core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'
 
-  s.add_dependency 'activemerchant', '~> 1.49.0'
+  s.add_dependency 'activemerchant', '~> 1.59'
   s.add_dependency 'acts_as_list', '0.7.2'
   s.add_dependency 'awesome_nested_set', '~> 3.0.1'
   s.add_dependency 'carmen', '~> 1.0.0'
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'paperclip', '~> 4.3.0'
   s.add_dependency 'paranoia', '~> 2.1.0'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '~> 4.2.7.1'
+  s.add_dependency 'rails', '~> 4.2.5'
   s.add_dependency 'ransack', '~> 1.4.1'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.2'

data/vendor/assets/javascripts/jquery.payment.js

@@ -1,11 +1,10 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.7.1
 (function() {
-  var $, cardFromNumber, cardFromType, cards, defaultFormat, formatBackCardNumber, formatBackExpiry, formatCardNumber, formatExpiry, formatForwardExpiry, formatForwardSlash, hasTextSelected, luhnCheck, reFormatCardNumber, restrictCVC, restrictCardNumber, restrictExpiry, restrictNumeric, setCardType,
+  var $, cardFromNumber, cardFromType, cards, defaultFormat, formatBackCardNumber, formatBackExpiry, formatCardNumber, formatExpiry, formatForwardExpiry, formatForwardSlashAndSpace, hasTextSelected, luhnCheck, reFormatCVC, reFormatCardNumber, reFormatExpiry, reFormatNumeric, replaceFullWidthChars, restrictCVC, restrictCardNumber, restrictExpiry, restrictNumeric, safeVal, setCardType,
     __slice = [].slice,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
-    _this = this;
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-  $ = jQuery;
+  $ = window.jQuery || window.Zepto || window.$;
 
   $.payment = {};
 
@@ -19,80 +18,92 @@
 
   defaultFormat = /(\d{1,4})/g;
 
-  cards = [
+  $.payment.cards = cards = [
     {
       type: 'maestro',
-      pattern: /^(5018|5020|5038|6304|6759|676[1-3])/,
+      patterns: [5018, 502, 503, 506, 56, 58, 639, 6220, 67],
       format: defaultFormat,
       length: [12, 13, 14, 15, 16, 17, 18, 19],
       cvcLength: [3],
       luhn: true
     }, {
-      type: 'dinersclub',
-      pattern: /^(36|38|30[0-5])/,
+      type: 'forbrugsforeningen',
+      patterns: [600],
       format: defaultFormat,
-      length: [14],
-      cvcLength: [3],
-      luhn: true
-    }, {
-      type: 'laser',
-      pattern: /^(6706|6771|6709)/,
-      format: defaultFormat,
-      length: [16, 17, 18, 19],
+      length: [16],
       cvcLength: [3],
       luhn: true
     }, {
-      type: 'jcb',
-      pattern: /^35/,
+      type: 'dankort',
+      patterns: [5019],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
-      type: 'unionpay',
-      pattern: /^62/,
-      format: defaultFormat,
-      length: [16, 17, 18, 19],
-      cvcLength: [3],
-      luhn: false
-    }, {
-      type: 'discover',
-      pattern: /^(6011|65|64[4-9]|622)/,
+      type: 'visa',
+      patterns: [4],
       format: defaultFormat,
-      length: [16],
+      length: [13, 16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'mastercard',
-      pattern: /^5[1-5]/,
+      patterns: [51, 52, 53, 54, 55, 22, 23, 24, 25, 26, 27],
       format: defaultFormat,
       length: [16],
       cvcLength: [3],
       luhn: true
     }, {
       type: 'amex',
-      pattern: /^3[47]/,
+      patterns: [34, 37],
       format: /(\d{1,4})(\d{1,6})?(\d{1,5})?/,
       length: [15],
       cvcLength: [3, 4],
       luhn: true
     }, {
-      type: 'visa',
-      pattern: /^4/,
+      type: 'dinersclub',
+      patterns: [30, 36, 38, 39],
+      format: /(\d{1,4})(\d{1,6})?(\d{1,4})?/,
+      length: [14],
+      cvcLength: [3],
+      luhn: true
+    }, {
+      type: 'discover',
+      patterns: [60, 64, 65, 622],
       format: defaultFormat,
-      length: [13, 14, 15, 16],
+      length: [16],
+      cvcLength: [3],
+      luhn: true
+    }, {
+      type: 'unionpay',
+      patterns: [62, 88],
+      format: defaultFormat,
+      length: [16, 17, 18, 19],
+      cvcLength: [3],
+      luhn: false
+    }, {
+      type: 'jcb',
+      patterns: [35],
+      format: defaultFormat,
+      length: [16],
       cvcLength: [3],
       luhn: true
     }
   ];
 
   cardFromNumber = function(num) {
-    var card, _i, _len;
+    var card, p, pattern, _i, _j, _len, _len1, _ref;
     num = (num + '').replace(/\D/g, '');
     for (_i = 0, _len = cards.length; _i < _len; _i++) {
       card = cards[_i];
-      if (card.pattern.test(num)) {
-        return card;
+      _ref = card.patterns;
+      for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+        pattern = _ref[_j];
+        p = pattern + '';
+        if (num.substr(0, p.length) === p) {
+          return card;
+        }
       }
     }
   };
@@ -131,20 +142,82 @@
     if (($target.prop('selectionStart') != null) && $target.prop('selectionStart') !== $target.prop('selectionEnd')) {
       return true;
     }
-    if (typeof document !== "undefined" && document !== null ? (_ref = document.selection) != null ? typeof _ref.createRange === "function" ? _ref.createRange().text : void 0 : void 0 : void 0) {
-      return true;
+    if ((typeof document !== "undefined" && document !== null ? (_ref = document.selection) != null ? _ref.createRange : void 0 : void 0) != null) {
+      if (document.selection.createRange().text) {
+        return true;
+      }
     }
     return false;
   };
 
+  safeVal = function(value, $target) {
+    var currPair, cursor, digit, error, last, prevPair;
+    try {
+      cursor = $target.prop('selectionStart');
+    } catch (_error) {
+      error = _error;
+      cursor = null;
+    }
+    last = $target.val();
+    $target.val(value);
+    if (cursor !== null && $target.is(":focus")) {
+      if (cursor === last.length) {
+        cursor = value.length;
+      }
+      if (last !== value) {
+        prevPair = last.slice(cursor - 1, +cursor + 1 || 9e9);
+        currPair = value.slice(cursor - 1, +cursor + 1 || 9e9);
+        digit = value[cursor];
+        if (/\d/.test(digit) && prevPair === ("" + digit + " ") && currPair === (" " + digit)) {
+          cursor = cursor + 1;
+        }
+      }
+      $target.prop('selectionStart', cursor);
+      return $target.prop('selectionEnd', cursor);
+    }
+  };
+
+  replaceFullWidthChars = function(str) {
+    var chars, chr, fullWidth, halfWidth, idx, value, _i, _len;
+    if (str == null) {
+      str = '';
+    }
+    fullWidth = '\uff10\uff11\uff12\uff13\uff14\uff15\uff16\uff17\uff18\uff19';
+    halfWidth = '0123456789';
+    value = '';
+    chars = str.split('');
+    for (_i = 0, _len = chars.length; _i < _len; _i++) {
+      chr = chars[_i];
+      idx = fullWidth.indexOf(chr);
+      if (idx > -1) {
+        chr = halfWidth[idx];
+      }
+      value += chr;
+    }
+    return value;
+  };
+
+  reFormatNumeric = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
+    return setTimeout(function() {
+      var value;
+      value = $target.val();
+      value = replaceFullWidthChars(value);
+      value = value.replace(/\D/g, '');
+      return safeVal(value, $target);
+    });
+  };
+
   reFormatCardNumber = function(e) {
-    var _this = this;
+    var $target;
+    $target = $(e.currentTarget);
     return setTimeout(function() {
-      var $target, value;
-      $target = $(e.currentTarget);
+      var value;
       value = $target.val();
+      value = replaceFullWidthChars(value);
       value = $.payment.formatCardNumber(value);
-      return $target.val(value);
+      return safeVal(value, $target);
     });
   };
 
@@ -175,10 +248,14 @@
     }
     if (re.test(value)) {
       e.preventDefault();
-      return $target.val(value + ' ' + digit);
+      return setTimeout(function() {
+        return $target.val(value + ' ' + digit);
+      });
     } else if (re.test(value + digit)) {
       e.preventDefault();
-      return $target.val(value + digit + ' ');
+      return setTimeout(function() {
+        return $target.val(value + digit + ' ');
+      });
     }
   };
 
@@ -186,9 +263,6 @@
     var $target, value;
     $target = $(e.currentTarget);
     value = $target.val();
-    if (e.meta) {
-      return;
-    }
     if (e.which !== 8) {
       return;
     }
@@ -197,13 +271,29 @@
     }
     if (/\d\s$/.test(value)) {
       e.preventDefault();
-      return $target.val(value.replace(/\d\s$/, ''));
+      return setTimeout(function() {
+        return $target.val(value.replace(/\d\s$/, ''));
+      });
     } else if (/\s\d?$/.test(value)) {
       e.preventDefault();
-      return $target.val(value.replace(/\s\d?$/, ''));
+      return setTimeout(function() {
+        return $target.val(value.replace(/\d$/, ''));
+      });
     }
   };
 
+  reFormatExpiry = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
+    return setTimeout(function() {
+      var value;
+      value = $target.val();
+      value = replaceFullWidthChars(value);
+      value = $.payment.formatExpiry(value);
+      return safeVal(value, $target);
+    });
+  };
+
   formatExpiry = function(e) {
     var $target, digit, val;
     digit = String.fromCharCode(e.which);
@@ -214,10 +304,21 @@
     val = $target.val() + digit;
     if (/^\d$/.test(val) && (val !== '0' && val !== '1')) {
       e.preventDefault();
-      return $target.val("0" + val + " / ");
+      return setTimeout(function() {
+        return $target.val("0" + val + " / ");
+      });
     } else if (/^\d\d$/.test(val)) {
       e.preventDefault();
-      return $target.val("" + val + " / ");
+      return setTimeout(function() {
+        var m1, m2;
+        m1 = parseInt(val[0], 10);
+        m2 = parseInt(val[1], 10);
+        if (m2 > 2 && m1 !== 0) {
+          return $target.val("0" + m1 + " / " + m2);
+        } else {
+          return $target.val("" + val + " / ");
+        }
+      });
     }
   };
 
@@ -234,10 +335,10 @@
     }
   };
 
-  formatForwardSlash = function(e) {
-    var $target, slash, val;
-    slash = String.fromCharCode(e.which);
-    if (slash !== '/') {
+  formatForwardSlashAndSpace = function(e) {
+    var $target, val, which;
+    which = String.fromCharCode(e.which);
+    if (!(which === '/' || which === ' ')) {
       return;
     }
     $target = $(e.currentTarget);
@@ -249,9 +350,6 @@
 
   formatBackExpiry = function(e) {
     var $target, value;
-    if (e.meta) {
-      return;
-    }
     $target = $(e.currentTarget);
     value = $target.val();
     if (e.which !== 8) {
@@ -260,15 +358,26 @@
     if (($target.prop('selectionStart') != null) && $target.prop('selectionStart') !== value.length) {
       return;
     }
-    if (/\d(\s|\/)+$/.test(value)) {
+    if (/\d\s\/\s$/.test(value)) {
       e.preventDefault();
-      return $target.val(value.replace(/\d(\s|\/)*$/, ''));
-    } else if (/\s\/\s?\d?$/.test(value)) {
-      e.preventDefault();
-      return $target.val(value.replace(/\s\/\s?\d?$/, ''));
+      return setTimeout(function() {
+        return $target.val(value.replace(/\d\s\/\s$/, ''));
+      });
     }
   };
 
+  reFormatCVC = function(e) {
+    var $target;
+    $target = $(e.currentTarget);
+    return setTimeout(function() {
+      var value;
+      value = $target.val();
+      value = replaceFullWidthChars(value);
+      value = value.replace(/\D/g, '').slice(0, 4);
+      return safeVal(value, $target);
+    });
+  };
+
   restrictNumeric = function(e) {
     var input;
     if (e.metaKey || e.ctrlKey) {
@@ -330,6 +439,9 @@
     if (!/^\d+$/.test(digit)) {
       return;
     }
+    if (hasTextSelected($target)) {
+      return;
+    }
     val = $target.val() + digit;
     return val.length <= 4;
   };
@@ -358,33 +470,44 @@
   };
 
   $.payment.fn.formatCardCVC = function() {
-    this.payment('restrictNumeric');
+    this.on('keypress', restrictNumeric);
     this.on('keypress', restrictCVC);
+    this.on('paste', reFormatCVC);
+    this.on('change', reFormatCVC);
+    this.on('input', reFormatCVC);
     return this;
   };
 
   $.payment.fn.formatCardExpiry = function() {
-    this.payment('restrictNumeric');
+    this.on('keypress', restrictNumeric);
     this.on('keypress', restrictExpiry);
     this.on('keypress', formatExpiry);
-    this.on('keypress', formatForwardSlash);
+    this.on('keypress', formatForwardSlashAndSpace);
     this.on('keypress', formatForwardExpiry);
     this.on('keydown', formatBackExpiry);
+    this.on('change', reFormatExpiry);
+    this.on('input', reFormatExpiry);
     return this;
   };
 
   $.payment.fn.formatCardNumber = function() {
-    this.payment('restrictNumeric');
+    this.on('keypress', restrictNumeric);
     this.on('keypress', restrictCardNumber);
     this.on('keypress', formatCardNumber);
     this.on('keydown', formatBackCardNumber);
     this.on('keyup', setCardType);
     this.on('paste', reFormatCardNumber);
+    this.on('change', reFormatCardNumber);
+    this.on('input', reFormatCardNumber);
+    this.on('input', setCardType);
     return this;
   };
 
   $.payment.fn.restrictNumeric = function() {
     this.on('keypress', restrictNumeric);
+    this.on('paste', reFormatNumeric);
+    this.on('change', reFormatNumeric);
+    this.on('input', reFormatNumeric);
     return this;
   };
 
@@ -394,8 +517,7 @@
 
   $.payment.cardExpiryVal = function(value) {
     var month, prefix, year, _ref;
-    value = value.replace(/\s/g, '');
-    _ref = value.split('/', 2), month = _ref[0], year = _ref[1];
+    _ref = value.split(/[\s\/]+/, 2), month = _ref[0], year = _ref[1];
     if ((year != null ? year.length : void 0) === 2 && /^\d+$/.test(year)) {
       prefix = (new Date).getFullYear();
       prefix = prefix.toString().slice(0, 2);
@@ -423,7 +545,7 @@
   };
 
   $.payment.validateCardExpiry = function(month, year) {
-    var currentTime, expiry, prefix, _ref;
+    var currentTime, expiry, _ref;
     if (typeof month === 'object' && 'month' in month) {
       _ref = month, month = _ref.month, year = _ref.year;
     }
@@ -438,13 +560,18 @@
     if (!/^\d+$/.test(year)) {
       return false;
     }
-    if (!(parseInt(month, 10) <= 12)) {
+    if (!((1 <= month && month <= 12))) {
       return false;
     }
     if (year.length === 2) {
-      prefix = (new Date).getFullYear();
-      prefix = prefix.toString().slice(0, 2);
-      year = prefix + year;
+      if (year < 70) {
+        year = "20" + year;
+      } else {
+        year = "19" + year;
+      }
+    }
+    if (year.length !== 4) {
+      return false;
     }
     expiry = new Date(year, month);
     currentTime = new Date;
@@ -454,13 +581,14 @@
   };
 
   $.payment.validateCardCVC = function(cvc, type) {
-    var _ref, _ref1;
+    var card, _ref;
     cvc = $.trim(cvc);
     if (!/^\d+$/.test(cvc)) {
       return false;
     }
-    if (type) {
-      return _ref = cvc.length, __indexOf.call((_ref1 = cardFromType(type)) != null ? _ref1.cvcLength : void 0, _ref) >= 0;
+    card = cardFromType(type);
+    if (card != null) {
+      return _ref = cvc.length, __indexOf.call(card.cvcLength, _ref) >= 0;
     } else {
       return cvc.length >= 3 && cvc.length <= 4;
     }
@@ -476,22 +604,49 @@
 
   $.payment.formatCardNumber = function(num) {
     var card, groups, upperLength, _ref;
+    num = num.replace(/\D/g, '');
     card = cardFromNumber(num);
     if (!card) {
       return num;
     }
     upperLength = card.length[card.length.length - 1];
-    num = num.replace(/\D/g, '');
-    num = num.slice(0, +upperLength + 1 || 9e9);
+    num = num.slice(0, upperLength);
     if (card.format.global) {
       return (_ref = num.match(card.format)) != null ? _ref.join(' ') : void 0;
     } else {
       groups = card.format.exec(num);
-      if (groups != null) {
-        groups.shift();
+      if (groups == null) {
+        return;
       }
-      return groups != null ? groups.join(' ') : void 0;
+      groups.shift();
+      groups = $.grep(groups, function(n) {
+        return n;
+      });
+      return groups.join(' ');
     }
   };
 
-}).call(this);
+  $.payment.formatExpiry = function(expiry) {
+    var mon, parts, sep, year;
+    parts = expiry.match(/^\D*(\d{1,2})(\D+)?(\d{1,4})?/);
+    if (!parts) {
+      return '';
+    }
+    mon = parts[1] || '';
+    sep = parts[2] || '';
+    year = parts[3] || '';
+    if (year.length > 0) {
+      sep = ' / ';
+    } else if (sep === ' /') {
+      mon = mon.substring(0, 1);
+      sep = '';
+    } else if (mon.length === 2 || sep.length > 0) {
+      sep = ' / ';
+    } else if (mon.length === 1 && (mon !== '0' && mon !== '1')) {
+      mon = "0" + mon;
+      sep = ' / ';
+    }
+    return mon + sep + year;
+  };
+
+}).call(this);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.49.0
+        version: '1.59'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.49.0
+        version: '1.59'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7.1
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.7.1
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -793,7 +793,7 @@ files:
 - db/migrate/20150128060325_remove_spree_configurations.rb
 - db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb
 - db/migrate/20150309161154_ensure_payments_have_numbers.rb
-- db/migrate/20150314013438_add_missing_indexes.rb
+- db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb
 - db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb
 - db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb
 - db/migrate/20150515211137_fix_adjustment_order_id.rb

data/db/migrate/20150314013438_add_missing_indexes.rb

@@ -1,25 +0,0 @@
-class AddMissingIndexes < ActiveRecord::Migration
-  def change
-    add_index   :spree_promotion_rules_users,
-                        [:user_id, :promotion_rule_id],
-                        name: 'index_promotion_rules_users_on_user_id_and_promotion_rule_id'
-    add_index   :spree_products_promotion_rules,
-                        [:promotion_rule_id, :product_id],
-                        name: 'index_products_promotion_rules_on_promotion_rule_and_product'
-    add_index :spree_orders, :canceler_id
-    add_index :spree_orders, :store_id
-    add_index :spree_orders_promotions, [:promotion_id, :order_id]
-    add_index :spree_properties_prototypes, :prototype_id
-    add_index   :spree_properties_prototypes,
-                        [:prototype_id, :property_id],
-                        name:  'index_properties_prototypes_on_prototype_and_property'
-    add_index :spree_taxons_prototypes, [:prototype_id, :taxon_id]
-    add_index :spree_option_types_prototypes, :prototype_id
-    add_index   :spree_option_types_prototypes,
-                        [:prototype_id, :option_type_id],
-                        name: 'index_option_types_prototypes_on_prototype_and_option_type'
-    add_index   :spree_option_values_variants,
-                        [:option_value_id, :variant_id],
-                        name: 'index_option_values_variants_on_option_value_and_variant'
-  end
-end