will_filter 3.1.8 → 3.1.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    will_filter (3.1.8)
+    will_filter (3.1.9)
       kaminari
       rails (>= 3.2.3)
       sass

data/app/models/will_filter/filter.rb

@@ -828,5 +828,22 @@ module WillFilter
     def sum(column_name)
       model_class.sum(column_name, :conditions => sql_conditions)
     end
+
+    def max(column_name)
+      model_class.maximum(column_name, :conditions => sql_conditions)
+    end
+
+    def min(column_name)
+      model_class.minimum(column_name, :conditions => sql_conditions)
+    end
+
+    def avg(column_name)
+      model_class.average(column_name, :conditions => sql_conditions)
+    end
+
+    def count(column_name)
+      model_class.count(column_name, :conditions => sql_conditions)
+    end
+
   end
 end

data/app/views/will_filter/common/_results_table.html.erb

@@ -22,18 +22,37 @@
         opts[:columns].each_with_index do |column, index|
           cmeta = {}
 
+          # supported notations for columns => [
+          #  :id,
+          #  [:id, lambda{|obj| obj.id}], 
+          #  [:id, lambda{|obj| obj.id}, "color: white"], 
+          #  [:id, lambda{|obj| obj.id}, {:style => "color: white"}], 
+          #  [:id, {:filterable => true, :value => lambda{|obj| obj.id}}],
+          #  [:id, {:filterable => true, :value => lambda{|obj| obj.id}}],
+          #  {:key => :id, :filterable => true} 
+          # ]
+
           if column.is_a?(Array)
-            cmeta[:key] = column[0]
-            cmeta[:value] = column[1]
-            unless column[2].nil?
-              if column[2].is_a?(Hash)
-                cmeta.merge!(column[2])           
-              elsif column[2].is_a?(String) 
-                cmeta[:style] = column[2]
-              else
-                raise WillFilter::FilterException.new("Unsupported table column format #{column[2]}")  
-              end
-            end    
+            if column.size < 2
+              raise WillFilter::FilterException.new("Array table column definition must have at least two elements") 
+            end
+
+            cmeta[:key] = column[0]  # first param must always be the column key
+
+            if column[1].is_a?(Hash)  # second param is a hash
+              cmeta.merge!(column[1])  
+            else  
+              cmeta[:value] = column[1]
+              unless column[2].nil?
+                if column[2].is_a?(Hash)   # third param can be a set of attributes
+                  cmeta.merge!(column[2])
+                elsif column[2].is_a?(String)  # third param can be a string, which represents a style
+                  cmeta[:style] = column[2]
+                else
+                  raise WillFilter::FilterException.new("Unsupported table column format #{column[2]}")  
+                end
+              end    
+            end
           elsif column.is_a?(Hash)
             cmeta = column
             cmeta[:key] ||= "key_#{index}"
@@ -104,6 +123,11 @@
   </thead>  
 
   <tbody>
+
+    <% if opts[:header] %>
+      <%=render(:partial => "/will_filter/common/results_table_summary", :locals => {:data => opts[:header], :filter => filter, :carray => carray}) %>
+    <% end -%>
+
     <% results.each_with_index do |obj, index| %>
       <tr class='data_row <%=(index % 2 == 0) ? "wf_row_even" : "wf_row_odd"%>'>
         <% carray.each_with_index do |cmeta, column_index| %>
@@ -122,15 +146,22 @@
             value_style << 'width:30px;' if cmeta[:key] == :checkbox
             value_class << ' current_sort' if filter.column_sorted?(cmeta[:key])
 
+            if cmeta[:filterable]
+              filter_value = cmeta[:value].nil? ? value : obj.send(cmeta[:key])
+            end
           %>
           <td style='<%=value_style%>' class='<%=value_class%>'>
+              <% if cmeta[:filterable] %>
+                <div style='float:right;'><%=link_to(image_tag("will_filter/filter.png", :style=>"width:12px;"), results.add_filter_condition(cmeta[:key], :is, filter_value.to_s).to_params, {:title => "Show only #{filter_value}"}) %></div>
+              <% end -%>  
+
                <% if cmeta[:key] == :checkbox %>
                   <%= check_box_tag("#{value}[]", obj.id, false, :id => "wf_check_#{index}", :onClick => "wfVerifyTrigger(this)") %>
             
                <% elsif value.is_a?(Hash) %>
                   <% value.each do |key, value| %>
                     <strong><%=key%>:</strong> <%= value %>;
-                  <% end %>
+                  <% end -%>
                   
                 <% elsif value.is_a?(Time) %> 
                   <%= value.strftime("%m/%d/%Y %l:%M:%S") %>
@@ -139,12 +170,18 @@
                   <%= value.strftime("%m/%d/%Y") %>
                   
                <% else %>
+
                   <%= value.to_s %> 
-               <% end %>  
+               <% end -%>  
           </td>
-        <% end %>
+        <% end -%>
       </tr>
-    <% end  %>
+    <% end -%>
+
+    <% if opts[:footer] %>
+      <%=render(:partial => "/will_filter/common/results_table_summary", :locals => {:data => opts[:footer], :filter => filter, :carray => carray}) %>
+    <% end -%>
+
   </tbody>
 </table>    
     

data/app/views/will_filter/common/_results_table_summary.html.erb

@@ -0,0 +1,53 @@
+<% if data[:label] %>
+<tr>
+  <td colspan="<%=carray.size%>" style="height:10px; padding:2px; font-size:10px; background-color:#FFF8EF;"><%=data[:label]%></td>
+</tr> 
+<% end %>
+
+<tr>
+<% carray.each_with_index do |cmeta, column_index|
+     vmeta = { }
+     if data[:value] 
+        if data[:value].is_a?(Proc)
+          vmeta[:value] = data[:value].call(cmeta[:key])
+        elsif data[:value].is_a?(Hash)
+          vmeta[:value] = data[:value][cmeta[:key]]
+
+          if vmeta[:value].is_a?(Hash)
+            vmeta.merge!(vmeta[:value])
+          elsif vmeta[:value].is_a?(Array)
+            vmeta.merge!(vmeta[:value].last)
+            vmeta[:value] = vmeta[:value].first
+          end
+            
+          if vmeta[:value].is_a?(Symbol)  
+            case vmeta[:value]
+            when :total
+              vmeta[:value] = number_to_currency(filter.sum(cmeta[:key]))
+            when :sum
+              vmeta[:value] = filter.sum(cmeta[:key])
+            when :count
+              vmeta[:value] = filter.count(cmeta[:key])
+            when :min
+              vmeta[:value] = filter.min(cmeta[:key])
+            when :max
+              vmeta[:value] = filter.max(cmeta[:key])
+            when :avg
+              vmeta[:value] = filter.avg(cmeta[:key])
+            when :range
+              vmeta[:value] = [filter.min(cmeta[:key]), filter.max(cmeta[:key])].join(" - ")
+            end
+          end  
+
+        end
+      end
+
+      vmeta[:class] ||= ""
+      vmeta[:style] ||= ""
+    %>   
+
+  <td style="background-color:#FFF8EF;<%=vmeta[:style]%>" class="<%=vmeta[:class]%>">
+    <%= vmeta[:value] %>
+  </td>
+<% end %>
+</tr>

data/lib/will_filter/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module WillFilter
-  VERSION = "3.1.8"
+  VERSION = "3.1.9"
 end

data/test/dummy/app/models/merchant/order.rb

@@ -3,5 +3,12 @@ module Merchant
     self.table_name = :merchant_orders
     belongs_to :user
     has_many :order_items
+
+	  def self.generate_random_data(count = 500)
+	    0.upto(count) do 
+	      create(:user_id => User.random, :amount => rand(5000))      
+	    end
+	  end
+
   end
 end

data/test/dummy/app/models/merchant/order_filter.rb

@@ -1,9 +1,13 @@
 module Merchant
   class OrderFilter < WillFilter::Filter
 
-    def inner_joins
-      [:user]
-    end
+	  def model_class
+	    Merchant::Order
+	  end
+
+    # def inner_joins
+    #   [:user]
+    # end
 
   end
 end

data/test/dummy/app/models/merchant/order_item_filter.rb

@@ -1,9 +1,13 @@
 module Merchant
   class OrderItemFilter < WillFilter::Filter
 
-    def inner_joins
-      [:order]
-    end
+	  def model_class
+	    Merchant::OrderItem
+	  end
+
+    # def inner_joins
+    #   [:order]
+    # end
 
   end
 end

data/test/dummy/app/views/advanced/event_members.html.erb

@@ -1,2 +1,2 @@
-<h1>Event Member Filter</h1>
+<h1>Advanced Event Member Filter</h1>
 <%= render :partial=> "/common/event_members" %>

data/test/dummy/app/views/advanced/events.html.erb

@@ -1,2 +1,2 @@
-<h1>Event Filter</h1>
+<h1>Advanced Event Filter</h1>
 <%= render :partial=> "/common/events" %>

data/test/dummy/app/views/advanced/users.html.erb

@@ -1,2 +1,2 @@
-<h1>User Filter</h1>
+<h1>Advanced User Filter</h1>
 <%= render :partial=> "/common/users" %>

data/test/dummy/app/views/common/_event_members.html.erb

@@ -2,14 +2,11 @@
 
 <%= will_filter_table_tag(@event_users, :columns => [
 	:id, 
-	[:event_id, lambda { |obj| 
-		link_to(obj.event ? obj.event.name : obj.event_id, @event_users.add_filter_condition(:event_id, :is, obj.event_id).to_params)
-	}], 
-	[:user_id, lambda { |obj| 
-		link_to(obj.user_id ? obj.user.name : obj.user_id, @event_users.add_filter_condition(:user_id, :is, obj.user_id).to_params)
-	}, {
-		:title => 'User Name',
-		:style => 'font-weight:bold'
+	[:event_id, :value => lambda{|e| e.event.name}, :filterable => true], 
+	[:user_id, {
+		:value => lambda{|e| e.user.name},
+		:filterable => true,
+		:title => 'User Name'
 	}], 
 	:created_at
 ]) %>

data/test/dummy/app/views/common/_events.html.erb

@@ -1,3 +1,17 @@
 <%= will_filter_tag(@events)%>
 
-<%= will_filter_table_tag(@events) %>
+<%= will_filter_table_tag(@events, 
+	:columns => [
+		:id, 
+		[:creator_id, :value => lambda{|obj| obj.user ? obj.user.name : 'deleted user'}, :filterable => true, :title => 'Creator'], 
+		:headline, 
+		[:rank, {:style => "text-align:right; padding:0px;"}], 
+		:start_time
+	],
+	:header => {
+		:value => {
+			:id => "<strong>Average:</strong>".html_safe,
+			:rank => [:avg, {:style=>"color:blue; font-weight:bold; text-align:right;"}]
+		}
+	}
+) %>

data/test/dummy/app/views/common/_menu.html.erb

@@ -2,21 +2,26 @@
   <center>
 		<table style="width:900px;" cellpadding="0" cellspacing="0">
 		  <tr>
+		  	<% 
+		  		controller_name = controller.controller_name 
+		  		controller_name = "simple" if controller_name == "orders"
+		  	%>
 		    <td style="text-align:left;">
-		        <%=link_to("Users", :action => :users) %>
-		      | <%=link_to("Events", :action => :events) %>
-		      | <%=link_to("Event Members", :action => :event_members) %>
-          <% unless controller.controller_name == 'simple' %>
-           | <%=link_to("Users with Actions", :action => :users_with_actions) %>
-					<% end %>
-		    </td>
-		    <td style="text-align:right;">
-				  <% if controller.controller_name == 'simple' %>
-  		      <%=link_to("Extended Filters", :controller => :advanced, :action => :users) %>
+		    	<%= controller_name == 'simple' ? "Basic" : "Advanced" %>: 
+		        <%=link_to("Users", :controller => controller_name, :action => :users) %>
+		      | <%=link_to("Events", :controller => controller_name, :action => :events) %>
+		      | <%=link_to("Event Members", :controller => controller_name, :action => :event_members) %>
+		      ||
+				  <% if controller_name == 'simple' %>
+  		      <%=link_to("Switch to Advanced Filters", :controller => :advanced, :action => :users) %>
 					<% else %>
-            <%=link_to("Basic Filters", :controller => :simple, :action => :users) %>
+            <%=link_to("Switch to Basic Filters", :controller => :simple, :action => :users) %>
 					<% end %>	
 		    </td>
+		    <td style="text-align:right;">
+          <%=link_to("Users with Actions", :controller => :advanced, :action => :users_with_actions) %> |
+		      <%=link_to("Custom Header/Footer", :controller => :orders, :action => :index) %> 
+		    </td>
 		  </tr>
 		</table>
 	</center>

data/test/dummy/app/views/common/_users.html.erb

@@ -35,6 +35,6 @@
 	  :sortable => true,
 	  :sort_key => lambda{ |filter| filter.column_sorted?(:first_name) ? :first_name : :last_name}    	
   }, 
-  :birthday,
-  { :key => :sex, :title => 'Gender' }
+  [:birthday, :filterable => true],
+  [:sex, {:title => 'Gender', :filterable => true}]
 ]) %>

data/test/dummy/app/views/orders/index.html.erb

@@ -1,2 +1,26 @@
+<h1>Custom Header and Footer</h1>
+
 <%= will_filter_tag(@orders) %>
-<%= will_filter_table_tag(@orders) %>
+<%= will_filter_table_tag(@orders, 
+	:columns => [:id, :user_id, [:amount, :filterable => true], :created_at],
+	:header => {
+		:label => "Total Amount",	
+		:value => lambda{ |key|
+			if (key == :amount) 
+				total = @orders.wf_filter.sum(key)
+				if total < 1000
+					raw("<span style='color:red;'>#{number_to_currency(total)}</span>")
+				else	
+					raw("<span style='color:green;'>#{number_to_currency(total)}</span>")	
+				end
+			end	
+		}
+	},
+	:footer => {
+		:style => "background-color: #eee;",
+		:value => {
+			:id => "<strong>Range:</strong>".html_safe,
+			:amount => [:range, {:style=>"color:blue; font-weight:bold;"}]
+		}
+	}	
+) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000Z
+date: 2012-06-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152663880 !ruby/object:Gem::Requirement
+  requirement: &2157126080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152663880
+  version_requirements: *2157126080
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152662420 !ruby/object:Gem::Requirement
+  requirement: &2157123600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152662420
+  version_requirements: *2157123600
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152652700 !ruby/object:Gem::Requirement
+  requirement: &2157122600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152652700
+  version_requirements: *2157122600
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152651440 !ruby/object:Gem::Requirement
+  requirement: &2157121060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152651440
+  version_requirements: *2157121060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152650160 !ruby/object:Gem::Requirement
+  requirement: &2157119180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152650160
+  version_requirements: *2157119180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152648340 !ruby/object:Gem::Requirement
+  requirement: &2157117660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152648340
+  version_requirements: *2157117660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152647000 !ruby/object:Gem::Requirement
+  requirement: &2157116020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152647000
+  version_requirements: *2157116020
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152645580 !ruby/object:Gem::Requirement
+  requirement: &2157113260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152645580
+  version_requirements: *2157113260
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &2152643440 !ruby/object:Gem::Requirement
+  requirement: &2157110820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152643440
+  version_requirements: *2157110820
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2152642600 !ruby/object:Gem::Requirement
+  requirement: &2157107520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152642600
+  version_requirements: *2157107520
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152641600 !ruby/object:Gem::Requirement
+  requirement: &2157106320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152641600
+  version_requirements: *2157106320
 description: will_filter is a powerful customizable framework for filtering active_record
   models.
 email:
@@ -151,12 +151,12 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - app/assets/images/will_filter/.gitkeep
 - app/assets/images/will_filter/buttons.png
 - app/assets/images/will_filter/calendar.png
 - app/assets/images/will_filter/clock.png
 - app/assets/images/will_filter/close.gif
+- app/assets/images/will_filter/filter.png
 - app/assets/images/will_filter/sort_arrow_all.gif
 - app/assets/images/will_filter/sort_bg.gif
 - app/assets/images/will_filter/spinner.gif
@@ -179,6 +179,7 @@ files:
 - app/views/will_filter/calendar/index.html.erb
 - app/views/will_filter/common/_actions_bar.html.erb
 - app/views/will_filter/common/_results_table.html.erb
+- app/views/will_filter/common/_results_table_summary.html.erb
 - app/views/will_filter/common/_scripts.html.erb
 - app/views/will_filter/exporter/export.html.erb
 - app/views/will_filter/exporter/index.html.erb
@@ -280,7 +281,6 @@ files:
 - test/dummy/app/views/kaminari/_paginator.html.erb
 - test/dummy/app/views/kaminari/_prev_page.html.erb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/layouts/orders.html.erb
 - test/dummy/app/views/orders/index.html.erb
 - test/dummy/app/views/orders/items.html.erb
 - test/dummy/app/views/simple/event_members.html.erb
@@ -342,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4303547157894045742
+      hash: 2634563707694904433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -351,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4303547157894045742
+      hash: 2634563707694904433
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -406,7 +406,6 @@ test_files:
 - test/dummy/app/views/kaminari/_paginator.html.erb
 - test/dummy/app/views/kaminari/_prev_page.html.erb
 - test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/layouts/orders.html.erb
 - test/dummy/app/views/orders/index.html.erb
 - test/dummy/app/views/orders/items.html.erb
 - test/dummy/app/views/simple/event_members.html.erb

data/VERSION

@@ -1 +0,0 @@
-3.0.5

data/test/dummy/app/views/layouts/orders.html.erb

@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-  <title>will_filter examples</title>
-  <%= stylesheet_link_tag    "application" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body style="margin:0px;">
-	<center>
-	  <div style="margin-top:20px;width:900px;text-align:left;">
-	    <%= yield %>
-	  </div>
-	</center>
-</body>
-</html>