wherewolf 0.5.0 → 0.6.0

data/README.rdoc

@@ -59,7 +59,7 @@ Setting blacklist will remove those columns from the list
 Both whitelist and blacklist can take a proc if you want to lazy evaluate
 
     class Player < ActiveRecord::Base
-      has_query_parsing :whitelist => proc { |model| model.accessible_attributes }
+      has_query_parsing :whitelist => proc { |model| model.accessible_attributes.map(&:to_sym) }
     end
 
 would restrict the searchable columns to those exposed by accessible_attributes

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.5.0"
+  gem.version = "0.6.0"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/lib/wherewolf.rb

@@ -12,15 +12,11 @@ module Wherewolf
   
   module ClassMethods
     def has_query_parsing(options = {})
-      self.class_eval <<-EOV
-        def self.wherewolf_options
-          #{options}
-        end
-      EOV
-
       self.class_eval do
+        cattr_accessor :wherewolf_options
         scope :where_query, lambda { |query| Wherewolf::Where::Processor.parse(self, query) }
         scope :order_query, lambda { |query| Wherewolf::Order::Processor.parse(self, query) }
+        self.wherewolf_options = options
       end
     end
   end

data/lib/wherewolf/processor.rb

@@ -22,13 +22,13 @@ module Wherewolf
     end
 
     def whitelist
-      return @options[:whitelist].call if @options[:whitelist].is_a?(Proc)
+      return @options[:whitelist].call(self.model) if @options[:whitelist].is_a?(Proc)
       return @options[:whitelist] if @options[:whitelist]
       return nil
     end
 
     def blacklist
-      return @options[:blacklist].call if @options[:blacklist].is_a?(Proc)
+      return @options[:blacklist].call(self.model) if @options[:blacklist].is_a?(Proc)
       return @options[:blacklist] if @options[:blacklist]
       return nil
     end

data/test/helper.rb

@@ -46,7 +46,8 @@ class AddUsers < ActiveRecord::Migration
     end
     
     create_table :countries do |t|
-      t.string :team
+      t.string :name
+      t.string :jersey_color
     end
   end
 
@@ -65,6 +66,7 @@ class Team < ActiveRecord::Base
 end
 
 class Country < ActiveRecord::Base
+  attr_accessible :name
   has_query_parsing :whitelist => [ :name ]
 end
 

data/test/processor_test.rb

@@ -43,7 +43,11 @@ class ProcessorTest < Test::Unit::TestCase
       end
 
       should 'evaluate options[:whitelist] if is a proc' do
-        assert_equal [ :name, :type ], Wherewolf::Processor.new(Player, :whitelist => proc { return [ :name, :type ] }).send(:whitelist)
+        assert_equal [ :name, :type ], Wherewolf::Processor.new(Player, :whitelist => proc { |model| [ :name, :type ] }).send(:whitelist)
+      end
+      
+      should 'pass model into whitelist proc' do
+        assert_equal [ :name, ], Wherewolf::Processor.new(Country, :whitelist => proc { |model| model.accessible_attributes.map(&:to_sym) }).send(:whitelist)
       end
     end
   
@@ -57,7 +61,11 @@ class ProcessorTest < Test::Unit::TestCase
       end
 
       should 'evaluate options[:blacklist] if is a proc' do
-        assert_equal [ :name, :type ], Wherewolf::Processor.new(Player, :blacklist => proc { return [ :name, :type ] }).send(:blacklist)
+        assert_equal [ :name, :type ], Wherewolf::Processor.new(Player, :blacklist => proc { |model| [ :name, :type ] }).send(:blacklist)
+      end
+
+      should 'pass model into blacklist proc' do
+        assert_equal [ :name ], Wherewolf::Processor.new(Country, :blacklist => proc { |model| model.accessible_attributes.map(&:to_sym) }).send(:blacklist)
       end
     end
   end

data/wherewolf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wherewolf"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Eftos"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wherewolf
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &70293403498180 !ruby/object:Gem::Requirement
+  requirement: &70363111528740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293403498180
+  version_requirements: *70363111528740
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70293403497160 !ruby/object:Gem::Requirement
+  requirement: &70363111528260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293403497160
+  version_requirements: *70363111528260
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70293403496160 !ruby/object:Gem::Requirement
+  requirement: &70363111527780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403496160
+  version_requirements: *70363111527780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70293403495640 !ruby/object:Gem::Requirement
+  requirement: &70363111527300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403495640
+  version_requirements: *70363111527300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70293403494940 !ruby/object:Gem::Requirement
+  requirement: &70363111526820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403494940
+  version_requirements: *70363111526820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70293403451080 !ruby/object:Gem::Requirement
+  requirement: &70363111526340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403451080
+  version_requirements: *70363111526340
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70293403450480 !ruby/object:Gem::Requirement
+  requirement: &70363111525860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403450480
+  version_requirements: *70363111525860
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &70293403449820 !ruby/object:Gem::Requirement
+  requirement: &70363111525380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403449820
+  version_requirements: *70363111525380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70293403448900 !ruby/object:Gem::Requirement
+  requirement: &70363111524900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403448900
+  version_requirements: *70363111524900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70293403448020 !ruby/object:Gem::Requirement
+  requirement: &70363111524420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403448020
+  version_requirements: *70363111524420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70293403446960 !ruby/object:Gem::Requirement
+  requirement: &70363126234820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403446960
+  version_requirements: *70363126234820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70293403446380 !ruby/object:Gem::Requirement
+  requirement: &70363126233820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70293403446380
+  version_requirements: *70363126233820
 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.
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2148443602705417876
+      hash: -3222849472552349803
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: