ruby-ext-js 0.2.1 → 0.3.0

data/README.markdown

@@ -65,6 +65,10 @@ Examples:
 
 Version number conventions: Patch-level bumps for bug fixes, minor-level bumps for changes that break backwards-compatibility, major-level bumps for major new features.
 
+## 0.3.0
+
+* `ExtJs::Mongo` now supports 'date' filter params with "gt" and "lt" params.
+
 ## 0.2.1
 
 * `ExtJs::Mongo.options` fixes.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/ruby-ext-js.rb

@@ -1,3 +1,5 @@
+require "date"
+
 module ExtJs
   class Postgres
     def self.db_opts(params, opts = {}); raise NotImplementedError; end
@@ -127,14 +129,7 @@ module ExtJs
           
           next unless params["filter"][i]
           
-          field = (params["filter"][i]["field"] || "").gsub(/[^\.\w\d_-]/, "").strip
-          values = Array( params["filter"][i]["data"] ? params["filter"][i]["data"]["value"] : nil )
-          
-          if values.size == 1
-            values = values[0]
-          elsif values.size > 1
-            values = { "$in" => values }
-          end
+          field, values = self.filter_for( params["filter"][i] )
           
           unless field.empty? || !allowed_filters.include?( field ) || values.empty?
             conds.merge! field => values
@@ -144,5 +139,36 @@ module ExtJs
       
       conds
     end
+    
+    def self.filter_for( hash )
+      hash["data"] ||= {}
+      hash["field"] ||= ""
+      
+      field = hash["field"].gsub(/[^\.\w\d_-]/, "").strip
+      values = Array( hash["data"]["value"] )
+      comparison = self.comparison_for( hash["data"]["comparison"] )
+      
+      case hash["data"]["type"]
+        when "date"
+          values.map!{ |date| Date.parse( date ) }
+          values = { comparison => values[0] }
+        else
+          if values.size == 1
+            values = values[0]
+          elsif values.size > 1
+            values = { comparison => values }
+          end
+      end
+      
+      return field, values
+    end
+    
+    def self.comparison_for( str )
+      case str
+        when "lt"; "$lt"
+        when "gt"; "$gt"
+        else; "$in"
+      end
+    end
   end
 end

data/ruby-ext-js.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-ext-js}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
-  s.date = %q{2011-01-21}
+  s.date = %q{2011-01-24}
   s.description = %q{Ultra-basic classes for working with Ext.js requests and translating them to DataMapper / Mongood query opts.}
   s.email = %q{tyson@doloreslabs.com}
   s.extra_rdoc_files = [

data/spec/ruby-ext-js_spec.rb

@@ -1,3 +1,4 @@
+require "date"
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "ExtJs" do
@@ -20,7 +21,7 @@ describe "ExtJs" do
       
       class TestMongoWithFilters < ExtJs::Mongo
         def self.allowed_filters
-          ["state", "score"]
+          ["state", "score", "inserted_at"]
         end
       end
       
@@ -85,6 +86,56 @@ describe "ExtJs" do
         mongo = TestMongoWithFilters.new( params )
         mongo.conditions.should == { "state" => "open", "score" => { "$in" => ["5", "4"] } }
       end
+      
+      it "handles date range params" do
+        date = Date.parse "11/26/2010"
+        
+        params = { "filter" => {
+          "0" => {
+            "data" => {
+              "type" => "date",
+              "value" => "11/26/2010",
+              "comparison" => "lt"
+            },
+            "field" => "inserted_at"
+          }
+        }}
+        
+        mongo = TestMongoWithFilters.new( params )
+        mongo.conditions.should == { "inserted_at" => { "$lt" => date } }
+        
+        params = { "filter" => {
+          "0" => {
+            "data" => {
+              "type" => "date",
+              "value" => "11/26/2010",
+              "comparison" => "gt"
+            },
+            "field" => "inserted_at"
+          }
+        }}
+        
+        mongo = TestMongoWithFilters.new( params )
+        mongo.conditions.should == { "inserted_at" => { "$gt" => date } }
+      end
+      
+      it "handles invalid comparison operators by falling back to $in" do
+        date = Date.parse "11/26/2010"
+        
+        params = { "filter" => {
+          "0" => {
+            "data" => {
+              "type" => "date",
+              "value" => "11/26/2010",
+              "comparison" => "BOO"
+            },
+            "field" => "inserted_at"
+          }
+        }}
+        
+        mongo = TestMongoWithFilters.new( params )
+        mongo.conditions.should == { "inserted_at" => { "$in" => date } }
+      end
     end
     
     describe "opts" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ext-js
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-01-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency