will_filter 3.1.9 → 3.1.10

data/.gitignore

@@ -1,3 +1,4 @@
+.idea
 .bundle/
 log/*.log
 pkg/

data/Gemfile

@@ -2,3 +2,27 @@ source "http://rubygems.org"
 
 # Declare your gem's dependencies in will_filter.gemspec.
 gemspec
+
+gem 'bundler', ['>= 1.0.0']
+
+gem 'jquery-rails'
+gem 'jquery-ui-rails'
+gem 'bootstrap-sass'
+gem 'kaminari'
+
+group :development do
+  gem 'rspec'
+  gem 'rspec-rails'
+  gem 'pry'
+  gem 'sqlite3'
+  gem 'spork'
+  gem 'watchr'
+  gem 'rr'
+end
+
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+

data/Gemfile.lock

@@ -37,13 +37,29 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bootstrap-sass (2.1.1.0)
     builder (3.0.0)
     coderay (1.0.6)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.6.3)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.0.2)
+      jquery-rails
+      railties (>= 3.1.0)
     json (1.6.6)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
@@ -101,6 +117,10 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.9.0)
     sass (3.1.15)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
     slop (2.4.4)
     spork (0.9.0)
     sprockets (2.1.2)
@@ -114,18 +134,28 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
+    uglifier (2.1.2)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
     watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bootstrap-sass
   bundler (>= 1.0.0)
+  coffee-rails (~> 3.2.1)
+  jquery-rails
+  jquery-ui-rails
+  kaminari
   pry
   rr
   rspec
-  rspec-rails (>= 2.1.0)
+  rspec-rails
+  sass-rails (~> 3.2.3)
   spork
   sqlite3
+  uglifier (>= 1.0.3)
   watchr
   will_filter!

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

@@ -139,7 +139,7 @@
     font-family: Arial;
     margin:0px;
     padding: 2px !important;
-     @include rounded-corners(10px);
+    @include rounded-corners(10px);
   }
 
   select {
@@ -149,7 +149,7 @@
     margin:0px;
     padding: 1px !important;
     background-color:#EDEDED;
-     @include rounded-corners(10px);
+    @include rounded-corners(10px);
   }
 
   a {
@@ -167,7 +167,7 @@
 .end {float:right;}
 .begin {float:left;}
 .center {text-align:center;}
-.full_width {width:100%;}
+.full_width {width:100% !important;}
 
 .boolean_container {
   vertical-align:middle;

data/app/controllers/will_filter/calendar_controller.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2012 Michael Berkovich
+# Copyright (c) 2010-2013 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-2012 Michael Berkovich
+# Copyright (c) 2010-2013 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,6 +25,7 @@ require 'csv'
 
 module WillFilter
   class ExporterController < ApplicationController
+    
     def index
       @wf_filter = WillFilter::Filter.deserialize_from_params(params)
       render :layout => false

data/app/controllers/will_filter/filter_controller.rb

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2012 Michael Berkovich
+# Copyright (c) 2010-2013 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -50,6 +50,8 @@ module WillFilter
     before_save     :prepare_save
     after_find      :process_find
     
+    JOIN_NAME_INDICATOR = '>'
+
     #############################################################################
     # Basics 
     #############################################################################
@@ -108,6 +110,10 @@ module WillFilter
       @fields ||= []
     end
     
+    def extra_params
+      @extra_params ||= {}
+    end    
+
     #############################################################################
     # a list of indexed fields where at least one of them has to be in a query
     # otherwise the filter may hang the database
@@ -244,6 +250,28 @@ module WillFilter
       "#{order} #{order_type}"
     end
   
+    def order_model
+      @order_model ||= begin
+        order_parts = order.split('.')
+        if order_parts.size > 1
+          order_parts.first.camelcase
+        else
+          model_class_name
+        end
+      end  
+    end
+
+    def order_clause
+      @order_clause ||= begin
+        order_parts = order.split('.')
+        if order_parts.size > 1
+          "#{order_parts.first.camelcase.constantize.table_name}.#{order_parts.last} #{order_type}"
+        else
+          "#{model_class_name.constantize.table_name}.#{order_parts.first} #{order_type}"
+        end
+      end  
+    end
+
     def column_sorted?(key)
       key.to_s == order
     end
@@ -280,8 +308,14 @@ module WillFilter
     # Can be overloaded for custom titles
     #############################################################################
     def condition_title_for(key)
-      title = key.to_s.gsub(".", ": ").gsub("_", " ").split("/").last
-      title.split(" ").collect{|part| part.capitalize}.join(" ")
+      title_parts = key.to_s.split('.')
+      title = key.to_s.gsub(".", ": ").gsub("_", " ")
+      title = title.split(" ").collect{|part| part.split("/").last.capitalize}.join(" ")
+      if title_parts.size > 1
+        "#{JOIN_NAME_INDICATOR} #{title}"
+      else
+        title  
+      end
     end
     
     def condition_options
@@ -290,7 +324,22 @@ module WillFilter
         definition.keys.each do |cond|
           opts << [condition_title_for(cond), cond.to_s]
         end
-        opts.sort_by{ |i| i[0] }
+        opts = opts.sort_by{|opt| opt.first.gsub(JOIN_NAME_INDICATOR, 'zzz') }
+        
+        separated = []
+        opts.each_with_index do |opt, index|
+          if index > 0
+            prev_opt_parts = opts[index-1].first.split(":")
+            curr_opt_parts = opt.first.split(":")
+            
+            if (prev_opt_parts.size != curr_opt_parts.size) or (curr_opt_parts.size > 1 and (prev_opt_parts.first != curr_opt_parts.first))
+              key_parts = opt.last.split('.')
+              separated << ["-------------- #{curr_opt_parts.first.gsub("#{JOIN_NAME_INDICATOR} ", '')} --------------", "#{key_parts.first}.id"]
+            end
+          end
+          separated << opt
+        end
+        separated
       end
     end
     
@@ -331,6 +380,15 @@ module WillFilter
       add_condition_at(size, condition_key, operator_key, values)
     end
 
+    def add_condition!(condition_key, operator_key, values = [])
+      add_condition(condition_key, operator_key, values)
+      self
+    end
+
+    def clone_with_condition(condition_key, operator_key, values = [])
+      dup.add_condition!(condition_key, operator_key, values)
+    end
+
     def replace_condition(condition_key, operator_key, values = [])
       remove_condition(condition_key)
       add_condition_at(size, condition_key, operator_key, values)
@@ -425,10 +483,25 @@ module WillFilter
         condition = condition_at(index)
         condition.serialize_to_params(params, index)
       end
-      HashWithIndifferentAccess.new(params.merge(merge_params))
+      
+      params.merge!(extra_params)
+      params.merge!(merge_params)
+      HashWithIndifferentAccess.new(params)
     end
     alias_method :to_params, :serialize_to_params
 
+    def to_url_params
+      params = []
+      serialize_to_params.each do |name, value|
+        params << "#{name.to_s}=#{ERB::Util.url_encode(value)}"
+      end
+      params.join("&")
+    end
+    
+    def to_s
+      to_url_params
+    end
+
     #############################################################################
     # allows to create a filter from params only
     #############################################################################
@@ -619,7 +692,6 @@ module WillFilter
     #############################################################################
     # Saved Filters 
     #############################################################################
-
     def user_filters
       @user_filters ||= begin
         conditions = ["model_class_name = ?", self.model_class_name]
@@ -644,12 +716,12 @@ 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
   
         if user_filters.any?
-          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]
           end
@@ -717,12 +789,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

data/app/views/will_filter/calendar/index.html.erb

@@ -23,9 +23,9 @@
 		  	<%=link_to_function("&laquo;".html_safe, "wfCalendar.goToStartDate('#{@calendar.previous_start_date}')", :style=>"font-size:16px;")%>	
 			  &nbsp;&nbsp;&nbsp; 			
 				<% if @calendar.mode != 'annual' %>	
-  		 		 <%= select_tag("month", options_for_select(WillFilter::Calendar.month_options, @calendar.month), {:id => "wf_calendar_month", :onChange=>"wfCalendar.goToStartDate('')"}) %>
+  		 		 <%= select_tag("month", options_for_select(WillFilter::Calendar.month_options, @calendar.month), {:id => "wf_calendar_month", :onChange=>"wfCalendar.goToStartDate('')", :style => "width:auto;"}) %>
 				<% end %>
-		 		<%= select_tag("year", options_for_select(WillFilter::Calendar.year_options, @calendar.year), {:id => "wf_calendar_year",:onChange=>"wfCalendar.goToStartDate('')"}) %>
+		 		<%= select_tag("year", options_for_select(WillFilter::Calendar.year_options, @calendar.year), {:id => "wf_calendar_year",:onChange=>"wfCalendar.goToStartDate('')", :style => "width:auto;"}) %>
 			  &nbsp;&nbsp;&nbsp; 				
 		  	<%=link_to_function("&raquo".html_safe, "wfCalendar.goToStartDate('#{@calendar.next_start_date}')", :style=>"font-size:16px;")%>	
 			  &nbsp; 	
@@ -37,11 +37,11 @@
 		  <div style="text-align:center; margin-top:10px; padding:5px; border-top:1px solid #ccc;">
  	        <div style="margin:5px;">
 				      Time: &nbsp; 
-				      <%= select_tag("wf_calendar_hour", options_for_select(WillFilter::Calendar.hour_options, @calendar.hour)) %>
+				      <%= select_tag("wf_calendar_hour", options_for_select(WillFilter::Calendar.hour_options, @calendar.hour), :style => "width:auto;") %>
 				      :
-				      <%= select_tag("wf_calendar_minute", options_for_select(WillFilter::Calendar.minute_options, @calendar.minute)) %>
+				      <%= select_tag("wf_calendar_minute", options_for_select(WillFilter::Calendar.minute_options, @calendar.minute), :style => "width:auto;") %>
 				      :
-				      <%= select_tag("wf_calendar_second", options_for_select(WillFilter::Calendar.second_options, @calendar.second)) %>
+				      <%= select_tag("wf_calendar_second", options_for_select(WillFilter::Calendar.second_options, @calendar.second), :style => "width:auto;") %>
 			    </div>
 		      <%=link_to_function("<span>Set Date and Time</span>".html_safe, "wfCalendar.setDateTime()", :class => "wf_grey_button wf_pcb") %>
 		      <%=link_to_function("<span>Cancel</span>".html_safe, "wfCalendar.hide()", :class => "wf_grey_button wf_pcb") %>

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

@@ -1,5 +1,7 @@
+<% if results.size > 0 %>
 <div class="<%=opts[:class]%>" style="<%=opts[:style]%>">
   <% actions.each do |action| %>
       <%=link_to_function("<span>#{action.first}</span>".html_safe, "#{action.last}", :class => "wf_grey_button wf_pcb") %>
 	<% end %>  
 </div>    
+<% end %>

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

@@ -0,0 +1,49 @@
+<%= stylesheet_link_tag("will_filter/filter") -%>
+
+<table class="<%=opts[:table_class]%>" style="<%=opts[:table_style]%>">
+  <%  opts[:columns].each_with_index do |column, column_index| 
+      style = 'padding:3px;'
+      if column.is_a?(Array)
+        key = column.first
+        if column.second.is_a?(Proc)
+          value = column.second.call(object)
+        else
+          value = column.second.to_s
+        end
+        style << column.last if column.size > 2  
+
+      elsif column.is_a?(Hash)
+        key = column[:key] || "key_#{column_index}"
+        if column[:value]   
+          value = column[:value]
+          value = value.call(object) if value.is_a?(Proc)
+        else
+          value = object.send(key) 
+        end
+        style << column[:style] if column[:style]
+      else
+        key = column
+        value = object.send(key)
+      end
+  %>
+  <tr>
+    <th style="<%=opts[:key_style]%>">
+      <%= key.to_s.titleize %>
+    </th>
+    <td style="<%=opts[:value_style]%>">
+      <% if value.is_a?(Hash) %>
+        <%= value.to_json %>
+                            
+      <% elsif value.is_a?(Time) %>   
+        <%= value.strftime("%m/%d/%Y %l:%M:%S") %>
+
+      <% elsif value.is_a?(Date) %>  
+        <%= value.strftime("%m/%d/%Y") %>
+                            
+      <% else %>
+        <%= value.to_s %> 
+      <% end %>  
+    </td> 
+  </tr> 
+  <% end %>
+</table>  

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

@@ -1,14 +1,13 @@
+<%= stylesheet_link_tag("will_filter/filter") -%>
+
+<% if results.size > 0 %>
 <table class='wf_paginator' style="margin-top:10px; margin-bottom:10px;">
     <tr>
         <td style='text-align:left'>
             <%= paginate(results) %>
         </td>
         <td style='text-align:right'>
-						<% if results.total_count > 0 %>
-							Showing <%= results.offset_value + 1 %> - <%= results.offset_value + results.length %> of <%= results.total_count %>
-						<% else %>	
-							No results found
-						<% end %>
+						Showing <%= results.offset_value + 1 %> - <%= results.offset_value + results.length %> of <%= results.total_count %>
         </td>
     </tr>
 </table>
@@ -62,8 +61,8 @@
 
           carray << cmeta
 
-          sort_direction        = filter.column_sorted?(cmeta[:key]) ? filter.order_type : "asc"
-          sort_direction_click  = filter.column_sorted?(cmeta[:key]) ? (sort_direction == "asc" ? "desc" : "asc") : "asc"
+          sort_direction        = filter && filter.column_sorted?(cmeta[:key]) ? filter.order_type : "asc"
+          sort_direction_click  = filter && filter.column_sorted?(cmeta[:key]) ? (sort_direction == "asc" ? "desc" : "asc") : "asc"
 
           if cmeta[:sort_key]
             sort_key = cmeta[:sort_key].call(filter)
@@ -72,7 +71,7 @@
           end
 
           if cmeta[:sortable].nil?
-            sortable = filter.contains_column?(cmeta[:key])
+            sortable = filter && filter.contains_column?(cmeta[:key])
           else
             sortable = cmeta[:sortable]
           end
@@ -80,7 +79,13 @@
           if cmeta[:title].is_a?(Proc)
             column_title = cmeta[:title].call(filter)
           else
-            column_title = cmeta[:title] || filter.condition_title_for(cmeta[:key])  
+            # column_title = cmeta[:title] || filter ? filter.condition_title_for(cmeta[:key]) : "Undefined"
+            if filter 
+              column_title = cmeta[:title] || filter.condition_title_for(cmeta[:key])
+            else
+              column_title = cmeta[:title] || cmeta[:key].to_s.titleize
+            end
+
             if sortable
               column_title = link_to(column_title, filter.to_params(:wf_order => cmeta[:key], :wf_order_type => sort_direction_click), :title => "sort by #{cmeta[:key]} ascending", :class => "sort_link")
             end  
@@ -89,7 +94,7 @@
           # column class name 
           title_class_name      = cmeta[:title_class] || cmeta[:key].to_s
           title_class_name      << " sortable"                 if sortable            
-          title_class_name      << " current_sort"             if filter.column_sorted?(sort_key)
+          title_class_name      << " current_sort"             if filter && filter.column_sorted?(sort_key)
           title_class_name      << " #{sort_direction}"
 
           # extra styling that can be applied on a column
@@ -132,7 +137,7 @@
       <tr class='data_row <%=(index % 2 == 0) ? "wf_row_even" : "wf_row_odd"%>'>
         <% carray.each_with_index do |cmeta, column_index| %>
           <%
-            value_style = cmeta[:style] || 'padding-top:2px;padding-bottom:2px;' # should be moved to css
+            value_style = cmeta[:style] || 'padding-top:2px;padding-bottom:2px;vertical-align:middle;' # should be moved to css
             value_class = cmeta[:class] || ''
 
             if cmeta[:value].nil?
@@ -144,7 +149,7 @@
             end
 
             value_style << 'width:30px;' if cmeta[:key] == :checkbox
-            value_class << ' current_sort' if filter.column_sorted?(cmeta[:key])
+            value_class << ' current_sort' if filter and filter.column_sorted?(cmeta[:key])
 
             if cmeta[:filterable]
               filter_value = cmeta[:value].nil? ? value : obj.send(cmeta[:key])
@@ -202,3 +207,17 @@
     }
   }
 </script>
+
+<% else %>
+
+<table class='wf_paginator' style="margin-top:10px; margin-bottom:10px;">
+    <tr>
+        <td style='text-align:left'>
+            No results found
+        </td>
+        <td style='text-align:right'>
+        </td>
+    </tr>
+</table>
+
+<% end %>

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

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2010-2013 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.
+#++
+
 #############################################################################
 # will_filter configuration
 #

data/lib/generators/will_filter/templates/create_will_filter_filters.rb

@@ -1,3 +1,26 @@
+#--
+# Copyright (c) 2010-2013 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.
+#++
+
 class CreateWillFilterFilters < ActiveRecord::Migration
   def change
     create_table :will_filter_filters do |t|

data/lib/generators/will_filter/will_filter_generator.rb

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

data/lib/will_filter/calendar.rb

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

data/lib/will_filter/config.rb

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

data/lib/will_filter/containers/boolean.rb

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

data/lib/will_filter/containers/date.rb

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

data/lib/will_filter/containers/date_range.rb

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

data/lib/will_filter/containers/date_time.rb

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

data/lib/will_filter/containers/date_time_range.rb

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

data/lib/will_filter/containers/double.rb

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

data/lib/will_filter/containers/double_delimited.rb

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

data/lib/will_filter/containers/double_range.rb

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

data/lib/will_filter/containers/filter_list.rb

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

data/lib/will_filter/containers/list.rb

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

data/lib/will_filter/containers/nil.rb

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

data/lib/will_filter/containers/numeric.rb

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

data/lib/will_filter/containers/numeric_delimited.rb

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

data/lib/will_filter/containers/numeric_range.rb

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

data/lib/will_filter/containers/single_date.rb

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

data/lib/will_filter/containers/text.rb

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

data/lib/will_filter/containers/text_delimited.rb

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

data/lib/will_filter/engine.rb

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

data/lib/will_filter/extensions/action_controller_extension.rb

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

data/lib/will_filter/extensions/action_view_extension.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2012 Michael Berkovich
+# Copyright (c) 2010-2013 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -25,26 +25,39 @@ module WillFilter
   module ActionViewExtension
     extend ActiveSupport::Concern
 
-     def will_filter_tag(results, opts = {})
-       render(:partial => "/will_filter/filter/container", :locals => {:wf_filter => results.wf_filter, :opts => opts})
-     end
+    def will_filter_tag(results, opts = {})
+     render(:partial => "/will_filter/filter/container", :locals => {:wf_filter => results.wf_filter, :opts => opts})
+    end
 
-     def will_filter_scripts_tag(opts = {})
-       render(:partial => "/will_filter/common/scripts", :locals => {:opts => opts})
-     end
+    def will_filter_scripts_tag(opts = {})
+     render(:partial => "/will_filter/common/scripts", :locals => {:opts => opts})
+    end
 
-     def will_filter_table_tag(results, opts = {})
-       filter = results.wf_filter
-       opts[:columns] ||= filter.model_column_keys
-       render(:partial => "/will_filter/common/results_table", :locals => {:results => results, :filter => filter, :opts => opts})
+    def will_filter_table_tag(results, opts = {})
+     filter = results.wf_filter
+     if results.size > 0
+        opts[:columns] ||= (filter ? filter.model_column_keys : results.first.class.columns.collect{|col| col.name.to_sym})
+     else
+        opts[:columns] = []
      end
+     render(:partial => "/will_filter/common/results_table", :locals => {:results => results, :filter => filter, :opts => opts})
+    end
+
+    def will_filter_actions_bar_tag(results, actions, opts = {})
+     filter = results.wf_filter
+     opts[:class] ||= "wf_actions_bar_blue"
+     opts[:style] ||= ""
+     render(:partial => "/will_filter/common/actions_bar", :locals => {:results => results, :filter => filter, :actions => actions, :opts => opts})
+    end    
 
-     def will_filter_actions_bar_tag(results, actions, opts = {})
-       filter = results.wf_filter
-       opts[:class] ||= "wf_actions_bar_blue"
-       opts[:style] ||= ""
-       render(:partial => "/will_filter/common/actions_bar", :locals => {:results => results, :filter => filter, :actions => actions, :opts => opts})
-     end    
+    def will_filter_details_tag(obj, opts = {})
+      opts[:columns]      ||= obj.attribute_names.sort
+      opts[:table_class]  ||= "wf_details_table"
+      opts[:table_style]  ||= ""
+      opts[:key_style]    ||= "width:200px;"
+      opts[:value_style]  ||= "text-align:left"
+      render(:partial => "/will_filter/common/details_table", :locals => {:object => obj, :opts => opts})
+    end
      
   end
 end

data/lib/will_filter/extensions/active_record_extension.rb

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

data/lib/will_filter/extensions/array_extension.rb

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

data/lib/will_filter/filter_condition.rb

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

data/lib/will_filter/filter_container.rb

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

data/lib/will_filter/filter_exception.rb

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

data/lib/will_filter/railtie.rb

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

data/lib/will_filter/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2012 Michael Berkovich
+# Copyright (c) 2010-2013 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,5 +22,5 @@
 #++
 
 module WillFilter
-  VERSION = "3.1.9"
+  VERSION = "3.1.10"
 end

data/test/dummy/db/schema.rb

@@ -16,8 +16,8 @@ ActiveRecord::Schema.define(:version => 20120223232000) do
   create_table "event_users", :force => true do |t|
     t.integer  "event_id"
     t.integer  "user_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   add_index "event_users", ["event_id", "user_id"], :name => "index_event_users_on_event_id_and_user_id"
@@ -31,8 +31,8 @@ ActiveRecord::Schema.define(:version => 20120223232000) do
     t.string   "headline"
     t.datetime "start_time"
     t.datetime "end_time"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.float    "rank"
   end
 
@@ -42,15 +42,15 @@ ActiveRecord::Schema.define(:version => 20120223232000) do
     t.integer  "order_id"
     t.string   "name"
     t.integer  "price"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "merchant_orders", :force => true do |t|
     t.integer  "user_id"
     t.integer  "amount"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "users", :force => true do |t|
@@ -58,8 +58,8 @@ ActiveRecord::Schema.define(:version => 20120223232000) do
     t.string   "last_name"
     t.date     "birthday"
     t.string   "sex"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
   end
 
   create_table "will_filter_filters", :force => true do |t|
@@ -68,8 +68,8 @@ ActiveRecord::Schema.define(:version => 20120223232000) do
     t.text     "data"
     t.integer  "user_id"
     t.string   "model_class_name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
   end
 
   add_index "will_filter_filters", ["user_id"], :name => "index_will_filter_filters_on_user_id"

data/will_filter.gemspec

@@ -20,15 +20,6 @@ Gem::Specification.new do |s|
 
   s.licenses = ['MIT']
 
-  s.add_dependency 'rails', ['>= 3.2.3']
-  s.add_dependency 'kaminari', ['>= 0']
-  s.add_dependency 'sass', ['>= 0']
-  s.add_development_dependency 'pry', ['>= 0']
-  s.add_development_dependency 'bundler', ['>= 1.0.0']
-  s.add_development_dependency 'sqlite3', ['>= 0']
-  s.add_development_dependency 'rspec', ['>= 0']
-  s.add_development_dependency 'rspec-rails', ['>= 2.1.0']
-  s.add_development_dependency 'spork', ['>= 0']
-  s.add_development_dependency 'watchr', ['>= 0']
-  s.add_development_dependency 'rr', ['>= 0']
+  s.add_dependency 'rails', ['~> 3.2.3']
+  s.add_dependency 'kaminari', ['~> 0.13.0']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,129 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157126080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157126080
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: &2157123600 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2157123600
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &2157122600 !ruby/object:Gem::Requirement
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157122600
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: &2157121060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157121060
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2157119180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2157119180
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2157117660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157117660
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2157116020 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157116020
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &2157113260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *2157113260
-- !ruby/object:Gem::Dependency
-  name: spork
-  requirement: &2157110820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157110820
-- !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: &2157107520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157107520
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &2157106320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157106320
+        version: 0.13.0
 description: will_filter is a powerful customizable framework for filtering active_record
   models.
 email:
@@ -178,6 +89,7 @@ files:
 - app/views/will_filter/calendar/_quarter.html.erb
 - app/views/will_filter/calendar/index.html.erb
 - app/views/will_filter/common/_actions_bar.html.erb
+- app/views/will_filter/common/_details_table.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
@@ -340,21 +252,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2634563707694904433
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2634563707694904433
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A filtering engine plugin for Rails 3.1