conditioner 0.0.4 → 0.0.5

data/lib/conditioner.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Conditioner
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   autoload :ActiveRecordMixin, 'conditioner/active_record_mixin'
   autoload :Condition, 'conditioner/condition'
   autoload :Configurator, 'conditioner/configurator'

data/lib/conditioner/configurator.rb

@@ -23,11 +23,15 @@ module Conditioner
             cnd.and(["upper(#{cnd.with_table_name(field)}) like upper(?)",v])
             #FIXME: add logic for ranges
           elsif field=~ /^from_(\w*_(datetime|at))/ and cnd.is_field?($1)
-            cnd.and(["#{cnd.with_table_name($1)} >= ?","#{v} 00:00:00.000"])
+            datetime = Time.parse(v)
+            cnd.and(["#{cnd.with_table_name($1)} >= ?",datetime])
           elsif field=~ /^to_(\w*_(datetime|at))/ and cnd.is_field?($1)
-            cnd.and(["#{cnd.with_table_name($1)} <= ?","#{v} 23:59:59.999"])
+            datetime = Time.parse(v).change(:hour => 23,:min => 59,:sec => 59,:usec => 0)
+            cnd.and(["#{cnd.with_table_name($1)} <= ?",datetime])
           elsif cnd.is_field?(field) && (field.include?('_datetime') || field.include?('_at'))
-            cnd.and(["(#{cnd.with_table_name(field)} BETWEEN ? AND ?)","#{v} 00:00","#{v} 23:59:59.999"])
+            start_date = Time.parse(v).change(:hour => 0,:min => 0,:sec => 0,:usec => 0)
+            end_date = Time.parse(v).change(:hour => 23,:min => 59,:sec => 59,:usec => 0)
+            cnd.and(["(#{cnd.with_table_name(field)} BETWEEN ? AND ?)",start_date,end_date])
           elsif field=~ /^(\w*)_(ltoe|gtoe|lt|gt)$/ and cnd.is_field?($1)
             operator = { 'lt' => '<', 'gt' => '>', 'ltoe' => '<=', 'gtoe' => '>=' }[$2]
             cnd.and(["#{cnd.with_table_name($1)} #{operator} ?", v])

data/test/conditioner_test.rb

@@ -26,14 +26,18 @@ class TestConditioner < Test::Unit::TestCase
   def test_extraction
     cnd=User.conditioner(:updated_at=>'2009-01-01', :email=>'nicola@mail.com',:unexisting=>'value')
     assert_match(/"users"."email"\s*=\s*'nicola@mail.com'/, cnd)
-    assert_match(/users.updated_at BETWEEN '2009-01-01 00:00' AND '2009-01-01 23:59:59.999'/, cnd)
+    assert_match(/users.updated_at BETWEEN '2009-01-01 00:00:00/,cnd)
+    assert_match(/AND '2009-01-01 23:59:59/, cnd)
     assert_no_match(/unexisting/, cnd)
+    User.all(:conditions=>cnd)
   end
 
   def test_extract_from_and_to_prefixed_date_fields
-    cnd = User.conditioner :to_updated_at =>'2010-02-02', :from_updated_at=>'2009-01-01'
-    assert_match(/updated_at <= '2010-02-02 23:59:59.999'/, cnd)
-    assert_match(/updated_at >= '2009-01-01 00:00:00.000'/, cnd)
+    cnd = User.conditioner :to_updated_at =>'2010-02-02', 
+      :from_updated_at=>'2009-01-01'
+    assert_match(/updated_at <= '2010-02-02 23:59:59/, cnd)
+    assert_match(/updated_at >= '2009-01-01 00:00:00/, cnd)
+    User.all(:conditions=>cnd)
   end
 
   def test_extract_lt_and_gt_postfixed_fields

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'stringio'
 require File.dirname(__FILE__) + '/../lib/conditioner'
 require "test/unit"
 require 'rubygems'
+gem "activerecord",'= 2.3.8'
 require 'active_record'
 
 ActiveRecord::Base.logger = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: conditioner
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - niquola
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +04:00
+date: 2010-10-22 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -28,19 +28,19 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- init.rb
-- Manifest.txt
-- PostInstall.txt
 - Rakefile
-- README.rdoc
 - History.txt
-- lib/conditioner.rb
-- lib/conditioner/condition.rb
-- lib/conditioner/active_record_mixin.rb
+- Manifest.txt
+- README.rdoc
+- PostInstall.txt
+- init.rb
 - lib/conditioner/fake_model.rb
 - lib/conditioner/configurator.rb
-- test/conditioner_test.rb
+- lib/conditioner/condition.rb
+- lib/conditioner/active_record_mixin.rb
+- lib/conditioner.rb
 - test/test_helper.rb
+- test/conditioner_test.rb
 has_rdoc: true
 homepage: http://github.com/niquola/conditioner
 licenses: []