search_fu 0.0.5 → 0.0.7

data/javascript/search_fu.js

@@ -0,0 +1,51 @@
+jQuery(function(){
+  add_remove_row.bindAddLink('#search_fu_add', '#hidden_search_fields', '#search_fu_tbody');
+  add_remove_row.bindRemoveLink('.search_fu_remove', '.search_fu_rows');
+
+  $('form#search_fu_form').live("ajax:beforeSend", function() {
+    $('body').css('cursor', 'wait');
+  });
+
+  $('form#search_fu_form').live("ajax:success", function(a, b, c, d) {
+    $($(this).attr("element")).html(b);
+    $('body').css('cursor', 'default');
+  });
+
+  $('#search_fu_more_link').live("click", function(a, b, c, d) {
+    var going_to_fetch_page, old_text;
+    $('body').css('cursor', 'wait');
+    old_text = $('#search_fu_more_link').text();
+    if(typeof going_to_fetch_page === 'undefined') { going_to_fetch_page = 2; }
+    $('#search_fu_more_link').attr("href", $('form#search_fu_form').attr('action'));
+    $('#search_fu_more_link').data("params", $("form#search_fu_form").serialize() + "&page=" + going_to_fetch_page);
+    $('#search_fu_more_link').hide();
+    $('#search_fu_more_span').text("Wait, fetching more result....");
+    $.get($(this).attr("href"), $(this).data("params"), function(data) {
+      $($("#search_fu_more_link").attr("element")).append(data);
+      $('#search_fu_more_span').text("");
+      going_to_fetch_page++;
+      $('#search_fu_more_link').show();
+      if(data.trim() === "") { $('#search_fu_more_span').text("No more result. Try again? ") }
+      $('body').css('cursor', 'default');
+    });
+    return false;
+  });
+});
+
+var add_remove_row = {
+  bindRemoveLink: function(removeLinkClass, removeElementClass) {
+    $(removeLinkClass).live('click',
+      function(){
+        $(this).parents(removeElementClass).remove();
+        return false;
+      });
+  },
+  bindAddLink: function(addLinkElement, addHtml, appendAt) {
+    $(addLinkElement).live('click', function(){
+      html = $(addHtml).html().replace(/_NEW_/g, 'new_' + new Date().getTime());
+      $(appendAt).append(html);
+      return false;
+    });
+  }
+};
+

data/lib/search_fu/controller_additions.rb

@@ -1,7 +1,7 @@
 module SearchFu
   module ControllerAdditions
     def store_search_fu_session
-      session["#{self.class.name.sub(/Controller/, '').underscore.singularize}_search_fu"] = params[:search_fu] if params[:search_fu_commit]
+      session["#{self.class.name.sub(/Controller/, '').underscore.singularize}_search_fu"] = params[:search_fu] if params[:search_fu]
     end
   end
 end

data/lib/search_fu/model_additions.rb

@@ -62,7 +62,7 @@ module SearchFu
       end
 
       def to_arel_operator(val)
-        {"~" => "like", "="  =>  "=", ">=" => ">=", "<=" => "<=", "<" => "<", ">" => ">"}[val]
+        {"~" => "like", "="  =>  "=", ">=" => ">=", "<=" => "<=", "<" => "<", ">" => ">", "<>" => "<>"}[val]
       end
 
       def create_search_fu_attribute_hash(name, hash)

data/lib/search_fu/version.rb

@@ -1,4 +1,4 @@
 module SearchFu
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end
 

data/lib/search_fu/view_helper.rb

@@ -2,31 +2,40 @@ require 'action_view'
 
 module FilterFu
   module ViewHelper
-    def search_fu_form_for(model_klass, options={})
-      hidden_search_fields(model_klass) +
-      form_tag(polymorphic_path(model_klass), options.merge(method: :get, id: 'search_fu_form')) do
-        filter_table model_klass
-      end +
-      javascript_tag("add_remove_row.bindAddLink('#search_fu_add', '#hidden_search_fields', '#search_fu_tbody');") +
-      javascript_tag("add_remove_row.bindRemoveLink('.search_fu_remove', '.search_fu_rows');")
+
+    def search_fu_form_for(model_klass, element="#content", options={})
+      button_class = options.delete(:button_class)
+      button_class ||= {}
+      button_class[:remove] ||= ""
+      button_class[:add_apply] ||= ""
+      search_fields_blueprint(model_klass, button_class[:remove]) +
+      form_tag(polymorphic_path(model_klass), options.merge(method: :get, remote: true, id: 'search_fu_form', element: element)) do
+        filter_table model_klass, button_class
+      end
     end
 
