will_filter 3.1.3 → 3.1.5

data/.gitignore

@@ -4,6 +4,7 @@ pkg/
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/
+test/dummy/.sass-cache/
 db/schema.rb*
 tmp/*
 log/*

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2 --create
+rvm use 1.9.2@will_filter --create

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    will_filter (3.1.3)
+    will_filter (3.1.5)
       coffee-script
       kaminari
       rails (>= 3.1.0)
@@ -126,7 +126,7 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     steak (2.0.0)
       capybara (>= 1.0.0)

data/README.rdoc

@@ -72,9 +72,6 @@ Open your browser and point to:
 
   http://localhost:3000
 
-Live will_filter_examples application is running here:
-
-http://wf.tr8n.org 
 
 If you have any questions, comments or suggestions, email me at theiceberk@gmail.com
 

data/app/assets/javascripts/will_filter/filter.js

@@ -1,5 +1,5 @@
 /****************************************************************************
-  Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -235,7 +235,7 @@ Wf.Calendar.prototype = {
           var trigger_position = Wf.Utils.cumulativeOffset(wfCalendar.trigger);
           var calendar_container = Wf.element("wf_calendar");
           calendar_container.style.left = (trigger_position[0] - 273) + "px";
-          calendar_container.style.top = trigger_position[1] - 6 + "px";
+          calendar_container.style.top = trigger_position[1] - 38 + "px";
           calendar_container.style.width = "260px";
           Wf.Effects.appear("wf_calendar");
       } 
@@ -261,7 +261,7 @@ Wf.Calendar.prototype = {
           var width = (mode=='annual' ? 760 : 400);
           var calendar_container = Wf.element("wf_calendar");
           calendar_container.style.left = (trigger_position[0] - width - 13) + "px";
-          calendar_container.style.top = trigger_position[1] - 6 + "px";
+          calendar_container.style.top = trigger_position[1] - 38 + "px";
           calendar_container.style.width = width + "px";
       } 
     });
@@ -340,8 +340,8 @@ Wf.Exporter.prototype = {
 	    onComplete: function(transport) {
           var trigger_position = Wf.Utils.cumulativeOffset(trigger);
           var exporter_container = Wf.element("wf_exporter");
-          exporter_container.style.left = (trigger_position[0] - 245) + "px";
-          exporter_container.style.top = trigger_position[1] + "px";
+          exporter_container.style.left = (trigger_position[0] - 240) + "px";
+          exporter_container.style.top = (trigger_position[1] - 32) + "px";
 				  Wf.Effects.appear("wf_exporter");
 	    } 
 	  });

data/app/assets/javascripts/will_filter/filter_prototype_effects.js

@@ -1,5 +1,5 @@
 /****************************************************************************
-  Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 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/assets/stylesheets/will_filter/exporter.css.scss

@@ -5,62 +5,85 @@
 }
 
 @mixin shadow($info) {
-	box-shadow:$info;
-	-moz-box-shadow:$info;
-	-webkit-box-shadow:$info;
+  box-shadow:$info;
+  -moz-box-shadow:$info;
+  -webkit-box-shadow:$info;
+}
+
+.wf_exporter_header {
+  font-size:12px;
+  font-weight:bold;
+  margin:0 10px;
+
+  .close {
+    text-decoration:none;
+    font-size:18px;
+    color:#888;
+    &:hover { color:#222;}
+  }
 }
 
 .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);	
- 	@include shadow(2px 3px 3px 2px rgba(0,0,0,0.6));	
+  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);
+   @include shadow(2px 3px 3px 2px rgba(0,0,0,0.6));
+
+  img {
+    border: 0px;
+  }
+
+  input {
+    border: 1px solid #ccc;
+    font-size: 12px;
+    font-family: Arial;
+    @include rounded-corners(10px);
+  }
 
-	img {
-		border: 0px;
-	}
+  select  {
+    border: 1px solid #ccc;
+    font-size: 12px;
+    font-family: Arial;
+    background-color:#EDEDED;
+    @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; 
-		background-color:#EDEDED;
-		@include rounded-corners(10px);		
-	}
+  table {
+    width:100%;
+    border-collapse: collapse;
+    font-size:12px;
+    padding:0px;
+    margin:0px;
+
+    thead tr {
+       border-bottom:1px solid #bababa;
+       font-weight:bold;
+    }
+
+    td {
+      vertical-align:top;
+      padding: 0px;
+      margin: 0px;
+    }
+
+  }
+
+  .center { padding-bottom: 5px;}
 
-	table {
-		width:100%;
-		border-collapse: collapse; 
-		font-size:12px; 
-		padding:0px; 
-		margin:0px;
-	}
-	
-	td {
-		vertical-align:top; 
-		padding: 0px; 
-		margin: 0px; 
-	}
 }
 
 .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);	
+  background-color:white;
+  padding: 5px;
+  margin: 5px;
+  font-size:10px;
+  border:solid 1px #bababa;
+  border-color:#bababa #e8e8e8 #e8e8e8 #bababa;
+  @include rounded-corners(10px);
 }
+

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

@@ -166,6 +166,7 @@
 
 .end {float:right;}
 .begin {float:left;}
+.center {text-align:center;}
 .full_width {width:100%;}
 
 .boolean_container {

data/app/controllers/will_filter/application_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 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/calendar_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 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) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ module WillFilter
   
     def export
       params[:page] = 1
-      params[:per_page] = 10000 # mas export limit
+      params[:wf_per_page] = 10000 # max export limit
   
       @wf_filter = WillFilter::Filter.deserialize_from_params(params)
       
@@ -62,38 +62,27 @@ module WillFilter
     end  
   
   private
-  
-    def send_xml_data(wf_filter)
-      class_name = wf_filter.model_class_name.underscore
-      
-      result = ""
-      xml = Builder::XmlMarkup.new(:target => result, :indent => 1)
-      xml.instruct!
-      xml.tag!(class_name.pluralize) do
-        wf_filter.results.each do |obj|
-          xml.tag!(class_name.underscore) do
-            wf_filter.fields.each do |field|
-              xml.tag!(field.to_s, obj.send(field).to_s) 
-            end    
-          end
-        end
-      end
-      
-      send_data(result, :type => 'text/xml', :charset => 'utf-8')
-    end  
-  
-    def send_json_data(wf_filter)
-      result = []
+    
+    def results_from(wf_filter)
+      results = []
       
       wf_filter.results.each do |obj|
         hash = {}
         wf_filter.fields.each do |field|
           hash[field] = obj.send(field).to_s 
         end  
-        result << hash
+        results << hash
       end
       
-      send_data(result.to_json, :type => 'text', :charset => 'utf-8')
+      results
+    end
+  
+    def send_xml_data(wf_filter)
+      send_data(results_from(wf_filter).to_xml, :type => 'text/xml', :charset => 'utf-8')
+    end  
+  
+    def send_json_data(wf_filter)
+      send_data(results_from(wf_filter).to_json, :type => 'text', :charset => 'utf-8')
     end  
     
     def send_csv_data(wf_filter)

data/app/controllers/will_filter/filter_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -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("Update 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("Delete 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) 2010-2011 Michael Berkovich
+# Copyright (c) 2010-2012 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,6 +33,11 @@ module WillFilter
     #############################################################################
     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
     
@@ -378,6 +383,7 @@ 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)
     end
@@ -476,14 +482,15 @@ module WillFilter
     # SQL Conditions 
     #############################################################################
     def sql_conditions
-      @sql_conditions  ||= begin
-  
+      @sql_conditions ||= begin
         if errors? 
-          all_sql_conditions = [" 1 = 2 "] 
+          [" 1 = 2 "] 
         else
           all_sql_conditions = [""]
           0.upto(size - 1) do |index|
             condition = condition_at(index)
+            next if custom_condition?(condition)
+
             sql_condition = condition.container.sql_condition
             
             unless sql_condition
@@ -493,15 +500,17 @@ module WillFilter
             if all_sql_conditions[0].size > 0
               all_sql_conditions[0] << ( match.to_sym == :all ? " AND " : " OR ")
             end
-            
+
             all_sql_conditions[0] << sql_condition[0]
+
             sql_condition[1..-1].each do |c|
               all_sql_conditions << c
             end
+
           end
+
+          all_sql_conditions
         end
-        
-        all_sql_conditions
       end
     end
     
@@ -547,7 +556,7 @@ module WillFilter
         if include_default
           filters = default_filters
           if (filters.size > 0)
-            filters.insert(0, ["-- Select Default Filter --", "-1"])
+            filters.insert(0, ["Select default filter", "-1"])
           end
         end
   
@@ -569,7 +578,7 @@ module WillFilter
         user_filters = WillFilter::Filter.find(:all, :conditions => conditions)
         
         if user_filters.size > 0
-          filters << ["-- Select Saved Filter --", "-2"] if include_default
+          filters << ["Select saved filter", "-2"] if include_default
           
           user_filters.each do |filter|
             filters << [filter.name, filter.id.to_s]
@@ -638,12 +647,12 @@ module WillFilter
     #############################################################################
     def export_formats
       formats = []
-      formats << ["-- Generic Formats --", -1]
+      formats << ["Generic formats", -1]
       WillFilter::Config.default_export_formats.each do |frmt|
         formats << [frmt, frmt]
       end
       if custom_formats.size > 0
-        formats << ["-- Custom Formats --", -2]
+        formats << ["Custom formats", -2]
         custom_formats.each do |frmt|
           formats << frmt
         end
@@ -683,7 +692,49 @@ module WillFilter
         "INNER JOIN #{join_table_name} ON #{join_table_name}.id = #{table_name}.#{join_on_field}"
       end
     end
-    
+
+    # overload this method to indicate which conditions are custom
+    def custom_conditions
+      []
+    end
+
+    # overload this method to evaluate a custom condition on an object
+    def custom_condition_met?(condition, object)
+      false
+    end
+
+    def custom_condition?(condition)
+      custom_conditions.include?(condition.key)
+    end
+
+    def custom_conditions?
+      return if custom_conditions.empty?
+      conditions.each do |condition|
+        return true if custom_condition?(condition)
+      end
+    end
+
+    def process_custom_conditions(objects)
+      filtered = []
+      objects.each do |obj|
+        condition_flags = []
+        
+        0.upto(size - 1) do |index|
+          condition = condition_at(index)
+          next unless custom_condition?(condition)
+          condition_flags << custom_condition_met?(condition, obj)
+        end
+         
+        if condition_flags.size > 0
+          next if match.to_s == "all" and condition_flags.include?(false)
+          next unless condition_flags.include?(true)        
+        end 
+         
+        filtered << obj 
+      end
+      filtered
+    end
+
     def results
       @results ||= begin
         handle_empty_filter! 
@@ -691,6 +742,12 @@ module WillFilter
         inner_joins.each do |inner_join|
           recs = recs.joins(association_name(inner_join))
         end
+
+        if custom_conditions?
+          recs = process_custom_conditions(recs.all)
+          recs = Kaminari.paginate_array(recs)
+        end  
+
         recs = recs.page(page).per(per_page)
         recs.wf_filter = self
         recs