mymoip 0.2.6 → 0.3.1

data/CHANGELOG.md

@@ -1,32 +1,80 @@
 CHANGELOG
 =========
 
-**0.2.6**
+0.3.1
+-----
+
+* Re-releasing 0.3.0 after some Rubygems issues.
+
+0.3.0
+-----
+
+* Add dependency of active_model gem for validations.
+* Try always to store the plain value of attributes. While the previous version would require you to provide phones in the `"(51)93040-5060"` format, now works even with `"051930405060"`.
+* Payer accepts address_state and address_country downcased.
+* CreditCard accept a valid string date as owner_birthday.
+* Extract conversions of attributes' formats to a new Formatter class.
+* Prevent use of CreditCardPayment#to_json with a invalid CreditCard.
+* Prevent use of Instruction#to_xml with invalid attributes by itself or a invalid Payer.
+
+New validations:
+* **CreditCard**
+    * Require a logo and a security_code.
+    * Validate length of owner_phone (accepts 8 and 9 digit phones with its DDD code).
+    * Validate length of security_code (American Express has 4 digits, others 3).
+    * Validate format of expiration_date using `%m/%y`.
+    * Limit logos in the available at AVAILABLE_LOGOS constant.
+* **Instruction**
+    * Require an id, payment_reason, values and a payer.
+* **Payer**
+    * Require and id, name, email, address_street, address_street_number, address_neighbourhood, address_city, address_state, address_country, address_cep and an address_phone.
+    * Validate length of address_state in 2 chars.
+    * Validate length of address_country in 3 chars.
+    * Validate length of address_cep in 8 chars.
+    * Validate length of address_phone (accepts 8 and 9 digit phones with its DDD code).
+
+0.2.6
+-----
+
 * Deprecate owner_rg attribute of MyMoip::CreditCard; you should provide a owner_cpf from now on. Should explain issues with Visa's risk analysis.
 
-**0.2.5**
+0.2.5
+-----
+
 * Request's log messages moved to debug level.
 * Make CreditCard class accept string and symbol logos.
 * Create MyMoip::CreditCard::AVAILABLE_LOGOS constant.
 * Standardise Request#api_call parameters.
 
-**0.2.4**
+0.2.4
+-----
+
 * Fix American Express logo format expected by Moip.
 
-**0.2.3**
+0.2.3
+-----
+
 * Remove .rvmrc
 * CreditCardPayment's initialization can now receive a hash of options.
 * lib/requests folder created.
 * Requests has methods to return its response id.
 
-**0.2.2**
+0.2.2
+-----
+
 * Explicitly require order for Requests classes.
 
-**0.2.1**
+0.2.1
+-----
+
 * Bugfix related to explicitly require MyMoip class being needed.
 
-**0.2.0**
+0.2.0
+-----
+
 * Update production url from `https://desenvolvedor.moip.com.br` to `https://www.moip.com.br`.
 
-**0.1.0**
+0.1.0
+-----
+
 * First version of the gem.

data/Gemfile

@@ -8,6 +8,7 @@ source "http://rubygems.org"
 
 gem "builder"
 gem "httparty"
+gem "activemodel"
 
 group :development do
   gem "rdoc", "~> 3.12"

data/Gemfile.lock

@@ -1,6 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     addressable (2.3.2)
     ansi (1.4.3)
     builder (3.0.0)
@@ -9,6 +15,7 @@ GEM
     httparty (0.8.3)
       multi_json (~> 1.0)
       multi_xml
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -34,6 +41,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activemodel
   builder
   bundler
   httparty

data/README.md

