query_string_filter 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/filter.treetop

@@ -63,7 +63,7 @@ grammar Filter
   end
   
   rule key
-    [a-z]+
+    [a-z_]+
     {
       def eval
         text_value
@@ -89,14 +89,36 @@ grammar Filter
   end
   
   rule string
-    [A-Z_a-z0-9]+
+    double_quoted_string / single_quoted_string / unquoted_string
+  end
+
+  rule double_quoted_string
+    '"' (!'"' .)* '"'
     {
       def eval
-        text_value
+        text_value[1 ... -1]
+      end
+    }
+  end
+
+  rule single_quoted_string
+    '\'' (!'\'' .)* '\''
+    {
+      def eval
+        text_value[1 ... -1]
       end
     }
   end
   
+  rule unquoted_string
+    [A-Za-z0-9_]+
+    {
+      def eval
+        text_value
+      end
+    }
+  end
+
   rule integer
     [0-9]+
     {

data/lib/query_string_filter.rb

@@ -4,12 +4,16 @@ Treetop.load(File.dirname(__FILE__) + '/filter')
 
 class QueryStringFilter
   
+  class ParseError < RuntimeError; end
+  
   def initialize
     @parser = FilterParser.new
   end
   
-  def process(string)
-    @parser.parse(string).eval
+  def parse(string)
+    parsed = @parser.parse(string)
+    raise ParseError, "unable to parse: #{string}" unless parsed
+    parsed.eval
   end
   
 end

data/query_string_filter.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{query_string_filter}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
   s.date = %q{2009-10-27}
-  s.description = %q{TODO: longer description of your gem}
+  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 = [
     "LICENSE",
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{TODO: one-line summary of your gem}
+  s.summary = %q{Convert from a filter query string param to a MongoMapper conditions hash}
   s.test_files = [
     "spec/query_string_filter_spec.rb",
      "spec/spec_helper.rb"

data/spec/query_string_filter_spec.rb

@@ -6,56 +6,87 @@ describe "QueryStringFilter" do
     @filter = QueryStringFilter.new
   end
   
-  describe "basic" do
+  describe "failure" do
+    it "no operator" do
+      lambda {
+        @filter.parse("something")
+      }.should raise_error(QueryStringFilter::ParseError)
+    end
+  end
+  
+  describe "keys" do
+    it "key with underscore" do
+      @filter.parse("with_underscore = test").should == {
+        :with_underscore => "test"
+      }
+    end
+
+    it "value with single quotes" do
+      @filter.parse("foo = 'bar camp'").should == {
+        :foo => "bar camp"
+      }
+    end
+  end
   
+  describe "basic operators" do
     it ": with string" do
       expected = {
         :name => /david/
       }
       ["name:david", "name : david"].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
   
     it ": with number" do
       expected = { :count => /77/ }
       ["count:77", "count : 77"].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
+      end
+    end
+
+    it "= with string" do
+      expected = {
+        :name => "David"
+      }
+      [
+        %(name=David),
+        %(name = David)
+      ].each do |s|
+        @filter.parse(s).should == expected
       end
     end
   
     it ">" do
       expected = { :value => { '$gt' => 12 } }
       ["value>12", "value > 12"].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
   
     it "<" do
       expected = { :value => { '$lt' => 12 } }
       ["value<12", "value < 12"].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
   
     it ">=" do
       expected = { :value => { '$gte' => 12 } }
       ["value>=12", "value >= 12"].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
   
     it "<=" do
       expected = { :value => { '$lte' => 12 } }
       ["value<=12", "value <= 12"].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
-    
   end
   
   describe "compound" do
-    
     it ": with 2 strings" do
       expected = {
         :title => /election|texas/
@@ -64,7 +95,7 @@ describe "QueryStringFilter" do
         "title:election,texas",
         "title : election , texas"
       ].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
 
@@ -75,10 +106,9 @@ describe "QueryStringFilter" do
       [
         "title:election,texas,bob",
       ].each do |s|
-        @filter.process(s).should == expected
+        @filter.parse(s).should == expected
       end
     end
-    
   end
 
 end

metadata

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