query_string_filter 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/filter.treetop

@@ -1,6 +1,19 @@
 grammar Filter
 
   rule match
+    and_expression / simple
+  end
+  
+  rule and_expression
+    simple ospace 'and' ospace match
+    {
+      def eval
+        simple.eval.merge(match.eval)
+      end
+    }
+  end
+  
+  rule simple
     fuzzy / equality / inequality
   end
 

data/query_string_filter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{query_string_filter}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]

data/spec/query_string_filter_spec.rb

@@ -130,5 +130,24 @@ describe "QueryStringFilter" do
       end
     end
   end
+  
+  describe "and" do
+    it "double" do
+      actual = %(format="xml" and count=13)
+      @filter.parse(actual).should == {
+        "format" => "xml",
+        "count"  => 13,
+      }
+    end
+
+    it "triple" do
+      actual = %(format="xml" and count=13 and size=64)
+      @filter.parse(actual).should == {
+        "format" => "xml",
+        "count"  => 13,
+        "size"   => 64,
+      }
+    end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: query_string_filter
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - David James