search_fu 0.0.7 → 0.0.8.beta

data/.rspec

@@ -0,0 +1 @@
+--color

data/javascript/search_fu.js

@@ -1,7 +1,6 @@
 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');
   });
@@ -10,26 +9,6 @@ jQuery(function(){
     $($(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 = {

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]
+      session["#{self.class.name.sub(/Controller/, '').underscore.singularize}_search_fu"] = params[:search_fu] if params[:search_fu_commit]
     end
   end
 end
@@ -9,4 +9,3 @@ end
 if defined?(ActionController::Base)
   ActionController::Base.send :include, SearchFu::ControllerAdditions
 end
-

data/lib/search_fu/model_additions.rb

@@ -28,9 +28,9 @@ module SearchFu
         a
       end
 
-      def search_fu(name, hash)
+      def search_fu(*args)
         @_search_fu_attributes ||= []
-        c_attr = create_search_fu_attribute_hash(name, hash)
+        c_attr = create_search_fu_attribute_hash(*args)
         @_search_fu_attributes << c_attr unless @_search_fu_attributes.detect { |t| t[:name] == c_attr[:name]}
       end
 
@@ -65,12 +65,54 @@ module SearchFu
         {"~" => "like", "="  =>  "=", ">=" => ">=", "<=" => "<=", "<" => "<", ">" => ">", "<>" => "<>"}[val]
       end
 
-      def create_search_fu_attribute_hash(name, hash)
-        raise "No Query Key found in query hash" unless hash[:ar_query]
+      def create_search_fu_attribute_hash(*args)
+        # args[0] - column name, args[1] - view name, args[3] - search_fu hash
+        # args[0] - view name, args[1] - search_fu_hash
+        # args[0] - column name, args[1] - view name
+        # args[0] - column name
+        hash = {}
+        hash = args.delete args.last if args.last.class == Hash
+
+        if args.size == 2
+          search_fu_attribute_hash(args[1], ar_query(args[0], hash))
+        elsif args.size == 1
+          search_fu_attribute_hash(args[0].to_s.humanize, ar_query(args[0], hash))
+        end
+      end
+
+      def ar_query(col_name, hash)
+        arq = hash[:ar_query]
+        operator = hash[:operator]
+        converter = hash[:convert]
+        col = columns.detect { |t| t.name == col_name.to_s }
+        if col
+          case
+          when col.type == :string || col.type == :text
+            operator ||= 'like'
+            arq ||= %Q(where("upper(#{self.table_name}.#{col_name}) <op> upper('<value>')"))
+          when col.type == :datetime || col.type == :date
+            converter ||= Proc.new{ |op, val| Date.parse(val.to_s).to_s(:db) }
+            arq ||= %Q(where("#{self.table_name}.#{col_name} <op> '<value>'"))
+          when col.type == :decimal || col.type == :integer
+            arq ||= %Q(where("#{self.table_name}.#{col_name} <op> <value>"))
+          when col.type == :boolean
+            converter ||= Proc.new { |op, val| ['t', 'y', 'true', 'yes'].include?(val.downcase) ? 'true' : 'false' }
+            arq ||= %Q(where("#{self.table_name}.#{col_name} <op> <value>"))
+          end
+        end
+        hsh = {}
+        hsh.merge!(ar_query: arq)
+        hsh.merge!(operator: operator || "=")
+        hsh.merge!(convert: converter)
+        return hsh
+      end
+
+      def search_fu_attribute_hash(name, hash)
+        raise "No Query found in hash!" unless hash[:ar_query]
         {
           name:     name,
           ar_query: hash[:ar_query],
-          operator: hash[:operator] || '=',
+          operator: hash[:operator],
           convert:  hash[:convert]
         }
       end

data/lib/search_fu/version.rb

@@ -1,4 +1,4 @@
 module SearchFu
-  VERSION = "0.0.7"
+  VERSION = "0.0.8.beta"
 end
 

data/lib/search_fu/view_helper.rb

@@ -1,6 +1,6 @@
 require 'action_view'
 
-module FilterFu
+module SearchFu
   module ViewHelper
 
     def search_fu_form_for(model_klass, element="#content", options={})
@@ -14,13 +14,7 @@ module FilterFu
       end
     end
 
-    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)
+   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") +
@@ -51,7 +45,7 @@ module FilterFu
     def filter_footer(add_apply_button_class)
       content_tag(:tr) do
         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)
+        submit_tag("Apply", name: "search_fu_commit", class: add_apply_button_class, disable_with: "Searching..."), colspan: 3)
       end
     end
 
@@ -70,6 +64,6 @@ module FilterFu
 end
 
 if defined?(ActionController::Base)
-  ActionController::Base.helper(FilterFu::ViewHelper)
+  ActionController::Base.helper(SearchFu::ViewHelper)
 end
 

data/search_fu.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "rails"
+  s.add_dependency 'activerecord'
+  s.add_dependency 'actionpack'
 end

data/spec/search_fu_spec.rb

@@ -1,98 +1,31 @@
 require 'spec_helper'
 
-describe SearchFu do
-  before(:each) {
-#    Payment._search_fu_attributes = []
-    @err_attr2 = ['Error', { operator: '=' }]
-    @pay_attr1 = ['Collector', { ar_query: %q(where("payments.collector <op> '<value>'")), operator: 'like'}]
-    @pay_attr2 = ['Pay to', { ar_query: %q(where("accounts.name1 <op> '<value>' or accounts.name2 <op> '<value>'").joins(:to_account)),
-                              operator: 'like'}]
-    @pay_attr3 = ['Pay from', { ar_query: %q(where("accounts.name1 <op> '<value>' or accounts.name2 <op> '<value>'").joins(:from_account)),
-                                operator: 'like'}]
-    @pay_attr4 = ['Date', { ar_query: %q(where("payments.date <op> '<value>'")),
-                            operator: '=', convert: Proc.new {|op, t| Date.parse(t.to_s).to_s } } ]
-  }
-
-  describe "#search_fu" do
-    before(:each) do
-      Payment.search_fu @pay_attr1[0], @pay_attr1[1]
-      Payment.search_fu @pay_attr2[0], @pay_attr2[1]
-      Payment.search_fu @pay_attr3[0], @pay_attr3[1]
-      Payment.search_fu @pay_attr4[0], @pay_attr4[1]
-    end
-
-    it "should not query if hash empty" do
-      Payment.search(nil).to_sql.downcase.should == Payment.where("1=1").to_sql.downcase
-    end
-
-    it "should return an array of names" do
-      Payment.search_fu_names.sort.should == ['Collector', 'Date', 'Pay from', 'Pay to']
-    end
-
-    it "should not query if value nil" do
-      Payment.search( { b: { name: 'Date', value: '' } }).to_sql.downcase.should ==
-        Payment.where("1=1").to_sql.downcase
-    end
-
-    it "should combine where relation" do
-      Payment.search( { b: { name: 'Pay to', value: 'smith' } , a: { name: 'Pay from', value: 'tkh'} }).to_sql.downcase.should ==
-        Payment.where("1=1").where("accounts.name1 like '%smith%' or accounts.name2 like '%smith%'").joins(:to_account).
-        where("accounts.name1 like '%tkh%' or accounts.name2 like '%tkh%'").joins(:from_account).to_sql.downcase
+describe SearchFu::ModelAdditions do
+  describe '.search_fu_attribute_hash' do
+    it "should raise error if hash[:ar_query] not found" do
+      lambda { SearchFu.search_fu_attribute_hash('name', {}) }.should raise_error("No Query found in hash!")
     end
 
-    it "should return join where relation" do
-      Payment.search( { b: { name: 'Pay to', value: 'smith' } }).to_sql.downcase.should ==
-        Payment.where("1=1").where("accounts.name1 like '%smith%' or accounts.name2 like '%smith%'").joins(:to_account).to_sql.downcase
+    it "should not rails error if hash[:ar_query] exists" do
+      lambda { SearchFu.search_fu_attribute_hash('name', ar_query: 3) }.should_not raise_error("No Query found in hash!")
     end
 
-    it "should use value operator return simple where relation and convert value" do
-      Payment.search( { b: { name: 'Date', value: '>= 12-Jun-2010' } }).to_sql.downcase.should ==
-        Payment.where("1=1").where('payments.date >= ?', Date.parse('12-Jun-2010')).to_sql.downcase
-    end
-
-    it "should return simple where relation and convert value" do
-      Payment.search( { b: { name: 'Date', value: '12-Jun-2010' } }).to_sql.downcase.should ==
-        Payment.where("1=1").where("payments.date = '#{Date.parse('12-Jun-2010')}'").to_sql.downcase
-    end
+    describe 'return hash' do
+      it "should be hashed correctly" do
+        SearchFu.search_fu_attribute_hash("stuff", ar_query: 'haha').should ==
+          { name: 'stuff', ar_query: 'haha', operator: nil, convert: nil }
 
-    it "should use value operator and return simple where relation" do
-      Payment.search({a: { name: 'Collector', value: '= smith ma'}}).to_sql.downcase.should ==
-       Payment.where("1=1").where("payments.collector = 'smith ma'").to_sql.downcase
-    end
+        SearchFu.search_fu_attribute_hash("stuff", ar_query: 'haha', operator: 'kaka').should ==
+          { name: 'stuff', ar_query: 'haha', operator: 'kaka', convert: nil }
 
-    it "should return simple where relation" do
-      Payment.search({a: { name: 'Collector', value: 'smith ma'}}).to_sql.downcase.should ==
-        Payment.where("1=1").where('payments.collector like ?', '%smith ma%').to_sql.downcase
-    end
+        SearchFu.search_fu_attribute_hash("stuff", ar_query: 'haha', convert: 'caca').should ==
+          { name: 'stuff', ar_query: 'haha', operator: nil, convert: 'caca' }
 
-    it "should raise error, if :name ont found" do
-      lambda { Payment.search({a: { name: 'haha', value: 'mama'}}) }.should raise_error("Column 'haha' not found.")
+        SearchFu.search_fu_attribute_hash("stuff", ar_query: 'haha', convert: 'caca', operator: 'kaka' ).should ==
+          { name: 'stuff', ar_query: 'haha', operator: 'kaka', convert: 'caca' }
+      end
     end
   end
 
-  it "should respond_to #search" do
-    Payment.respond_to?(:search).should be_true
-  end
-
-  it "should respond_to #search_fu" do
-    Payment.respond_to?(:search_fu).should be_true
-  end
-
-  it "should add #search_fu params to _search_fu_attributes" do
-    Payment.search_fu(@pay_attr1[0], @pay_attr1[1])
-    Payment.search_fu(@pay_attr2[0], @pay_attr2[1])
-    Payment.search_fu_names.count.should == 2
-  end
-
-  it "#search_fu should not duplicated :name attr to _search_fu_attributes" do
-    Payment.search_fu(@pay_attr1[0], @pay_attr1[1])
-    Payment.search_fu(@pay_attr1[0], @pay_attr1[1])
-    Payment.search_fu_names.count == 1
-  end
-
-  it "#search_fu should raise error if :ar_query in nil" do
-    lambda { Payment.search_fu(@err_attr2[0], @err_attr2[1]) }.should raise_error "No Query Key found in query hash"
-  end
-
 end
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: search_fu
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8.beta
+  prerelease: 6
 platform: ruby
 authors:
 - Tan Kwang How
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &82980960 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &77688230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82980960
+  version_requirements: *77688230
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &82980740 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &77688020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82980740
+  version_requirements: *77688020
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &82903650 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: &77687810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: *77687810
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &77687600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *82903650
+  version_requirements: *77687600
 description: A ActiveRecord method to allow user specify and combine query in views
 email:
 - tankwanghow@gmail.com
@@ -52,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - Rakefile
 - javascript/search_fu.js
@@ -79,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: search_fu
 rubygems_version: 1.8.10