search_fu 0.0.2 → 0.0.3

data/lib/search_fu/model_additions.rb

@@ -3,34 +3,35 @@ module SearchFu
    def self.included(base)
       base.extend ClassMethods
       base.class_eval do
-        class_attribute :_search_fu_attributes
-        self._search_fu_attributes = []
+        attr_accessor :_search_fu_attributes
       end
     end
 
     module ClassMethods
       def search(hash)
-        return self.where("1=1") unless hash
+        rtnval = self.scopes[:search_fu_before] ? self.search_fu_before : self.where("1=1")
+        return rtnval 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]}
+          search_fu_attr = @_search_fu_attributes.detect { |t| t[:name] == v[:name]}
           raise "Column '#{v[:name]}' not found." unless search_fu_attr
           @rel << generate_where(search_fu_attr, v[:value])
         end
-        self.instance_eval(@rel.join('.'))
+        rtnval.instance_eval(@rel.join('.'))
       end
 
       def search_fu_names
         a = []
-        self._search_fu_attributes.each do |h|
+        @_search_fu_attributes.each do |h|
           a << h[:name]
         end
         a
       end
 
       def search_fu(name, hash)
+        @_search_fu_attributes ||= []
         c_attr = create_search_fu_attribute_hash(name, hash)
-        self._search_fu_attributes << c_attr unless self._search_fu_attributes.detect { |t| t[:name] == c_attr[:name]}
+        @_search_fu_attributes << c_attr unless @_search_fu_attributes.detect { |t| t[:name] == c_attr[:name]}
       end
 
       private
@@ -41,7 +42,11 @@ module SearchFu
         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]
+        if attr[:ar_query].class == Proc
+          w = attr[:ar_query].call
+        else
+          w = attr[:ar_query]
+        end
         w.gsub(/<op>/, op).gsub(/<value>/, val)
       end
 
@@ -74,6 +79,7 @@ module SearchFu
   end
 end
 
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send :include, SearchFu::ModelAdditions
-end
+#if defined?(ActiveRecord::Base)
+  #ActiveRecord::Base.send :include, SearchFu::ModelAdditions
+#end
+

data/lib/search_fu/version.rb

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

data/lib/search_fu/view_helper.rb

@@ -4,9 +4,11 @@ module FilterFu
   module ViewHelper
     def search_fu_form_for(model_klass, options={})
       hidden_search_fields(model_klass) +
-      form_tag(polymorphic_path(Payment), options.merge(method: :get, id: 'search_fu_form')) do
+      form_tag(polymorphic_path(model_klass), options.merge(method: :get, id: 'search_fu_form')) do
         filter_table model_klass
-      end
+      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');")
     end
 
     def filter_table(model_klass)

data/spec/search_fu_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe FilterFu do
+describe SearchFu do
   before(:each) {
-    Payment._search_fu_attributes = []
+#    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)),
@@ -13,7 +13,7 @@ describe FilterFu do
                             operator: '=', convert: Proc.new {|op, t| Date.parse(t.to_s).to_s } } ]
   }
 
-  describe "#filter" do
+  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]
@@ -81,13 +81,13 @@ describe FilterFu do
   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_attributes.count.should == 2
+    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_attributes.count.should == 1
+    Payment.search_fu_names.count == 1
   end
 
   it "#search_fu should raise error if :ar_query in nil" do
@@ -95,3 +95,4 @@ describe FilterFu do
   end
 
 end
+

metadata

@@ -2,7 +2,7 @@
 name: search_fu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tan Kwang How
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +08:00
-default_executable: 
+date: 2011-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -60,22 +59,15 @@ files:
 - Gemfile
 - Rakefile
 - javascript/add_remove_row.js
-- lib/filter_fu.rb
-- lib/filter_fu/controller_additions.rb
-- lib/filter_fu/model_additions.rb
-- lib/filter_fu/version.rb
-- lib/filter_fu/view_helper.rb
 - lib/search_fu.rb
 - lib/search_fu/controller_additions.rb
 - lib/search_fu/model_additions.rb
 - lib/search_fu/version.rb
 - lib/search_fu/view_helper.rb
 - search_fu.gemspec
-- spec/filter_fu_spec.rb
 - spec/schema.rb
 - spec/search_fu_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/tankwanghow
 licenses: []
 
@@ -99,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: search_fu
-rubygems_version: 1.5.2
+rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
 summary: Combine query in views

data/lib/filter_fu/controller_additions.rb

@@ -1,12 +0,0 @@
-module Filterable
-  module ControllerAdditions
-    def store_filterable_session
-      session["#{self.class.name.sub(/Controller/, '').underscore.singularize}_filterable"] = params[:filterable] if params[:filterable_commit]
-    end
-  end
-end
-
-if defined?(ActionController::Base)
-  ActionController::Base.send :include, Filterable::ControllerAdditions
-end
-

data/lib/filter_fu/model_additions.rb