@@ -47,9 +47,9 @@ payer = MyMoip::Payer.new(
   address_city: "Porto Alegre",
   address_state: "RS",
   address_country: "BRA",
-  address_cep: "90440-150",
-  address_phone: "(51)3040-5060"
-) # 9 digit phones must be in "(11)93040-5060" format
+  address_cep: "90440150",
+  address_phone: "5130405060"
+)
 
 instruction = MyMoip::Instruction.new(
   id: "instruction_id_defined_by_you",
@@ -71,8 +71,8 @@ credit_card = MyMoip::CreditCard.new(
   security_code: "000",
   owner_name: "Juquinha da Rocha",
   owner_birthday: Date.new(1984, 11, 3),
-  owner_phone: "(51)3040-5060",
-  owner_cpf: "522.116.706-95"
+  owner_phone: "5130405060",
+  owner_cpf: "52211670695"
 )
 
 credit_card_payment = MyMoip::CreditCardPayment.new(credit_card, installments: 1)
@@ -85,6 +85,11 @@ payment_request.api_call(credit_card_payment, token: transparent_request.token)
 payment_request.success?
 ```
 
+Documentation
+-------------
+
+For more information you can access the [wiki page](https://github.com/Irio/mymoip/wiki).
+
 License
 -------
 

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.3.1

data/lib/mymoip/credit_card.rb

@@ -1,5 +1,7 @@
 module MyMoip
   class CreditCard
+    include ActiveModel::Validations
+
     attr_accessor :logo, :card_number, :expiration_date, :security_code,
                 :owner_name, :owner_birthday, :owner_phone, :owner_cpf
 
@@ -7,22 +9,59 @@ module MyMoip
       :american_express, :diners, :hipercard, :mastercard, :visa
     ]
 
-    def initialize(params)
-      @logo            = params[:logo]            if params.has_key? :logo
-      @card_number     = params[:card_number]     if params.has_key? :card_number
-      @expiration_date = params[:expiration_date] if params.has_key? :expiration_date
-      @security_code   = params[:security_code]   if params.has_key? :security_code
-      @owner_name      = params[:owner_name]      if params.has_key? :owner_name
-      @owner_birthday  = params[:owner_birthday]  if params.has_key? :owner_birthday
-      @owner_phone     = params[:owner_phone]     if params.has_key? :owner_phone
-      @owner_cpf       = params[:owner_cpf]       if params.has_key? :owner_cpf
-
-      self.owner_rg    = params[:owner_rg]        if params.has_key? :owner_rg
+    validates_presence_of :logo, :security_code
+    validates_length_of :owner_phone, within: 10..11, allow_nil: true
+    validates_length_of :security_code, within: 3..4
+    validates_format_of :expiration_date, with: /\A(?:(?:0[1-9])|(?:1[02]))\/\d{2}\Z/ # %m/%y
+    validates_inclusion_of :logo, in: AVAILABLE_LOGOS
+
+    def initialize(attrs)
+      self.logo            = attrs[:logo]            if attrs.has_key?(:logo)
+      self.card_number     = attrs[:card_number]     if attrs.has_key?(:card_number)
+      self.expiration_date = attrs[:expiration_date] if attrs.has_key?(:expiration_date)
+      self.security_code   = attrs[:security_code]   if attrs.has_key?(:security_code)
+      self.owner_name      = attrs[:owner_name]      if attrs.has_key?(:owner_name)
+      self.owner_birthday  = attrs[:owner_birthday]  if attrs.has_key?(:owner_birthday)
+      self.owner_phone     = attrs[:owner_phone]     if attrs.has_key?(:owner_phone)
+      self.owner_cpf       = attrs[:owner_cpf]       if attrs.has_key?(:owner_cpf)
+
+      # Deprecated attributes
+      self.owner_rg        = attrs[:owner_rg]        if attrs.has_key?(:owner_rg)
+    end
+
+    def logo=(value)
+      value = value.to_sym unless value.nil?
+      @logo = value
+    end
+
+    def owner_birthday=(value)
+      unless value.nil?
+        value = Date.parse(value.to_s)
+      end
+      @owner_birthday = value
+    end
+
+    def owner_phone=(value)
+      unless value.nil?
+        # Removes non-digits
+        value.gsub!(/\D*/, '')
+        # Removes zeros in the beginning
+        value.gsub!(/\A0*/, '')
+      end
+      @owner_phone = value
     end
 
     def owner_rg=(value)
       warn "[DEPRECATION] `owner_rg` is deprecated. Please use `owner_cpf` instead."
       self.owner_cpf = value
     end
+
+    def owner_cpf=(value)
+      unless value.nil?
+        # Removes dashes and dots
+        value.gsub!(/\-|\./, '')
+      end
+      @owner_cpf = value
+    end
   end
 end

data/lib/mymoip/credit_card_payment.rb

@@ -3,17 +3,18 @@ module MyMoip
     attr_accessor :credit_card, :installments
 
     def initialize(credit_card, opts = {})
-      @credit_card = credit_card
+      self.credit_card = credit_card
       # Backward compatibility. See 0.2.3 CHANGELOG
-      @installments = if opts.kind_of?(Integer)
-                       opts
-                     else
-                       opts[:installments] || 1
-                     end
+      self.installments = if opts.kind_of?(Integer)
+                            opts
+                          else
+                            opts[:installments] || 1
+                          end
     end
 
-    def to_json
+    def to_json(formatter = MyMoip::Formatter)
       raise "No CreditCard provided" if credit_card.nil?
+      raise ArgumentError, 'Invalid credit card' if credit_card.invalid?
 
       json = {
         Forma:        "CartaoCredito",
@@ -21,23 +22,27 @@ module MyMoip
         CartaoCredito: {
           Numero:           credit_card.card_number,
           Expiracao:        credit_card.expiration_date,
-          CodigoSeguranca:  credit_card.security_code,
-          Portador: {
-            Nome:           credit_card.owner_name,
-            DataNascimento: credit_card.owner_birthday.strftime("%d/%m/%Y"),
-            Telefone:       credit_card.owner_phone,
-            Identidade:     credit_card.owner_cpf
-          }
+          CodigoSeguranca:  credit_card.security_code
         }
       }
 
+      json[:CartaoCredito][:Portador] = {
+        Nome: credit_card.owner_name,
+        DataNascimento: (credit_card.owner_birthday and
+                         formatter.date(credit_card.owner_birthday)),
+        Telefone: (credit_card.owner_phone and
+                   formatter.phone(credit_card.owner_phone)),
+        Identidade: (credit_card.owner_cpf and
+                     formatter.cpf(credit_card.owner_cpf))
+      }
+
       json[:Instituicao] = {
         american_express: "AmericanExpress",
         diners:           "Diners",
         hipercard:        "Hipercard",
         mastercard:       "Mastercard",
         visa:             "Visa"
-      }.fetch(credit_card.logo.to_sym)
+      }.fetch(credit_card.logo)
 
       if cash?
         json[:Recebimento] = "AVista"

data/lib/mymoip/formatter.rb

@@ -0,0 +1,23 @@
+module MyMoip
+  class Formatter
+    def self.cep(plain_cep)
+      raise ArgumentError, 'Cannot format CEP nil' if plain_cep.nil?
+      plain_cep.gsub(/(\d{5})/, '\1-')
+    end
+
+    def self.phone(plain_phone)
+      raise ArgumentError, 'Cannot format phone nil' if plain_phone.nil?
+      plain_phone.gsub(/(\d{2})(\d)?(\d{4})(\d{4})/, '(\1)\2\3-\4')
+    end
+
+    def self.date(plain_date)
+      raise ArgumentError, 'Cannot format date nil' if plain_date.nil?
+      plain_date.strftime("%d/%m/%Y")
+    end
+
+    def self.cpf(plain_cpf)
+      raise ArgumentError, 'Cannot format cpf nil' if plain_cpf.nil?
+      plain_cpf.gsub(/(\d{3})(\d{3})(\d{3})(\d{2})/, '\1.\2.\3-\4')
+    end
+  end
+end

data/lib/mymoip/instruction.rb

@@ -1,15 +1,21 @@
 module MyMoip
   class Instruction
+    include ActiveModel::Validations
+
     attr_accessor :id, :payment_reason, :values, :payer
 
+    validates_presence_of :id, :payment_reason, :values, :payer
+
     def initialize(attrs)
-      @id             = attrs[:id]             if attrs.has_key?(:id)
-      @payment_reason = attrs[:payment_reason] if attrs.has_key?(:payment_reason)
-      @values         = attrs[:values]         if attrs.has_key?(:values)
-      @payer          = attrs[:payer]          if attrs.has_key?(:payer)
+      self.id             = attrs[:id]             if attrs.has_key?(:id)
+      self.payment_reason = attrs[:payment_reason] if attrs.has_key?(:payment_reason)
+      self.values         = attrs[:values]         if attrs.has_key?(:values)
+      self.payer          = attrs[:payer]          if attrs.has_key?(:payer)
     end
 
     def to_xml(root = nil)
+      raise ArgumentError, 'Invalid payer' if payer.invalid?
+      raise ArgumentError, 'Invalid params for instruction' if self.invalid?
 
       xml  = ""
       root = Builder::XmlMarkup.new(target: xml)

data/lib/mymoip/payer.rb

@@ -1,26 +1,62 @@
 module MyMoip
   class Payer
+    include ActiveModel::Validations
+
     attr_accessor :id, :name, :email,
                   :address_street, :address_street_number, :address_street_extra,
                   :address_neighbourhood, :address_city, :address_state,
                   :address_country, :address_cep, :address_phone
 
+    validates_presence_of :id, :name, :email, :address_street,
+                          :address_street_number, :address_neighbourhood,
+                          :address_city, :address_state, :address_country,
+                          :address_cep, :address_phone
+    validates_length_of :address_state, is: 2
+    validates_length_of :address_country, is: 3
+    validates_length_of :address_cep, is: 8
+    validates_length_of :address_phone, within: 10..11
+
     def initialize(attrs)
-      @id                    = attrs[:id]                     if attrs.has_key?(:id)
-      @name                  = attrs[:name]                   if attrs.has_key?(:name)
-      @email                 = attrs[:email]                  if attrs.has_key?(:email)
-      @address_street        = attrs[:address_street]         if attrs.has_key?(:address_street)
-      @address_street_number = attrs[:address_street_number]  if attrs.has_key?(:address_street_number)
-      @address_street_extra  = attrs[:address_street_extra]   if attrs.has_key?(:address_street_extra)
-      @address_neighbourhood = attrs[:address_neighbourhood]  if attrs.has_key?(:address_neighbourhood)
-      @address_city          = attrs[:address_city]           if attrs.has_key?(:address_city)
-      @address_state         = attrs[:address_state]          if attrs.has_key?(:address_state)
-      @address_country       = attrs[:address_country]        if attrs.has_key?(:address_country)
-      @address_cep           = attrs[:address_cep]            if attrs.has_key?(:address_cep)
-      @address_phone         = attrs[:address_phone]          if attrs.has_key?(:address_phone)
+      self.id                    = attrs[:id]                    if attrs.has_key?(:id)
+      self.name                  = attrs[:name]                  if attrs.has_key?(:name)
+      self.email                 = attrs[:email]                 if attrs.has_key?(:email)
+      self.address_street        = attrs[:address_street]        if attrs.has_key?(:address_street)
+      self.address_street_number = attrs[:address_street_number] if attrs.has_key?(:address_street_number)
+      self.address_street_extra  = attrs[:address_street_extra]  if attrs.has_key?(:address_street_extra)
+      self.address_neighbourhood = attrs[:address_neighbourhood] if attrs.has_key?(:address_neighbourhood)
+      self.address_city          = attrs[:address_city]          if attrs.has_key?(:address_city)
+      self.address_state         = attrs[:address_state]         if attrs.has_key?(:address_state)
+      self.address_country       = attrs[:address_country]       if attrs.has_key?(:address_country)
+      self.address_cep           = attrs[:address_cep]           if attrs.has_key?(:address_cep)
+      self.address_phone         = attrs[:address_phone]         if attrs.has_key?(:address_phone)
+    end
+
+    def address_cep=(value)
+      value.gsub!(/\D*/, '') unless value.nil?
+      @address_cep = value
+    end
+
+    def address_state=(value)
+      value = value.upcase unless value.nil?
+      @address_state = value
+    end
+
+    def address_country=(value)
+      value = value.upcase unless value.nil?
+      @address_country = value
+    end
+
+    def address_phone=(value)
+      unless value.nil?
+        # Removes non-digits
+        value.gsub!(/\D*/, '')
+        # Removes zeros in the beginning
+        value.gsub!(/\A0*/, '')
+      end
+      @address_phone = value
     end
 
-    def to_xml(root = nil)
+    def to_xml(root = nil, formatter = MyMoip::Formatter)
       if root.nil?
         xml  = ""
         root ||= Builder::XmlMarkup.new(target: xml)
@@ -37,8 +73,8 @@ module MyMoip
         n1.Cidade(@address_city)
         n1.Estado(@address_state)
         n1.Pais(@address_country)
-        n1.CEP(@address_cep)
-        n1.TelefoneFixo(@address_phone)
+        n1.CEP(formatter.cep(@address_cep))
+        n1.TelefoneFixo(formatter.phone(@address_phone))
       end
 
       xml

data/lib/mymoip.rb

@@ -1,3 +1,4 @@
+require 'active_model'
 require 'builder'
 require 'logger'
 require 'httparty'

data/mymoip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mymoip"
-  s.version = "0.2.6"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Irio Irineu Musskopf Junior"]
-  s.date = "2012-11-13"
+  s.date = "2012-11-17"
   s.description = "Provides a implementation of MoIP's transparent checkout."
   s.email = "irio.musskopf@caixadeideias.com.br"
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/mymoip.rb",
     "lib/mymoip/credit_card.rb",
     "lib/mymoip/credit_card_payment.rb",
+    "lib/mymoip/formatter.rb",
     "lib/mymoip/instruction.rb",
     "lib/mymoip/json_parser.rb",
     "lib/mymoip/payer.rb",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     "test/live_test.rb",
     "test/test_credit_card_payment.rb",
     "test/test_creditcard.rb",
+    "test/test_formatter.rb",
     "test/test_instruction.rb",
     "test/test_mymoip.rb",
     "test/test_payer.rb",
@@ -61,6 +63,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -71,6 +74,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<activemodel>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
@@ -82,6 +86,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<activemodel>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/test/fixtures/fixture.rb

@@ -1,6 +1,6 @@
 class Fixture
-  def self.payer
-    MyMoip::Payer.new(
+  def self.payer(params = {})
+    params = {
       id: "your_own_payer_id",
       name: "Juquinha da Rocha",
       email: "juquinha@rocha.com",
@@ -13,16 +13,18 @@ class Fixture
       address_country: "BRA",
       address_cep: "90440-150",
       address_phone: "(51)3040-5060"
-    )
+    }.merge(params)
+    MyMoip::Payer.new(params)
   end
 
-  def self.instruction(payer)
-    MyMoip::Instruction.new(
+  def self.instruction(params={})
+    params = {
       id: "your_own_instruction_id",
       payment_reason: "some payment_reason",
       values: [100.0, 200.0],
       payer: payer
-    )
+    }.merge(params)
+    MyMoip::Instruction.new(params)
   end
 
   def self.credit_card(params = {})

data/test/test_credit_card_payment.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 class TestCreditCardPayment < Test::Unit::TestCase
-
   def test_initialization_and_getters
     credit_card = Fixture.credit_card
     subject = MyMoip::CreditCardPayment.new(credit_card, 1)
@@ -46,8 +45,8 @@ class TestCreditCardPayment < Test::Unit::TestCase
     assert_match /\A((0[1-9])|(1[02]))\/\d{2}\z/, payment.to_json[:CartaoCredito][:Expiracao]
     assert_match /\A\d{3}\z/, payment.to_json[:CartaoCredito][:CodigoSeguranca]
     original_date = Date.new(1980, 11, 3)
-    MyMoip::CreditCard.any_instance.stubs(:owner_birthday).returns(original_date)
-    assert_equal original_date.strftime("%d/%m/%Y"), payment.to_json[:CartaoCredito][:Portador][:DataNascimento]
+    MyMoip::Formatter.stubs(:date).returns('03/11/1980')
+    assert_equal '03/11/1980', payment.to_json[:CartaoCredito][:Portador][:DataNascimento]
     assert_match /\A\(\d{2}\)\d{4,5}-\d{4}/, payment.to_json[:CartaoCredito][:Portador][:Telefone]
     assert_match /\A\d{3}\.\d{3}\.\d{3}\-\d{2}\z/, payment.to_json[:CartaoCredito][:Portador][:Identidade]
   end
@@ -59,11 +58,57 @@ class TestCreditCardPayment < Test::Unit::TestCase
     end
   end
 
-  def test_to_json_should_accept_any_creditcard_logo_as_string
-    MyMoip::CreditCard::AVAILABLE_LOGOS.each do |logo|
-      payment = MyMoip::CreditCardPayment.new(Fixture.credit_card(logo: logo.to_s))
-      assert_nothing_raised(KeyError) { payment.to_json }
+  def test_to_json_method_uses_the_formatted_version_of_the_credit_cards_owner_birthday
+    date = Date.new(2040, 10, 30)
+    subject = MyMoip::CreditCardPayment.new(Fixture.credit_card(owner_birthday: date))
+    formatter = stub_everything('formatter')
+    formatter.expects(:date).with(date)
+    subject.to_json(formatter)
+  end
+
+  def test_to_json_method_skip_formatting_when_credit_cards_owner_birthday_is_nil
+    subject = MyMoip::CreditCardPayment.new(Fixture.credit_card(owner_birthday: nil))
+    formatter = stub_everything('formatter')
+    formatter.stubs(:date).with(nil).returns('should not be here')
+    json = subject.to_json(formatter)
+    assert_nil json[:CartaoCredito][:Portador][:DataNascimento]
+  end
+
+  def test_to_json_method_uses_the_formatted_version_of_the_credit_cards_owner_phone
+    subject = MyMoip::CreditCardPayment.new(Fixture.credit_card(owner_phone: '5130405060'))
+    formatter = stub_everything('formatter')
+    formatter.expects(:phone).with('5130405060')
+    subject.to_json(formatter)
+  end
+
+  def test_to_json_method_skip_formatting_when_credit_cards_owner_phone_is_nil
+    subject = MyMoip::CreditCardPayment.new(Fixture.credit_card(owner_phone: nil))
+    formatter = stub_everything('formatter')
+    formatter.stubs(:phone).with(nil).returns('should not be here')
+    json = subject.to_json(formatter)
+    assert_nil json[:CartaoCredito][:Portador][:Telefone]
+  end
+
+  def test_to_json_method_raises_an_exception_when_called_without_a_credit_card
+    subject = MyMoip::CreditCardPayment.new(nil)
+    assert_raise RuntimeError do
+      subject.to_json
     end
   end
 
+  def test_to_json_method_skip_formatting_when_credit_cards_owner_cpf_is_nil
+    subject = MyMoip::CreditCardPayment.new(Fixture.credit_card(owner_cpf: nil))
+    formatter = stub_everything('formatter')
+    formatter.stubs(:cpf).with(nil).returns('should not be here')
+    json = subject.to_json(formatter)
+    assert_nil json[:CartaoCredito][:Portador][:Identidade]
+  end
+
+  def test_to_json_method_raises_an_exception_when_called_with_a_invalid_credit_card
+    subject = MyMoip::CreditCardPayment.new(Fixture.credit_card)
+    MyMoip::CreditCard.any_instance.stubs(:invalid?).returns(true)
+    assert_raise ArgumentError do
+      subject.to_json
+    end
+  end
 end

data/test/test_creditcard.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 class TestCreditCard < Test::Unit::TestCase
-
   def test_initialization_and_setters
     subject = MyMoip::CreditCard.new(
       logo: :visa,
@@ -10,7 +9,7 @@ class TestCreditCard < Test::Unit::TestCase
       security_code: "000",
       owner_name: "Juquinha da Rocha",
       owner_birthday: Date.new(1984, 11, 3),
-      owner_phone: "(51)3040-5060",
+      owner_phone: "5130405060",
       owner_cpf: "522.116.706-95"
     )
 
@@ -20,8 +19,83 @@ class TestCreditCard < Test::Unit::TestCase
     assert_equal "000", subject.security_code
     assert_equal "Juquinha da Rocha", subject.owner_name
     assert_equal Date.new(1984, 11, 3), subject.owner_birthday
-    assert_equal "(51)3040-5060", subject.owner_phone
-    assert_equal "522.116.706-95", subject.owner_cpf
+    assert_equal "5130405060", subject.owner_phone
+    assert_equal "52211670695", subject.owner_cpf
+  end
+
+  def test_validate_presence_of_logo_attribute
+    subject = Fixture.credit_card
+    subject.logo = nil
+    assert subject.invalid? && subject.errors[:logo].present?,
+      'should be invalid without a logo'
+  end
+
+  def test_owner_birthday_accepts_string_version_of_dates
+    subject = Fixture.credit_card
+    subject.owner_birthday = '20/12/1980'
+    assert_equal Date.new(1980, 12, 20), subject.owner_birthday
+  end
+
+  def test_validate_presence_of_security_code_attribute
+    subject = Fixture.credit_card
+    subject.security_code = nil
+    assert subject.invalid? && subject.errors[:security_code].present?,
+      'should be invalid without an security_code'
+  end
+
+  def test_accept_nil_owner_phone
+    subject = Fixture.credit_card(owner_phone: nil)
+    assert subject.valid?, 'should be valid'
+  end
+
+  def test_validate_length_of_owner_phone_attribute_in_10_or_11_chars
+    subject = Fixture.credit_card
+    subject.owner_phone = '5130405060'
+    assert subject.valid?, 'should accept 10 chars'
+    subject.owner_phone = '51930405060'
+    assert subject.valid?, 'should accept 11 chars'
+    subject.owner_phone = '215130405060'
+    assert subject.invalid? && subject.errors[:owner_phone].present?,
+      'should not accept strings with other than 10 or 11 chars'
+  end
+
+  def test_remove_left_zeros_from_owner_phone
+    subject = Fixture.credit_card
+    subject.owner_phone = '05130405060'
+    assert_equal '5130405060', subject.owner_phone
+  end
+
+  def test_remove_dashes_from_owner_phone
+    subject = Fixture.credit_card
+    subject.owner_phone = '513040-5060'
+    assert_equal '5130405060', subject.owner_phone
+    subject.owner_phone = '5193040-5060'
+    assert_equal '51930405060', subject.owner_phone
+  end
+
+  def test_remove_parenthesis_from_owner_phone
+    subject = Fixture.credit_card
+    subject.owner_phone = '(51)30405060'
+    assert_equal '5130405060', subject.owner_phone
+    subject.owner_phone = '(51)930405060'
+    assert_equal '51930405060', subject.owner_phone
+  end
+
+  def test_remove_dashes_from_owner_cpf
+    subject = Fixture.credit_card
+    subject.owner_cpf = '522116706-95'
+    assert_equal '52211670695', subject.owner_cpf
+  end
+
+  def test_remove_dots_from_owner_cpf
+    subject = Fixture.credit_card
+    subject.owner_cpf = '522.116.70695'
+    assert_equal '52211670695', subject.owner_cpf
+  end
+
+  def test_accept_nil_owner_cpf
+    subject = Fixture.credit_card(owner_cpf: nil)
+    assert subject.valid?, 'should be valid'
   end
 
   def test_warns_about_owner_rg_attribute_deprecation_on_initialization
@@ -34,4 +108,43 @@ class TestCreditCard < Test::Unit::TestCase
     subject.expects(:warn).with(regexp_matches(/is deprecated/))
     subject.owner_rg = '1010202030'
   end
+
+  def test_accepts_security_codes_of_3_digits
+    subject = Fixture.credit_card(security_code: "180")
+    assert subject.valid?, 'should be valid'
+  end
+
+  def test_accepts_security_codes_of_4_digits
+    subject = Fixture.credit_card(security_code: "1809")
+    assert subject.valid?, 'should be valid'
+  end
+
+  def test_dont_accept_security_codes_of_neither_3_or_4_digits
+    subject = Fixture.credit_card(security_code: "1")
+    assert subject.invalid? && subject.errors[:security_code].present?, 'should not be valid'
+  end
+
+  def test_validate_format_of_expiration_date
+    subject = Fixture.credit_card(expiration_date: "12/2018")
+    assert subject.invalid? && subject.errors[:expiration_date].present?, 'should not accept other formats'
+    subject = Fixture.credit_card(expiration_date: "12/18")
+    assert subject.valid? && subject.errors[:expiration_date].empty?, 'should accept "%m/%y" format'
+  end
+
+  def test_converts_creditcard_string_logos_to_symbol
+    subject = Fixture.credit_card(logo: "visa")
+    assert_equal :visa, subject.logo
+  end
+
+  def test_accepts_any_creditcard_from_available_logos_constant
+    MyMoip::CreditCard::AVAILABLE_LOGOS.each do |logo|
+      subject = Fixture.credit_card(logo: logo)
+      assert subject.valid?, 'should be valid'
+    end
+  end
+
+  def test_dont_accept_logos_out_of_available_logos_constant
+    subject = Fixture.credit_card(logo: :unavailable_card)
+    assert subject.invalid? && subject.errors[:logo].present?, 'should not be valid'
+  end
 end

data/test/test_formatter.rb

@@ -0,0 +1,49 @@
+require 'helper'
+
+class TestFormatter < Test::Unit::TestCase
+  def test_cep_method_returns_the_given_cep_with_section_separator
+    assert_equal '92400-123', MyMoip::Formatter.cep('92400123')
+  end
+
+  def test_cep_method_raises_exception_with_nil_cep_given
+    assert_raise ArgumentError do
+      MyMoip::Formatter.cep(nil)
+    end
+  end
+
+  def test_phone_method_returns_the_given_8_digit_phone_with_section_separators
+    assert_equal '(51)3040-5060', MyMoip::Formatter.phone('5130405060')
+  end
+
+  def test_phone_method_returns_the_given_9_digit_phone_with_section_separators
+    assert_equal '(51)93040-5060', MyMoip::Formatter.phone('51930405060')
+  end
+
+  def test_phone_method_raises_exception_with_nil_phone_given
+    assert_raise ArgumentError do
+      MyMoip::Formatter.phone(nil)
+    end
+  end
+
+  def test_date_method_returns_the_given_date_in_the_format_expected
+    date = Date.new(2040, 10, 30)
+    assert_equal '30/10/2040', MyMoip::Formatter.date(date)
+  end
+
+  def test_date_method_raises_exception_with_nil_date_given
+    assert_raise ArgumentError do
+      MyMoip::Formatter.date(nil)
+    end
+  end
+
+  def test_cpf_method_returns_the_given_number_with_section_separators
+    cpf = '522.116.706-95'
+    assert_equal '522.116.706-95', MyMoip::Formatter.cpf('52211670695')
+  end
+
+  def test_cpf_method_raises_exception_with_nil_cpf_given
+    assert_raise ArgumentError do
+      MyMoip::Formatter.cpf(nil)
+    end
+  end
+end

data/test/test_instruction.rb

@@ -1,9 +1,7 @@
 require 'helper'
 
 class TestInstruction < Test::Unit::TestCase
-
   def test_getters_for_attributes
-
     payer       = Fixture.payer
     instruction = MyMoip::Instruction.new(
       id: "some id",
@@ -20,18 +18,80 @@ class TestInstruction < Test::Unit::TestCase
 
   def test_should_generate_a_string_when_converting_to_xml
     payer       = Fixture.payer
-    instruction = Fixture.instruction(payer)
+    instruction = Fixture.instruction(payer: payer)
 
     assert_equal String, instruction.to_xml.class
   end
 
   def test_xml_format
     payer       = Fixture.payer
-    instruction = Fixture.instruction(payer)
+    instruction = Fixture.instruction(payer: payer)
     expected_format = <<XML
 <EnviarInstrucao><InstrucaoUnica TipoValidacao=\"Transparente\"><Razao>some payment_reason</Razao><Valores><Valor moeda=\"BRL\">100.00</Valor><Valor moeda=\"BRL\">200.00</Valor></Valores><IdProprio>your_own_instruction_id</IdProprio><Pagador><Nome>Juquinha da Rocha</Nome><Email>juquinha@rocha.com</Email><IdPagador>your_own_payer_id</IdPagador><EnderecoCobranca><Logradouro>Felipe Neri</Logradouro><Numero>406</Numero><Complemento>Sala 501</Complemento><Bairro>Auxiliadora</Bairro><Cidade>Porto Alegre</Cidade><Estado>RS</Estado><Pais>BRA</Pais><CEP>90440-150</CEP><TelefoneFixo>(51)3040-5060</TelefoneFixo></EnderecoCobranca></Pagador></InstrucaoUnica></EnviarInstrucao>
 XML
     assert_equal expected_format.rstrip, instruction.to_xml
   end
 
+  def test_to_xml_method_raises_exception_when_called_with_invalid_payer
+    subject = Fixture.instruction
+    MyMoip::Payer.any_instance.stubs(:invalid?).returns(true)
+    assert_raise ArgumentError do
+      subject.to_xml
+    end
+  end
+
+  def test_to_xml_method_dont_raises_exception_when_called_with_valid_payer
+    subject = Fixture.instruction
+    MyMoip::Payer.any_instance.stubs(:invalid?).returns(false)
+    assert_nothing_raised ArgumentError do
+      subject.to_xml
+    end
+  end
+
+  def test_to_xml_method_raises_exception_when_called_with_invalid_params
+    subject = Fixture.instruction
+    MyMoip::Instruction.any_instance.stubs(:invalid?).returns(true)
+    assert_raise ArgumentError do
+      subject.to_xml
+    end
+  end
+
+  def test_to_xml_method_dont_raises_exception_when_called_with_valid_params
+    subject = Fixture.instruction
+    MyMoip::Instruction.any_instance.stubs(:invalid?).returns(false)
+    assert_nothing_raised ArgumentError do
+      subject.to_xml
+    end
+  end
+
+  def test_validate_presence_of_id_attribute
+    subject = Fixture.instruction
+    subject.id = nil
+    assert subject.invalid? && subject.errors[:id].present?,
+      'should be invalid without an id'
+  end
+
+  def test_validate_presence_of_payment_reason_attribute
+    subject = Fixture.instruction
+    subject.payment_reason = nil
+    assert subject.invalid? && subject.errors[:payment_reason].present?,
+      'should be invalid without a payment_reason'
+    subject.payment_reason = ''
+    assert subject.invalid? && subject.errors[:payment_reason].present?,
+      'should be invalid without a payment_reason'
+  end
+
+  def test_validate_presence_of_values_attribute
+    subject = Fixture.instruction
+    subject.values = nil
+    assert subject.invalid? && subject.errors[:values].present?,
+      'should be invalid without values'
+  end
+
+  def test_validate_presence_of_payer_attribute
+    subject = Fixture.instruction
+    subject.payer = nil
+    assert subject.invalid? && subject.errors[:payer].present?,
+      'should be invalid without a payer'
+  end
 end

data/test/test_payer.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 class TestPayer < Test::Unit::TestCase
-
   def test_getters_for_attributes
     payer = MyMoip::Payer.new(
       id: "some id",
@@ -12,10 +11,10 @@ class TestPayer < Test::Unit::TestCase
       address_street_extra: "some address_street_extra",
       address_neighbourhood: "some address_neighbourhood",
       address_city: "some address_city",
-      address_state: "some address_state",
-      address_country: "some address_country",
-      address_cep: "some address_cep",
-      address_phone: "some address_phone"
+      address_state: "RS",
+      address_country: "BRA",
+      address_cep: "92123456",
+      address_phone: "5130405060"
     )
 
     assert_equal "some id", payer.id
@@ -26,10 +25,195 @@ class TestPayer < Test::Unit::TestCase
     assert_equal "some address_street_extra", payer.address_street_extra
     assert_equal "some address_neighbourhood", payer.address_neighbourhood
     assert_equal "some address_city", payer.address_city
-    assert_equal "some address_state", payer.address_state
-    assert_equal "some address_country", payer.address_country
-    assert_equal "some address_cep", payer.address_cep
-    assert_equal "some address_phone", payer.address_phone
+    assert_equal "RS", payer.address_state
+    assert_equal "BRA", payer.address_country
+    assert_equal "92123456", payer.address_cep
+    assert_equal "5130405060", payer.address_phone
+  end
+
+  def test_validate_presence_of_id_attribute
+    subject = Fixture.payer
+    subject.id = nil
+    assert subject.invalid?, 'should be invalid without an id'
+    subject.id = ''
+    assert subject.invalid?, 'should be invalid without an id'
+  end
+
+  def test_validate_presence_of_name_attribute
+    subject = Fixture.payer
+    subject.name = nil
+    assert subject.invalid?, 'should be invalid without an name'
+    subject.name = ''
+    assert subject.invalid?, 'should be invalid without an name'
+  end
+
+  def test_validate_presence_of_email_attribute
+    subject = Fixture.payer
+    subject.email = nil
+    assert subject.invalid?, 'should be invalid without an email'
+    subject.email = ''
+    assert subject.invalid?, 'should be invalid without an email'
+  end
+
+  def test_validate_presence_of_address_street_attribute
+    subject = Fixture.payer
+    subject.address_street = nil
+    assert subject.invalid?, 'should be invalid without an address_street'
+    subject.address_street = ''
+    assert subject.invalid?, 'should be invalid without an address_street'
+  end
+
+  def test_validate_presence_of_address_street_number_attribute
+    subject = Fixture.payer
+    subject.address_street_number = nil
+    assert subject.invalid?, 'should be invalid without an address_street_number'
+    subject.address_street_number = ''
+    assert subject.invalid?, 'should be invalid without an address_street_number'
+  end
+
+  def test_validate_presence_of_address_neighbourhood_attribute
+    subject = Fixture.payer
+    subject.address_neighbourhood = nil
+    assert subject.invalid?, 'should be invalid without an address_neighbourhood'
+    subject.address_neighbourhood = ''
+    assert subject.invalid?, 'should be invalid without an address_neighbourhood'
+  end
+
+  def test_validate_presence_of_address_city_attribute
+    subject = Fixture.payer
+    subject.address_city = nil
+    assert subject.invalid?, 'should be invalid without an address_city'
+    subject.address_city = ''
+    assert subject.invalid?, 'should be invalid without an address_city'
+  end
+
+  def test_validate_presence_of_address_state_attribute
+    subject = Fixture.payer
+    subject.address_state = nil
+    assert subject.invalid?, 'should be invalid without an address_state'
+    subject.address_state = ''
+    assert subject.invalid?, 'should be invalid without an address_state'
+  end
+
+  def test_validate_length_of_address_state_attribute_in_2_chars
+    subject = Fixture.payer
+    subject.address_state = 'RS'
+    assert subject.valid?, 'should accept 2 chars'
+    subject.address_state = 'RSS'
+    assert subject.invalid? && subject.errors[:address_state].present?,
+      'should not accept strings with other than 2 chars'
+  end
+
+  def test_upcase_assigned_address_state
+    subject = Fixture.payer
+    subject.address_state = 'rs'
+    assert_equal 'RS', subject.address_state
+  end
+
+  def test_validate_presence_of_address_country_attribute
+    subject = Fixture.payer
+    subject.address_country = nil
+    assert subject.invalid?, 'should be invalid without an address_country'
+    subject.address_country = ''
+    assert subject.invalid?, 'should be invalid without an address_country'
+  end
+
+  def test_validate_length_of_address_country_attribute_in_3_chars
+    subject = Fixture.payer
+    subject.address_country = 'BRA'
+    assert subject.valid?, 'should accept 3 chars'
+    subject.address_country = 'BR'
+    assert subject.invalid? && subject.errors[:address_country].present?,
+      'should not accept strings with other than 3 chars'
+  end
+
+  def test_upcase_assigned_address_country
+    subject = Fixture.payer
+    subject.address_country = 'bra'
+    assert_equal 'BRA', subject.address_country
+  end
+
+  def test_validate_presence_of_address_cep_attribute
+    subject = Fixture.payer
+    subject.address_cep = nil
+    assert subject.invalid?, 'should be invalid without an address_cep'
+    subject.address_cep = ''
+    assert subject.invalid?, 'should be invalid without an address_cep'
+  end
+
+  def test_validate_length_of_address_cep_attribute_in_2_chars
+    subject = Fixture.payer
+    subject.address_cep = '92123456'
+    assert subject.valid?, 'should accept 8 chars'
+    subject.address_cep = '921234560000'
+    assert subject.invalid? && subject.errors[:address_cep].present?,
+      'should not accept strings with other than 8 chars'
+  end
+
+  def test_dont_count_dashes_in_the_address_cep_length_validation
+    subject = Fixture.payer
+    subject.address_cep = '92123-456'
+    assert subject.valid?
+  end
+
+  def test_remove_dashes_from_address_cep
+    subject = Fixture.payer
+    subject.address_cep = '92123-456'
+    assert_equal '92123456', subject.address_cep
+  end
+
+  def test_validate_presence_of_address_phone_attribute
+    subject = Fixture.payer
+    subject.address_phone = nil
+    assert subject.invalid?, 'should be invalid without an address_phone'
+    subject.address_phone = ''
+    assert subject.invalid?, 'should be invalid without an address_phone'
+  end
+
+  def test_validate_length_of_address_phone_attribute_in_10_or_11_chars
+    subject = Fixture.payer
+    subject.address_phone = '5130405060'
+    assert subject.valid?, 'should accept 10 chars'
+    subject.address_phone = '51930405060'
+    assert subject.valid?, 'should accept 11 chars'
+    subject.address_phone = '215130405060'
+    assert subject.invalid? && subject.errors[:address_phone].present?,
+      'should not accept strings with other than 10 or 11 chars'
+  end
+
+  def test_remove_left_zeros_from_address_phone
+    subject = Fixture.payer
+    subject.address_phone = '05130405060'
+    assert_equal '5130405060', subject.address_phone
+  end
+
+  def test_remove_dashes_from_address_phone
+    subject = Fixture.payer
+    subject.address_phone = '513040-5060'
+    assert_equal '5130405060', subject.address_phone
+    subject.address_phone = '5193040-5060'
+    assert_equal '51930405060', subject.address_phone
+  end
+
+  def test_remove_parenthesis_from_address_phone
+    subject = Fixture.payer
+    subject.address_phone = '(51)30405060'
+    assert_equal '5130405060', subject.address_phone
+    subject.address_phone = '(51)930405060'
+    assert_equal '51930405060', subject.address_phone
   end
 
+  def test_to_xml_method_uses_the_formatted_version_of_the_address_cep
+    subject = Fixture.payer(address_cep: '92000123')
+    formatter = stub_everything('formatter')
+    formatter.expects(:cep).with('92000123')
+    subject.to_xml(nil, formatter)
+  end
+
+  def test_to_xml_method_uses_the_formatted_version_of_the_address_phone
+    subject = Fixture.payer(address_phone: '5130405060')
+    formatter = stub_everything('formatter')
+    formatter.expects(:phone).with('5130405060')
+    subject.to_xml(nil, formatter)
+  end
 end

data/test/test_payment_request.rb

@@ -71,7 +71,7 @@ class TestPaymentRequest < Test::Unit::TestCase
   end
 
   def test_method_to_get_moip_code
-    instruction = Fixture.instruction(Fixture.payer)
+    instruction = Fixture.instruction(payer: Fixture.payer)
     transparent_request = MyMoip::TransparentRequest.new("your_own_id")
     VCR.use_cassette('transparent_request') do
       transparent_request.api_call(instruction)
@@ -85,7 +85,7 @@ class TestPaymentRequest < Test::Unit::TestCase
   end
 
   def test_code_method_should_return_nil_with_blank_response
-    instruction = Fixture.instruction(Fixture.payer)
+    instruction = Fixture.instruction(payer: Fixture.payer)
     transparent_request = MyMoip::TransparentRequest.new("your_own_id")
     VCR.use_cassette('transparent_request') do
       transparent_request.api_call(instruction)

data/test/test_transparent_request.rb

@@ -57,7 +57,7 @@ class TestTransparentRequest < Test::Unit::TestCase
   def test_should_provide_the_transaction_id_get_by_the_request
     request = MyMoip::TransparentRequest.new("some_id")
     VCR.use_cassette('transparent_request') do
-      request.api_call(Fixture.instruction(Fixture.payer))
+      request.api_call(Fixture.instruction(payer: Fixture.payer))
     end
     assert_equal "201210171118501100000001102691", request.id
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mymoip
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +190,7 @@ files:
 - lib/mymoip.rb
 - lib/mymoip/credit_card.rb
 - lib/mymoip/credit_card_payment.rb
+- lib/mymoip/formatter.rb
 - lib/mymoip/instruction.rb
 - lib/mymoip/json_parser.rb
 - lib/mymoip/payer.rb
@@ -188,6 +205,7 @@ files:
 - test/live_test.rb
 - test/test_credit_card_payment.rb
 - test/test_creditcard.rb
+- test/test_formatter.rb
 - test/test_instruction.rb
 - test/test_mymoip.rb
 - test/test_payer.rb
@@ -209,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1339834329601628158
+      hash: 3042837852117747253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: