formatted_date 1.0.0 → 1.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.1.0 released 2009-11-16
+
+* Adicionados alguns testes
+* Corre��o de dois pequenos bugs. O plugin n�o respeitava a op��o <tt>format</tt>. Estava faltando uma verifica��o no range da data caso j� fosse passado uma data para convers�o e n�o uma string.
+
 == 1.0.0 released 2009-11-10
 
 * Primeiro release

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Ícaro Leopoldino da Motta
+Copyright (c) 2009 �caro Leopoldino da Motta
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -14,8 +14,6 @@ n
 consideradas inv�lidas). Para capturar esses erros existe o famoso
 <tt>validates_presence_of</tt>.
 
-----
-
 === Configura��o
 
 No arquivo <i>config/environment.rb</i> adicione o seguinte:
@@ -25,8 +23,6 @@ No arquivo <i>config/environment.rb</i> adicione o seguinte:
 E ent�o execute a task:
 
   rake gems:install
-  
-----
 
 === Exemplos
 
@@ -54,8 +50,8 @@ abaixo.
 <tt>default</tt>::
   O padr�o � <tt>nil</tt>, mas qualquer valor pode ser passado.
 <tt>validate</tt>::
-  Valor booleano para dizer se o plugin deve adicionar uma mensagem de erro caso
-  a data n�o seja v�lida. Padr�o <tt>true</tt>.
+  Valor booleano para dizer se o plugin deve validar o(s) atributo(s) caso
+  ele(s) seja(m) inv�lido(s). Padr�o <tt>true</tt>.
 <tt>message</tt>::
   Mensagem a ser exibida caso ocorra algum erro na convers�o para uma data.
   O padr�o � uma mensagem do tipo <tt>invalid</tt> definida no seu arquivo de
@@ -66,8 +62,6 @@ abaixo.
 <tt>range</tt>::
   Intervalo v�lido para a(s) data(s). Deve ser do tipo <tt>Range</tt>.
   Padr�o: 1850 � 2038.
-  
-----
 
 === M�dulo de Convers�o
 

data/Rakefile

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/gempackagetask'
+load 'test/tasks.rake'
+
+FORMATTED_DATE_VERSION = '1.1.0'
+CLEAN.include('pkg')
+
+spec = Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
+  s.name = "formatted_date"
+  s.summary = "Customize o formato de datas no Rails."
+  s.description = "Customize o formato de datas no Rails."
+  s.version = FORMATTED_DATE_VERSION
+  
+  s.author = "Ícaro Leopoldino da Motta"
+  s.email = "icaro.ldm@gmail.com"
+  
+  s.has_rdoc = true
+  s.require_path = "lib"
+  
+  s.extra_rdoc_files = %w( README.rdoc CHANGELOG.rdoc )
+  s.files = FileList['init.rb', 'README.rdoc', 'CHANGELOG.rdoc', 'LICENSE', 'Rakefile', 'rails/init.rb', 'lib/**/*', 'test/**/*']
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.define
+end
+
+task :build => [:clean, :repackage]
+
+task :default => :test

data/lib/formatted_date/conversion.rb

@@ -2,7 +2,9 @@ module FormattedDate
   
   module Conversion
     
+    #:stopdoc:
     DefaultOptions = FormattedDate::DefaultOptions.tap { |opts| opts.delete(:message); opts.delete(:validate) }
+    #:startdoc:
     
     #
     # Tenta fazer a convers�o de cada uma das datas. Em caso de erro,
@@ -44,12 +46,13 @@ module FormattedDate
                 options[:default]
               end
             end
-          elsif date.is_a?(Time) || date.is_a?(Date)
-            date
+          elsif date.is_a?(Time) || date.is_a?(Date) || date.is_a?(DateTime)
+            options[:range].include?(date.year) ? date : options[:default]
           else
             options[:default]
           end
         end
+        
         dates.many? ? dates : dates.first
       end
   end

data/lib/formatted_date/conversion_plugin.rb

@@ -44,27 +44,24 @@ module FormattedDate
     
     private
     
-      def perform_conversion(klass)
-        @status, @output = if @input.is_a? String
-          if @input.blank?
-            [INVALID, @options.default]
-          else
-            begin
-              parsed = klass.strptime(@input, @options.format)
-              if @options.range.include? parsed.year
-                [VALID, parsed]
-              else
-                [OUT_OF_RANGE, @options.default]
+      def perform_conversion(klass)        
+        @status, @output = 
+          if @input.is_a? String
+            if @input.blank?
+              [INVALID, @options.default]
+            else
+              begin
+                parsed = klass.strptime(@input, @options.format)
+                @options.range.include?(parsed.year) ? [VALID, parsed] : [OUT_OF_RANGE, @options.default]
+              rescue ArgumentError
+                [PARSE_FAIL, @options.default]
               end
-            rescue ArgumentError
-              [PARSE_FAIL, @options.default]
             end
+          elsif @input.is_a?(Time) || @input.is_a?(Date) || @input.is_a?(DateTime)
+            @options.range.include?(@input.year) ? [VALID, @input] : [OUT_OF_RANGE, @options.default]
+          else
+            [INVALID, @options.default]
           end
-        elsif @input.is_a?(Time) || @input.is_a?(Date)
-          [VALID, @input]
-        else
-          [INVALID, @options.default]
-        end
         
         @output
       end

data/lib/formatted_date/formatting.rb

@@ -1,5 +1,6 @@
 module FormattedDate
   
+  #:stopdoc:
   DefaultOptions = {
     :format   => '%d/%m/%Y',
     :default  => nil,
@@ -8,6 +9,7 @@ module FormattedDate
     :message  => :invalid,
     :type     => :datetime
   }
+  #:startdoc:
 
   #
   # Formata as datas de acordo com o formato passado.
@@ -37,7 +39,7 @@ module FormattedDate
       # pela op��o <format>.
       #
       define_method "#{name}_before_type_cast" do
-        if self[name].is_a?(Time) || self[name].is_a?(Date)
+        if self[name].is_a?(Time) || self[name].is_a?(Date) || self[name].is_a?(DateTime)
           self[name].strftime(options[:format])
         else
           self.read_attribute_before_type_cast(name)
@@ -50,6 +52,7 @@ module FormattedDate
       define_method "#{name}=" do |value|
         conv = ConversionPlugin.new(value, options)
         date = conv.convert!
+
         if conv.valid?
           self[name] = date.strftime(options[:db_format])
         else # data inv�lida
@@ -57,7 +60,7 @@ module FormattedDate
           # sabemos que ela � inv�lida. De qualquer forma � necess�rio porque
           # depois n�s devemos ser capazes de resgatar a data sem o cast
           # (valor de entrada original).
-          self[name] = value
+          self[name] = date
           
           if options[:validate]
             self.class.class_eval do

data/test/conversion_test.rb

@@ -0,0 +1,46 @@
+require 'test/unit'
+require 'test/lib/activerecord_test_case'
+require 'test/lib/load_fixtures'
+require 'lib/formatted_date/conversion'
+
+class ConversionTest < ActiveRecordTestCase
+  def test_conversion_methods
+    datetime = to_datetime('26/11/1986')
+    date = to_date('26/11/1986')
+    assert_equal date, datetime.to_date
+  end
+  
+  def test_return_type
+    date = to_datetime(Time.now)
+    dates = to_datetime(1.year.ago, nil, '21/12/2012')
+    assert_kind_of Time, date
+    assert_kind_of Array, dates
+  end
+  
+  def test_format_option
+    date = to_datetime('2000 - 24/01 - [15h 30min]', :format => '%Y - %d/%m - [%Hh %Mmin]')
+    assert_kind_of DateTime, date
+  end
+  
+  def test_default_option
+    date_01, date_02 = to_datetime(nil, '30/02/2000', :default => Time.now)
+    assert_kind_of Time, date_01
+    assert_kind_of Time, date_02
+  end
+  
+  def test_range_option
+    date_01, date_02 = to_datetime('26/11/1986', '01/01/2001', :range => 1980..2000)
+    assert_kind_of DateTime, date_01
+    assert_nil date_02
+  end
+  
+  private
+  
+    def to_datetime(*args)
+      FormattedDate::Conversion.to_datetime(*args)
+    end
+    
+    def to_date(*args)
+      FormattedDate::Conversion.to_date(*args)
+    end
+end

data/test/database.yml

@@ -0,0 +1,4 @@
+sqlite3:
+  database: ":memory:"
+  adapter: sqlite3
+  timeout: 500

data/test/fixtures/schema.rb

@@ -0,0 +1,8 @@
+ActiveRecord::Schema.define do
+  create_table :users, :force => true do |t|
+    t.string     :name
+    t.datetime   :born_at, :alone_since
+    t.date       :first_job_on
+    t.timestamps
+  end
+end

data/test/fixtures/user.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  formatted_date :born_at, :range => 1930..2050
+  formatted_date :alone_since, :format => '%d-%m-%Y'
+  formatted_date :first_job_on, :default => Date.today, :type => :date
+end

data/test/fixtures/users.yml

@@ -0,0 +1,6 @@
+icaro:
+  id: 1
+  name: Icaro L. da Motta
+  born_at: <%= 22.years.ago %>
+  created_at: <%= Time.now %>
+  updated_at: <%= Time.now %>

data/test/formatted_date_test.rb

@@ -0,0 +1,37 @@
+require 'test/unit'
+require 'test/lib/activerecord_test_case'
+require 'test/lib/load_fixtures'
+
+class FormattedDateTest < ActiveRecordTestCase
+  fixtures :users
+  
+  def setup
+    @user = User.first
+  end
+  
+  def test_format_option
+    @user.alone_since = '26-11-1986'
+    assert_kind_of Time, @user.alone_since
+  end
+ 
+  def test_default_option
+    @user.first_job_on = nil
+    assert_kind_of Date, @user.first_job_on
+  end
+ 
+  def test_range_option
+    @user.born_at = 200.years.ago
+    assert_nil @user.born_at
+    @user.born_at = Time.now
+    assert_kind_of Time, @user.born_at
+  end
+ 
+  def test_before_type_cast
+    @user.born_at = '30/02/2000'
+    @user.alone_since = 'ancient times'
+    assert_nil @user.born_at_before_type_cast
+    assert_nil @user.alone_since_before_type_cast
+    @user.born_at = '21/12/2012'
+    assert_equal '21/12/2012', @user.born_at_before_type_cast
+  end  
+end

data/test/lib/activerecord_test_case.rb

@@ -0,0 +1,20 @@
+require 'lib/activerecord_test_connector'
+
+class ActiveRecordTestCase < Test::Unit::TestCase
+  if defined? ActiveSupport::Testing::SetupAndTeardown
+    include ActiveSupport::Testing::SetupAndTeardown
+  end
+ 
+  if defined? ActiveRecord::TestFixtures
+    include ActiveRecord::TestFixtures
+  end
+  
+  self.fixture_path = ActiveRecordTestConnector::FIXTURES_PATH
+  self.use_transactional_fixtures = true
+  
+  def self.fixtures(*args)
+    super
+  end
+end
+
+ActiveRecordTestConnector.setup

data/test/lib/activerecord_test_connector.rb

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'active_record'
+require 'active_record/fixtures'
+
+class ActiveRecordTestConnector
+  FIXTURES_PATH = File.join(File.dirname(__FILE__), '..', 'fixtures')
+  
+  def self.setup
+    setup_connection
+    load_schema
+    add_load_path FIXTURES_PATH
+  end
+  
+  private
+  
+    def self.add_load_path(path)
+      dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
+      dep.load_paths.unshift path
+    end
+    
+    def self.load_schema
+      ActiveRecord::Base.silence do
+        ActiveRecord::Migration.verbose = false
+        load File.join(FIXTURES_PATH, 'schema.rb')
+      end
+    end
+  
+    def self.setup_connection
+      configurations = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'database.yml'))
+      ActiveRecord::Base.establish_connection configurations['sqlite3']
+    end
+end

data/test/lib/load_fixtures.rb

@@ -0,0 +1,9 @@
+require 'lib/activerecord_test_connector'
+
+# setup the connection
+ActiveRecordTestConnector.setup
+ 
+# load all fixtures
+Fixtures.create_fixtures(ActiveRecordTestConnector::FIXTURES_PATH, ActiveRecord::Base.connection.tables)
+ 
+require 'formatted_date'

data/test/tasks.rake

@@ -0,0 +1,8 @@
+require 'rake/testtask'
+
+desc 'Testa o plugin formatted_date'
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+  t.libs << 'test'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formatted_date
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - "\xC3\x8Dcaro Leopoldino da Motta"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -02:00
+date: 2009-11-16 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -27,11 +27,22 @@ files:
 - README.rdoc
 - CHANGELOG.rdoc
 - LICENSE
+- Rakefile
 - rails/init.rb
 - lib/formatted_date/conversion.rb
 - lib/formatted_date/conversion_plugin.rb
 - lib/formatted_date/formatting.rb
 - lib/formatted_date.rb
+- test/conversion_test.rb
+- test/database.yml
+- test/fixtures/schema.rb
+- test/fixtures/user.rb
+- test/fixtures/users.yml
+- test/formatted_date_test.rb
+- test/lib/activerecord_test_case.rb
+- test/lib/activerecord_test_connector.rb
+- test/lib/load_fixtures.rb
+- test/tasks.rake
 has_rdoc: true
 homepage: 
 licenses: []