@@ -1,39 +0,0 @@
-module FilterFu
-  module ModelAdditions
-   def self.included(base)
-      base.extend ClassMethods
-      base.class_eval do
-        class_attribute :_filter_fu_attributes
-        self._filter_fu_attributes = []
-      end
-    end
-
-    module ClassMethods
-      def filter_fu(*args)
-        args.each do |attr|
-          c_attr = create_filter_fu_attribute_hash(attr)
-          self._filter_fu_attributes << c_attr unless self._filter_fu_attributes.detect { |t| t[:name] == c_attr[:name]}
-        end
-      end
-
-      private
-
-      def create_filter_fu_attribute_hash(attr)
-        raise "Parameter has no :name key" unless attr[:name]
-        raise "Parameter has no :where key" unless attr[:where]
-        { name: attr[:name],
-          where: attr[:where],
-          operator: attr[:operator] || :eq,
-          convert: attr[:convert],
-          joins: attr[:joins],
-          and: attr[:and] }
-      end
-
-    end
-
-  end
-end
-
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send :include, FilterFu::ModelAdditions
-end

data/lib/filter_fu/version.rb

@@ -1,3 +0,0 @@
-module FilterFu
-  VERSION = "0.0.1"
-end

data/lib/filter_fu/view_helper.rb

@@ -1,63 +0,0 @@
-require 'action_view'
-
-module FilterFu
-  module ViewHelper
-    def filter_fu_form_for(model_klass, options={})
-      hidden_filter_fields(model_klass) +
-      form_tag(polymorphic_path(Payment), options.merge(method: :get, id: 'filter_fu_form')) do
-        filter_table model_klass
-      end
-    end
-
-    def filter_table(model_klass)
-      content_tag(:table, :id => 'filter_fu_table') do
-        content_tag(:thead, filter_header, :id => "filter_fu_thead") +
-        content_tag(:tbody, render_fields(model_klass),:id => "filter_fu_tbody") +
-        content_tag(:tfoot, filter_footer, :id => "filter_fu_tfoot")
-      end
-    end
-
-    def render_fields(model_klass)
-      html = ""
-      (session["#{model_klass.name.underscore}_filter_fu"] || params[:filter_fu] || {}).each do |k,v|
-        rand_id = (DateTime.now.to_i * rand * 100).to_i
-        html << content_tag(:tr, :id => "filter_fu_row_new_#{rand_id}", :class => "filter_fu_rows") do
-          content_tag(:td, select_tag("filter_fu[_new_#{rand_id}][name]", options_for_select(model_klass.filter_fu_names, v[:name]))) +
-          content_tag(:td, text_field_tag("filter_fu[_new_#{rand_id}][value]", v[:value])) +
-          content_tag(:td, link_to("X", "#", :class => 'filter_fu_remove'))
-        end
-      end
-      html.html_safe
-    end
-
-    def filter_header
-      content_tag(:tr) do
-        content_tag(:td, "Filter") +
-        content_tag(:td, "Value", :colspan => 2)
-      end
-    end
-
-    def filter_footer
-      content_tag(:tr) do
-        content_tag(:td, link_to("Add", "#", :id => "filter_fu_add") + submit_tag("Apply", :name => "filter_fu_commit"), :colspan => 3)
-      end
-    end
-
-    def hidden_filter_fields(model_klass)
-      content_tag(:table, :style=>"display:none") do
-        content_tag(:tbody, :id => "hidden_filter_fields") do
-          content_tag(:tr, :id => "filter_fu_row_NEW_", :class => "filter_fu_rows") do
-            content_tag(:td, select_tag("filter_fu[_NEW_][name]", options_for_select(model_klass.filter_fu_names))) +
-            content_tag(:td, text_field_tag("filter_fu[_NEW_][value]")) +
-            content_tag(:td, link_to("X", "#", :class => 'filter_fu_remove'))
-          end
-        end
-      end
-    end
-  end
-end
-
-if defined?(ActionController::Base)
-  ActionController::Base.helper(FilterFu::ViewHelper)
-end
-

data/lib/filter_fu.rb

@@ -1,4 +0,0 @@
-require 'filter_fu/model_additions'
-require 'filter_fu/view_helper'
-require 'filter_fu/controller_additions'
-

data/spec/filter_fu_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe FilterFu do
-  before(:each) {
-    Payment._filter_fu_attributes = []
-    @name_err_attr = { where: 'haha', operator: 'like' },
-                     { name: 'Date', where: "date", operator: '=',
-                       value_proc: Proc.new { |val| Date.parse(val) }  }
-
-    @where_err_attr = { name: 'haha', operator: 'like' },
-                      { name: 'Date', where: "date", operator: '=',
-                       value_proc: Proc.new { |val| Date.parse(val) }  }
-
-
-    @pay_attr1 = { name: 'Date', where: "date", operator: '=',
-                   value_proc: Proc.new { |val| Date.parse(val) }  },
-                 { name: 'Collector', where: 'collector', operator: 'like' }
-  }
-  it "should respond_to #filter_fu" do
-    Payment.respond_to?(:filter_fu).should be_true
-  end
-
-  it "should add #filter_fu params to _filter_fu_attributes" do
-    Payment.filter_fu(*@pay_attr1)
-    Payment._filter_fu_attributes.count.should == 2
-  end
-
-  it "#filter_fu should not duplicated :name attr to _filter_fu_attributes" do
-    Payment.filter_fu(*@pay_attr1)
-    Payment.filter_fu(*@pay_attr1)
-    Payment._filter_fu_attributes.count.should == 2
-  end
-
-  it "should raise error, if #filter_fu params has no name key" do
-    lambda { Payment.filter_fu(*@name_err_attr) }.should raise_error "Parameter has no :name key"
-  end
-
-  it "should raise error, if #filter_fu params has no where key" do
-    lambda { Payment.filter_fu(*@where_err_attr) }.should raise_error "Parameter has no :where key"
-  end
-
-
-end