conditioner 0.0.5 → 0.0.6

data/README.rdoc

@@ -43,6 +43,7 @@ To override Conditioner configurations create config/initializers/conditioner.rb
 
 * 0.0.2 Add configurable rules for extactions
 * 0.0.3 Fix bug with to extract - which eat first parameter 
+* 0.0.6 Some fixes for correct timezones support in rails
 
 == LICENSE:
 

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 PKG_FILES = FileList[ '[a-zA-Z]*', 'generators/**/*', 'lib/**/*', 'rails/**/*', 'tasks/**/*', 'test/**/*' ]
 
-require 'lib/conditioner.rb'
+require File.dirname(__FILE__) + '/lib/conditioner.rb'
 spec = Gem::Specification.new do |s|
   s.name = "conditioner"
   s.version = Conditioner::VERSION

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.5'
+  VERSION = '0.0.6'
   autoload :ActiveRecordMixin, 'conditioner/active_record_mixin'
   autoload :Condition, 'conditioner/condition'
   autoload :Configurator, 'conditioner/configurator'

data/lib/conditioner/configurator.rb

@@ -23,14 +23,14 @@ 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)
-            datetime = Time.parse(v)
+            datetime = Time.zone.parse(v)
             cnd.and(["#{cnd.with_table_name($1)} >= ?",datetime])
           elsif field=~ /^to_(\w*_(datetime|at))/ and cnd.is_field?($1)
-            datetime = Time.parse(v).change(:hour => 23,:min => 59,:sec => 59,:usec => 0)
+            datetime = Time.zone.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'))
-            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)
+            start_date = Time.zone.parse(v).change(:hour => 0,:min => 0,:sec => 0,:usec => 0)
+            end_date = Time.zone.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]

data/test/conditioner_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper.rb'
 
 Conditioner.configure do |cfg|
   #Must be activated by default
@@ -13,6 +13,10 @@ Conditioner.configure do |cfg|
   end
 end
 
+# FIXME: we are depending on Time.zone now...
+# This is required for Time.zone to work correctly
+Time.zone ||= ENV['TZ'] || 'UTC'
+
 class TestConditioner < Test::Unit::TestCase
 
   def test_conditioner_creation
@@ -77,6 +81,12 @@ class TestConditioner < Test::Unit::TestCase
     assert_match(/created_at > '2010-01-01'/, cnd)
   end
 
+  def test_dates_from_to
+    cnd = User.conditioner :from_created_at => '2010-01-01', :to_created_at => '2010-01-01'
+    assert_match(/created_at >= '2010-01-01 00:00:00/, cnd)
+    assert_match(/created_at <= '2010-01-01 23:59:59/, cnd)
+  end
+
   def test_conditioner_without_model
     cnd = Conditioner.create('users', :columns => ['id', 'email']).extract(:email => "nicola", :foo => "bar")
     assert_equal(%Q["users"."email" = 'nicola'], cnd)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: conditioner
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - niquola
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +04:00
+date: 2010-11-29 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -28,17 +27,17 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- Rakefile
 - History.txt
-- Manifest.txt
-- README.rdoc
 - PostInstall.txt
 - init.rb
+- Manifest.txt
+- README.rdoc
+- Rakefile
+- lib/conditioner.rb
+- lib/conditioner/condition.rb
 - lib/conditioner/fake_model.rb
 - lib/conditioner/configurator.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
@@ -55,7 +54,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -64,7 +62,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"