mymoip 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 401ae2832ae5de6b706bf0581872a9554bd06f7e
-  data.tar.gz: d8ec3a961608600adae70bd42211e07ea9aae631
+  metadata.gz: 53ae6a3acf07d96de7fdeb44ec9f36da4b4d8302
+  data.tar.gz: 9a35890d9732b300341b60e8184d690b0cf6ca4f
 SHA512:
-  metadata.gz: e5b9b24159c3122829f406ee1e09e19db8f087f3d4e63474461b57cab065a6095aec3d7f984b6b7f2516108f94bf1e21a55800d30c7467747c7f6aa320b6e80a
-  data.tar.gz: f3bfdf0541cab984fbf4f535fe01725a83670e4429120407d6d535b9d04ef7e7e9689ca39cebbaff0320106998898c7bfc394657f04b9a3ee20022847d7d2c46
+  metadata.gz: 4d2460af5d3c904b87d6ebe4f3deec91964e00a68331b191265abdedd9be87ca5fcd2e1df50c021bf83e684c541fea1fceed6e29970fadbb258b4b3c083129ef
+  data.tar.gz: 39a6d852ca28a90ab3dbfeee666f912c7eb61dd86ea2fd94f869d7b54968bf29dc1907bef22715f1b462e0458011c5a8410ff0dc9586134526bb5fc07dafddde

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.7.0
+
+* Allow payments using redirection to Moip's domain. (by @oznek)
+* Include PaymentSlip configuration class. (by @oznek)
+* Remove backward compatibility with CreditCardPayment w/o options hash.
+
 ## 0.6.2
 
 * Removed development dependency of jeweler. Gems are now managed

data/README.md

@@ -24,11 +24,13 @@ Any patch are welcome, even removing extra white spaces.
 ## First of all
 
 **Bundler - Gemfile**
+
 ```ruby
 gem 'mymoip'
 ```
 
 **Configuration**
