dm-persevere-adapter 0.51.0 → 0.52.0

data/VERSION

@@ -1 +1 @@
-0.51.0
+0.52.0

data/lib/persevere_adapter.rb

@@ -3,7 +3,7 @@ require 'dm-core'
 require 'dm-aggregates'
 require 'dm-types'
 require 'extlib'
-require 'json'
+# require 'json'
 require 'bigdecimal'
 
 require 'model_json_support'
@@ -708,6 +708,15 @@ module DataMapper
           end
         end
 
+        def munge_condition(condition)
+          cond = condition.loaded_value
+
+          cond = "\"#{cond}\"" if cond.is_a?(String)
+          cond = "date(%10.f)" % (Time.parse(cond.to_s).to_f * 1000) if cond.is_a?(DateTime)
+          cond = 'undefined' if cond.nil?
+          return cond
+        end
+
         def process_condition(condition)
           case condition
             # Persevere 1.0 regular expressions are disable for security so we pass them back for DataMapper query filtering
@@ -724,12 +733,15 @@ module DataMapper
               inside.empty? ? [] : "!(%s)" % inside
             when DataMapper::Query::Conditions::InclusionComparison then process_in(condition.subject.name, condition.value)
             when DataMapper::Query::Conditions::EqualToComparison then
-              cond = condition.loaded_value
-
-              cond = "\"#{cond}\"" if cond.is_a?(String)
-              cond = "date(%10.f)" % (Time.parse(cond.to_s).to_f * 1000) if cond.is_a?(DateTime)
-              cond = 'undefined' if cond.nil?
-              "#{condition.subject.field}=#{cond}"
+              "#{condition.subject.field}=#{munge_condition(condition)}"
+            when DataMapper::Query::Conditions::GreaterThanComparison then
+              "#{condition.subject.field}>#{munge_condition(condition)}"
+            when DataMapper::Query::Conditions::LessThanComparison then
+              "#{condition.subject.field}<#{munge_condition(condition)}"
+            when DataMapper::Query::Conditions::GreaterThanOrEqualToComparison then
+              "#{condition.subject.field}>=#{munge_condition(condition)}"
+            when DataMapper::Query::Conditions::LessThanOrEqualToComparison then
+              "#{condition.subject.field}<=#{munge_condition(condition)}"
             when DataMapper::Query::Conditions::NullOperation then []
             when Array then
                old_statement, bind_values = condition

data/spec/persevere_adapter_spec.rb

@@ -193,7 +193,18 @@ describe DataMapper::Adapters::PersevereAdapter do
    
     it_should_behave_like 'An Aggregatable Class'
     
-    it "should be able to get a count of objects within a range of dates"
+    it "should be able to get a count of objects within a range of dates" do
+      Bozon.auto_migrate!
+      orig_date = DateTime.now - 7
+      Bozon.create(:author => 'Robbie', :created_at => orig_date, :title => '1 week ago')
+      Bozon.create(:author => 'Ivan',   :created_at => DateTime.now, :title => 'About Now')
+      Bozon.create(:author => 'Sean',   :created_at => DateTime.now + 7, :title => 'Sometime later')
+
+      Bozon.count.should eql(3)
+      Bozon.count(:created_at => orig_date).should eql(1)
+      Bozon.count(:created_at.gt => orig_date).should eql(2)
+      Bozon.auto_migrate_down!
+    end
     
     it "should count with like conditions" do
       Country.count(:name.like => '%n%').should == 4

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 51
+  - 52
   - 0
-  version: 0.51.0
+  version: 0.52.0
 platform: ruby
 authors: 
 - Ivan R. Judson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -06:00
+date: 2010-04-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency