query_string_filter 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/filter.treetop

@@ -16,17 +16,43 @@ grammar Filter
   rule simple
     fuzzy / equality / inequality
   end
-
+  
   rule fuzzy
+    fuzzy_with_strings / fuzzy_with_string
+  end
+
+  rule fuzzy_with_strings
     key ospace ':' ospace strings
     {
       def eval
-        { key.eval => /#{strings.eval}/ }
+        { key.eval => /#{strings.eval('|')}/ }
       end
     }
   end
-
+  
+  rule fuzzy_with_string
+    key ospace ':' ospace string
+    {
+      def eval
+        { key.eval => /#{string.eval}/ }
+      end
+    }
+  end
+  
   rule equality
+    equality_with_strings / equality_with_value
+  end
+
+  rule equality_with_strings
+    key ospace '=' ospace strings
+    {
+      def eval
+        { key.eval => strings.eval(',') }
+      end
+    }
+  end
+  
+  rule equality_with_value
     key ospace '=' ospace value
     {
       def eval
@@ -39,6 +65,7 @@ grammar Filter
     gt / gte / lt / lte
   end
   
+  # greater than
   rule gt
     key ospace '>' ospace value
     {
@@ -48,6 +75,7 @@ grammar Filter
     }
   end
   
+  # greater than or equal
   rule gte
     key ospace '>=' ospace value
     {
@@ -57,6 +85,7 @@ grammar Filter
     }
   end
   
+  # less than
   rule lt
     key ospace '<' ospace value
     {
@@ -65,7 +94,8 @@ grammar Filter
       end
     }
   end
-  
+
+  # less than or equal
   rule lte
     key ospace '<=' ospace value
     {
@@ -89,10 +119,10 @@ grammar Filter
   end
   
   rule strings
-    string more:(ospace ',' ospace string)*
+    string more:(ospace ',' ospace string)+
     {
-      def eval
-        strings.map { |e| e.eval }.join("|")
+      def eval(separator)
+        strings.map { |e| e.eval }.join(separator)
       end
       
       def strings

data/query_string_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{query_string_filter}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-04-13}
   s.description = %q{Convert a filter param in a query string to a conditions hash useful for MongoMapper searching}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [

data/spec/query_string_filter_spec.rb

@@ -131,6 +131,18 @@ describe "QueryStringFilter" do
   end
   
   describe "compound" do
+    it "= with 2 strings" do
+      expected = {
+        "title" => 'election,texas'
+      }
+      [
+        "title=election,texas",
+        "title = election , texas"
+      ].each do |s|
+        @filter.parse(s).should == expected
+      end
+    end
+
     it ": with 2 strings" do
       expected = {
         "title" => /election|texas/

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - David James
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-04-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency