search_fu 0.0.1 → 0.0.2

data/lib/search_fu/model_additions.rb

@@ -9,8 +9,9 @@ module SearchFu
     end
 
     module ClassMethods
-      def filter(hash)
-        @rel = []
+      def search(hash)
+        return self.where("1=1") unless hash
+        @rel = [%q(where("1=1"))]
         hash.each do |k,v|
           search_fu_attr = self._search_fu_attributes.detect { |t| t[:name] == v[:name]}
           raise "Column '#{v[:name]}' not found." unless search_fu_attr
@@ -19,7 +20,7 @@ module SearchFu
         self.instance_eval(@rel.join('.'))
       end
 
-      def filter_names
+      def search_fu_names
         a = []
         self._search_fu_attributes.each do |h|
           a << h[:name]
@@ -37,9 +38,15 @@ module SearchFu
       def generate_where(attr, value)
         a = grab_operator_value(value)
         op = a[0] || attr[:operator]
+        return %q(where("1=1")) if a[1].blank?
+        val = assign_like(op, a[1])
         val = attr[:convert].call(op, a[1]) if attr[:convert]
         w = attr[:ar_query]
-        w.gsub(/<op>/, op).gsub(/<value>/, val.to_s)
+        w.gsub(/<op>/, op).gsub(/<value>/, val)
+      end
+
+      def assign_like(op, val)
+        op == "like" ? "%#{val.to_s}%" : val.to_s
       end
 
       def grab_operator_value(value)

data/lib/search_fu/version.rb

@@ -1,3 +1,3 @@
 module SearchFu
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/search_fu/view_helper.rb

@@ -3,7 +3,7 @@ require 'action_view'
 module FilterFu
   module ViewHelper
     def search_fu_form_for(model_klass, options={})
-      hidden_filter_fields(model_klass) +
+      hidden_search_fields(model_klass) +
       form_tag(polymorphic_path(Payment), options.merge(method: :get, id: 'search_fu_form')) do
         filter_table model_klass
       end
@@ -43,9 +43,9 @@ module FilterFu
       end
     end
 
-    def hidden_filter_fields(model_klass)
+    def hidden_search_fields(model_klass)
       content_tag(:table, :style=>"display:none") do
-        content_tag(:tbody, :id => "hidden_filter_fields") 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]")) +

data/spec/search_fu_spec.rb

@@ -4,14 +4,13 @@ describe FilterFu do
   before(:each) {
     Payment._search_fu_attributes = []
     @err_attr2 = ['Error', { operator: '=' }]
-    @pay_attr1 = ['Collector', { ar_query: %q(where("payments.collector <op> '<value>'")), operator: 'like',
-                                 convert: Proc.new{|op,t| op == "like" ? "%#{t.to_s}%" : t.to_s}}]
+    @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' , convert: Proc.new{|op,t| op == "like" ? "%#{t.to_s}%" : t.to_s}}]
+                              operator: 'like'}]
     @pay_attr3 = ['Pay from', { ar_query: %q(where("accounts.name1 <op> '<value>' or accounts.name2 <op> '<value>'").joins(:from_account)),
-                                operator: 'like' , convert: Proc.new{|op,t| op == "like" ? "%#{t.to_s}%" : t.to_s}}]
+                                operator: 'like'}]
     @pay_attr4 = ['Date', { ar_query: %q(where("payments.date <op> '<value>'")),
-                            operator: '=', convert: Proc.new {|op, t| Date.parse(t.to_s) } } ]
+                            operator: '=', convert: Proc.new {|op, t| Date.parse(t.to_s).to_s } } ]
   }
 
   describe "#filter" do
@@ -22,49 +21,57 @@ describe FilterFu do
       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.filter_names.sort.should == ['Collector', 'Date', 'Pay from', 'Pay to']
+      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.filter( { b: { name: 'Pay to', value: 'smith' } , a: { name: 'Pay from', value: 'tkh'} }).to_sql.downcase.should ==
-        Payment.where("accounts.name1 like '%smith%' or accounts.name2 like '%smith%'").joins(:to_account).
+      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
     end
 
     it "should return join where relation" do
-      Payment.filter( { b: { name: 'Pay to', value: 'smith' } }).to_sql.downcase.should ==
-        Payment.where("accounts.name1 like '%smith%' or accounts.name2 like '%smith%'").joins(:to_account).to_sql.downcase
+      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
     end
 
     it "should use value operator return simple where relation and convert value" do
-      Payment.filter( { b: { name: 'Date', value: '>= 12-Jun-2010' } }).to_sql.downcase.should ==
-        Payment.where('payments.date >= ?', Date.parse('12-Jun-2010')).to_sql.downcase
+      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.filter( { b: { name: 'Date', value: '12-Jun-2010' } }).to_sql.downcase.should ==
-        Payment.where("payments.date = '#{Date.parse('12-Jun-2010')}'").to_sql.downcase
+      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 use value operator and return simple where relation" do
-      Payment.filter({a: { name: 'Collector', value: '= smith ma'}}).to_sql.downcase.should ==
-       Payment.where("payments.collector = 'smith ma'").to_sql.downcase
+      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
 
     it "should return simple where relation" do
-      Payment.filter({a: { name: 'Collector', value: 'smith ma'}}).to_sql.downcase.should ==
-        Payment.where('payments.collector like ?', '%smith ma%').to_sql.downcase
+      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
 
     it "should raise error, if :name ont found" do
-      lambda { Payment.filter({a: { name: 'haha', value: 'mama'}}) }.should raise_error("Column 'haha' not found.")
+      lambda { Payment.search({a: { name: 'haha', value: 'mama'}}) }.should raise_error("Column 'haha' not found.")
     end
-
   end
 
-  it "should respond_to #filter" do
-    Payment.respond_to?(:filter).should be_true
+  it "should respond_to #search" do
+    Payment.respond_to?(:search).should be_true
   end
 
   it "should respond_to #search_fu" do

metadata

@@ -2,7 +2,7 @@
 name: search_fu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tan Kwang How
@@ -59,7 +59,6 @@ files:
 - .gitignore
 - Gemfile
 - Rakefile
-- filter_fu.gemspec
 - javascript/add_remove_row.js
 - lib/filter_fu.rb
 - lib/filter_fu/controller_additions.rb

data/filter_fu.gemspec

@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "filter_fu/version"
-
-Gem::Specification.new do |s|
-  s.name        = "filter_fu"
-  s.version     = FilterFu::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Tan Kwang How"]
-  s.email       = ["tankwanghow@gmail.com"]
-  s.homepage    = "http://github.com/tankwanghow"
-  s.summary     = %q{Combine query in views}
-  s.description = %q{A ActiveRecord method to allow user specify and combine query in views}
-
-  s.rubyforge_project = "filter_fu"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "rails"
-end