will_filter 3.1.7 → 3.1.8

data/spec/{containers → lib/will_filter/containers}/double_spec.rb

@@ -1,12 +1,17 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../spec_helper', File.dirname(__FILE__))
 
 describe WillFilter::Containers::Double do
   describe '#filter' do
-    before :all do
-      5.times {|i| User.create(:first_name => "User #{i}")}
-    end
-
     context "filtering with is operator" do
+
+      before :all do
+        5.times {|i| User.create(:first_name => "User #{i}")}
+      end
+
+      after :all do
+        User.delete_all
+      end
+
       it "should return a single result" do
         User.filter(:params => {:wf_c0 => "first_name", :wf_o0 => "is", :wf_v0_0 => "User 1"}).total_count.should == 1
       end

data/spec/{extensions → lib/will_filter/extensions}/active_record_extension_spec.rb

@@ -1,11 +1,16 @@
-require File.expand_path('../spec_helper', File.dirname(__FILE__))
+require File.expand_path('../../../spec_helper', File.dirname(__FILE__))
 
 describe WillFilter::ActiveRecordExtension do
-  describe '#filter' do
+  describe 'filter' do
+
     before :all do
       5.times {|i| User.create(:first_name => "User #{i}")}
     end
 
+    after :all do
+      User.delete_all
+    end
+
     context "filtering with no params" do
       it "should return all of the results" do
         User.filter(:params => {}).total_count.should == User.count

data/spec/models/will_filter/filter_spec.rb

@@ -0,0 +1,249 @@
+require File.expand_path('../../spec_helper', File.dirname(__FILE__))
+
+describe WillFilter::Filter do
+  describe 'creating new filter' do
+    context 'when filter extensions are enabled' do
+      context 'creating base filter' do
+        it 'should raise an exception' do
+          WillFilter::Config.stub!(:require_filter_extensions?).and_return(true)
+        	expect { WillFilter::Filter.new(User) }.should raise_error
+        end
+      end
+      context 'creating extended filter' do
+        it 'should be fine' do
+          WillFilter::Config.stub!(:require_filter_extensions?).and_return(true)
+          filter = UserFilter.new
+          filter.should be_a(UserFilter)
+          filter.model_class.should eq(User)
+        end
+      end
+    end
+    
+    context 'when filter extensions are disabled' do
+      it "should create a filter" do
+        WillFilter::Config.stub!(:require_filter_extensions?).and_return(false)
+        filter = WillFilter::Filter.new(User)
+        filter.should be_a(WillFilter::Filter)
+        filter.model_class_name.should eq('User')
+        filter.model_class.should eq(User)
+        filter.table_name.should eq('users')
+      end
+    end
+  end
+
+  describe 'filter methods' do
+    before :all do 
+      @filter = WillFilter::Filter.new(User)
+    end
+    
+    it 'definition should contain the right attributes' do
+      @filter.definition.keys.should eq([:id, :first_name, :last_name, :birthday, :sex, :created_at, :updated_at])
+    end    
+
+    context 'container_by_sql_type' do
+      it 'should map the right containers' do
+        ['bigint', 'numeric', 'smallint', 'integer', 'int'].each do |type|
+          @filter.container_by_sql_type(type).should eq(["nil", "numeric", "numeric_range", "numeric_delimited"])
+        end  
+        
+        ['float', 'double'].each do |type|
+          @filter.container_by_sql_type(type).should eq(["nil", "double", "double_range", "double_delimited"])
+        end  
+
+        ['timestamp', 'datetime'].each do |type|
+          @filter.container_by_sql_type(type).should eq(["nil", "date_time", "date_time_range", "single_date"])
+        end  
+        
+        ['date'].each do |type|
+          @filter.container_by_sql_type(type).should eq(["nil", "date", "date_range"])
+        end
+
+        ['char', 'character', 'varchar', 'text', 'text[]', 'bytea'].each do |type|
+          @filter.container_by_sql_type(type).should eq(["nil", "text", "text_delimited"])
+        end  
+
+        ['boolean', 'tinyint'].each do |type|
+          @filter.container_by_sql_type(type).should eq(["nil", "boolean"])
+        end
+      end    
+    end
+
+    context 'default_condition_definition_for' do    
+      it 'should map the right containers' do
+        @filter.default_condition_definition_for('id', 'int').should eq({
+             :is_provided=>"nil",
+             :is_not_provided=>"nil",
+             :is=>"numeric",
+             :is_not=>"numeric",
+             :is_less_than=>"numeric",
+             :is_greater_than=>"numeric",
+             :is_in_the_range=>"numeric_range",
+             :is_in=>"numeric_delimited",
+             :is_filtered_by=>:filter_list
+        })
+
+        @filter.default_condition_definition_for('first_name', 'varchar').should eq({
+             :is_provided=>"nil",
+             :is_not_provided=>"nil",
+             :is=>"text",
+             :is_not=>"text",
+             :contains=>"text",
+             :does_not_contain=>"text",
+             :starts_with=>"text",
+             :ends_with=>"text",
+             :is_in=>"text_delimited",
+             :is_not_in=>"text_delimited"
+       })
+      end
+    end
+
+    context 'operator sorting' do    
+      it 'should sort the operators according to default sort' do
+        WillFilter::Config.operator_order.should eq([
+           "is",
+           "is_not",
+           "is_on",
+           "is_in",
+           "is_provided",
+           "is_not_provided",
+           "is_after",
+           "is_before",
+           "is_in_the_range",
+           "contains",
+           "does_not_contain",
+           "starts_with",
+           "ends_with",
+           "is_greater_than",
+           "is_less_than",
+           "is_filtered_by"
+        ])
+
+        @filter.sorted_operators({
+           :is_provided=>"nil",
+           :is_not_provided=>"nil",
+           :is=>"numeric",
+           :is_not=>"numeric",
+           :is_less_than=>"numeric",
+           :is_greater_than=>"numeric",
+           :is_in_the_range=>"numeric_range",
+           :is_in=>"numeric_delimited",
+           :is_filtered_by=>:filter_list
+        }).should eq([
+           "is",
+           "is_not",
+           "is_in",
+           "is_provided",
+           "is_not_provided",
+           "is_in_the_range",
+           "is_greater_than",
+           "is_less_than",
+           "is_filtered_by"
+        ])
+      end
+    end    
+  end  
+
+  describe 'serialization' do
+    context 'serializing a default filter with no params' do
+      before :all do 
+        @filter = WillFilter::Filter.new(User)
+      end
+
+      it 'should create a default filter hash' do
+        @filter.to_params.should eq({
+           "wf_type"=>"WillFilter::Filter",
+           "wf_match"=>:all,
+           "wf_model"=>"User",
+           "wf_order"=>"id",
+           "wf_order_type"=>"desc",
+           "wf_per_page"=>30,
+           "wf_export_fields"=>"",
+           "wf_export_format"=>:html
+        })
+      end
+    end
+
+    context 'serializing a filter with conditions' do
+      before :all do 
+        @filter = WillFilter::Filter.new(User)
+        @filter.add_condition(:first_name, :is, "Alex")
+        @filter.add_condition(:sex, :is, "male")
+      end
+
+      it 'should create a default filter hash' do
+        @filter.to_params.should eq({
+           "wf_type"=>"WillFilter::Filter",
+           "wf_match"=>:all,
+           "wf_model"=>"User",
+           "wf_order"=>"id",
+           "wf_order_type"=>"desc",
+           "wf_per_page"=>30,
+           "wf_export_fields"=>"",
+           "wf_export_format"=>:html,
+           "wf_c0"=>:first_name,
+           "wf_o0"=>:is,
+           "wf_v0_0"=>"Alex",
+           "wf_c1"=>:sex,
+           "wf_o1"=>:is,
+           "wf_v1_0"=>"male"
+        })
+      end
+    end
+
+    context 'serializing a default filter with params' do
+      before :all do 
+        @filter = WillFilter::Filter.new(User)
+      end
+
+      it 'should create a default filter hash' do
+        @filter.to_params(:extra => 'value').should eq({
+           "wf_type"=>"WillFilter::Filter",
+           "wf_match"=>:all,
+           "wf_model"=>"User",
+           "wf_order"=>"id",
+           "wf_order_type"=>"desc",
+           "wf_per_page"=>30,
+           "wf_export_fields"=>"",
+           "wf_export_format"=>:html,
+           "extra"=>"value"
+         })
+      end
+    end
+  end
+
+  describe 'deserialization' do
+
+    context 'deserializing a filter with conditions' do
+      before :all do 
+        @filter = WillFilter::Filter.new(User)
+      end
+
+      it 'should create a default filter hash' do
+        @filter.from_params({
+           "wf_type"=>"WillFilter::Filter",
+           "wf_match"=>:all,
+           "wf_model"=>"User",
+           "wf_order"=>"first_name",
+           "wf_order_type"=>"asc",
+           "wf_per_page"=>30,
+           "wf_export_fields"=>"",
+           "wf_export_format"=>:html,
+           "wf_c0"=>:first_name,
+           "wf_o0"=>:is,
+           "wf_v0_0"=>"Alex",
+           "wf_c1"=>:sex,
+           "wf_o1"=>:is,
+           "wf_v1_0"=>"male"
+        })
+
+        @filter.order.should eq('first_name')
+        @filter.order_type.should eq('asc')
+        @filter.conditions.size.should eq(2)
+        @filter.conditions.first.key.should eq(:first_name)
+        @filter.conditions.first.operator.should eq(:is)
+      end
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,28 +1,28 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rails'
-require 'kaminari'
-require 'database_cleaner'
-require 'will_filter'
-
-# Ensure we use 'syck' instead of 'psych' in 1.9.2
-# RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
-# Psych does not yet support YAML 1.1 merge keys.
-# Merge keys is often used in mongoid.yml
-# See: http://redmine.ruby-lang.org/issues/show/4300
-if RUBY_VERSION >= '1.9.2'
-  YAML::ENGINE.yamler = 'syck'
+ENV["RAILS_ENV"] = "test"
+
+require 'pp'
+require 'spork'
+
+Spork.prefork do
+
+	require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
+	require 'rspec/rails'
+
+	ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
+
+	# Requires supporting ruby files with custom matchers and macros, etc,
+	# in spec/support/ and its subdirectories.
+	Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+
+	RSpec.configure do |config|
+	  config.use_transactional_fixtures = true
+      config.use_instantiated_fixtures  = false	  
+	end
+
 end
-require File.join(File.dirname(__FILE__), 'fake_app')
-
-require 'rspec/rails'
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.mock_with :rr
-  config.before :all do
-    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
-  end
+
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
+
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,11 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   
+  rescue_from StandardError do |e|
+    pp e.backtrace
+    raise e
+  end
+
   def current_user
   	# for testing purposes we just create a user and store it in the db
     @current_user ||= begin

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

@@ -1,6 +1,6 @@
 module Merchant
   class Order < ActiveRecord::Base
-    set_table_name :merchant_orders
+    self.table_name = :merchant_orders
     belongs_to :user
     has_many :order_items
   end

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

@@ -1,6 +1,6 @@
 module Merchant
   class OrderItem < ActiveRecord::Base
-    set_table_name :merchant_order_items
+    self.table_name = :merchant_order_items
     belongs_to :order, :class_name => "Merchant::Order"
   end
 end

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-<h1>Advanced Users Filter</h1>
+<h1>User Filter with Action Bar</h1>
 <%= will_filter_tag(@users) %>
 <%= will_filter_table_tag(@users, :columns => [
       [:checkbox, 'users'], 

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

@@ -1,2 +1,15 @@
 <%= will_filter_tag(@event_users)%>
-<%= will_filter_table_tag(@event_users) %>
+
+<%= 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'
+	}], 
+	:created_at
+]) %>

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

@@ -1,2 +1,3 @@
 <%= will_filter_tag(@events)%>
+
 <%= will_filter_table_tag(@events) %>

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

@@ -12,9 +12,9 @@
 		    </td>
 		    <td style="text-align:right;">
 				  <% if controller.controller_name == 'simple' %>
-  		      <%=link_to("Switch to Advanced Mode", :controller => :advanced, :action => :users) %>
+  		      <%=link_to("Extended Filters", :controller => :advanced, :action => :users) %>
 					<% else %>
-            <%=link_to("Switch to Simple Mode", :controller => :simple, :action => :users) %>
+            <%=link_to("Basic Filters", :controller => :simple, :action => :users) %>
 					<% end %>	
 		    </td>
 		  </tr>

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

@@ -1,2 +1,40 @@
 <%= will_filter_tag(@users) %>
-<%= will_filter_table_tag(@users) %>
+
+<%= will_filter_table_tag(@users, :columns => [
+   :id, 
+   {:key => :name, 
+	   :value => lambda{ |obj| 
+		   if @users.wf_filter.column_sorted?(:last_name)
+			   raw("<span style='font-weight:normal'>#{h(obj.first_name)} <strong>#{h(obj.last_name)}</strong></span>")
+		   elsif @users.wf_filter.column_sorted?(:first_name)	
+			   raw("<span style='font-weight:normal'><strong>#{h(obj.first_name)}</strong> #{h(obj.last_name)}</span>")
+		   else
+			   "#{obj.first_name} #{obj.last_name}"
+		   end	
+	  }, 
+	  :title => lambda{ |filter| 
+		  if filter.column_sorted?(:last_name)
+    	  first_name_link = link_to("First Name", filter.to_params(:wf_order => :first_name, :wf_order_type => 'asc'), :title => "sort by first name ascending")
+    	  last_name_link = link_to("Last Name", filter.to_params(:wf_order => :last_name, :wf_order_type => (filter.order_type == 'asc' ? 'desc' : 'asc')), 
+    		                        :title => "sort by last name #{(filter.order_type == 'asc' ? 'descending' : 'ascending')}", 
+    		                        :style=>'color:black;font-weight:bold')
+    	
+		   elsif filter.column_sorted?(:first_name)	
+    	   last_name_link = link_to("Last Name", filter.to_params(:wf_order => :last_name, :wf_order_type => 'asc'), :title => "sort by last name ascending")
+    	   first_name_link = link_to("First Name", filter.to_params(:wf_order => :first_name, :wf_order_type => (filter.order_type == 'asc' ? 'desc' : 'asc')), 
+    		                        :title => "sort by first name #{(filter.order_type == 'asc' ? 'descending' : 'ascending')}", 
+    		                        :style=>'color:black;font-weight:bold')
+    	
+		   else
+         last_name_link = link_to("Last Name", filter.to_params(:wf_order => :last_name, :wf_order_type => 'asc'), :title => "sort by last name ascending")
+    	   first_name_link = link_to("First Name", filter.to_params(:wf_order => :first_name, :wf_order_type => 'asc'), :title => "sort by first name ascending")
+		   end	
+
+  	   [first_name_link, last_name_link].join(' / ').html_safe
+	  },
+	  :sortable => true,
+	  :sort_key => lambda{ |filter| filter.column_sorted?(:first_name) ? :first_name : :last_name}    	
+  }, 
+  :birthday,
+  { :key => :sex, :title => 'Gender' }
+]) %>

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

@@ -1,2 +1,2 @@
-<h1>Simple Event Members Filter</h1>
+<h1>Basic Filter with EventMember Model</h1>
 <%= render :partial=> "/common/event_members" %>

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

@@ -1,3 +1,3 @@
-<h1>Simple Events Filter</h1>
+<h1>Basic Filter with Event Model</h1>
 <%= render :partial=> "/common/events" %>
 

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

@@ -1,2 +1,2 @@
-<h1>Simple Users Filter</h1>
+<h1>Basic Filter with User Model</h1>
 <%= render :partial=> "/common/users" %>

data/will_filter.gemspec

@@ -13,8 +13,6 @@ Gem::Specification.new do |s|
   s.summary     = "A filtering engine plugin for Rails 3.1"
   s.description = "will_filter is a powerful customizable framework for filtering active_record models."
 
-  s.rubyforge_project = 'will_filter'
-  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ['README.rdoc']
@@ -22,17 +20,15 @@ Gem::Specification.new do |s|
 
   s.licenses = ['MIT']
 
-  s.add_dependency 'rails', ['>= 3.1.0']
+  s.add_dependency 'rails', ['>= 3.2.3']
   s.add_dependency 'kaminari', ['>= 0']
   s.add_dependency 'sass', ['>= 0']
-  s.add_dependency 'coffee-script', ['>= 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', ['>= 0']
-  s.add_development_dependency 'factory_girl', ['>= 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_development_dependency 'steak', ['>= 0']
-  s.add_development_dependency 'capybara', ['>= 0']
-  s.add_development_dependency 'database_cleaner', ['>= 0']
 end