will_filter 3.1.7 → 3.1.8

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format=d
+--drb

data/.watchr

@@ -0,0 +1,18 @@
+def run_spec(file)
+  unless File.exist?(file)
+    puts "#{file} does not exist"
+    return
+  end
+
+  puts "Running #{file}"
+  system "bundle exec rspec #{file}"
+  puts
+end
+
+watch("spec/.*/*_spec.rb") do |match|
+  run_spec match[0]
+end
+
+watch("app/(.*/.*).rb") do |match|
+  run_spec %{spec/#{match[1]}_spec.rb}
+end

data/Gemfile.lock

@@ -1,156 +1,131 @@
 PATH
   remote: .
   specs:
-    will_filter (3.1.7)
-      coffee-script
+    will_filter (3.1.8)
       kaminari
-      rails (>= 3.1.0)
+      rails (>= 3.2.3)
       sass
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
+    arel (3.0.2)
     builder (3.0.0)
-    capybara (1.1.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.2.2)
-      ffi (~> 1.0.6)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.1.2)
-    database_cleaner (0.6.7)
+    coderay (1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    execjs (1.2.9)
-      multi_json (~> 1.0)
-    factory_girl (2.1.2)
-      activesupport
-    ffi (1.0.9)
     hike (1.2.1)
     i18n (0.6.0)
-    json_pure (1.6.1)
-    kaminari (0.12.4)
-      rails (>= 3.0.0)
-    mail (2.3.0)
+    journey (1.0.3)
+    json (1.6.6)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    nokogiri (1.5.0)
-    polyglot (0.3.2)
-    rack (1.3.3)
-    rack-cache (1.0.3)
+    method_source (0.7.1)
+    mime-types (1.18)
+    multi_json (1.3.2)
+    polyglot (0.3.3)
+    pry (0.9.9)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rr (1.0.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
-    rubyzip (0.9.4)
-    sass (3.1.7)
-    selenium-webdriver (2.7.0)
-      childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    sprockets (2.0.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
+    sass (3.1.15)
+    slop (2.4.4)
+    spork (0.9.0)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
-    steak (2.0.0)
-      capybara (>= 1.0.0)
-      rspec-rails (>= 2.5.0)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
+    tzinfo (0.3.33)
+    watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  capybara
-  database_cleaner
-  factory_girl
+  pry
   rr
   rspec
-  rspec-rails
+  rspec-rails (>= 2.1.0)
+  spork
   sqlite3
-  steak
+  watchr
   will_filter!

data/README.rdoc

@@ -46,13 +46,27 @@ Note: 'User' is a Rails ActiveRecord model
 Now all you have to do is create a view for this action and add the following tag where you want the filter to be rendered:
 
   <%= will_filter_tag(@users) %>
-	
+
 And optionally you can do (for results table):
 	
   <%= will_filter_table_tag(@users) %>
 
 That's it. This will render a filter box with various conditions, operators and values for the model object you selected.
 
+
+= Documentation
+
+Please read the following document to learn more about filter customization:
+
+https://github.com/berk/will_filter/wiki/Customizing-Filters
+
+Please read the following document to learn more about table tag customization:
+
+https://github.com/berk/will_filter/wiki/Customizing-Table-View
+
+
+= Screenshots
+
 Below are a couple of screenshot of what the filter looks like when it is rendered on a page:
 
 http://wiki.tr8n.org/images/e/e1/Wf1.png
@@ -60,6 +74,8 @@ http://wiki.tr8n.org/images/e/e1/Wf1.png
 http://wiki.tr8n.org/images/5/50/Wf2.png
 
 
+= Dummy Application
+
 This plugin comes with a dummy test project. To try out some of the examples, run the following commands:
 
   $ git clone git://github.com/berk/will_filter.git

data/VERSION

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

data/app/controllers/will_filter/filter_controller.rb

@@ -23,6 +23,7 @@
 
 module WillFilter
   class FilterController < ApplicationController
+    
     def index
       @filters = WillFilter::Filter.new(WillFilter::Filter).deserialize_from_params(params).results
     end

data/app/models/will_filter/filter.rb

@@ -20,10 +20,32 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
+#
+#-- WillFilter::Filter Schema Information
+#
+# Table name: will_filter_filters
+#
+#  id                  INTEGER         not null, primary key
+#  type                varchar(255)    
+#  name                varchar(255)    
+#  data                text            
+#  user_id             integer         
+#  model_class_name    varchar(255)    
+#  created_at          datetime        
+#  updated_at          datetime        
+#
+# Indexes
+#
+#  index_will_filter_filters_on_user_id    (user_id) 
+#
+#++
 
 module WillFilter
   class Filter < ActiveRecord::Base
-    set_table_name  :will_filter_filters
+    self.table_name = :will_filter_filters 
+    attr_accessible :type, :name, :data, :user_id, :model_class_name
+
+    # set_table_name  :will_filter_filters
     serialize       :data
     before_save     :prepare_save
     after_find      :process_find
@@ -40,7 +62,7 @@ module WillFilter
 
       self.model_class_name = model_class.to_s
     end
-    
+
     def dup
       super.tap {|ii| ii.conditions = self.conditions.dup}
     end
@@ -155,11 +177,15 @@ module WillFilter
         defs
       end
     end
-  
-    def container_by_sql_type(type)
+
+    def self.container_by_sql_type(type)
       raise WillFilter::FilterException.new("Unsupported data type #{type}") unless WillFilter::Config.data_types[type]
       WillFilter::Config.data_types[type]
     end
+
+    def container_by_sql_type(type)
+      self.class.container_by_sql_type(type)
+    end
     
     def default_condition_definition_for(name, sql_data_type)
       type = sql_data_type.split(" ").first.split("(").first.downcase
@@ -293,9 +319,22 @@ module WillFilter
       oper
     end
     
+    def conditions_for(condition_key)
+      @conditions.select{|cond| cond.key == condition_key}
+    end
+
+    def remove_condition(condition_key)
+      @conditions -= conditions_for(condition_key)
+    end
+
     def add_condition(condition_key, operator_key, values = [])
       add_condition_at(size, 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)
+    end
     
     def valid_operator?(condition_key, operator_key)
       condition_key = condition_key.to_sym if condition_key.is_a?(String)
@@ -386,10 +425,10 @@ module WillFilter
         condition = condition_at(index)
         condition.serialize_to_params(params, index)
       end
-      
-      params.merge(merge_params)
+      HashWithIndifferentAccess.new(params.merge(merge_params))
     end
-    
+    alias_method :to_params, :serialize_to_params
+
     #############################################################################
     # allows to create a filter from params only
     #############################################################################
@@ -465,6 +504,7 @@ module WillFilter
   
       self
     end
+    alias_method :from_params, :deserialize_from_params
     
     #############################################################################
     # Validations 

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

@@ -17,81 +17,114 @@
   <thead>
     <tr>
       <% 
+        carray = [] # stores the order of the columns
+
         opts[:columns].each_with_index do |column, index|
+          cmeta = {}
+
           if column.is_a?(Array)
-            key = column.first
+            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    
           elsif column.is_a?(Hash)
-            key = column[:key] || "key_#{index}"
+            cmeta = column
+            cmeta[:key] ||= "key_#{index}"
+          else
+            cmeta[:key] = column
+          end
+
+          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"
+
+          if cmeta[:sort_key]
+            sort_key = cmeta[:sort_key].call(filter)
+          else  
+            sort_key = cmeta[:key]
+          end
+
+          if cmeta[:sortable].nil?
+            sortable = filter.contains_column?(cmeta[:key])
           else
-            key = column
+            sortable = cmeta[:sortable]
           end
-          
-          style = ""
-          sort_direction       = filter.column_sorted?(key) ? filter.order_type : "asc"
-          sort_direction_click = filter.column_sorted?(key) ? (sort_direction == "asc" ? "desc" : "asc") : "asc"
-          column_title   = filter.condition_title_for(key)  
-          the_class_name =  key.to_s
-          the_class_name << " sortable"                 if filter.contains_column?(key)              
-          the_class_name << " current_sort"             if filter.column_sorted?(key)
-          the_class_name << " #{sort_direction}"
-
-          style << "width:15px" if key == :checkbox          
+
+          if cmeta[:title].is_a?(Proc)
+            column_title = cmeta[:title].call(filter)
+          else
+            column_title = cmeta[:title] || filter.condition_title_for(cmeta[:key])  
+            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  
+          end  
+
+          # 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      << " #{sort_direction}"
+
+          # extra styling that can be applied on a column
+          title_style           = cmeta[:title_style] || "" 
+          title_style           << ";width:15px" if cmeta[:key] == :checkbox          
         %>
-        <th class="<%= the_class_name %>" style="<%=style%>">
+
+        <th class="<%= title_class_name %>" style="<%=title_style%>">
           <div class="table_head_container">
-            <% if filter.contains_column?(key) %>
+            <% if sortable %>
               <div class="sort_control">
-                <%= link_to "", filter.serialize_to_params(:wf_order => key, :wf_order_type => 'asc'), :title => "sort by #{key} ascending", :class => 'up' %>
-                <%= link_to "", filter.serialize_to_params(:wf_order => key, :wf_order_type => 'desc'), :title => "sort by #{key} descending", :class => 'down' %>
+                <%= link_to "", filter.to_params(:wf_order => sort_key, :wf_order_type => 'asc'), :title => "sort by #{sort_key} ascending", :class => 'up' %>
+                <%= link_to "", filter.to_params(:wf_order => sort_key, :wf_order_type => 'desc'), :title => "sort by #{sort_key} descending", :class => 'down' %>
               </div>
-    
-              <%= link_to column_title, filter.serialize_to_params(:wf_order => key, :wf_order_type => sort_direction_click), :class => "sort_link" %>
-            <% elsif key == :checkbox %>
+            
+              <div style='white-space: nowrap;'>
+                <%= column_title %>
+              </div>
+
+            <% elsif cmeta[:key] == :checkbox %>
               <%= check_box_tag("wf_check_all", "", false, :onClick => "wfCheckAll(this)") %>
+
             <% else %>
               <%= column_title %> 
+
             <% end %> 
           </div>
         </th>
       <% end %>
     </tr>
   </thead>  
-    
+
   <tbody>
     <% results.each_with_index do |obj, index| %>
       <tr class='data_row <%=(index % 2 == 0) ? "wf_row_even" : "wf_row_odd"%>'>
-        <% opts[:columns].each_with_index do |column, column_index| %>
+        <% carray.each_with_index do |cmeta, column_index| %>
           <%
-            style = 'padding:3px;'
-            if column.is_a?(Array)
-              key = column.first
-
-              if column.second.is_a?(Proc)
-                value = column.second.call(obj)
-              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(obj) if value.is_a?(Proc)
-              else
-                value = obj.send(key) 
-              end
-              style << column[:style] if column[:style]
+            value_style = cmeta[:style] || 'padding-top:2px;padding-bottom:2px;' # should be moved to css
+            value_class = cmeta[:class] || ''
 
+            if cmeta[:value].nil?
+              value = obj.send(cmeta[:key]) 
+            elsif cmeta[:value].is_a?(Proc)
+              value = cmeta[:value].call(obj)
             else
-              key = column
-              value = obj.send(key)
+              value = cmeta[:value]
             end
 
-            style << "padding-left:10px;" if key == :checkbox
+            value_style << 'width:30px;' if cmeta[:key] == :checkbox
+            value_class << ' current_sort' if filter.column_sorted?(cmeta[:key])
+
           %>
-          <td style='<%=style%>' <%= " class='current_sort'" if filter.column_sorted?(key) %>>
-               <% if key == :checkbox %>
+          <td style='<%=value_style%>' class='<%=value_class%>'>
+               <% if cmeta[:key] == :checkbox %>
                   <%= check_box_tag("#{value}[]", obj.id, false, :id => "wf_check_#{index}", :onClick => "wfVerifyTrigger(this)") %>
             
                <% elsif value.is_a?(Hash) %>

data/lib/will_filter/extensions/action_view_extension.rb

@@ -24,27 +24,27 @@
 module WillFilter
   module ActionViewExtension
     extend ActiveSupport::Concern
-    module InstanceMethods
-       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_tag(results, opts = {})
+       render(:partial => "/will_filter/filter/container", :locals => {:wf_filter => results.wf_filter, :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})
-       end
+     def will_filter_scripts_tag(opts = {})
+       render(:partial => "/will_filter/common/scripts", :locals => {: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    
-    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})
+     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    
+     
   end
 end

data/lib/will_filter/extensions/array_extension.rb

@@ -31,4 +31,10 @@ class Array
     @wf_filter
   end
   
+	def add_filter_condition(condition_key, operator_key, values = [])
+		sub_filter = wf_filter.dup
+    sub_filter.replace_condition(condition_key, operator_key, values)
+		sub_filter
+	end
+
 end

data/lib/will_filter/filter_condition.rb

@@ -37,8 +37,8 @@ module WillFilter
     end
   
     def serialize_to_params(params, index)
-      params["wf_c#{index}"] = key
-      params["wf_o#{index}"] = operator
+      params["wf_c#{index}".to_sym] = key
+      params["wf_o#{index}".to_sym] = operator
       container.serialize_to_params(params, index)
       params
     end

data/lib/will_filter/version.rb

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