+
 ```ruby
 MyMoip.environment = 'production' # 'sandbox' by default
 
@@ -89,6 +91,7 @@ purchase.code # Moip code or nil, depending of the checkout's return
 ## The hard way
 
 **First request: what and from who**
+
 ```ruby
 payer = MyMoip::Payer.new(
   id:                    'payer_id_defined_by_you',
@@ -138,6 +141,7 @@ payment_request.api_call(credit_card_payment,
 ```
 
 **Success?**
+
 ```ruby
 payment_request.success?
 ```
@@ -195,7 +199,7 @@ installments = [
   { min: 2, max: 12, forward_taxes: true,  fee: 1.99 } # 1.99 fee = 1.99% per month
 ]
 
-MyMoip::Instruction.new(
+instruction = MyMoip::Instruction.new(
   id:             'instruction_id_defined_by_you',
   payment_reason: 'Order in Buy Everything Store',
   values:         [100.0],
@@ -206,6 +210,79 @@ MyMoip::Instruction.new(
 
 [More](https://github.com/Irio/mymoip/wiki/Installments-use).
 
+### Notification and return URLs
+
+URLs configured at MoIP account can be overrided by passing new URLs values to the instruction object.
+A notification URL is used for MoIP NASP notification system, responsible for transaction changes signals, 
+and a return URL is used to return to your website when a payment is using external websites.
+
+```ruby
+instruction = MyMoip::Instruction.new(
+  id:               'instruction_id_defined_by_you',
+  payment_reason:   'Order in Buy Everything Store',
+  values:           [100.0],
+  payer:            payer,
+  notification_url: 'https://example.com/payments/notification',
+  return_url:       'https://example.com/payments/return'
+)
+```
+
+### Payment methods configuration
+
+If you don't need all the payment methods available, you can choose some by configuring 
+PaymentMethods and adding it to the instruction:
+
+```ruby
+payment_methods = MyMoip::PaymentMethods.new(
+  payment_slip: false,
+  credit_card:  true,
+  debit:        true,
+  debit_card:   true,
+  financing:    true, 
+  moip_wallet:  true
+)
+
+instruction = MyMoip::Instruction.new(
+  id:              'instruction_id_defined_by_you',
+  payment_reason:  'Order in Buy Everything Store',
+  values:          [100.0],
+  payer:           payer,
+  payment_methods: payment_methods
+)
+```
+
+### Payment slip (aka boleto) configuration 
+
+You can optionally configure your payment slip creating a PaymentSlip and adding to the instruction:
+
+```ruby
+payment_slip = MyMoip::PaymentSlip.new(
+  expiration_date:      Date.today.next_day.to_datetime,
+  expiration_days:      5,
+  expiration_days_type: :business_day,
+  instruction_line_1:   'This is the first instruction line.',
+  instruction_line_2:   'Please do not pay this slip.',
+  instruction_line_3:   'This is a test! :)',
+  logo_url:             'https://example.com/logo.png'
+)
+  
+instruction = MyMoip::Instruction.new(
+  id:             'instruction_id_defined_by_you',
+  payment_reason: 'Order in Buy Everything Store',
+  values:         [100.0],
+  payer:          payer,
+  payment_slip:   payment_slip
+)
+```
+
+A payment slip can have the following attributes:
+
+  * expiration_date: a DateTime indicating the last payment date to this slip.
+  * expiration_days: expiration days after which the printed payment slip will be considered expired.
+  * expiration_days_type: type of expiration day, which can be :business_day or :calendar_day.
+  * instruction_line_1, instruction_line_2, instruction_line_3: lines of instruction (up to 63 characters each), added to the payment slip.
+  * logo_url: an URL pointing to an image which will be added to the body of the payment slip.
+
 ## Going alive!
 
 If you are ready to get your application using MyMoip approved by MoIP or already have valid production keys, you can read a specific [documentation](https://github.com/Irio/mymoip/wiki/Going-alive).

data/lib/mymoip/commission.rb

@@ -5,7 +5,7 @@ module MyMoip
     attr_accessor :reason, :receiver_login, :fixed_value, :percentage_value
 
     validates_presence_of :reason, :receiver_login
-    validates_presence_of :fixed_value, if: -> { percentage_value.nil? }
+    validates_presence_of :fixed_value,      if: -> { percentage_value.nil? }
     validates_presence_of :percentage_value, if: -> { fixed_value.nil? }
     validates_numericality_of :fixed_value, greater_than_or_equal_to: 0,
                                             allow_nil: true
@@ -14,10 +14,9 @@ module MyMoip
                                                  allow_nil: true
 
     def initialize(attrs)
-      self.reason           = attrs[:reason]
-      self.receiver_login   = attrs[:receiver_login]
-      self.fixed_value      = attrs[:fixed_value]
-      self.percentage_value = attrs[:percentage_value]
+      attrs.each do |attr, value|
+        public_send(:"#{attr}=", value)
+      end
     end
 
     def gross_amount(instruction)

data/lib/mymoip/credit_card_payment.rb

@@ -3,18 +3,13 @@ module MyMoip
     attr_accessor :credit_card, :installments
 
     def initialize(credit_card, opts = {})
-      self.credit_card = credit_card
-      # Backward compatibility. See 0.2.3 CHANGELOG
-      self.installments = if opts.kind_of?(Integer)
-                            opts
-                          else
-                            opts[:installments] || 1
-                          end
+      self.credit_card  = credit_card
+      self.installments = opts[:installments] || 1
     end
 
     def to_json(formatter = MyMoip::Formatter)
       raise InvalidCreditCard, 'No credit card provided.' if credit_card.nil?
-      raise InvalidCreditCard if credit_card.invalid?
+      raise InvalidCreditCard                             if credit_card.invalid?
 
       json = {
         Forma:        "CartaoCredito",

data/lib/mymoip/exceptions.rb

@@ -1,11 +1,13 @@
 module MyMoip
-  class Error < StandardError; end
+  class Error < StandardError;      end
 
-  class InvalidComission < Error; end
+  class InvalidComission < Error;   end
 
-  class InvalidCreditCard < Error; end
+  class InvalidCreditCard < Error;  end
 
   class InvalidInstruction < Error; end
 
-  class InvalidPayer < Error; end
+  class InvalidPayer < Error;       end
+
+  class InvalidPaymentSlip < Error; end
 end

data/lib/mymoip/formatter.rb

@@ -1,7 +1,7 @@
 module MyMoip
   class Formatter
     def self.cep(plain_cep)
-      raise ArgumentError, 'Cannot format CEP nil' if plain_cep.nil?
+      raise ArgumentError, 'Cannot format CEP nil'   if plain_cep.nil?
       plain_cep.gsub(/(\d{5})/, '\1-')
     end
 
@@ -11,12 +11,12 @@ module MyMoip
     end
 
     def self.date(plain_date)
-      raise ArgumentError, 'Cannot format date nil' if plain_date.nil?
+      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?
+      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

data/lib/mymoip/instruction.rb

@@ -1,35 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/validators.rb')
 module MyMoip
   class Instruction
+    include Validators
     include ActiveModel::Validations
 
     attr_accessor :id, :payment_reason, :values, :payer,
                   :commissions, :fee_payer_login, :payment_receiver_login,
-                  :payment_receiver_name,:installments
+                  :payment_receiver_name, :installments,
+                  :notification_url, :return_url,
+                  :payment_slip, :payment_methods
 
     validates_presence_of :id, :payment_reason, :values, :payer
     validate :commissions_value_must_be_lesser_than_values
     validate :payment_receiver_presence_in_commissions
+    validate :url_format_validation
 
     def initialize(attrs)
-      self.id                     = attrs[:id]
-      self.payment_reason         = attrs[:payment_reason]
-      self.values                 = attrs[:values]
-      self.payer                  = attrs[:payer]
-      self.commissions            = attrs[:commissions] || []
-      self.fee_payer_login        = attrs[:fee_payer_login]
-      self.payment_receiver_login = attrs[:payment_receiver_login]
-      self.payment_receiver_name  = attrs[:payment_receiver_name]
-      self.installments           = attrs[:installments]
+      attrs.each do |attr, value|
+        public_send(:"#{attr}=", value)
+      end
+
+      self.commissions ||= []
     end
 
     def to_xml(root = nil)
-      raise InvalidPayer if payer.invalid?
+      raise InvalidPayer       if payer.invalid?
+      raise InvalidPaymentSlip if payment_slip and payment_slip.invalid?
       raise InvalidInstruction if self.invalid?
       if invalid_commission = commissions.detect { |c| c.invalid? }
         raise InvalidComission, invalid_commission
       end
 
-      xml  = ""
+      xml = ""
       root = Builder::XmlMarkup.new(target: xml)
 
       root.EnviarInstrucao do |n1|
@@ -39,24 +41,39 @@ module MyMoip
             @values.each { |v| n3.Valor("%.2f" % v, moeda: "BRL") }
           end
           n2.IdProprio(@id)
-          
+
           if @installments
             n2.Parcelamentos do |n4|
-              @installments.each do |i| 
+              @installments.each do |installments|
                 n4.Parcelamento do |n5|
-                  n5.MinimoParcelas i[:min]
-                  n5.MaximoParcelas i[:max]
-                  n5.Repassar i[:forward_taxes] if i[:forward_taxes]
-                  n5.Juros i[:fee]
+                  n5.MinimoParcelas(installments[:min])
+                  n5.MaximoParcelas(installments[:max])
+                  if installments[:forward_taxes]
+                    n5.Repassar(installments[:forward_taxes])
+                  end
+                  n5.Juros(installments[:fee])
                 end
               end
             end
           end
 
-          commissions_to_xml n2  if !commissions.empty?
-          payment_receiver_to_xml n2 if payment_receiver_login
+          commissions_to_xml(n2)      if commissions.any?
+          payment_receiver_to_xml(n2) if payment_receiver_login
 
           n2.Pagador { |n3| @payer.to_xml(n3) }
+
+          unless @payment_methods.blank? or @payment_methods.using_all?
+            n2.FormasPagamento { |n3| @payment_methods.to_xml(n3) }
+          end
+          unless @payment_slip.blank?
+            n2.Boleto { |n3| @payment_slip.to_xml(n3) }
+          end
+          unless @notification_url.blank?
+            n2.URLNotificacao(@notification_url)
+          end
+          unless @return_url.blank?
+            n2.URLRetorno(@return_url)
+          end
         end
       end
 
@@ -100,5 +117,15 @@ module MyMoip
         n.Apelido(payment_receiver_name)
       end
     end
+
+    def url_format_validation
+      if not notification_url.blank? and not valid_url?(notification_url)
+        errors.add(:notification_url, 'Invalid URL format')
+      end
+
+      if not return_url.blank? and not valid_url?(return_url)
+        errors.add(:return_url, 'Invalid URL format.')
+      end
+    end
   end
 end

data/lib/mymoip/payer.rb

@@ -3,17 +3,18 @@ module MyMoip
     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
+                  :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_state,   is: 2
     validates_length_of :address_country, is: 3
-    validates_length_of :address_cep, is: 8
+    validates_length_of :address_cep,     is: 8
     validates_length_of :address_phone, within: 10..11
 
     def initialize(attrs)

data/lib/mymoip/payment_methods.rb

@@ -0,0 +1,46 @@
+module MyMoip
+  class PaymentMethods
+    include ActiveModel::Validations
+
+    attr_accessor :payment_slip, :credit_card, :debit, :debit_card, :financing,
+                  :moip_wallet
+
+    validates_inclusion_of :payment_slip, :credit_card, :debit, :debit_card,
+                           :financing, :moip_wallet, in: [true, false]
+
+    def initialize(attrs = {})
+      self.payment_slip = true
+      self.credit_card  = true
+      self.debit        = true
+      self.debit_card   = true
+      self.financing    = true
+      self.moip_wallet  = true
+
+      attrs.each do |attr, value|
+        public_send(:"#{attr}=", value)
+      end
+    end
+
+    def to_xml(root = nil)
+      if root.nil?
+        xml = ""
+        root ||= Builder::XmlMarkup.new(target: xml)
+      end
+
+      if not using_all?
+        root.FormaPagamento('BoletoBancario')        if payment_slip
+        root.FormaPagamento('CartaoDeCredito')       if credit_card
+        root.FormaPagamento('DebitoBancario')        if debit
+        root.FormaPagamento('CartaoDeDebito')        if debit_card
+        root.FormaPagamento('FinanciamentoBancario') if financing
+        root.FormaPagamento('CarteiraMoIP')          if moip_wallet
+      end
+
+      xml
+    end
+
+    def using_all?
+      payment_slip and credit_card and debit and debit_card and financing and moip_wallet
+    end
+  end
+end

data/lib/mymoip/payment_slip.rb

@@ -0,0 +1,74 @@
+module MyMoip
+  class PaymentSlip
+    include Validators
+    include ActiveModel::Validations
+
+    attr_accessor :expiration_date, :expiration_days, :expiration_days_type,
+                  :instruction_line_1, :instruction_line_2,
+                  :instruction_line_3, :logo_url
+
+    validates_length_of :instruction_line_1, maximum: 63, allow_nil: true
+    validates_length_of :instruction_line_2, maximum: 63, allow_nil: true
+    validates_length_of :instruction_line_3, maximum: 63, allow_nil: true
+
+    validates_numericality_of :expiration_days, less_than_or_equal_to: 99,
+                              allow_nil: true
+    validates_inclusion_of :expiration_days_type,
+                           in: [:business_day, :calendar_day], allow_nil: true
+
+    validate :logo_url_format
+    validate :expiration_date_format
+
+    def initialize(attrs)
+      attrs.each do |attr, value|
+        public_send(:"#{attr}=", value)
+      end
+    end
+
+    def to_xml(root = nil)
+      raise InvalidPaymentSlip if invalid?
+
+      if root.nil?
+        xml = ""
+        root ||= Builder::XmlMarkup.new(target: xml)
+      end
+
+      root.DataVencimento(expiration_date.strftime('%Y-%m-%dT%H:%M:%S.%L%:z')) unless expiration_date.blank?
+
+      if expiration_days
+        type = nil
+        if expiration_days_type
+          if expiration_days_type == :business_day
+            type = {'Tipo' => 'Uteis'}
+          elsif expiration_days_type == :calendar_day
+            type = {'Tipo' => 'Corridos'}
+          end
+        end
+
+        root.DiasExpiracao(expiration_days, type)
+      end
+
+      root.Instrucao1(instruction_line_1) unless instruction_line_1.blank?
+      root.Instrucao2(instruction_line_2) unless instruction_line_2.blank?
+      root.Instrucao3(instruction_line_3) unless instruction_line_3.blank?
+
+      root.URLLogo(logo_url) unless logo_url.blank?
+
+      xml
+    end
+
+    private
+
+    def logo_url_format
+      if not logo_url.blank? and not valid_url?(logo_url)
+        errors.add(:logo_url, 'Invalid URL format.')
+      end
+    end
+
+    def expiration_date_format
+      if not expiration_date.blank? and not expiration_date.instance_of?(DateTime)
+        errors.add(:expiration_date, 'Expiration date must be a DateTime object.')
+      end
+    end
+  end
+end

data/lib/mymoip/request.rb

@@ -17,7 +17,7 @@ module MyMoip
         MyMoip.ensure_key_and_token_set!
       end
 
-      opts[:logger].info "New #{self.class} being sent to MoIP."
+      opts[:logger].info  "New #{self.class} being sent to MoIP."
       opts[:logger].debug "#{self.class} of ##{@id} with #{params.inspect}"
 
       url = MyMoip.api_url + params.delete(:path)

data/lib/mymoip/requests/transparent_request.rb

@@ -17,21 +17,19 @@ module MyMoip
     end
 
     def success?
-      @response && @response["EnviarInstrucaoUnicaResponse"]["Resposta"]["Status"] == "Sucesso"
-    rescue NoMethodError => e
+      @response["EnviarInstrucaoUnicaResponse"]["Resposta"]["Status"] == "Sucesso"
+    rescue NoMethodError
       false
     end
 
     def token
-      @response["EnviarInstrucaoUnicaResponse"]["Resposta"]["Token"] || nil
-    rescue NoMethodError => e
-      nil
+      @response["EnviarInstrucaoUnicaResponse"]["Resposta"]["Token"]
+    rescue NoMethodError
     end
 
     def id
       @response["EnviarInstrucaoUnicaResponse"]["Resposta"]["ID"]
-    rescue NoMethodError => e
-      nil
+    rescue NoMethodError
     end
 
   end

data/lib/mymoip/validators.rb

@@ -0,0 +1,12 @@
+module MyMoip
+  module Validators
+    private
+
+    def valid_url?(url)
+      uri = URI.parse(url)
+      uri.kind_of?(URI::HTTP) or uri.kind_of?(URI::HTTPS)
+    rescue URI::InvalidURIError
+      false
+    end
+  end
+end

data/lib/mymoip/version.rb

@@ -1,3 +1,3 @@
 module MyMoip
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

data/lib/mymoip.rb

@@ -48,8 +48,10 @@ end
 
 $LOAD_PATH << "./lib/mymoip"
 
+require File.dirname(__FILE__) + "/mymoip/validators.rb"
+
 files = Dir[File.dirname(__FILE__) + "/mymoip/*.rb"]
 files.each { |f| require f }
 
 MyMoip.environment = "sandbox"
-MyMoip.logger = Logger.new(STDOUT)
+MyMoip.logger      = Logger.new(STDOUT)

data/test/fixtures/fixture.rb

@@ -53,4 +53,17 @@ class Fixture
     MyMoip::Commission.new(params)
   end
 
+  def self.payment_slip(params = {})
+    params = {
+        expiration_date: DateTime.new(2020, 1, 1),
+        expiration_days: 7,
+        expiration_days_type: :business_day,
+        instruction_line_1: 'Line 1',
+        instruction_line_2: 'Line 2',
+        instruction_line_3: 'Line 3',
+        logo_url: 'http://www.myurl.com/logo.png'
+    }.merge(params)
+
+    MyMoip::PaymentSlip.new(params)
+  end
 end

data/test/lib/test_credit_card_payment.rb

@@ -1,13 +1,6 @@
 require_relative '../test_helper'
 
 class TestCreditCardPayment < Test::Unit::TestCase
-  def test_initialization_and_getters
-    credit_card = Fixture.credit_card
-    subject = MyMoip::CreditCardPayment.new(credit_card, 1)
-    assert_equal credit_card, subject.credit_card
-    assert_equal 1, subject.installments
-  end
-
   def test_allow_initialization_with_a_hash_of_options
     credit_card = Fixture.credit_card
     subject = MyMoip::CreditCardPayment.new(credit_card, installments: 2)
@@ -17,13 +10,13 @@ class TestCreditCardPayment < Test::Unit::TestCase
 
   def test_cash_method_with_one_tranch
     credit_card = Fixture.credit_card
-    subject = MyMoip::CreditCardPayment.new(credit_card, 1)
+    subject = MyMoip::CreditCardPayment.new(credit_card, installments: 1)
     assert_equal true, subject.cash?
   end
 
   def test_cash_method_with_more_than_one_installments
     credit_card = Fixture.credit_card
-    subject = MyMoip::CreditCardPayment.new(credit_card, 3)
+    subject = MyMoip::CreditCardPayment.new(credit_card, installments: 3)
     assert_equal false, subject.cash?
   end
 

data/test/lib/test_instruction.rb

@@ -14,7 +14,9 @@ class TestInstruction < Test::Unit::TestCase
       fee_payer_login: "fee_payer_login",
       payment_receiver_login: "payment_receiver_login",
       payment_receiver_name: "nick_fury",
-      installments: installments
+      installments: installments,
+      notification_url: 'http://please.notify.me',
+      return_url: 'http://return.to.my.address.com'
     )
 
     assert_equal "some id", instruction.id
@@ -26,6 +28,8 @@ class TestInstruction < Test::Unit::TestCase
     assert_equal "fee_payer_login", instruction.fee_payer_login
     assert_equal "payment_receiver_login", instruction.payment_receiver_login
     assert_equal "nick_fury", instruction.payment_receiver_name
+    assert_equal 'http://please.notify.me', instruction.notification_url
+    assert_equal 'http://return.to.my.address.com', instruction.return_url
   end
 
   def test_should_generate_a_string_when_converting_to_xml
@@ -45,6 +49,18 @@ XML
     assert_equal expected_format.rstrip, instruction.to_xml
   end
   
+  def test_xml_format_with_urls
+    payer       = Fixture.payer
+    instruction = Fixture.instruction(payer: payer)
+    instruction.notification_url = 'http://qwerty.me/nasp'
+    instruction.return_url = 'http://return.to.me'
+    
+    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><Parcelamentos><Parcelamento><MinimoParcelas>2</MinimoParcelas><MaximoParcelas>12</MaximoParcelas><Repassar>true</Repassar><Juros>1.99</Juros></Parcelamento></Parcelamentos><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><URLNotificacao>http://qwerty.me/nasp</URLNotificacao><URLRetorno>http://return.to.me</URLRetorno></InstrucaoUnica></EnviarInstrucao>
+XML
+    assert_equal expected_format.rstrip, instruction.to_xml
+  end
+
   def test_xml_format_with_installments
     payer        = Fixture.payer
     installments = [
@@ -214,4 +230,14 @@ XML
     assert subject.invalid? && subject.errors[:payer].present?,
       'should be invalid without a payer'
   end
+
+  def test_validate_url
+    subject = Fixture.instruction
+    assert subject.valid?    
+
+    subject.notification_url = 'ftp://sdfsdfs.com'
+    subject.return_url = 'xxftpsdfsdfs.com'
+
+    assert subject.invalid? && subject.errors[:notification_url].present? && subject.errors[:return_url].present?
+  end
 end

data/test/lib/test_payment_methods.rb

@@ -0,0 +1,54 @@
+require_relative '../test_helper'
+
+class TestPaymentMethods < Test::Unit::TestCase
+  def test_initialization_and_setters
+    params = {
+      payment_slip: true,
+      credit_card: false,
+      debit: true,
+      debit_card: false, 
+      financing: true, 
+      moip_wallet: false
+    }
+
+    subject = MyMoip::PaymentMethods.new(params)
+    assert_equal params[:payment_slip], subject.payment_slip
+    assert_equal params[:credit_card], subject.credit_card
+    assert_equal params[:debit], subject.debit
+    assert_equal params[:debit_card], subject.debit_card
+    assert_equal params[:financing], subject.financing
+    assert_equal params[:moip_wallet], subject.moip_wallet
+  end
+
+  def test_validates_boolean
+    subject = MyMoip::PaymentMethods.new
+    assert subject.valid?
+
+    subject.payment_slip = 1
+    subject.credit_card = 1
+    subject.debit = 1
+    subject.debit_card = 1
+    subject.financing = 1
+    subject.moip_wallet = 1
+
+    assert subject.invalid? && 
+      subject.errors[:payment_slip].present? &&
+      subject.errors[:credit_card].present? &&
+      subject.errors[:debit].present? &&
+      subject.errors[:debit_card].present? &&
+      subject.errors[:financing].present? &&
+      subject.errors[:moip_wallet].present?
+  end
+
+  def test_xml_format
+    subject = MyMoip::PaymentMethods.new
+    assert_equal '', subject.to_xml
+
+    subject.payment_slip = false
+    expected_format = <<XML
+<FormaPagamento>CartaoDeCredito</FormaPagamento><FormaPagamento>DebitoBancario</FormaPagamento><FormaPagamento>CartaoDeDebito</FormaPagamento><FormaPagamento>FinanciamentoBancario</FormaPagamento><FormaPagamento>CarteiraMoIP</FormaPagamento>
+XML
+    assert_equal expected_format.strip, subject.to_xml
+  end
+
+end

data/test/lib/test_payment_request.rb

@@ -75,7 +75,7 @@ class TestPaymentRequest < Test::Unit::TestCase
     VCR.use_cassette('transparent_request') do
       transparent_request.api_call(instruction)
     end
-    credit_card_payment = MyMoip::CreditCardPayment.new(Fixture.credit_card, 1)
+    credit_card_payment = MyMoip::CreditCardPayment.new(Fixture.credit_card, installments: 1)
     payment_request = MyMoip::PaymentRequest.new("your_own_id")
     VCR.use_cassette('payment_request') do
       payment_request.api_call(credit_card_payment, token: transparent_request.token)
@@ -89,7 +89,7 @@ class TestPaymentRequest < Test::Unit::TestCase
     VCR.use_cassette('transparent_request') do
       transparent_request.api_call(instruction)
     end
-    credit_card_payment = MyMoip::CreditCardPayment.new(Fixture.credit_card, 1)
+    credit_card_payment = MyMoip::CreditCardPayment.new(Fixture.credit_card, installments: 1)
     payment_request = MyMoip::PaymentRequest.new("your_own_id")
     assert_nil payment_request.code
   end

data/test/lib/test_payment_slip.rb

@@ -0,0 +1,78 @@
+require_relative '../test_helper'
+
+class TestPaymentSlip < Test::Unit::TestCase
+  def test_validate_length_of_instruction_lines
+    subject = Fixture.payment_slip()
+    assert subject.valid?
+
+    subject.instruction_line_1 = ('*' * 63)
+    subject.instruction_line_2 = ('*' * 63)
+    subject.instruction_line_3 = ('*' * 63)
+
+    assert subject.valid?
+
+    subject.instruction_line_1 = ('*' * 64)
+    subject.instruction_line_2 = ('*' * 64)
+    subject.instruction_line_3 = ('*' * 64)
+
+    assert subject.invalid?
+    assert subject.errors[:instruction_line_1].present? && 
+     subject.errors[:instruction_line_2].present? && 
+     subject.errors[:instruction_line_3].present?
+  end
+
+  def test_validate_expiration_days
+    subject = Fixture.payment_slip(expiration_days: 99)
+    assert subject.valid?
+
+    subject.expiration_days = 100
+    assert subject.invalid? && subject.errors[:expiration_days].present?
+  end
+
+  def test_validate_expiration_type
+    subject = Fixture.payment_slip(expiration_days_type: :calendar_day)
+    assert subject.valid?
+
+    subject.expiration_days_type = :business_day
+    assert subject.valid?
+
+    subject.expiration_days_type = :another_type
+    assert subject.invalid? && subject.errors[:expiration_days_type].present?
+  end
+
+  def test_validate_logo_url
+    subject = Fixture.payment_slip(logo_url: 'http://www.uol.com.br')
+    assert subject.valid?
+
+    subject.logo_url = 'https://www.google.com/sdfsdf.png'
+    assert subject.valid?
+
+    subject.logo_url = 'file://www.google.com/sdfsdf.png'
+    assert subject.invalid? && subject.errors[:logo_url].present?
+  end
+  
+  def test_validate_expiration_date_format
+    subject = Fixture.payment_slip(expiration_date: DateTime.new)
+    assert subject.valid?
+
+    subject.expiration_date = Date.new
+    assert subject.invalid? && subject.errors[:expiration_date].present?
+  end
+
+  def test_xml_format
+    subject = Fixture.payment_slip()
+    expected_format = <<XML
+<DataVencimento>2020-01-01T00:00:00.000+00:00</DataVencimento><DiasExpiracao Tipo="Uteis">7</DiasExpiracao><Instrucao1>Line 1</Instrucao1><Instrucao2>Line 2</Instrucao2><Instrucao3>Line 3</Instrucao3><URLLogo>http://www.myurl.com/logo.png</URLLogo>
+XML
+    assert_equal expected_format.rstrip, subject.to_xml
+  end
+
+  def test_xml_method_raises_exception_when_called_with_invalid_params
+    subject = Fixture.payment_slip
+    subject.stubs(:invalid?).returns(true)
+    assert_raise MyMoip::InvalidPaymentSlip do
+      subject.to_xml
+    end
+  end
+
+end

data/test/lib/test_validators.rb

@@ -0,0 +1,13 @@
+require_relative '../test_helper'
+
+class TestValidators < Test::Unit::TestCase
+  include MyMoip::Validators
+
+  def test_valid_url_validator
+  	assert_equal valid_url?('http://valid.url.me'), true
+  	assert_equal valid_url?('https://valid.url.me'), true
+  	assert_equal valid_url?('ftp://valid.url.me'), false
+  	assert_equal valid_url?('valid.url.me'), false
+  	assert_equal valid_url?('me'), false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mymoip
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Irio Irineu Musskopf Junior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -160,10 +160,13 @@ files:
 - lib/mymoip/instruction.rb
 - lib/mymoip/json_parser.rb
 - lib/mymoip/payer.rb
+- lib/mymoip/payment_methods.rb
+- lib/mymoip/payment_slip.rb
 - lib/mymoip/purchase.rb
 - lib/mymoip/request.rb
 - lib/mymoip/requests/payment_request.rb
 - lib/mymoip/requests/transparent_request.rb
+- lib/mymoip/validators.rb
 - lib/mymoip/version.rb
 - mymoip.gemspec
 - test/fixtures/fixture.rb
@@ -177,10 +180,13 @@ files:
 - test/lib/test_instruction.rb
 - test/lib/test_mymoip.rb
 - test/lib/test_payer.rb
+- test/lib/test_payment_methods.rb
 - test/lib/test_payment_request.rb
+- test/lib/test_payment_slip.rb
 - test/lib/test_purchase.rb
 - test/lib/test_request.rb
 - test/lib/test_transparent_request.rb
+- test/lib/test_validators.rb
 - test/live_test.rb
 - test/test_helper.rb
 homepage: https://github.com/Irio/mymoip
@@ -203,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: MoIP transactions in a gem to call your own.
@@ -219,9 +225,13 @@ test_files:
 - test/lib/test_instruction.rb
 - test/lib/test_mymoip.rb
 - test/lib/test_payer.rb
+- test/lib/test_payment_methods.rb
 - test/lib/test_payment_request.rb
+- test/lib/test_payment_slip.rb
 - test/lib/test_purchase.rb
 - test/lib/test_request.rb
 - test/lib/test_transparent_request.rb
+- test/lib/test_validators.rb
 - test/live_test.rb
 - test/test_helper.rb
+has_rdoc: