will_filter 3.1.2 → 3.1.3

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

@@ -1,56 +1,60 @@
-<%= hidden_field_tag(:wf_id, wf_filter.id) %>
-<%= hidden_field_tag(:wf_type, wf_filter.class.name) %>
-<%= hidden_field_tag(:wf_dirty, "false") %>
-<%= hidden_field_tag(:wf_submitted, "false") %>
-<%= hidden_field_tag(:wf_name, wf_filter.name) %>
-<%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
-<%= hidden_field_tag(:wf_export_format, "") %>
-<%= hidden_field_tag(:wf_export_fields, "") %>
-	
+<div style="margin:0;padding:0;display:inline">
+  <%= hidden_field_tag(:wf_id, wf_filter.id) %>
+  <%= hidden_field_tag(:wf_type, wf_filter.class.name) %>
+  <%= hidden_field_tag(:wf_dirty, "false") %>
+  <%= hidden_field_tag(:wf_submitted, "false") %>
+  <%= hidden_field_tag(:wf_name, wf_filter.name) %>
+  <%= hidden_field_tag(:wf_model, wf_filter.model_class_name) %>
+  <%= hidden_field_tag(:wf_export_format, "") %>
+  <%= hidden_field_tag(:wf_export_fields, "") %>
+</div>
+
 <div class="header">
   <% if wf_filter.show_save_options? %>
-		<div style="float:right;">
-	    <%=link_to_function("<span>Save As New...</span>".html_safe, "wfFilter.saveFilter()", :class => "wf_grey_button wf_pcb") %>
-	    <%=link_to_function("<span>Update</span>".html_safe, "wfFilter.updateFilter()", :class => "wf_grey_button wf_pcb") %>
-	    <%=link_to_function("<span>Delete</span>".html_safe, "wfFilter.deleteFilter()", :class => "wf_grey_button wf_pcb") %>
+    <div class="end">
+      <%=link_to_function("<span>Save As New...</span>".html_safe, "wfFilter.saveFilter()", :class => "wf_grey_button wf_pcb") %>
+      <%=link_to_function("<span>Update</span>".html_safe, "wfFilter.updateFilter()", :class => "wf_grey_button wf_pcb") %>
+      <%=link_to_function("<span>Delete</span>".html_safe, "wfFilter.deleteFilter()", :class => "wf_grey_button wf_pcb") %>
       <% if wf_filter.show_export_options? %>
         <%=link_to_function("<span>Export Data...</span>".html_safe, "wfExporter.show(this)", :class => "wf_grey_button wf_pcb") %>
       <% end %>
-		</div>
+    </div>
   <% end %>
-	<div style="font-weight:bold; font-size:18px;">
+  <div>
     <% unless wf_filter.saved_filters.empty? %>
        <%= select_tag(:wf_key, options_for_select(wf_filter.saved_filters, wf_filter.key), {:onChange=>"wfFilter.loadSavedFilter()"}) %>
     <% end %>
-	</div>
+  </div>
 </div>
 
 <div class="body">
+
   <% if wf_filter.errors[:filter] %>
     <div class="wf_filter_error">
       <%= wf_filter.errors[:filter] %>
     </div>
   <% end %>
 
-	<div style="padding:5px">
-		Match <%= select_tag(:wf_match, options_for_select(wf_filter.match_options, wf_filter.match), {:onChange=>"wfFilter.markDirty()"}) %>
-		of the following conditions:
-	</div>
-	
-	<% if wf_filter.size == 0 %> 
-	  <div style="font-style:italic; padding:5px; color: black">
-	    You haven't added any filter conditions, so all of the results were returned. 
-	    Use the "Add" button in the bottom left corner to add a new condition or select 
-	    a predefined filter from a drop-down list above.
-		</div> 
-	<% else %>
-		<table class="table" cellpadding="0" cellspacing="0">
-			<% 
-					0.upto(wf_filter.size-1) do |index| 
-			  	 	condition = wf_filter.condition_at(index) 
-			%>
-		   <%= render :partial => "/will_filter/filter/condition", :locals => {:wf_filter => wf_filter, :condition => condition, :index => index}%> 
-			<% end %>
-	  </table>  
-	<% end %>	
+  <div class="filter_match_type">
+    Match <%= select_tag(:wf_match, options_for_select(wf_filter.match_options, wf_filter.match), {:onChange=>"wfFilter.markDirty()"}) %>
+    of the following conditions:
+  </div>
+
+  <% if wf_filter.size == 0 %>
+    <div class="no_filter_hint">
+      You haven't added any filter conditions, so all of the results were returned.
+      Use the "Add" button in the bottom left corner to add a new condition or select
+      a predefined filter from a drop-down list above.
+    </div>
+  <% else %>
+    <table class="table" cellpadding="0" cellspacing="0">
+      <%
+          0.upto(wf_filter.size-1) do |index|
+             condition = wf_filter.condition_at(index)
+      %>
+       <%= render :partial => "/will_filter/filter/condition", :locals => {:wf_filter => wf_filter, :condition => condition, :index => index}%>
+      <% end %>
+    </table>
+  <% end %>
+
 </div>

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

@@ -2,30 +2,36 @@
 
 <%= form_tag({}, {:method => :get, :name=>'wf_form', :id => 'wf_form', :class => 'wf_form' }) do %>
 <div class="wf_container">
-    <div id="wf_filter_conditions" class="conditions">
-        <%= render :partial=> "/will_filter/filter/conditions", :locals => {:wf_filter => wf_filter} %>
+  <div id="wf_filter_conditions" class="conditions">
+      <%= render :partial=> "/will_filter/filter/conditions", :locals => {:wf_filter => wf_filter} %>
+  </div>
+
+  <div class="footer">
+    <div class="actions">
+      <small>
+        <%=link_to_function("Toggle Conditions", "wfFilter.toggleDebugger()") %>
+      </small>
+      &nbsp;&nbsp;
+      Order:
+      <%= select_tag(:wf_order, options_for_select(wf_filter.condition_options, wf_filter.order), {:onChange=>"markDirty()"}) %>
+      <%= select_tag(:wf_order_type, options_for_select(wf_filter.order_type_options, wf_filter.order_type), {:onChange=>"markDirty()"}) %>
+      Per Page:
+      <%= select_tag(:wf_per_page, options_for_select(wf_filter.per_page_options, wf_filter.per_page.to_s), {:onChange=>"markDirty()"}) %>
+      &nbsp;&nbsp;
+      <%=link_to_function("<span>Submit Filter</span>".html_safe, "wfFilter.submit()", :class => "wf_grey_button wf_pcb") %>
     </div>
-    
-    <div class="footer">
-      <div class="actions">
-        <%=link_to_function("Toggle Conditions", "wfFilter.toggleDebugger()", :style=>"font-size:9px") %>
-        &nbsp;&nbsp;
-        Order: 
-        <%= select_tag(:wf_order, options_for_select(wf_filter.condition_options, wf_filter.order), {:onChange=>"markDirty()"}) %>
-        <%= select_tag(:wf_order_type, options_for_select(wf_filter.order_type_options, wf_filter.order_type), {:onChange=>"markDirty()"}) %>
-        Per Page: 
-        <%= select_tag(:wf_per_page, options_for_select(wf_filter.per_page_options, wf_filter.per_page.to_s), {:onChange=>"markDirty()"}) %>
-        &nbsp;&nbsp;<%=link_to_function("<span>Submit Filter</span>".html_safe, "wfFilter.submit()", :class => "wf_grey_button wf_pcb") %>
-      </div>
-      <div>
-        <%=link_to_function("<span>+ Add</span>".html_safe, "wfFilter.addCondition()", :class => "wf_grey_button wf_pcb") %>
-        <%=link_to_function("<span>- Clear</span>".html_safe, "wfFilter.removeAllConditions()", :class => "wf_grey_button wf_pcb") %>
-        &nbsp;&nbsp;<span id="wf_loader" class="spinner" style="display:none;"><%=image_tag "will_filter/spinner.gif", {:style=>"vertical-align:middle"} %> Loading...</span>
-      </div>
+    <div>
+      <%=link_to_function("<span>+ Add</span>".html_safe, "wfFilter.addCondition()", :class => "wf_grey_button wf_pcb") %>
+      <%=link_to_function("<span>- Clear</span>".html_safe, "wfFilter.removeAllConditions()", :class => "wf_grey_button wf_pcb") %>
+      &nbsp;&nbsp;
+      <span id="wf_loader" class="spinner" style="display:none;">
+        <%=image_tag "will_filter/spinner.gif" %> Loading...
+      </span>
     </div>
+  </div>
 
-    <div id="wf_debugger" class="debugger" style="display:none;">
-        <%= raw(wf_filter.debug_sql_conditions) %>
-    </div>
+  <div id="wf_debugger" class="debugger" style="display:none;">
+      <%= raw(wf_filter.debug_sql_conditions) %>
+  </div>
 </div>
 <% end %>

data/app/views/will_filter/filter/containers/_boolean.html.erb

@@ -1,4 +1,4 @@
-<div style='vertical-align:middle; text-align:left; padding-top:4px;'>
+<div class="boolean_container">
 	<%=radio_button_tag("wf_v#{index}_0", '1', (container.value == '1'), :style => 'width:20px', :onChange => 'wfFilter.fieldChanged(this)')%>	True
   &nbsp;&nbsp;
 	<%=radio_button_tag("wf_v#{index}_0", '0', (container.value == '0'), :style => 'width:20px', :onChange => 'wfFilter.fieldChanged(this)')%>	False

data/config/will_filter/config.yml

@@ -12,7 +12,7 @@
 defaults: &defaults
   effects_options:
     enabled:              false
-    script_path:          "/will_filter/javascripts/will_filter_prototype_effects.js"
+    script_path:          "will_filter/filter_prototype_effects.js"
     
   save_options: 
     enabled:              true

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

@@ -12,7 +12,7 @@
 defaults: &defaults
   effects_options:
     enabled:              false
-    script_path:          "/will_filter/javascripts/will_filter_prototype_effects.js"
+    script_path:          "will_filter/filter_prototype_effects.js"
     
   save_options: 
     enabled:              true

data/lib/will_filter/version.rb

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

data/spec/config/config_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe WillFilter::Config do
+  subject { WillFilter::Config }
+  describe 'operator_order' do
+    context 'by default' do
+      its(:config) {should_not == nil}
+      its(:containers) {should_not == nil}
+      its(:data_types) {should_not == nil}
+      its(:operators) {should_not == nil}
+      its(:operator_order) {should_not == nil}
+    end
+  end
+end

data/spec/extensions/active_record_extension_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
+describe WillFilter::ActiveRecordExtension do
+  describe '#filter' do
+    before :all do
+      5.times {|i| User.create(:first_name => "User #{i}")}
+    end
+
+    context "filtering with no params" do
+      it "should return all of the results" do
+        User.filter(:params => {}).total_count.should == User.count
+      end
+    end
+
+    context "filtering with is operator" do
+      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
+    end
+    
+    context "filtering with like operator" do
+      it "should return all matched results" do
+        User.filter(:params => {:wf_c0 => "first_name", :wf_o0 => "contains", :wf_v0_0 => "User"}).total_count.should == User.count
+      end
+    end
+    
+    context "filtering with ends_with operator" do
+      it "should return all matched results" do
+        User.filter(:params => {:wf_c0 => "first_name", :wf_o0 => "ends_with", :wf_v0_0 => "4"}).total_count.should == 1
+      end
+    end
+
+    context "filtering with starts_with operator" do
+      it "should return all matched results" do
+        User.filter(:params => {:wf_c0 => "first_name", :wf_o0 => "starts_with", :wf_v0_0 => "U"}).total_count.should == User.count
+      end
+    end
+    
+  end
+end

data/spec/fake_app.rb

@@ -0,0 +1,57 @@
+require 'active_record'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+# database
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection('test')
+
+# config
+app = Class.new(Rails::Application)
+app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
+app.config.session_store :cookie_store, :key => "_myapp_session"
+app.config.active_support.deprecation = :log
+app.initialize!
+
+# routes
+app.routes.draw do
+  resources :users
+end
+
+# models
+class User < ActiveRecord::Base
+  has_many :events
+  has_many :events_users
+end
+class Event < ActiveRecord::Base
+  belongs_to :user, :class_name => 'User', :foreign_key => :creator_id
+  has_many :event_users
+end
+class EventUser < ActiveRecord::Base
+  belongs_to :event
+  belongs_to :user
+end
+
+# controllers
+class ApplicationController < ActionController::Base; end
+class UsersController < ApplicationController
+  def index
+    @users = User.filter(:params => params)
+    render :inline => <<-ERB
+<%= will_filter_tag(@users) %>
+ERB
+  end
+end
+
+# helpers
+Object.const_set(:ApplicationHelper, Module.new)
+
+#migrations
+class CreateAllTables < ActiveRecord::Migration
+  def self.up
+    Dir["#{File.dirname(__FILE__)}/../test/dummy/db/migrate/*.rb"].each do |f| 
+      require f 
+      f.split("/").last.gsub('.rb', '').split('_')[1..-1].join('_').camelcase.constantize.up
+    end  
+  end
+end

data/spec/spec_helper.rb

@@ -1,27 +1,28 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+$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'
 
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
+# 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'
+end
+require File.join(File.dirname(__FILE__), 'fake_app')
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+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}
 
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
+RSpec.configure do |config|
+  config.mock_with :rr
+  config.before :all do
+    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'users'
+  end
 end

data/test/dummy/config/will_filter/config.yml

@@ -12,7 +12,7 @@
 defaults: &defaults
   effects_options:
     enabled:              false
-    script_path:          "/will_filter/javascripts/will_filter_prototype_effects.js"
+    script_path:          "will_filter/filter_prototype_effects.js"
     
   save_options: 
     enabled:              true

data/test/dummy/db/migrate/20110924023807_create_will_filter_filters.rb

@@ -0,0 +1,19 @@
+class CreateWillFilterFilters < ActiveRecord::Migration
+  def self.up
+    create_table :will_filter_filters do |t|
+      t.string      :type
+      t.string      :name
+      t.text        :data
+      t.integer     :user_id
+      t.string      :model_class_name
+      
+      t.timestamps
+    end
+    
+    add_index :will_filter_filters, [:user_id]
+  end
+  
+  def self.down
+    drop_table :will_filter_filters
+  end
+end