From 9eaa0a09cf21b283330e9771497c2d1025a12eab Mon Sep 17 00:00:00 2001 From: Fernando Luizao Date: Fri, 28 Aug 2009 20:25:44 -0300 Subject: [PATCH] fixes para ruby 1.9 --- brcep/lib/brcep/busca_endereco.rb | 1 + brdata/lib/brdata.rb | 3 ++- brdata/lib/brdata/br_date_helper.rb | 3 ++- brdata/lib/brdata/excecoes.rb | 1 + .../lib/brhelper/br_form_options_helper.rb | 1 + brnumeros/lib/brnumeros/number_portuguese.rb | 19 ++++++++++--------- brstring/lib/brstring/string_portuguese.rb | 1 + 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/brcep/lib/brcep/busca_endereco.rb b/brcep/lib/brcep/busca_endereco.rb index 7653a7f..a3dd965 100644 --- a/brcep/lib/brcep/busca_endereco.rb +++ b/brcep/lib/brcep/busca_endereco.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 require 'net/http' require 'rexml/document' diff --git a/brdata/lib/brdata.rb b/brdata/lib/brdata.rb index d10a651..b6a3d89 100644 --- a/brdata/lib/brdata.rb +++ b/brdata/lib/brdata.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) @@ -40,4 +41,4 @@ module BrData Date::FERIADOS.clear Date::FERIADOS_METODOS.clear feriados.each { |f| Date::FERIADOS << f } -metodos.each { |m| Date::FERIADOS_METODOS << m } \ No newline at end of file +metodos.each { |m| Date::FERIADOS_METODOS << m } diff --git a/brdata/lib/brdata/br_date_helper.rb b/brdata/lib/brdata/br_date_helper.rb index 7b29fe7..bcda85d 100644 --- a/brdata/lib/brdata/br_date_helper.rb +++ b/brdata/lib/brdata/br_date_helper.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 module ActionView::Helpers::DateHelper # Traduz o método distance_of_time_in_words para retornar esse valor em português # @@ -30,4 +31,4 @@ def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false) else "mais de #{(distance_in_minutes / 525960).round} anos" end end -end \ No newline at end of file +end diff --git a/brdata/lib/brdata/excecoes.rb b/brdata/lib/brdata/excecoes.rb index 13514d0..4b589b8 100644 --- a/brdata/lib/brdata/excecoes.rb +++ b/brdata/lib/brdata/excecoes.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 def cria_excecao(classe, mensagem) eval "class #{classe}; def initialize; super('#{mensagem}'); end; end" end diff --git a/brhelper/lib/brhelper/br_form_options_helper.rb b/brhelper/lib/brhelper/br_form_options_helper.rb index 8e272f7..78e249b 100644 --- a/brhelper/lib/brhelper/br_form_options_helper.rb +++ b/brhelper/lib/brhelper/br_form_options_helper.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 module ActionView::Helpers::FormOptionsHelper ESTADOS_BRASILEIROS = [["Acre", "AC"], ["Alagoas", "AL"], diff --git a/brnumeros/lib/brnumeros/number_portuguese.rb b/brnumeros/lib/brnumeros/number_portuguese.rb index 4c97c62..29d5654 100644 --- a/brnumeros/lib/brnumeros/number_portuguese.rb +++ b/brnumeros/lib/brnumeros/number_portuguese.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 module Extenso @@unidade = { 0 => "zero", @@ -60,12 +61,12 @@ def por_extenso # Extenso.por_extenso(100) ==> "cem" # Extenso.por_extenso(158) ==> "cento e cinquenta e oito" def Extenso.por_extenso(numero) - negativo=(numero<0)?"menos ":"" + negativo=(numero<0)? "menos " : "" n=numero.to_i.abs return case n - when 0..9: negativo + @@unidade[n].to_s - when 10..19: negativo + @@dezena[n].to_s - when 20..99: + when 0..9 then negativo + @@unidade[n].to_s + when 10..19 then negativo + @@dezena[n].to_s + when 20..99 v=n % 10 if v== 0 negativo + @@dezena[n].to_s @@ -121,8 +122,8 @@ def por_extenso_em_reais # Extenso.por_extenso_em_reais(100) ==> "cem reais" # Extenso.por_extenso_em_reais(100.58) ==> "cem reais e cinquenta e oito centavos" def ExtensoReal.por_extenso_em_reais(valor) - negativo=(valor<0)?" negativo":"" - negativos=(valor<0)?" negativos":"" + negativo=(valor<0)? " negativo" : "" + negativos=(valor<0)? " negativos" : "" valor = valor.abs return 'grátis' if valor == 0 case valor @@ -138,9 +139,9 @@ def ExtensoReal.por_extenso_em_reais(valor) real,cents=("%.2f" % valor).split(/\./).map{ |m| m.to_i} valor_cents=Extenso.por_extenso(cents%100) valor_cents+= case cents.to_i%100 - when 0: "" - when 1: " centavo" - when 2..99: " centavos" + when 0 then "" + when 1 then " centavo" + when 2..99 then " centavos" end if real.to_i > 0 diff --git a/brstring/lib/brstring/string_portuguese.rb b/brstring/lib/brstring/string_portuguese.rb index b28f5aa..8421921 100644 --- a/brstring/lib/brstring/string_portuguese.rb +++ b/brstring/lib/brstring/string_portuguese.rb @@ -1,3 +1,4 @@ +# encoding: UTF-8 class String MINUSCULAS_COM_ACENTO = 'áéíóúâêîôûàèìòùäëïöüãõñç' MAIUSCULAS_COM_ACENTO = 'ÁÉÍÓÚÂÊÎÔÛÀÈÌÒÙÄËÏÖÜÃÕÑÇ'