will_filter 3.1.1 → 3.1.2

data/CHANGELOG.rdoc

@@ -1,2 +1,8 @@
+== 3.1.2, released 2011-10-01
+* fixed associations
+* fixed debugging info
+
 == 3.1.1, released 2011-09-29
-== 0.1.0, released 2010-07-02
+* upgraded to Rails 3.1
+
+== 2.3.1, released 2010-07-02

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    will_filter (3.1.1)
+    will_filter (3.1.2)
       coffee-script
       kaminari
       rails (>= 3.1.0)
@@ -136,7 +136,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/README.rdoc

@@ -13,6 +13,7 @@ a matter of adding two lines of code - one to your controller and one to your vi
 Add the following gems to your Gemfile: 
 
   gem 'will_filter', "~> 3.1.0" 
+  gem 'kaminari'
 
 And run:
 
@@ -23,6 +24,11 @@ To configure and initialize will_filter engine, run the following commands:
   $ rails generate will_filter  
   $ rake db:migrate 
 
+At the top of your routes.rb file, add the following line:
+
+  mount WillFilter::Engine => "/will_filter"
+
+
 == Examples
 
 To add a filtered result-set to your controller use the following method call:

data/app/models/will_filter/filter.rb

@@ -132,9 +132,8 @@ module WillFilter
         model_columns.each do |col|
           defs[col.name.to_sym] = default_condition_definition_for(col.name, col.sql_type)
         end
-        
         inner_joins.each do |inner_join|
-          join_class = inner_join.first.to_s.camelcase.constantize
+          join_class = association_class(inner_join)
           join_class.columns.each do |col|
             defs[:"#{join_class.to_s.underscore}.#{col.name.to_sym}"] = default_condition_definition_for(col.name, col.sql_type)
           end
@@ -238,7 +237,7 @@ module WillFilter
     # Can be overloaded for custom titles
     #############################################################################
     def condition_title_for(key)
-      title = key.to_s.gsub(".", ": ").gsub("_", " ")
+      title = key.to_s.gsub(".", ": ").gsub("_", " ").split("/").last
       title.split(" ").collect{|part| part.capitalize}.join(" ")
     end
     
@@ -531,7 +530,7 @@ module WillFilter
         
         all_conditions << cond
       end
-      all_conditions
+      all_conditions.join("")
     end
   
     def debug_sql_conditions
@@ -666,12 +665,20 @@ module WillFilter
     def process_custom_format
       ""
     end
+
+    def association_name(inner_join)
+      (inner_join.is_a?(Array) ? inner_join.first : inner_join).to_sym
+    end
     
+    def association_class(inner_join)
+      model_class.new.association(association_name(inner_join)).build.class
+    end  
+      
     # deprecated for Rails 3.0 and up
     def joins
       return nil if inner_joins.empty?
       inner_joins.collect do |inner_join|
-        join_table_name = inner_join.first.to_s.camelcase.constantize.table_name
+        join_table_name = association_class(inner_join).table_name
         join_on_field = inner_join.last.to_s
         "INNER JOIN #{join_table_name} ON #{join_table_name}.id = #{table_name}.#{join_on_field}"
       end
@@ -681,8 +688,8 @@ module WillFilter
       @results ||= begin
         handle_empty_filter! 
         recs = model_class.where(sql_conditions).order(order_clause)
-        inner_joins.each do |j|
-          recs = recs.joins(j.first)
+        inner_joins.each do |inner_join|
+          recs = recs.joins(association_name(inner_join))
         end
         recs = recs.page(page).per(per_page)
         recs.wf_filter = self

data/app/views/will_filter/filter/_container.html.erb

@@ -25,7 +25,7 @@
     </div>
 
     <div id="wf_debugger" class="debugger" style="display:none;">
-        <%= wf_filter.debug_sql_conditions %>
+        <%= raw(wf_filter.debug_sql_conditions) %>
     </div>
 </div>
 <% end %>

data/lib/will_filter/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module WillFilter
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end

data/test/dummy/app/assets/javascripts/orders.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/test/dummy/app/assets/stylesheets/orders.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

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

@@ -0,0 +1,9 @@
+class OrdersController < ApplicationController
+  def index
+    @orders = Merchant::Order.filter(:params => params, :filter => Merchant::OrderFilter)
+  end
+  
+  def items
+    @order_items = Merchant::OrderItem.filter(:params => params, :filter => Merchant::OrderItemFilter)
+  end
+end

data/test/dummy/app/helpers/orders_helper.rb

@@ -0,0 +1,2 @@
+module OrdersHelper
+end

data/test/dummy/app/models/event_filter.rb

@@ -35,7 +35,7 @@ class EventFilter < WillFilter::Filter
   end
 
   def inner_joins
-    [[:user, :creator_id]]
+    [:user]
   end
 
 end

data/test/dummy/app/models/event_user_filter.rb

@@ -1,7 +1,7 @@
 class EventUserFilter < WillFilter::Filter
 
   def inner_joins
-    [[:user, :user_id], [:event, :event_id]]
+    [:user, :event]
   end
 
   def definition

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

@@ -0,0 +1,7 @@
+module Merchant
+  class Order < ActiveRecord::Base
+    set_table_name :merchant_orders
+    belongs_to :user
+    has_many :order_items
+  end
+end

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+<!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>

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

@@ -0,0 +1,2 @@
+<%= will_filter_tag(@orders) %>
+<%= will_filter_table_tag(@orders) %>

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

@@ -0,0 +1,2 @@
+<%= will_filter_tag(@order_items) %>
+<%= will_filter_table_tag(@order_items) %>

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+
   mount WillFilter::Engine => "/will_filter"
 
   match 'simple/users'
@@ -8,6 +9,9 @@ Rails.application.routes.draw do
   match 'advanced/users_with_actions'
   match 'advanced/events'
   match 'advanced/event_members'
+
+  match 'orders/index', :to => "orders#index"
+  match 'orders/items'
   
   root :to => "simple#users"
 end

data/test/dummy/db/migrate/20111001193019_create_orders.rb

@@ -0,0 +1,13 @@
+class CreateOrders < ActiveRecord::Migration
+  def self.up
+    create_table :merchant_orders do |t|
+      t.integer   :user_id
+      t.integer   :amount
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :merchant_orders
+  end
+end

data/test/dummy/db/migrate/20111001193027_create_order_items.rb

@@ -0,0 +1,14 @@
+class CreateOrderItems < ActiveRecord::Migration
+  def self.up
+    create_table :merchant_order_items do |t|
+      t.integer   :order_id
+      t.string    :name
+      t.integer   :price
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :merchant_order_items
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110924023807) do
+ActiveRecord::Schema.define(:version => 20111001193027) do
 
   create_table "event_users", :force => true do |t|
     t.integer  "event_id"
@@ -37,6 +37,21 @@ ActiveRecord::Schema.define(:version => 20110924023807) do
 
   add_index "events", ["creator_id"], :name => "index_events_on_creator_id"
 
+  create_table "merchant_order_items", :force => true do |t|
+    t.integer  "order_id"
+    t.string   "name"
+    t.integer  "price"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "merchant_orders", :force => true do |t|
+    t.integer  "user_id"
+    t.integer  "amount"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "users", :force => true do |t|
     t.string   "first_name"
     t.string   "last_name"

data/test/dummy/test/functional/orders_controller_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class OrdersControllerTest < ActionController::TestCase
+  test "should get index" do
+    get :index
+    assert_response :success
+  end
+
+end

data/test/dummy/test/unit/helpers/orders_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class OrdersHelperTest < ActionView::TestCase
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000 -07:00
+date: 2011-10-01 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160270500 !ruby/object:Gem::Requirement
+  requirement: &2152833300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160270500
+  version_requirements: *2152833300
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2160269980 !ruby/object:Gem::Requirement
+  requirement: &2152832660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160269980
+  version_requirements: *2152832660
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2160269500 !ruby/object:Gem::Requirement
+  requirement: &2152832180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160269500
+  version_requirements: *2152832180
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2160269020 !ruby/object:Gem::Requirement
+  requirement: &2152831700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160269020
+  version_requirements: *2152831700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160268540 !ruby/object:Gem::Requirement
+  requirement: &2152831220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2160268540
+  version_requirements: *2152831220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160268060 !ruby/object:Gem::Requirement
+  requirement: &2152830740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160268060
+  version_requirements: *2152830740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160267580 !ruby/object:Gem::Requirement
+  requirement: &2152830260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160267580
+  version_requirements: *2152830260
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2160267100 !ruby/object:Gem::Requirement
+  requirement: &2152829780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160267100
+  version_requirements: *2152829780
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2160266620 !ruby/object:Gem::Requirement
+  requirement: &2152829300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160266620
+  version_requirements: *2152829300
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2160266140 !ruby/object:Gem::Requirement
+  requirement: &2152828820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160266140
+  version_requirements: *2152828820
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2160265660 !ruby/object:Gem::Requirement
+  requirement: &2152828320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160265660
+  version_requirements: *2152828320
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2160265180 !ruby/object:Gem::Requirement
+  requirement: &2152827540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160265180
+  version_requirements: *2152827540
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2160264700 !ruby/object:Gem::Requirement
+  requirement: &2152826860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160264700
+  version_requirements: *2152826860
 description: will_filter is a powerful customizable framework for filtering active_record
   models.
 email:
@@ -330,18 +330,26 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/.DS_Store
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/javascripts/orders.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/stylesheets/kaminari.css
+- test/dummy/app/assets/stylesheets/orders.css
 - test/dummy/app/controllers/advanced_controller.rb
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/orders_controller.rb
 - test/dummy/app/controllers/simple_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/orders_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/event.rb
 - test/dummy/app/models/event_filter.rb
 - test/dummy/app/models/event_user.rb
 - test/dummy/app/models/event_user_filter.rb
+- test/dummy/app/models/merchant/order.rb
+- test/dummy/app/models/merchant/order_filter.rb
+- test/dummy/app/models/merchant/order_item.rb
+- test/dummy/app/models/merchant/order_item_filter.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/models/user_filter.rb
 - test/dummy/app/views/advanced/event_members.html.erb
@@ -360,6 +368,9 @@ 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
 - test/dummy/app/views/simple/events.html.erb
 - test/dummy/app/views/simple/users.html.erb
@@ -387,6 +398,8 @@ files:
 - test/dummy/db/migrate/20090416182137_create_users.rb
 - test/dummy/db/migrate/20090418042757_create_events.rb
 - test/dummy/db/migrate/20090418062225_create_event_users.rb
+- test/dummy/db/migrate/20111001193019_create_orders.rb
+- test/dummy/db/migrate/20111001193027_create_order_items.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/lib/tasks/dummy.rake
@@ -396,7 +409,9 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy/test/functional/orders_controller_test.rb
 - test/dummy/test/functional/welcome_controller_test.rb
+- test/dummy/test/unit/helpers/orders_helper_test.rb
 - test/dummy/test/unit/helpers/welcome_helper_test.rb
 - test/fixtures/will_filter/filters.yml
 - test/functional/will_filter/calendar_controller_test.rb
@@ -424,12 +439,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3372907185118611390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3372907185118611390
 requirements: []
 rubyforge_project: will_filter
 rubygems_version: 1.6.2
@@ -448,18 +469,26 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/app/.DS_Store
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/javascripts/orders.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/stylesheets/kaminari.css
+- test/dummy/app/assets/stylesheets/orders.css
 - test/dummy/app/controllers/advanced_controller.rb
 - test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/orders_controller.rb
 - test/dummy/app/controllers/simple_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/orders_helper.rb
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/event.rb
 - test/dummy/app/models/event_filter.rb
 - test/dummy/app/models/event_user.rb
 - test/dummy/app/models/event_user_filter.rb
+- test/dummy/app/models/merchant/order.rb
+- test/dummy/app/models/merchant/order_filter.rb
+- test/dummy/app/models/merchant/order_item.rb
+- test/dummy/app/models/merchant/order_item_filter.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/models/user_filter.rb
 - test/dummy/app/views/advanced/event_members.html.erb
@@ -478,6 +507,9 @@ 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
 - test/dummy/app/views/simple/events.html.erb
 - test/dummy/app/views/simple/users.html.erb
@@ -505,6 +537,8 @@ test_files:
 - test/dummy/db/migrate/20090416182137_create_users.rb
 - test/dummy/db/migrate/20090418042757_create_events.rb
 - test/dummy/db/migrate/20090418062225_create_event_users.rb
+- test/dummy/db/migrate/20111001193019_create_orders.rb
+- test/dummy/db/migrate/20111001193027_create_order_items.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/lib/tasks/dummy.rake
@@ -514,7 +548,9 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
+- test/dummy/test/functional/orders_controller_test.rb
 - test/dummy/test/functional/welcome_controller_test.rb
+- test/dummy/test/unit/helpers/orders_helper_test.rb
 - test/dummy/test/unit/helpers/welcome_helper_test.rb
 - test/fixtures/will_filter/filters.yml
 - test/functional/will_filter/calendar_controller_test.rb