wherewolf 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    wherewolf (0.2.0)
+    wherewolf (0.3.0)
       arel
       parslet
 

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Wherewolf allows you to consume search terms as strings without worrying about database injections. It parses the query and converts it into ARel. It's great for creating filterable REST APIs.}
   gem.email = "myles@madpilot.com.au"
   gem.authors = ["Myles Eftos"]
-  gem.version = "0.2.0"
+  gem.version = "0.3.0"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/lib/wherewolf/processor.rb

@@ -32,33 +32,48 @@ protected
     end
 
     def process_eq(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].eq(parse_value(ast[:right]))
     end
 
     def process_not_eq(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].not_eq(parse_value(ast[:right]))
     end
 
     def process_matches(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].matches(parse_value(ast[:right]))
     end
 
     def process_lt(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].lt(parse_value(ast[:right]))
     end
 
     def process_lteq(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].lteq(parse_value(ast[:right]))
     end
 
     def process_gt(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].gt(parse_value(ast[:right]))
     end
 
     def process_gteq(ast, table)
+      check_column!(ast[:left], table)
       table[ast[:left].to_sym].gteq(parse_value(ast[:right]))
     end
 
+    def check_column!(value, table)
+      unless table.columns.map(&:name).include?(value.to_sym)
+        source = Parslet::Source.new(value.to_s)
+        cause = Parslet::Cause.new('Column not found', source, value.offset, [])
+        raise Parslet::ParseFailed.new('Column not found', cause) 
+      end
+    end
+
     def parse_value(value)
       type = value.keys.first
       case type

data/test/processor_test.rb

@@ -41,7 +41,6 @@ class ProcessorTest < Test::Unit::TestCase
             assert_equal 28, e.position
           end
         end
- 
 
         should 'show a nice debug error' do
           begin
@@ -58,7 +57,20 @@ class ProcessorTest < Test::Unit::TestCase
             assert_equal "Parsing error occured at character 28", e.to_s
           end
         end
+        
+        should 'be raised if the requested column is not in the list' do
+          assert_raise Wherewolf::ParseError do
+            Player.from_query('shoe_size > 10')
+          end
+        end
 
+        should 'show a nice debug error if the requested column is not in the list' do
+          begin
+            Player.from_query('shoe_size > 10')
+          rescue Wherewolf::ParseError => e
+            assert_equal "Parsing error occured at character 0", e.to_s
+          end
+        end
       end
 
       should 'construct simple boolean statements' do

data/wherewolf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wherewolf"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Eftos"]
-  s.date = "2012-10-10"
+  s.date = "2012-10-11"
   s.description = "Wherewolf allows you to consume search terms as strings without worrying about database injections. It parses the query and converts it into ARel. It's great for creating filterable REST APIs."
   s.email = "myles@madpilot.com.au"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wherewolf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &70166778516180 !ruby/object:Gem::Requirement
+  requirement: &70231215234580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166778516180
+  version_requirements: *70231215234580
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70166778514340 !ruby/object:Gem::Requirement
+  requirement: &70231215233400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166778514340
+  version_requirements: *70231215233400
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70166778512340 !ruby/object:Gem::Requirement
+  requirement: &70231215232100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778512340
+  version_requirements: *70231215232100
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70166778511320 !ruby/object:Gem::Requirement
+  requirement: &70231215230020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778511320
+  version_requirements: *70231215230020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70166778510520 !ruby/object:Gem::Requirement
+  requirement: &70231215244520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778510520
+  version_requirements: *70231215244520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70166778509620 !ruby/object:Gem::Requirement
+  requirement: &70231215243640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778509620
+  version_requirements: *70231215243640
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70166778525100 !ruby/object:Gem::Requirement
+  requirement: &70231215242880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778525100
+  version_requirements: *70231215242880
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &70166778524220 !ruby/object:Gem::Requirement
+  requirement: &70231215242000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778524220
+  version_requirements: *70231215242000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70166778522920 !ruby/object:Gem::Requirement
+  requirement: &70231215240760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778522920
+  version_requirements: *70231215240760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70166778521500 !ruby/object:Gem::Requirement
+  requirement: &70231215239680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778521500
+  version_requirements: *70231215239680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70166778520140 !ruby/object:Gem::Requirement
+  requirement: &70231215238260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778520140
+  version_requirements: *70231215238260
 - !ruby/object:Gem::Dependency
   name: wherewolf
-  requirement: &70166778519320 !ruby/object:Gem::Requirement
+  requirement: &70231215253700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166778519320
+  version_requirements: *70231215253700
 description: Wherewolf allows you to consume search terms as strings without worrying
   about database injections. It parses the query and converts it into ARel. It's great
   for creating filterable REST APIs.
@@ -186,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -122893438368244231
+      hash: 730622563305472605
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: