will_filter 3.1.3 → 3.1.5

data/spec/fake_app.rb

@@ -19,18 +19,11 @@ app.routes.draw do
 end
 
 # models
-class User < ActiveRecord::Base
-  has_many :events
-  has_many :events_users
-end
-class Event < ActiveRecord::Base
-  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
-  has_many :event_users
-end
-class EventUser < ActiveRecord::Base
-  belongs_to :event
-  belongs_to :user
-end
+Dir["#{File.dirname(__FILE__)}/../test/dummy/app/models/*.rb"].each do |f| 
+  if [:user, :event, :event_user].include?(f.split("/").last.gsub('.rb', '').to_sym)
+    require f 
+  end  
+end  
 
 # controllers
 class ApplicationController < ActionController::Base; end
@@ -39,6 +32,7 @@ class UsersController < ApplicationController
     @users = User.filter(:params => params)
     render :inline => <<-ERB
 <%= will_filter_tag(@users) %>
+<%= will_filter_table_tag(@users) %>
 ERB
   end
 end

data/test/dummy/app/models/event.rb

@@ -8,7 +8,7 @@ class Event < ActiveRecord::Base
   
   def self.generate_random_data(count = 500)
     0.upto(count) do |index|
-      create(:user => User.random, :name => "Event #{index}", :headline => "Event Headline #{index}", :start_time => (Time.now + rand(100).hours))      
+      create(:user => User.random, :name => "Event #{index}", :headline => "Event Headline #{index}", :start_time => (Time.now + rand(100).hours), :rank => ((rand * 1000).to_i / 100.0))      
     end
   end
   

data/test/dummy/app/models/event_filter.rb

@@ -1,5 +1,9 @@
 class EventFilter < WillFilter::Filter
 
+  def model_class
+    Event
+  end
+
   def definition
     defs = super  
     defs[:"user.first_name"] = {:is => :text, :is_not => :text, :contains => :text}

data/test/dummy/app/models/event_user_filter.rb

@@ -1,5 +1,9 @@
 class EventUserFilter < WillFilter::Filter
 
+  def model_class
+    EventUser
+  end
+
   def inner_joins
     [:user, :event]
   end

data/test/dummy/app/models/user_filter.rb

@@ -1,17 +1,28 @@
 class UserFilter < WillFilter::Filter
 
+  def model_class
+    User
+  end
+
   def definition
     defs = super  
     defs[:sex][:is] = :list
     defs[:sex][:is_not] = :list
+    defs[:custom_condition] = {
+      :is => :list
+    }
     defs
   end
 
-  def value_options_for(criteria_key)
-    if criteria_key == :sex
+  def value_options_for(condition_key)
+    if condition_key == :sex
       return ["male", "female"]
     end
 
+    if condition_key == :custom_condition
+      return [["Third letter in the First Name is an 'a'", 'a'], ['Id is divisible by 3', '3']]
+    end
+
     return []
   end
 
@@ -54,4 +65,22 @@ class UserFilter < WillFilter::Filter
     "male_only"
   end
 
+  def custom_conditions
+    [:custom_condition]
+  end
+
+  def custom_condition_met?(condition, object)
+    if condition.key == :custom_condition
+      if condition.operator == :is
+        if (condition.container.value == 'a')
+          return (object.first_name[2..2] == 'a')
+        elsif (condition.container.value == '3')  
+          return (object.id % 3 == 0)
+        end
+      end 
+    end
+
+    return false
+  end
+
 end

data/test/dummy/config/will_filter/config.yml

@@ -10,6 +10,9 @@
 #############################################################################
 
 defaults: &defaults
+
+  require_filter_extensions: false   
+
   effects_options:
     enabled:              false
     script_path:          "will_filter/filter_prototype_effects.js"
@@ -29,6 +32,9 @@ defaults: &defaults
     numeric:              WillFilter::Containers::Numeric
     numeric_range:        WillFilter::Containers::NumericRange
     numeric_delimited:    WillFilter::Containers::NumericDelimited
+    double:               WillFilter::Containers::Double
+    double_range:         WillFilter::Containers::DoubleRange
+    double_delimited:     WillFilter::Containers::DoubleDelimited
     date_time_range:      WillFilter::Containers::DateTimeRange
     single_date:          WillFilter::Containers::SingleDate
     date:                 WillFilter::Containers::Date
@@ -46,10 +52,12 @@ defaults: &defaults
     smallint:             [nil, numeric, numeric_range, numeric_delimited]
     integer:              [nil, numeric, numeric_range, numeric_delimited]
     int:                  [nil, numeric, numeric_range, numeric_delimited]
-    double:               [nil, numeric, numeric_range, numeric_delimited]
+    float:                [nil, double, double_range, double_delimited]
+    double:               [nil, double, double_range, double_delimited]
     timestamp:            [nil, date_time, date_time_range, single_date]
     datetime:             [nil, date_time, date_time_range, single_date]
     date:                 [nil, date, date_range]
+    char:                 [nil, text, text_delimited]
     character:            [nil, text, text_delimited]
     varchar:              [nil, text, text_delimited]
     text:                 [nil, text, text_delimited]

data/test/dummy/db/migrate/20120223232000_add_rank_to_events.rb

@@ -0,0 +1,5 @@
+class AddRankToEvents < ActiveRecord::Migration
+  def change
+  	add_column :events, :rank, :float
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111001193027) do
+ActiveRecord::Schema.define(:version => 20120223232000) do
 
   create_table "event_users", :force => true do |t|
     t.integer  "event_id"
@@ -33,6 +33,7 @@ ActiveRecord::Schema.define(:version => 20111001193027) do
     t.datetime "end_time"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.float    "rank"
   end
 
   add_index "events", ["creator_id"], :name => "index_events_on_creator_id"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000 -07:00
-default_executable: 
+date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165640220 !ruby/object:Gem::Requirement
+  requirement: &2152808640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165640220
+  version_requirements: *2152808640
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2165639700 !ruby/object:Gem::Requirement
+  requirement: &2152803760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165639700
+  version_requirements: *2152803760
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2165639220 !ruby/object:Gem::Requirement
+  requirement: &2152801020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165639220
+  version_requirements: *2152801020
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2165638740 !ruby/object:Gem::Requirement
+  requirement: &2152797920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165638740
+  version_requirements: *2152797920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165638240 !ruby/object:Gem::Requirement
+  requirement: &2152795980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165638240
+  version_requirements: *2152795980
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165637760 !ruby/object:Gem::Requirement
+  requirement: &2152794840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165637760
+  version_requirements: *2152794840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165637280 !ruby/object:Gem::Requirement
+  requirement: &2152794080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165637280
+  version_requirements: *2152794080
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165636800 !ruby/object:Gem::Requirement
+  requirement: &2152793280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165636800
+  version_requirements: *2152793280
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2165636320 !ruby/object:Gem::Requirement
+  requirement: &2152792380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165636320
+  version_requirements: *2152792380
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2165635840 !ruby/object:Gem::Requirement
+  requirement: &2152791540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165635840
+  version_requirements: *2152791540
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2165635360 !ruby/object:Gem::Requirement
+  requirement: &2152790380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165635360
+  version_requirements: *2152790380
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2165634880 !ruby/object:Gem::Requirement
+  requirement: &2152789520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165634880
+  version_requirements: *2152789520
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2165634400 !ruby/object:Gem::Requirement
+  requirement: &2152788600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165634400
+  version_requirements: *2152788600
 description: will_filter is a powerful customizable framework for filtering active_record
   models.
 email:
@@ -173,8 +172,6 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- app/.DS_Store
-- app/assets/images/.DS_Store
 - app/assets/images/will_filter/.gitkeep
 - app/assets/images/will_filter/buttons.png
 - app/assets/images/will_filter/calendar.png
@@ -196,81 +193,20 @@ files:
 - app/controllers/will_filter/exporter_controller.rb
 - app/controllers/will_filter/filter_controller.rb
 - app/models/will_filter/filter.rb
-- app/views/.DS_Store
 - app/views/layouts/will_filter/application.html.erb
-- app/views/will_filter/.DS_Store
-- app/views/will_filter/calendar/.tmp__annual.html.erb.10120~
-- app/views/will_filter/calendar/.tmp__annual.html.erb.2839~
-- app/views/will_filter/calendar/.tmp__annual.html.erb.58862~
-- app/views/will_filter/calendar/.tmp__annual.html.erb.64846~
-- app/views/will_filter/calendar/.tmp__annual.html.erb.68789~
-- app/views/will_filter/calendar/.tmp__annual.html.erb.93003~
-- app/views/will_filter/calendar/.tmp__annual.html.erb.93827~
-- app/views/will_filter/calendar/.tmp__month.html.erb.756~
-- app/views/will_filter/calendar/.tmp__quarter.html.erb.69400~
-- app/views/will_filter/calendar/.tmp_index.html.erb.11043~
-- app/views/will_filter/calendar/.tmp_index.html.erb.33725~
-- app/views/will_filter/calendar/.tmp_index.html.erb.56447~
-- app/views/will_filter/calendar/.tmp_index.html.erb.85379~
-- app/views/will_filter/calendar/.tmp_index.html.erb.86425~
-- app/views/will_filter/calendar/.tmp_index.html.erb.95884~
 - app/views/will_filter/calendar/_annual.html.erb
 - app/views/will_filter/calendar/_month.html.erb
 - app/views/will_filter/calendar/_quarter.html.erb
 - app/views/will_filter/calendar/index.html.erb
-- app/views/will_filter/common/.tmp__results_table.html.erb.47785~
-- app/views/will_filter/common/.tmp__results_table.html.erb.88043~
-- app/views/will_filter/common/.tmp__scripts.html.erb.51111~
-- app/views/will_filter/common/.tmp__scripts.html.erb.6990~
-- app/views/will_filter/common/.tmp__scripts.html.erb.88469~
 - app/views/will_filter/common/_actions_bar.html.erb
 - app/views/will_filter/common/_results_table.html.erb
 - app/views/will_filter/common/_scripts.html.erb
-- app/views/will_filter/exporter/.tmp_export.html.erb.10837~
-- app/views/will_filter/exporter/.tmp_export.html.erb.1415~
-- app/views/will_filter/exporter/.tmp_export.html.erb.60681~
-- app/views/will_filter/exporter/.tmp_export.html.erb.61343~
-- app/views/will_filter/exporter/.tmp_export_dialog.html.erb.22940~
-- app/views/will_filter/exporter/.tmp_index.html.erb.13538~
-- app/views/will_filter/exporter/.tmp_index.html.erb.23276~
-- app/views/will_filter/exporter/.tmp_index.html.erb.28308~
-- app/views/will_filter/exporter/.tmp_index.html.erb.29049~
 - app/views/will_filter/exporter/export.html.erb
 - app/views/will_filter/exporter/index.html.erb
-- app/views/will_filter/filter/.tmp__condition.html.erb.24762~
-- app/views/will_filter/filter/.tmp__condition.html.erb.27587~
-- app/views/will_filter/filter/.tmp__condition.html.erb.45362~
-- app/views/will_filter/filter/.tmp__condition.html.erb.49252~
-- app/views/will_filter/filter/.tmp__condition.html.erb.58234~
-- app/views/will_filter/filter/.tmp__condition.html.erb.60688~
-- app/views/will_filter/filter/.tmp__condition.html.erb.66557~
-- app/views/will_filter/filter/.tmp__condition.html.erb.68032~
-- app/views/will_filter/filter/.tmp__condition.html.erb.73740~
-- app/views/will_filter/filter/.tmp__condition.html.erb.81041~
-- app/views/will_filter/filter/.tmp__condition.html.erb.98638~
-- app/views/will_filter/filter/.tmp__conditions.html.erb.23216~
-- app/views/will_filter/filter/.tmp__conditions.html.erb.53568~
-- app/views/will_filter/filter/.tmp__conditions.html.erb.5788~
-- app/views/will_filter/filter/.tmp__conditions.html.erb.79521~
-- app/views/will_filter/filter/.tmp__conditions.html.erb.92102~
-- app/views/will_filter/filter/.tmp__conditions.html.erb.97034~
-- app/views/will_filter/filter/.tmp__container.html.erb.23178~
-- app/views/will_filter/filter/.tmp__container.html.erb.25113~
-- app/views/will_filter/filter/.tmp__container.html.erb.29332~
-- app/views/will_filter/filter/.tmp__container.html.erb.31412~
-- app/views/will_filter/filter/.tmp__container.html.erb.57958~
-- app/views/will_filter/filter/.tmp__container.html.erb.80588~
-- app/views/will_filter/filter/.tmp__container.html.erb.89054~
-- app/views/will_filter/filter/.tmp__container.html.erb.92260~
-- app/views/will_filter/filter/.tmp__container.html.erb.92798~
-- app/views/will_filter/filter/.tmp__filter_conditions.html.erb.70617~
-- app/views/will_filter/filter/.tmp_calendar.html.erb.30839~
-- app/views/will_filter/filter/.tmp_calendar.html.erb.52766~
-- app/views/will_filter/filter/.tmp_calendar.html.erb.83182~
-- app/views/will_filter/filter/.tmp_export_data.html.erb.50322~
-- app/views/will_filter/filter/.tmp_index.html.erb.40957~
 - app/views/will_filter/filter/_condition.html.erb
 - app/views/will_filter/filter/_conditions.html.erb
+- app/views/will_filter/filter/_conditions_footer.html.erb
+- app/views/will_filter/filter/_conditions_header.html.erb
 - app/views/will_filter/filter/_container.html.erb
 - app/views/will_filter/filter/containers/_blank.html.erb
 - app/views/will_filter/filter/containers/_boolean.html.erb
@@ -283,9 +219,6 @@ files:
 - app/views/will_filter/filter/containers/_text.html.erb
 - app/views/will_filter/filter/index.html.erb
 - config/routes.rb
-- config/will_filter/config.yml
-- db/migrate/20110924023807_create_will_filter_filters.rb
-- lib/generators/.DS_Store
 - lib/generators/will_filter/templates/config.yml
 - lib/generators/will_filter/templates/create_will_filter_filters.rb
 - lib/generators/will_filter/will_filter_generator.rb
@@ -298,6 +231,9 @@ files:
 - lib/will_filter/containers/date_range.rb
 - lib/will_filter/containers/date_time.rb
 - lib/will_filter/containers/date_time_range.rb
+- lib/will_filter/containers/double.rb
+- lib/will_filter/containers/double_delimited.rb
+- lib/will_filter/containers/double_range.rb
 - lib/will_filter/containers/filter_list.rb
 - lib/will_filter/containers/list.rb
 - lib/will_filter/containers/nil.rb
@@ -319,15 +255,13 @@ files:
 - lib/will_filter/version.rb
 - script/rails
 - spec/config/config_spec.rb
+- spec/containers/double_spec.rb
 - spec/extensions/active_record_extension_spec.rb
 - spec/fake_app.rb
 - spec/spec_helper.rb
-- test/.DS_Store
-- test/dummy/.DS_Store
 - test/dummy/.sass-cache/f9cb1ef521115be73f1c61d3d5d64f66c947af63/actions.css.scssc
 - test/dummy/.sass-cache/f9cb1ef521115be73f1c61d3d5d64f66c947af63/results.css.scssc
 - test/dummy/Rakefile
-- test/dummy/app/.DS_Store
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/orders.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -393,13 +327,13 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/will_filter/config.yml
-- test/dummy/db/migrate/.DS_Store
 - test/dummy/db/migrate/20090416182137_create_users.rb
 - test/dummy/db/migrate/20090418042757_create_events.rb
 - test/dummy/db/migrate/20090418062225_create_event_users.rb
 - test/dummy/db/migrate/20110924023807_create_will_filter_filters.rb
 - test/dummy/db/migrate/20111001193019_create_orders.rb
 - test/dummy/db/migrate/20111001193027_create_order_items.rb
+- test/dummy/db/migrate/20120223232000_add_rank_to_events.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/lib/tasks/dummy.rake
@@ -414,7 +348,6 @@ files:
 - test/test_helper.rb
 - test/will_filter_test.rb
 - will_filter.gemspec
-has_rdoc: true
 homepage: https://github.com/berk/will_filter
 licenses:
 - MIT
@@ -430,7 +363,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3476904460537457264
+      hash: -4561456729773262300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -439,23 +372,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3476904460537457264
+      hash: -4561456729773262300
 requirements: []
 rubyforge_project: will_filter
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A filtering engine plugin for Rails 3.1
 test_files:
 - spec/config/config_spec.rb
+- spec/containers/double_spec.rb
 - spec/extensions/active_record_extension_spec.rb
 - spec/fake_app.rb
 - spec/spec_helper.rb
-- test/dummy/.DS_Store
 - test/dummy/.sass-cache/f9cb1ef521115be73f1c61d3d5d64f66c947af63/actions.css.scssc
 - test/dummy/.sass-cache/f9cb1ef521115be73f1c61d3d5d64f66c947af63/results.css.scssc
 - test/dummy/Rakefile
-- test/dummy/app/.DS_Store
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/orders.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -521,13 +453,13 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/will_filter/config.yml
-- test/dummy/db/migrate/.DS_Store
 - test/dummy/db/migrate/20090416182137_create_users.rb
 - test/dummy/db/migrate/20090418042757_create_events.rb
 - test/dummy/db/migrate/20090418062225_create_event_users.rb
 - test/dummy/db/migrate/20110924023807_create_will_filter_filters.rb
 - test/dummy/db/migrate/20111001193019_create_orders.rb
 - test/dummy/db/migrate/20111001193027_create_order_items.rb
+- test/dummy/db/migrate/20120223232000_add_rank_to_events.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/lib/tasks/dummy.rake