-    def filter_table(model_klass)
-      content_tag(:table, :id => 'search_fu_table') do
-        content_tag(:thead, filter_header, :id => "search_fu_thead") +
-        content_tag(:tbody, render_fields(model_klass),:id => "search_fu_tbody") +
-        content_tag(:tfoot, filter_footer, :id => "search_fu_tfoot")
+    def link_to_more(text, element, options={})
+      content_tag(:span, "", id: "search_fu_more_span") +
+      link_to(text, '#', options.merge(id: "search_fu_more_link", element: element))
+    end
+
+
+    def filter_table(model_klass, button_class)
+      content_tag(:table, id: 'search_fu_table') do
+        content_tag(:thead, filter_header, id: "search_fu_thead") +
+        content_tag(:tbody, render_fields(model_klass, button_class[:remove]), id: "search_fu_tbody") +
+        content_tag(:tfoot, filter_footer(button_class[:add_apply]), id: "search_fu_tfoot")
       end
     end
 
-    def render_fields(model_klass)
+    def render_fields(model_klass, remove_button_class)
       html = ""
       (session["#{model_klass.name.underscore}_search_fu"] || params[:search_fu] || {}).each do |k,v|
         rand_id = (DateTime.now.to_i * rand * 100).to_i
-        html << content_tag(:tr, :id => "search_fu_row_new_#{rand_id}", :class => "search_fu_rows") do
+        html << content_tag(:tr, id: "search_fu_row_new_#{rand_id}", class: "search_fu_rows") do
           content_tag(:td, select_tag("search_fu[_new_#{rand_id}][name]", options_for_select(model_klass.search_fu_names, v[:name]))) +
           content_tag(:td, text_field_tag("search_fu[_new_#{rand_id}][value]", v[:value])) +
-          content_tag(:td, link_to("X", "#", :class => 'search_fu_remove'))
+          content_tag(:td, link_to("X", "#", class: "search_fu_remove #{remove_button_class}"))
         end
       end
       html.html_safe
@@ -35,23 +44,24 @@ module FilterFu
     def filter_header
       content_tag(:tr) do
         content_tag(:td, "Filter") +
-        content_tag(:td, "Value", :colspan => 2)
+        content_tag(:td, "Value", colspan: 2)
       end
     end
 
-    def filter_footer
+    def filter_footer(add_apply_button_class)
       content_tag(:tr) do
-        content_tag(:td, link_to("Add", "#", :id => "search_fu_add") + submit_tag("Apply", :name => "search_fu_commit"), :colspan => 3)
+        content_tag(:td, link_to("Add", "#", id: "search_fu_add", class: add_apply_button_class) +
+        submit_tag("Apply", class: add_apply_button_class, disable_with: "Searching..."), colspan: 3)
       end
     end
 
-    def hidden_search_fields(model_klass)
-      content_tag(:table, :style=>"display:none") do
-        content_tag(:tbody, :id => "hidden_search_fields") do
-          content_tag(:tr, :id => "search_fu_row_NEW_", :class => "search_fu_rows") do
+    def search_fields_blueprint(model_klass, remove_button_class)
+      content_tag(:table, style: "display:none") do
+        content_tag(:tbody, id: "hidden_search_fields") do
+          content_tag(:tr, id: "search_fu_row_NEW_", class: "search_fu_rows") do
             content_tag(:td, select_tag("search_fu[_NEW_][name]", options_for_select(model_klass.search_fu_names))) +
             content_tag(:td, text_field_tag("search_fu[_NEW_][value]")) +
-            content_tag(:td, link_to("X", "#", :class => 'search_fu_remove'))
+            content_tag(:td, link_to("X", "#", class: "search_fu_remove #{remove_button_class}"))
           end
         end
       end

metadata

@@ -1,64 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: search_fu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Tan Kwang How
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &82980960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *82980960
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &82980740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *82980740
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &82903650 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *82903650
 description: A ActiveRecord method to allow user specify and combine query in views
-email: 
+email:
 - tankwanghow@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
-- javascript/add_remove_row.js
+- javascript/search_fu.js
 - lib/search_fu.rb
 - lib/search_fu/controller_additions.rb
 - lib/search_fu/model_additions.rb
@@ -70,30 +66,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/tankwanghow
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: search_fu
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Combine query in views
 test_files: []
-

data/javascript/add_remove_row.js

@@ -1,20 +0,0 @@
-jQuery(function(){
-  //app.setupAjaxCallbacks();
-});
-
-var add_remove_row = {
-  bindRemoveLink: function(removeLinkClass, removeElementClass) {
-    $(removeLinkClass).live('click',
-      function(){
-        $(this).parents(removeElementClass).remove();
-        return false;
-      });
-  },
-  bindAddLink: function(addLinkElement, addHtml, appendAt) {
-    $(addLinkElement).click(function(){
-      html = $(addHtml).html().replace(/_NEW_/g, 'new_' + new Date().getTime());
-      $(appendAt).append(html);
-      return false;
-    });
-  }
-};