credit_card_support 1.0.0 → 1.0.1

data/lib/credit_card_support/credit_card_validator.rb

@@ -1,4 +1,3 @@
-raise "ActiveModel not included" unless Object.const_defined?(:ActiveModel)
 I18n.load_path << File.dirname(__FILE__) + '/locale/en.yml'
 
 class CreditCardValidator < ActiveModel::EachValidator
@@ -9,16 +8,20 @@ class CreditCardValidator < ActiveModel::EachValidator
     opts              = options.dup
     opts[:number]     ||= attribute
 
-    number            = record.send(opts[:number]||:number) rescue (raise ":number not defined")
-    expiry_year       = record.send(opts[:expiry_year]||:expiry_year) rescue (raise ":expiry_year not defined")
-    expiry_month      = record.send(opts[:expiry_month]||:expiry_month) rescue (raise ":expiry_month not defined")
+    @number_name        = opts[:number] || :number
+    @expiry_year_name   = opts[:expiry_year] || :expiry_year
+    @expiry_month_name  = opts[:expiry_month] || :expiry_month
+
+    @number           = record.send(@number_name)
+    @expiry_year      = record.send(@expiry_year_name)
+    @expiry_month      = record.send(@expiry_month_name)
     @allowed_issuers  = opts[:allowed_issuers]
     @allow_testcards  = opts[:allow_testcards]
 
-    @opts             = opts
-    @instrument       = CreditCardSupport::Instrument.new(number: number, expiry_year: expiry_year, expiry_month: expiry_month)
+    @instrument       = CreditCardSupport::Instrument.new(number: @number, expiry_year: @expiry_year, expiry_month: @expiry_month)
 
     validate_number
+    validate_expiration
   end
 
 
@@ -33,41 +36,47 @@ class CreditCardValidator < ActiveModel::EachValidator
   end
 
   def validate_number
-    validate_luhn
-    validate_issuer
-    validate_testcard
+    validate_number_luhn
+    validate_number_issuer
+    validate_number_testcard
+  end
+
+  def validate_expiration
     validate_expiry_year
     validate_expiry_month
-    validate_expiration_date rescue false
+    validate_expiration_date rescue nil
   end
 
-  def validate_luhn
-    errors.add(@opts[:number], t(:luhn_not_valid)) unless @instrument.has_valid_luhn?
+  def validate_number_luhn
+    errors.add(@number_name, t(:luhn_not_valid)) unless @instrument.has_valid_luhn?
   end
 
-  def validate_issuer
-    errors.add(@opts[:number], t(:issuer_not_known)) unless @instrument.issuer
+  def validate_number_issuer
+    errors.add(@number_name, t(:issuer_not_known)) unless @instrument.issuer
     if @allowed_issuers and @instrument.issuer and !@allowed_issuers.map(&:to_sym).include?(@instrument.issuer)
-      errors.add(@opts[:number], t(:issuer_not_supported, issuer: @instrument.issuer.to_s.upcase))
+      errors.add(@number_name, t(:issuer_not_supported, issuer: @instrument.issuer.to_s.upcase))
     end
   end
 
-  def validate_testcard
-    errors.add(@opts[:number], t(:testcard_not_supported)) if !@allow_testcards && @instrument.is_testcard?
+  def validate_number_testcard
+    errors.add(@number_name, t(:testcard_not_supported)) if !@allow_testcards && @instrument.is_testcard?
   end
 
   def validate_expiry_year
-    errors.add(@opts[:expiry_year], t(:cant_be_blank)) unless @instrument.expiry_year
+    errors.add(@expiry_year_name, t(:cant_be_blank)) unless @instrument.expiry_year
   end
 
   def validate_expiry_month
-    errors.add(@opts[:expiry_month], t(:cant_be_blank)) unless @instrument.expiry_month
+    errors.add(@expiry_month_name, t(:cant_be_blank)) unless @instrument.expiry_month
   end
 
   def validate_expiration_date
-    if @instrument.expired?
-      errors.add(@opts[:expiry_year], t(:cant_be_expired))
-      errors.add(@opts[:expiry_month], t(:cant_be_expired))
+    if @instrument.is_expired?
+      errors.add(@expiry_year_name, t(:cant_be_expired))
+      errors.add(@expiry_month_name, t(:cant_be_expired))
+    end
+    if @instrument.expiration_date > Date.new(Date.today.year+10)
+      errors.add(@expiry_year_name, t(:cant_be_so_far_in_the_future))
     end
   end
 

data/lib/credit_card_support/instrument.rb

@@ -143,10 +143,10 @@ module CreditCardSupport
     end
 
     def expiration_date
-      Date.new(expiry_year, expiry_month, -1)
+      Date.new(expiry_year, expiry_month, -1) rescue nil
     end
 
-    def expired?
+    def is_expired?
       expiration_date < Date.today
     end
 

data/lib/credit_card_support/locale/en.yml

@@ -7,3 +7,4 @@ en:
       testcard_not_supported: "testcards not supported"
       cant_be_blank: "can't be blank"
       is_expired: "is expired"
+      cant_be_so_far_in_the_future: "can't be so far in the future"

data/lib/credit_card_support/version.rb

@@ -2,7 +2,7 @@ module CreditCardSupport
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/credit_card_support.rb

@@ -1,2 +1,3 @@
 require 'credit_card_support/luhn_number'
 require 'credit_card_support/instrument'
+require 'credit_card_support/credit_card_validator' if Object.const_defined?(:ActiveModel)

data/spec/lib/credit_card_support/credit_card_validator_spec.rb

@@ -1,6 +1,5 @@
-require 'spec_helper'
 require 'active_model'
-require 'credit_card_support/credit_card_validator'
+require 'spec_helper'
 
 
 class CreditCard
@@ -87,6 +86,12 @@ describe CreditCardValidator do
           subject.should be_valid
         end
       end
+      context "in the future too much" do
+        it "is valid" do
+          subject.expiry_year = today.year + 11
+          subject.should be_invalid
+        end
+      end
       context "in the past" do
         it "is invalid" do
           subject.expiry_year = today.year - 1
@@ -103,6 +108,8 @@ describe CreditCardValidator do
       context "in the future" do
         it "is valid" do
           subject.expiry_month = today.month + 1
+          subject.valid?
+          puts subject.errors.inspect
           subject.should be_valid
         end
       end

data/spec/lib/credit_card_support/instrument_spec.rb

@@ -76,17 +76,17 @@ describe CreditCardSupport::Instrument do
     end
   end
 
-  describe "#expired?" do
+  describe "#is_expired?" do
     context "not expired" do
       it "returns false" do
-        subject.expired?.should be_false
+        subject.is_expired?.should be_false
       end
     end
     context "expired" do
       it "returns true" do
         subject.expiry_year = today.year
         subject.expiry_month = today.month-1
-        subject.expired?.should be_true
+        subject.is_expired?.should be_true
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: credit_card_support
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-09-21 00:00:00.000000000 Z
 dependencies: []
-description: Detects issuer from number, has ActiveModel validations and translations
+description: Detects issuer from a number, has ActiveModel validations and translations
   support.
 email: margus@tione.eu
 executables: []