query_string_filter 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/filter.treetop

@@ -8,7 +8,7 @@ grammar Filter
     key ospace ':' ospace strings
     {
       def eval
-        { key.eval.intern => /#{strings.eval}/ }
+        { key.eval => /#{strings.eval}/ }
       end
     }
   end
@@ -17,7 +17,7 @@ grammar Filter
     key ospace '=' ospace value
     {
       def eval
-        { key.eval.intern => value.eval }
+        { key.eval => value.eval }
       end
     }
   end
@@ -30,7 +30,7 @@ grammar Filter
     key ospace '>' ospace value
     {
       def eval
-        { key.eval.intern => { '$gt' => value.eval } }
+        { key.eval => { '$gt' => value.eval } }
       end
     }
   end
@@ -39,7 +39,7 @@ grammar Filter
     key ospace '>=' ospace value
     {
       def eval
-        { key.eval.intern => { '$gte' => value.eval } }
+        { key.eval => { '$gte' => value.eval } }
       end
     }
   end
@@ -48,7 +48,7 @@ grammar Filter
     key ospace '<' ospace value
     {
       def eval
-        { key.eval.intern => { '$lt' => value.eval } }
+        { key.eval => { '$lt' => value.eval } }
       end
     }
   end
@@ -57,13 +57,13 @@ grammar Filter
     key ospace '<=' ospace value
     {
       def eval
-        { key.eval.intern => { '$lte' => value.eval } }
+        { key.eval => { '$lte' => value.eval } }
       end
     }
   end
   
   rule key
-    [a-z_]+
+    [a-z_\.]+
     {
       def eval
         text_value

data/query_string_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{query_string_filter}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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.date = %q{2009-12-15}
   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

@@ -21,21 +21,29 @@ describe "QueryStringFilter" do
   end
   
   describe "keys" do
-    it "key with underscore" do
+    it "with underscore" do
       @filter.parse("with_underscore = test").should == {
-        :with_underscore => "test"
+        "with_underscore" => "test"
       }
     end
 
-    it "value with single quotes" do
+    it "with period" do
+      @filter.parse("released.year = 2008").should == {
+        'released.year' => 2008
+      }
+    end
+  end
+  
+  describe "values" do
+    it "with single quotes" do
       @filter.parse("foo = 'bar camp'").should == {
-        :foo => "bar camp"
+        "foo" => "bar camp"
       }
     end
 
-    it "value with http://" do
+    it "with http://" do
       @filter.parse("url = http://cnn.com").should == {
-        :url => "http://cnn.com"
+        "url" => "http://cnn.com"
       }
     end
   end
@@ -43,7 +51,7 @@ describe "QueryStringFilter" do
   describe "basic operators" do
     it ": with string" do
       expected = {
-        :name => /david/
+        "name" => /david/
       }
       ["name:david", "name : david"].each do |s|
         @filter.parse(s).should == expected
@@ -51,7 +59,7 @@ describe "QueryStringFilter" do
     end
   
     it ": with number" do
-      expected = { :count => /77/ }
+      expected = { "count" => /77/ }
       ["count:77", "count : 77"].each do |s|
         @filter.parse(s).should == expected
       end
@@ -59,7 +67,7 @@ describe "QueryStringFilter" do
 
     it "= with string" do
       expected = {
-        :name => "David"
+        "name" => "David"
       }
       [
         %(name=David),
@@ -68,30 +76,30 @@ describe "QueryStringFilter" do
         @filter.parse(s).should == expected
       end
     end
-  
+    
     it ">" do
-      expected = { :value => { '$gt' => 12 } }
+      expected = { "value" => { '$gt' => 12 } }
       ["value>12", "value > 12"].each do |s|
         @filter.parse(s).should == expected
       end
     end
   
     it "<" do
-      expected = { :value => { '$lt' => 12 } }
+      expected = { "value" => { '$lt' => 12 } }
       ["value<12", "value < 12"].each do |s|
         @filter.parse(s).should == expected
       end
     end
   
     it ">=" do
-      expected = { :value => { '$gte' => 12 } }
+      expected = { "value" => { '$gte' => 12 } }
       ["value>=12", "value >= 12"].each do |s|
         @filter.parse(s).should == expected
       end
     end
   
     it "<=" do
-      expected = { :value => { '$lte' => 12 } }
+      expected = { "value" => { '$lte' => 12 } }
       ["value<=12", "value <= 12"].each do |s|
         @filter.parse(s).should == expected
       end
@@ -101,7 +109,7 @@ describe "QueryStringFilter" do
   describe "compound" do
     it ": with 2 strings" do
       expected = {
-        :title => /election|texas/
+        "title" => /election|texas/
       }
       [
         "title:election,texas",
@@ -113,7 +121,7 @@ describe "QueryStringFilter" do
 
     it ": with 3 strings" do
       expected = {
-        :title => /election|texas|bob/
+        "title" => /election|texas|bob/
       }
       [
         "title:election,texas,bob",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: query_string_filter
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2009-12-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency