will_filter 3.1.5 → 3.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    will_filter (3.1.5)
+    will_filter (3.1.6)
       coffee-script
       kaminari
       rails (>= 3.1.0)

data/app/models/will_filter/filter.rb

@@ -31,7 +31,7 @@ module WillFilter
     #############################################################################
     # Basics 
     #############################################################################
-    def initialize(model_class)
+    def initialize(model_class = nil)
       super()
 
       if WillFilter::Config.require_filter_extensions? and self.class.name == "WillFilter::Filter"
@@ -94,8 +94,16 @@ module WillFilter
       []
     end
     
+    # For extra security, this method must be overloaded by the extending class.
     def model_class
-      return nil unless model_class_name
+      if WillFilter::Config.require_filter_extensions?
+        raise WillFilter::FilterException.new("model_class method must be overloaded in the extending class.") 
+      end
+
+      if model_class_name.blank?
+        raise WillFilter::FilterException.new("model_class_name was not specified.") 
+      end
+
       @model_class ||= model_class_name.constantize
     end
     
@@ -192,6 +200,8 @@ module WillFilter
     
     def order
       @order ||= default_order
+      @order = default_order unless contains_column?(@order.to_sym)
+      @order
     end
     
     def default_order_type
@@ -200,6 +210,8 @@ module WillFilter
   
     def order_type
       @order_type ||= default_order_type
+      @order_type = default_order_type unless ['asc', 'desc'].include?(@order_type.to_s)
+      @order_type
     end
   
     def order_clause
@@ -385,14 +397,27 @@ module WillFilter
       params = HashWithIndifferentAccess.new(params) unless params.is_a?(HashWithIndifferentAccess)
 
       params[:wf_type] = self.name unless params[:wf_type]
-      params[:wf_type].constantize.new(params[:wf_model]).deserialize_from_params(params)
+      filter_class = params[:wf_type].constantize
+      filter_instance = filter_class.new
+
+      unless filter_instance.kind_of?(WillFilter::Filter)
+        raise WillFilter::FilterException.new("Invalid filter class. Filter classes must extand WillFilter::Filter.")
+      end  
+      
+      if WillFilter::Config.require_filter_extensions?
+        filter_instance.deserialize_from_params(params) 
+      else  
+        filter_class.new(params[:wf_model]).deserialize_from_params(params) 
+      end
     end
     
     def deserialize_from_params(params)
       params = HashWithIndifferentAccess.new(params) unless params.is_a?(HashWithIndifferentAccess)
+
       @conditions = []
       @match                = params[:wf_match]       || :all
       @key                  = params[:wf_key]         || self.id.to_s
+
       self.model_class_name = params[:wf_model]       if params[:wf_model]
       
       @per_page             = params[:wf_per_page]    || default_per_page

data/lib/will_filter/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module WillFilter
-  VERSION = "3.1.5"
+  VERSION = "3.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152808640 !ruby/object:Gem::Requirement
+  requirement: &2164951700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152808640
+  version_requirements: *2164951700
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152803760 !ruby/object:Gem::Requirement
+  requirement: &2164948000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152803760
+  version_requirements: *2164948000
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152801020 !ruby/object:Gem::Requirement
+  requirement: &2164944880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152801020
+  version_requirements: *2164944880
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2152797920 !ruby/object:Gem::Requirement
+  requirement: &2164941460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152797920
+  version_requirements: *2164941460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152795980 !ruby/object:Gem::Requirement
+  requirement: &2164936460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152795980
+  version_requirements: *2164936460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152794840 !ruby/object:Gem::Requirement
+  requirement: &2164935220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152794840
+  version_requirements: *2164935220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152794080 !ruby/object:Gem::Requirement
+  requirement: &2164933660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152794080
+  version_requirements: *2164933660
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152793280 !ruby/object:Gem::Requirement
+  requirement: &2164931900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152793280
+  version_requirements: *2164931900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2152792380 !ruby/object:Gem::Requirement
+  requirement: &2164861240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152792380
+  version_requirements: *2164861240
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152791540 !ruby/object:Gem::Requirement
+  requirement: &2164859840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152791540
+  version_requirements: *2164859840
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2152790380 !ruby/object:Gem::Requirement
+  requirement: &2164858760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152790380
+  version_requirements: *2164858760
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152789520 !ruby/object:Gem::Requirement
+  requirement: &2164857640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152789520
+  version_requirements: *2164857640
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2152788600 !ruby/object:Gem::Requirement
+  requirement: &2164856120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152788600
+  version_requirements: *2164856120
 description: will_filter is a powerful customizable framework for filtering active_record
   models.
 email:
@@ -363,7 +363,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4561456729773262300
+      hash: -509527631151697114
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -372,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4561456729773262300
+      hash: -509527631151697114
 requirements: []
 rubyforge_project: will_filter
 rubygems_version: 1.8.11