will_filter 3.0.5 → 3.1.1

data/app/assets/stylesheets/will_filter/actions.css.scss

@@ -0,0 +1,27 @@
+@mixin rounded-corners($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+.wf_actions_bar_yellow {
+	margin-top:10px; 
+	margin-bottom:10px; 
+	padding:10px; 
+	background-color: #f9f8f7;
+	border-color: #E8E8E8 #BABABA #BABABA #E8E8E8;
+	border-style: solid;
+	border-width: 1px;
+ 	@include rounded-corners(10px);	
+}	
+
+.wf_actions_bar_blue {
+  margin-top:10px; 
+  margin-bottom:10px; 
+  padding:10px; 
+  background-color: #f1f4fa;
+  border-color: #E8E8E8 #BABABA #BABABA #E8E8E8;
+  border-style: solid;
+  border-width: 1px;
+ 	@include rounded-corners(10px);	
+}

data/app/assets/stylesheets/will_filter/buttons.css.scss

@@ -0,0 +1,24 @@
+/*
+  Pure CSS Buttons.
+  Learn more ~ http://www.halmatferello.com/lab/pure-css-buttons/
+
+  Licensed under GPL and MIT.
+*/
+.wf_pcb, .wf_pcb span                         {background: url('/assets/will_filter/buttons.png') no-repeat; height: 23px; line-height: 23px; padding: 3px 0 7px 0; }
+.wf_pcb, a.wf_pcb:link, a.wf_pcb:visited      {color: #333; font-size: 12px; font-style:bold; font-family:arial; padding-left: 14px; text-decoration: none !important; }
+
+/* ie 6 hack */
+* html div#frame .wf_pcb                      {color: #333; padding-top: 0px; padding-bottom: 0px; text-decoration: none; }
+
+/* ie 7 hack */
+*:first-child+html .wf_pcb                    {color: #333; padding-top: 0px; padding-bottom: 0px; text-decoration: none; }
+
+.wf_pcb span                                  {background-position: right -326px; padding-right: 14px; }
+a.wf_grey_button                              {background-position: left -219px; padding-top: 3px; }
+a.wf_grey_button span                         {background-position: right -545px; padding-top: 3px; }
+a.wf_grey_button:hover                        {background-position: left -246px; }
+a.wf_grey_button:hover span                   {background-position: right -572px; }
+a.wf_grey_button:active, .grey_active_button  {background-position: left -273px; }
+a.wf_grey_button:active span, .grey_active_button span {background-position: right -599px; }
+body.wf_grey_disabled_button                  {background-position: left -300px; color: #bbb !important; }
+body.wf_grey_disabled_button span             {background-position: right -626px; }

data/app/assets/stylesheets/will_filter/calendar.css.scss

@@ -0,0 +1,55 @@
+@mixin rounded-corners($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+.wf_calendar_trigger {border:0px; padding-left:2px; padding-right:2px;}
+
+.wf_calendar {
+	background-color:#eee; 
+	position:absolute; 
+	font-size:10px; 
+	border:solid 1px #e8e8e8; 
+	border-color:#e8e8e8 #bababa #bababa #e8e8e8;
+	padding: 5px; 
+ 	@include rounded-corners(10px);	
+
+	input {
+		border: 1px solid #ccc; 
+		font-size: 12px; 
+		font-family: Arial; 
+		@include rounded-corners(10px);		
+	}
+	
+	select {
+		border: 1px solid #ccc; 
+		font-size: 12px; 
+		font-family: Arial; 
+		padding:2px;
+		background-color:#EDEDED;
+		@include rounded-corners(10px);	
+	}	
+}
+
+.wf_calendar_container {
+	background-color:white; 
+	padding: 5px; 
+	margin: 5px; 
+	font-size:10px; 
+	border:solid 1px #bababa; 
+	border-color:#bababa #e8e8e8 #e8e8e8 #bababa; 
+ 	@include rounded-corners(10px);	
+}
+
+.wf_calendar_table                      {width:100%;}
+.wf_calendar_table td                   {padding:2px; margin:2px; text-align:center; vertical-align:top;}
+.wf_calendar img                        {border: 0px;}
+
+.wf_calendar_cells                      {border:1px dotted #ccc; width:100%; padding:2px; margin:0px; }
+.wf_calendar_cells td                   {padding:2px; border: 0px; text-align:center; vertical-align:middle; font-size:8px; color:black; background-color:white;cursor:pointer;} 
+.wf_calendar_title                      {text-align:center; border-top:1px solid #ccc; border-bottom:1px solid #ccc; background: #eee;}
+.wf_calendar_date_cell                  {width:11px; border: 1px solid #ccc; padding:2px; margin:1px; cursor:pointer; vertical-align:middle; text-align:center; background-color:white;}
+.wf_calendar_date_cell.today            {background-color:light-blue; } 
+.wf_calendar_date_cell.selected         {background-color:#ccc; } 
+.wf_calendar_date_cell:hover            {background-color:#ccc; } 

data/app/assets/stylesheets/will_filter/exporter.css.scss

@@ -0,0 +1,43 @@
+@mixin rounded-corners($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+.wf_exporter {
+	background-color:#eee; 
+	position:absolute; 
+	width:230px; 
+	padding: 5px; 
+	font-size:10px; 
+	border:solid 1px #e8e8e8; 
+	border-color:#e8e8e8 #bababa #bababa #e8e8e8;
+ 	@include rounded-corners(10px);	
+}
+
+.wf_exporter_container {
+	background-color:white; 
+	padding: 5px; 
+	margin: 5px; 
+	font-size:10px; 
+	border:solid 1px #bababa; 
+	border-color:#bababa #e8e8e8 #e8e8e8 #bababa; 
+ 	@include rounded-corners(10px);	
+}
+
+.wf_exporter img                        {border: 0px;}
+.wf_exporter input {
+	border: 1px solid #ccc; 
+	font-size: 12px; 
+	font-family: Arial; 
+	@include rounded-corners(10px);		
+}
+.wf_exporter select  {
+	border: 1px solid #ccc; 
+	font-size: 12px; 
+	font-family: Arial; 
+	background-color:#EDEDED;
+	@include rounded-corners(10px);		
+}
+.wf_exporter table                      {width:100%;border-collapse: collapse; font-size:12px; padding:0px; margin:0px;}
+.wf_exporter td                         {vertical-align:top; padding: 0px; margin: 0px; }

data/app/assets/stylesheets/will_filter/filter.css.scss

@@ -0,0 +1,152 @@
+@mixin rounded-corners($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+
+.wf_container {
+	padding:0px; 
+	background:#f1f4f9; 
+	margin:0px; 
+	margin-bottom:10px; 
+	font-size: 12px; 
+	font-family: Arial; 
+	width: 100%; 
+	border:solid 1px #e8e8e8;
+	border-color:#e8e8e8 #bababa #bababa #e8e8e8; 
+ 	@include rounded-corners(10px);	
+	
+	.spinner {
+		font-size: 10px;
+	}
+	
+	.debugger {
+		padding:5px; 
+		margin:2px; 
+		background:white; 
+		border:solid 1px #bababa;
+		border-color:#bababa #e8e8e8 #e8e8e8 #bababa; 
+		font-size:10px; 
+		color: #777;
+	 	@include rounded-corners(10px);	
+	}
+
+	.footer {
+		padding:5px; 
+		margin-top:3px;
+		.actions {
+			float:right;
+		}
+	}
+	
+	.conditions {
+		padding:0px; 
+		margin:5px;
+		.header {
+			margin:0px; 
+			height:25px; 
+			padding:5px;
+		}
+		.body {
+			padding:5px; 
+			background:white; 
+			border:solid 1px #bababa;
+			border-color:#bababa #e8e8e8 #e8e8e8 #bababa;
+		 	@include rounded-corners(10px);	
+		}
+		.condition {
+			padding-left:5px; 
+			padding-right:2px; 
+			padding-bottom:0px; 
+			width:20%; 
+			white-space:nowrap; 
+			vertical-align: top; 
+		}
+		.operator {
+			padding-right:2px; 
+			padding-bottom:0px; 
+			width:15%; 
+			white-space:nowrap; 
+			vertical-align: top; 
+		}
+		.values {
+			padding-right:2px; 
+			width:70%; 
+			margin:0px; 
+			vertical-align:top; 
+		}
+		.actions {
+			padding-right:5px; 
+			padding-bottom:2px; 
+			white-space:nowrap; 
+			text-align:right; 
+			width:100px; 
+			vertical-align: top; 
+		}
+		.table {
+			border:0px; 
+			width:100%; 
+			margin:0px; 
+			padding:0px;
+			td {
+				padding: 1px; 
+				vertical-align:top; 
+				white-space:nowrap; 
+			} 
+			.error {
+				padding: 2px;
+				padding-left:10px; 
+				padding-right:10px; 
+				margin:2px; 
+				font-size: 10px; 
+				background-color: #ffeded; 
+				font-family: Arial; 
+				border: 1px #f58a8a solid; 
+				color:#b60e0e;
+			 	@include rounded-corners(10px);	
+			}
+		}
+		
+		.values {
+			border:0px; 
+			width:100%; 
+			margin:0px; 
+			padding:0px; 
+			td {
+				vertical-align:top; 
+				padding: 0px; 
+				margin: 0px; 
+			}
+		}
+	}
+
+	input {
+		border: 1px solid #ccc; 
+		font-size: 12px; 
+		font-family: Arial; 
+		margin:0px; 
+		padding: 2px !important; 
+	 	@include rounded-corners(10px);	
+	}
+	
+	select {
+		border: 1px solid #ccc; 
+		font-size: 12px; 
+		font-family: Arial; 
+		margin:0px; 
+		padding: 1px !important; 
+		background-color:#EDEDED;
+	 	@include rounded-corners(10px);	
+	}
+
+	a {
+		text-decoration:none; 
+		color:#16b; 
+		outline:none; 
+		border:0px;
+	}
+	
+	img {
+		border:0px;
+	}
+}

data/app/assets/stylesheets/will_filter/results.css.scss

@@ -0,0 +1,63 @@
+.wf_paginator { width:100%; margin-bottom: 10px; font-size: 12px; font-family: Arial;}
+
+.wf_results_table { 
+  width: 100%;
+  font-size: 12px;
+  border: 1px #e5e5e5 solid;
+  border-collapse: collapse;
+  background-color: white;
+  margin-bottom: 10px;
+}
+
+.wf_results_table thead th {
+	background-color:#F5F5F5;
+	border-bottom:1px solid #CCCCCC;
+	border-top:1px solid #CCCCCC;
+	font-size:12px;
+	padding:5px 5px 5px 10px;
+	text-align:left;
+	white-space:nowrap;
+}
+.wf_results_table th,
+.wf_results_table td {padding-right:10px;padding-left:10px; border-left:1px solid #eee;}
+.wf_results_table td {padding:10px;border-bottom:solid 1px #ddd;vertical-align:top;}
+.wf_results_table th {border-left:1px solid #ccc;padding-right:0px;font-weight:normal}
+.wf_results_table th.first {border-left:none;}
+.wf_results_table th {background: transparent url(/assets/will_filter/sort_bg.gif) repeat-x scroll 0 0;}
+
+.wf_results_table th.sortable:hover {background-color:#ddd;}
+.wf_results_table th.sortable:hover .sort_control {display:block;}
+.wf_results_table th.sortable .sort_link {text-decoration:none;;width:100%;display:block;}
+
+.wf_results_table th.current_sort {background: transparent url(/assets/will_filter/sort_bg.gif) repeat-x scroll 0 -100px;}
+.wf_results_table th.current_sort .sort_control {display:block;}
+.wf_results_table th.current_sort .sort_link {color:#000}
+
+.wf_results_table th.desc .sort_control {display:block;}
+.wf_results_table th.asc .sort_control .up {background: url(/assets/will_filter/sort_arrow_all.gif) -17px 0 no-repeat;}
+.wf_results_table th.desc .sort_control .down {background: url(/assets/will_filter/sort_arrow_all.gif) -17px -13px no-repeat;}
+.wf_results_table td.current_sort {font-weight:bold;border-left:1px solid #ccc;border-right:1px solid #ccc;}
+.wf_results_table tr.data_row:hover {background-color: #eee;}
+
+.wf_results_table .sort_title {float:left;}
+.wf_results_table .table_head_container {position:relative;padding-right:20px;}
+
+.wf_results_table .edit_location th,
+.wf_results_table .edit_location td {background:none;padding:1px 2px;border:none;font-size:11px;}
+.wf_results_table .edit_location_link {font-size:11px;}
+
+.wf_results_table .sort_control {position:absolute;right:21px;margin:-5px -20px -5px 5px;display:none;height:24px;}
+.wf_results_table .sort_control .up {width:17px;height:11px;display:block;background: url(/assets/will_filter/sort_arrow_all.gif) 0 0 no-repeat;}
+.wf_results_table .sort_control .up:hover {width:17px;height:11px;display:block;background: url(/assets/will_filter/sort_arrow_all.gif) -17px 0 no-repeat;}
+.wf_results_table .sort_control .down {width:17px;height:11px;display:block;background: url(/assets/will_filter/sort_arrow_all.gif) 0 -13px no-repeat;}
+.wf_results_table .sort_control .down:hover {width:17px;height:11px;display:block;background: url(/assets/will_filter/sort_arrow_all.gif) -17px -13px no-repeat;}
+
+.wf_results_table th .sort_control .up,
+.wf_results_table th .sort_control .down {_height:12px !important;overflow:hidden;}
+
+.wf_results_table                       {width:100%;margin:0}
+.wf_results_table.short                 {margin-bottom:200px;}
+
+.wf_results_table thead th  {padding:5px 5px 5px 10px;text-align:left;font-size:12px;border-bottom:solid 1px #ccc;border-top:solid 1px #eee;background-color:#f5f5f5;white-space:nowrap;}
+.wf_results_table th.active {background:url(/assets/will_filter/results_table_th_active.gif) repeat-x;color:#fff;border-left:solid 1px #ccc;border-right:solid 1px #ccc}
+.wf_results_table th.active a {color:#fff;}

data/app/controllers/{application_controller.rb → will_filter/application_controller.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class ApplicationController < ActionController::Base
-  # protect_from_forgery
-  
+module WillFilter
+  class ApplicationController < ActionController::Base
+  end
 end

data/app/controllers/will_filter/calendar_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/will_filter/exporter_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/app/controllers/will_filter/filter_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -64,8 +64,6 @@ 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)
@@ -81,8 +79,6 @@ 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!
@@ -97,8 +93,6 @@ 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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,7 +23,7 @@
 
 module WillFilter
   class Filter < ActiveRecord::Base
-    set_table_name  :wf_filters
+    set_table_name  :will_filter_filters
     serialize       :data
     before_save     :prepare_save
     after_find      :process_find
@@ -31,13 +31,8 @@ module WillFilter
     #############################################################################
     # Basics 
     #############################################################################
-    def initialize(model_class = nil)
+    def initialize(model_class)
       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
     
@@ -94,16 +89,8 @@ module WillFilter
       []
     end
     
-    # For extra security, this method must be overloaded by the extending class.
     def model_class
-      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
-
+      return nil unless model_class_name
       @model_class ||= model_class_name.constantize
     end
     
@@ -201,8 +188,6 @@ module WillFilter
     
     def order
       @order ||= default_order
-      @order = default_order unless contains_column?(@order.to_sym)
-      @order
     end
     
     def default_order_type
@@ -211,8 +196,6 @@ 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
@@ -397,30 +380,15 @@ 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]
-      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
+      params[:wf_type].constantize.new(params[:wf_model]).deserialize_from_params(params)
     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
@@ -699,6 +667,7 @@ module WillFilter
       ""
     end
     
+    # deprecated for Rails 3.0 and up
     def joins
       return nil if inner_joins.empty?
       inner_joins.collect do |inner_join|
@@ -711,8 +680,11 @@ module WillFilter
     def results
       @results ||= begin
         handle_empty_filter! 
-        
-        recs = model_class.paginate(:order => order_clause, :page => page, :per_page => per_page, :conditions => sql_conditions, :joins => joins)
+        recs = model_class.where(sql_conditions).order(order_clause)
+        inner_joins.each do |j|
+          recs = recs.joins(j.first)
+        end
+        recs = recs.page(page).per(per_page)
         recs.wf_filter = self
         recs
       end