ruby-ext-js 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/ruby-ext-js.rb

@@ -80,7 +80,7 @@ module ExtJs
     
     # @return [Hash] `find()` conditions for `Mongo::Collection.find( conditions, opts )`
     def conditions
-      self.class.search_param( @params )
+      self.class.filter_param( @params )
     end
     
     # @return [Hash] `find()` options for `Mongo::Collection.find( conditions, opts )`
@@ -99,6 +99,16 @@ module ExtJs
       []
     end
     
+    # Define options for specific filters. Eg:
+    #   {
+    #     "field_1" => { :all_caps => true },
+    #     "field_2" => { :operator => "$all" },
+    #     "field_3" => { :strip => "true" }
+    #   }
+    def self.filter_opts
+      {}
+    end
+    
     protected
     
     def self.skip_param( params )
@@ -120,7 +130,7 @@ module ExtJs
       { :sort => [sort, dir] }
     end
     
-    def self.search_param( params )
+    def self.filter_param( params )
       conds = {}
       
       if params["filter"] && params["filter"].size > 0
@@ -167,9 +177,54 @@ module ExtJs
           end
       end
       
+      values = self.apply_filter_opts( field, values )
+      
       return field, values
     end
     
+    def self.apply_filter_opts( field, values )
+      return values if values.size == 0
+      
+      opts = {
+        :strip => true,
+        :all_caps => false,
+        :operator => nil
+      }.merge( filter_opts[field] || {} )
+      
+      if values.is_a?( String ) || values.is_a?( Array )
+        opts[:operator] ||= "$in"
+        values = Array( values )
+        values.map!{ |value| value.strip } if opts[:strip]
+        values.map!{ |value| value.upcase } if opts[:all_caps]
+        values = values.size > 1 ? { opts[:operator] => values } : values.first
+      elsif values.is_a?( Hash )
+        # Values is already a { "$in" => [1, 2] } style hash
+        if opts[:operator]
+          values = { opts[:operator] => values.values.flatten.uniq }
+        end
+        if opts[:strip]
+          values.each do |k, v|
+            if v.is_a?( Array )
+              values[k] = v.map{ |value| value.strip }
+            elsif v.is_a?( String )
+              values[k] = v.strip
+            end
+          end
+        end
+        if opts[:all_caps]
+          values.each do |k, v|
+            if v.is_a?( Array )
+              values[k] = v.map{ |value| value.upcase }
+            elsif v.is_a?( String )
+              values[k] = v.upcase
+            end
+          end
+        end
+      end
+      
+      values
+    end
+    
     def self.comparison_for( str )
       case str
         when "lt"; "$lte"

data/ruby-ext-js.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-ext-js}
-  s.version = "0.3.3"
+  s.version = "0.4.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-24}
+  s.date = %q{2011-03-21}
   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 = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/help/ruby-ext-js}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Ultra-basic classes for working with Ext.js requests and translating them to DataMapper / Mongood query opts.}
   s.test_files = [
     "spec/ruby-ext-js_spec.rb",
@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/ruby-ext-js_spec.rb

@@ -2,19 +2,6 @@ require "date"
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "ExtJs" do
-  # describe "Postgres" do
-  #   it "sorts on id when you ask it to sort on created_at" do
-  #     ExtJs::Postgres.pagination_opts({
-  #       :sort => "created_at",
-  #       :order => "desc"
-  #     })[:order].should == [:id.asc]
-  #   end
-  #   
-  #   it "specs the rest of the class or it gets the hose" do
-  #     pending "The current spec suite is currently rigidly tied to private models. Someday we'll write a generic spec suite here."
-  #   end
-  # end
-  
   describe "Mongo" do
     describe "conditions" do
       class TestMongoNoFilters < ExtJs::Mongo; end
@@ -25,6 +12,20 @@ describe "ExtJs" do
         end
       end
       
+      class TestMongoWithFiltersAndFilterOpts < ExtJs::Mongo
+        def self.allowed_filters
+          ["state", "score", "inserted_at"]
+        end
+        
+        def self.filter_opts
+          {
+            "state" => { :all_caps => true },
+            "score" => { :operator => "$all" },
+            "inserted_at" => { :strip => true }
+          }
+        end
+      end
+      
       it "handles empty params" do
         mongo = TestMongoNoFilters.new( {} )
         mongo.conditions.should == {}
@@ -152,6 +153,38 @@ describe "ExtJs" do
         mongo = TestMongoWithFilters.new( params )
         mongo.conditions.should == { "inserted_at" => { "$in" => start_time } }
       end
+      
+      it "allows specifying filter options per-field" do
+        params = {
+          "filter" => {
+            "0" => {
+              "field" => "state",
+              "data" => {
+                "value" => "open"
+              }
+            },
+            "1" => {
+              "field" => "score",
+              "data" => {
+                "value" => ["5", "4"]
+              }
+            },
+            "2" => {
+              "field" => "inserted_at",
+              "data" => {
+                "value" => [" Thursday "]
+              }
+            }
+          }
+        }
+        
+        mongo = TestMongoWithFiltersAndFilterOpts.new( params )
+        mongo.conditions.should == {
+          "state" => "OPEN",
+          "score" => { "$all" => ["5", "4"] },
+          "inserted_at" => "Thursday"
+        }
+      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
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 -08:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Ultra-basic classes for working with Ext.js requests and translating them to DataMapper / Mongood query opts.