will_filter 3.0.3 → 3.0.4

data/app/controllers/will_filter/filter_controller.rb

@@ -64,6 +64,8 @@ module WillFilter
     end
   
     def save_filter
+      raise WillFilter::FilterException.new("Saving functions are disabled") unless  WillFilter::Config.saving_enabled?
+
       params.delete(:wf_id)
       
       wf_filter = WillFilter::Filter.deserialize_from_params(params)
@@ -79,6 +81,8 @@ module WillFilter
     end
   
     def update_filter
+      raise WillFilter::FilterException.new("Saving functions are disabled") unless  WillFilter::Config.saving_enabled?
+
       wf_filter = WillFilter::Filter.find_by_id(params.delete(:wf_id))
       wf_filter.deserialize_from_params(params)
       wf_filter.validate!
@@ -93,6 +97,8 @@ module WillFilter
     end
   
     def delete_filter
+      raise WillFilter::FilterException.new("Saving functions are disabled") unless  WillFilter::Config.saving_enabled?
+
       wf_filter = WillFilter::Filter.find_by_id(params[:wf_id])
       wf_filter.destroy if wf_filter
   

data/app/models/will_filter/filter.rb

@@ -31,8 +31,13 @@ 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"
+        raise WillFilter::FilterException.new("Your configuration requires you to subclass the filter. Default filter cannot be created.")
+      end
+
       self.model_class_name = model_class.to_s
     end
     
@@ -89,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
     
@@ -188,6 +201,8 @@ module WillFilter
     
     def order
       @order ||= default_order
+      @order = default_order unless contains_column?(@order.to_sym)
+      @order
     end
     
     def default_order_type
@@ -196,6 +211,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
@@ -380,15 +397,30 @@ module WillFilter
     def self.deserialize_from_params(params)
       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)
+
+      # Validate sanity of user provided parameters
+      params.delete(:wf_order_type) unless [ 'asc', 'desc' ].include? params[:wf_order_type]
+      params.delete(:wf_order) unless self.class.columns.map(&:name).include? params[:wf_order]
+
       @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
       @page                 = params[:page]           || 1

data/app/views/will_filter/filter/_conditions.html.erb

@@ -3,9 +3,12 @@
 <%= hidden_field_tag(:wf_dirty, "false") %>
 <%= hidden_field_tag(:wf_submitted, "false") %>
 <%= hidden_field_tag(:wf_name, wf_filter.name) %>
-<%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
 <%= hidden_field_tag(:wf_export_format, "") %>
 <%= hidden_field_tag(:wf_export_fields, "") %>
+
+<% unless WillFilter::Config.require_filter_extensions? %>
+	<%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
+<% end %>
 	
 <div class="wf_header">
   <% if wf_filter.show_save_options? %>

data/lib/core_ext/active_record/base.rb

@@ -23,7 +23,7 @@
 
 class ActiveRecord::Base
   def self.filter(opts = {})
-    if ActiveRecord::Base == self.class
+    if 'ActiveRecord::Base' == self.to_s
       raise WillFilter::FilterException.new("Cannot apply filter to the ActiveRecord::Base object")
     end
 

data/lib/generators/will_filter/templates/config.yml

@@ -10,6 +10,34 @@
 #############################################################################
 
 defaults: &defaults
+
+  ###########################################################################
+  # 
+  # require_filter_extension makes the filter into an abstract class
+  # and will require you to subclass it in order for the filter to be 
+  # serializeable. The following will no longer work:
+  #
+  # @users = User.filter(:params => params) 
+  #
+  # Use your own filter class instead:
+  # 
+  # @users = User.filter(:params => params, :filter => UserFilter) 
+  # 
+  # In the subclass you must provide the model name to be filtered by overloading:
+  #
+  #  def model_class
+  #    User     
+  #  end
+  # 
+  ###########################################################################
+
+  require_filter_extensions: false   
+  
+  ###########################################################################
+  # If you would like to see some JavaScript effects
+  # provide your own effects class and implement required methods
+  ###########################################################################
+
   effects_options:
     enabled:              false
     script_path:          "/will_filter/javascripts/will_filter_prototype_effects.js"

data/lib/will_filter/config.rb

@@ -45,6 +45,10 @@ module WillFilter
       @config ||= load_yml("/config/will_filter/config.yml")
     end
   
+    def self.require_filter_extensions?
+      config[:require_filter_extensions]
+    end
+  
     def self.effects_options
       config[:effects_options]
     end

metadata

@@ -1,75 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: will_filter
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 3.0.4
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 3
-  version: 3.0.3
 platform: ruby
-authors: 
+authors:
 - Michael Berkovich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-22 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  name: rails
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1923831917
-        segments: 
-        - 3
-        - 0
-        - pre
-        - 2
-        version: 3.0.pre2
-  name: will_paginate
-  version_requirements: *id002
-description: Rails engine for filtering ActiveRecord model objects.
-email: theiceberk@gmail.com
+date: 2012-04-06 00:00:00.000000000Z
+dependencies: []
+description: 
+email: 
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .loadpath
-- .project
-- CHANGELOG.rdoc
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
+extra_rdoc_files: []
+files:
 - app/controllers/application_controller.rb
 - app/controllers/will_filter/calendar_controller.rb
 - app/controllers/will_filter/exporter_controller.rb
@@ -99,7 +46,6 @@ files:
 - app/views/will_filter/filter/containers/_numeric_range.html.erb
 - app/views/will_filter/filter/containers/_text.html.erb
 - app/views/will_filter/filter/index.html.erb
-- config.ru
 - config/application.rb
 - config/boot.rb
 - config/database.yml
@@ -109,12 +55,22 @@ files:
 - config/environments/test.rb
 - config/routes.rb
 - config/will_filter/config.yml
-- db/development.sqlite3
-- db/migrate/20090730070119_create_will_filter_tables.rb
-- db/seeds.rb
-- db/test.sqlite3
-- doc/README_FOR_APP
-- examples/README
+- public/404.html
+- public/422.html
+- public/500.html
+- public/favicon.ico
+- public/robots.txt
+- public/will_filter/images/buttons.png
+- public/will_filter/images/calendar.png
+- public/will_filter/images/clock.png
+- public/will_filter/images/close.gif
+- public/will_filter/images/results_table_th_active.gif
+- public/will_filter/images/sort_arrow_all.gif
+- public/will_filter/images/sort_bg.gif
+- public/will_filter/images/spinner.gif
+- public/will_filter/javascripts/will_filter.js
+- public/will_filter/javascripts/will_filter_prototype_effects.js
+- public/will_filter/stylesheets/will_filter.css
 - lib/application_helper.rb
 - lib/core_ext/active_record/base.rb
 - lib/core_ext/array.rb
@@ -122,9 +78,7 @@ files:
 - lib/generators/will_filter/templates/config.yml
 - lib/generators/will_filter/templates/create_will_filter_tables.rb
 - lib/generators/will_filter/will_filter_generator.rb
-- lib/tasks/.gitkeep
 - lib/tasks/will_filter_tasks.rake
-- lib/will_filter.rb
 - lib/will_filter/calendar.rb
 - lib/will_filter/common_methods.rb
 - lib/will_filter/config.rb
@@ -146,63 +100,29 @@ files:
 - lib/will_filter/filter_condition.rb
 - lib/will_filter/filter_container.rb
 - lib/will_filter/filter_exception.rb
-- pkg/will_filter-0.1.0.gem
-- pkg/will_filter-0.1.1.gem
-- public/404.html
-- public/422.html
-- public/500.html
-- public/favicon.ico
-- public/robots.txt
-- public/will_filter/images/buttons.png
-- public/will_filter/images/calendar.png
-- public/will_filter/images/clock.png
-- public/will_filter/images/close.gif
-- public/will_filter/images/results_table_th_active.gif
-- public/will_filter/images/sort_arrow_all.gif
-- public/will_filter/images/sort_bg.gif
-- public/will_filter/images/spinner.gif
-- public/will_filter/javascripts/will_filter.js
-- public/will_filter/javascripts/will_filter_prototype_effects.js
-- public/will_filter/stylesheets/will_filter.css
-- script/rails
-- test/functional/models/will_filter/filter_test.rb
-- test/performance/browsing_test.rb
-- test/test_helper.rb
-- uninstall.rb
-- will_filter.gemspec
-has_rdoc: true
+- lib/will_filter.rb
 homepage: http://github.com/berk/will_filter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Rails engine for filtering ActiveRecord model objects.
 test_files: []
-

data/.loadpath

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<loadpath>
-	<pathentry path="" type="src"/>
-	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
-	<pathentry path="GEM_LIB/activerecord-2.3.2/lib" type="var"/>
-	<pathentry path="GEM_LIB/rake-0.8.4/lib" type="var"/>
-	<pathentry path="GEM_LIB/activeresource-2.3.2/lib" type="var"/>
-	<pathentry path="GEM_LIB/rails-2.3.2/lib" type="var"/>
-	<pathentry path="GEM_LIB/actionmailer-2.3.2/lib" type="var"/>
-	<pathentry path="GEM_LIB/actionpack-2.3.2/lib" type="var"/>
-	<pathentry path="GEM_LIB/activesupport-2.3.2/lib" type="var"/>
-</loadpath>

data/.project

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>will_filter</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.rubypeople.rdt.core.rubybuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.rubypeople.rdt.core.rubynature</nature>
-		<nature>org.radrails.rails.core.railsnature</nature>
-	</natures>
-</projectDescription>

data/CHANGELOG.rdoc

@@ -1 +0,0 @@
-== 0.1.0, released 2011-05-29

data/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', '~> 3.0.0'
-gem "will_paginate", "~> 3.0.pre2"
-
-# gem 'sqlite3'

data/Gemfile.lock

@@ -1,73 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.10)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.9.1)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rails (~> 3.0.0)
-  will_paginate (~> 3.0.pre2)

data/LICENSE

@@ -1,18 +0,0 @@
-Copyright (c) 2011 Michael Berkovich
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
-the Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,74 +0,0 @@
-= WillFilter
-
-will_filter is a Rails engine plugin that extends the functionality of will_paginate by adding filters to your pages.
-
-== Preamble
- 
-If you ever had to build an admin tool for your web site that displayed a list of objects that can be filtered using 
-various criteria, this plugin will make your life easier. Adding a filtered page can now be 
-a matter of adding two lines of code - one to your controller and one to your view. See examples below.
-
-For advanced samples of how to use the filters, please download and install the following project: 
-
-http://github.com/berk/will_filter_examples
-
-== Installation Instructions
-
-Add the following gems to your Gemfile: 
-
-  gem "will_paginate", "~> 3.0.pre2"
-  gem 'will_filter', "~> 3.0.0" 
-
-And run:
-
-  $ bundle install
-
-To configure and initialize will_filter engine, run the following commands: 
-
-  $ rails generate will_filter  
-  $ rake db:migrate 
-
-== Examples
-
-To add a filtered result-set to your controller use the following method call:
-
-  class OrderController < ApplicationController
-  
-    def index
-      @orders = Order.filter(:params => params)    
-    end
-    
-  end  
-
-Note: 'Order' is a Rails ActiveRecord model 
-
-Now all you have to do is create a view for this action and add the following tag where you want the filter to be rendered:
-
-  <%= will_filter(@orders) %>
-	
-And optionally you can do (for results table):
-	
-  <%= will_filter_table_tag(@orders) %>
-
-That's it. This will render a filter box with various conditions, operators and values for the model object you selected.
-
-Below are a couple of screenshot of what the filter looks like when it is rendered on a page:
-
-http://wiki.tr8n.org/images/d/da/Will_filter_1.png
-
-http://wiki.tr8n.org/images/e/ec/Will_filter_2.png
-
-will_filter_examples project contains some samples that show you how to customize filters and much more
-
-  git://github.com/berk/will_filter_examples.git
-
-Live will_filter_examples application is running here:
-
-http://wf.tr8n.org 
-
-If you have any questions, comments or suggestions, email me at michael@geni.com
-
-== Authors and credits
-
-Authors::                Michael Berkovich
-

data/Rakefile

@@ -1,54 +0,0 @@
-#--
-# Copyright (c) 2011 Michael Berkovich
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require 'rake/testtask'
-
-Rake::TestTask.new do |test|
-  test.pattern = 'test/**/*_test.rb'
-  test.libs << 'test'
-end
-
-begin
- require 'jeweler'
- Jeweler::Tasks.new do |s|
-   s.name = "will_filter"
-   s.summary = "Rails engine for filtering ActiveRecord model objects."
-   s.email = "theiceberk@gmail.com"
-   s.homepage = "http://github.com/berk/will_filter"
-   s.description = "Rails engine for filtering ActiveRecord model objects."
-   s.authors = ["Michael Berkovich"]
- end
- Jeweler::GemcutterTasks.new
-rescue LoadError
- puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
-#require File.expand_path('../config/application', __FILE__)
-#require 'rake'
-#
-#WillFilter::Application.load_tasks
-
-

data/VERSION

@@ -1 +0,0 @@
-3.0.3

data/config.ru

@@ -1,4 +0,0 @@
-# This file is used by Rack-based servers to start the application.
-
-require ::File.expand_path('../config/environment',  __FILE__)
-run WillFilter::Application

data/db/migrate/20090730070119_create_will_filter_tables.rb

@@ -1,19 +0,0 @@
-class CreateWillFilterTables < ActiveRecord::Migration
-  def self.up
-    create_table :wf_filters do |t|
-      t.string      :type
-      t.string      :name
-      t.text        :data
-      t.integer     :user_id
-      t.string      :model_class_name
-      
-      t.timestamps
-    end
-    
-    add_index :wf_filters, [:user_id]
-  end
-  
-  def self.down
-    drop_table :wf_filters
-  end
-end

data/db/seeds.rb

@@ -1,7 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)

data/doc/README_FOR_APP

@@ -1,2 +0,0 @@
-Use this README file to introduce your application and point to useful places in the API for learning more.
-Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.

data/examples/README

@@ -1 +0,0 @@
-Please install will_filter_examples project to see how to configure the model_filters.

data/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'

data/test/functional/models/will_filter/filter_test.rb

@@ -1,297 +0,0 @@
-require File.expand_path('../../../../test_helper', __FILE__)
-
-module WillFilter
-  class FilterTest < ActiveSupport::TestCase
-
-    test "boolean container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:admin,
-                :wf_o0=>:is,
-                :wf_v0_0=>"1"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.admin = ? ", filter.sql_conditions.first
-      assert_equal true, filter.sql_conditions.last
-      
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:admin,
-                :wf_o0=>:is,
-                :wf_v0_0=>"0"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.admin = ? ", filter.sql_conditions.first
-      assert_equal false, filter.sql_conditions.last
-    end
-
-    test "date range container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:birth_date,
-                :wf_o0=>:is_in_the_range,
-                :wf_v0_0=>"1971-11-09",
-                :wf_v0_1=>"1974-11-09"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 3, filter.sql_conditions.size
-      assert_equal " (users.birth_date >= ? and users.birth_date <= ?) ", filter.sql_conditions.first
-    end
-
-    test "date time range container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is_in_the_range,
-                :wf_v0_0=>"1971-11-09 8:00",
-                :wf_v0_1=>"1971-11-09 12:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 3, filter.sql_conditions.size
-      assert_equal " (users.created_at >= ? and users.created_at <= ?) ", filter.sql_conditions.first
-    end
-
-    test "date time container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.created_at = ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is_not,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.created_at <> ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is_after,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.created_at > ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is_before,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.created_at < ? ", filter.sql_conditions.first
-    end
-
-    test "date container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:birth_date,
-                :wf_o0=>:is,
-                :wf_v0_0=>"1971-11-09"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.birth_date = ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:birth_date,
-                :wf_o0=>:is_not,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.birth_date <> ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:birth_date,
-                :wf_o0=>:is_after,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.birth_date > ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:birth_date,
-                :wf_o0=>:is_before,
-                :wf_v0_0=>"1971-11-09 8:00"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.birth_date < ? ", filter.sql_conditions.first
-    end
-
-    test "numeric delimited container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:id,
-                :wf_o0=>:is_in,
-                :wf_v0_0=>"1,2,3,4,5,6"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.id in (?) ", filter.sql_conditions.first
-    end
-
-    test "numeric range container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:id,
-                :wf_o0=>:is_in_the_range,
-                :wf_v0_0=>"1",
-                :wf_v0_1=>"10"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 3, filter.sql_conditions.size
-      assert_equal " (users.id >= ? and users.id <= ?) ", filter.sql_conditions.first
-    end
-
-    test "numeric container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:id,
-                :wf_o0=>:is,
-                :wf_v0_0=>"1"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.id = ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:id,
-                :wf_o0=>:is_not,
-                :wf_v0_0=>"1"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.id <> ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:id,
-                :wf_o0=>:is_less_than,
-                :wf_v0_0=>"1"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.id < ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:id,
-                :wf_o0=>:is_greater_than,
-                :wf_v0_0=>"1"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.id > ? ", filter.sql_conditions.first
-    end
-
-    test "single date container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is_on,
-                :wf_v0_0=>"1971-11-09"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 3, filter.sql_conditions.size
-      assert_equal " users.created_at >= ? and users.created_at < ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:created_at,
-                :wf_o0=>:is_not_on,
-                :wf_v0_0=>"1971-11-09"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 3, filter.sql_conditions.size
-      assert_equal " users.created_at < ? and users.created_at >= ? ", filter.sql_conditions.first
-    end
-   
-    test "text delimited container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:is_in,
-                :wf_v0_0=>"a,b,c,d,e,f,g"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name in (?) ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:is_not_in,
-                :wf_v0_0=>"a,b,c,d,e,f,g"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 1, filter.conditions.size
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name not in (?) ", filter.sql_conditions.first
-    end
-  
-    test "text container" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:is,
-                :wf_v0_0=>"Mike"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name = ? ", filter.sql_conditions.first
-      assert_equal "Mike", filter.sql_conditions.last
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:is_not,
-                :wf_v0_0=>"Mike"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name <> ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:contains,
-                :wf_v0_0=>"Mike"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name like ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:does_not_contain,
-                :wf_v0_0=>"Mike"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name not like ? ", filter.sql_conditions.first
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:starts_with,
-                :wf_v0_0=>"Mike"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name like ? ", filter.sql_conditions.first
-      assert_equal "Mike%", filter.sql_conditions.last
-
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:ends_with,
-                :wf_v0_0=>"Mike"}
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 2, filter.sql_conditions.size
-      assert_equal " users.name like ? ", filter.sql_conditions.first
-      assert_equal "%Mike", filter.sql_conditions.last
-    end  
-    
-    test "compound filter" do
-      params = {:wf_type=>"UserFilter", 
-                :wf_c0=>:name,
-                :wf_o0=>:is,
-                :wf_v0_0=>"Mike",
-                :wf_c1=>:birth_date,
-                :wf_o1=>:is_before,
-                :wf_v1_0=>"1971-11-09 8:00"
-                }
-      filter = WillFilter::Filter.deserialize_from_params(params)
-      assert_equal 3, filter.sql_conditions.size
-      assert_equal " users.name = ?  AND  users.birth_date < ? ", filter.sql_conditions.first
-    end
-    
-  end
-end

data/test/performance/browsing_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end

data/test/test_helper.rb

@@ -1,71 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end
-
-# Dummy UserFilter object for testing filter containers
-class UserFilter < WillFilter::Filter
-  def table_name
-    "users"
-  end
-  
-  def definition
-    {:id=>
-      {:is_provided=>"nil",
-       :is_not_provided=>"nil",
-       :is=>"numeric",
-       :is_not=>"numeric",
-       :is_less_than=>"numeric",
-       :is_greater_than=>"numeric",
-       :is_in_the_range=>"numeric_range",
-       :is_in=>"numeric_delimited",
-       :is_filtered_by=>:filter_list},
-     :name=>
-      {:is_provided=>"nil",
-       :is_not_provided=>"nil",
-       :is=>"text",
-       :is_not=>"text",
-       :contains=>"text",
-       :does_not_contain=>"text",
-       :starts_with=>"text",
-       :ends_with=>"text",
-       :is_in=>"text_delimited",
-       :is_not_in=>"text_delimited"},
-     :admin=>
-      {:is_provided=>"nil",
-       :is_not_provided=>"nil",
-       :is=>"boolean"
-      },
-     :birth_date =>
-      {:is_provided=>"nil",
-       :is_not_provided=>"nil",
-       :is=>"date",
-       :is_not=>"date",
-       :is_after=>"date",
-       :is_before=>"date",
-       :is_in_the_range=>"date_range"
-      },
-    :created_at=>
-      {:is_provided=>"nil",
-       :is_not_provided=>"nil",
-       :is=>"date_time",
-       :is_not=>"date_time",
-       :is_after=>"date_time",
-       :is_before=>"date_time",
-       :is_in_the_range=>"date_time_range",
-       :is_on=>"single_date",
-       :is_not_on=>"single_date"}
-    }
-  end
-  
-  
-end

data/uninstall.rb

@@ -1,24 +0,0 @@
-#--
-# Copyright (c) 2010 Michael Berkovich, Geni Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-# Uninstall hook code here

data/will_filter.gemspec

@@ -1,7 +0,0 @@
-Gem::Specification.new do |spec|
-  spec.name = "will_filter"
-  spec.version = "0.0.1"
-  spec.summary = "WillFilter"
-  spec.authors = ["Me"]
-  spec.files = Dir["{app,config,public,lib}/**/*"]
-end