search_fu 0.0.8.beta → 0.9.0

data/lib/search_fu.rb

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

data/lib/search_fu/model_additions.rb

@@ -1,127 +1,132 @@
+require 'search_fu_attributes'
+
 module SearchFu
-  module ModelAdditions
-   def self.included(base)
-      base.extend ClassMethods
-      base.class_eval do
-        attr_accessor :_search_fu_attributes
-      end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+
+    def search_fu name, view_name=nil, query=nil
+      @search_fu_attrs ||= SearchFuAttributes.new
+      @search_fu_attrs << SearchFuAttribute.new(name, view_name, query)
     end
 
-    module ClassMethods
-      def search(hash)
-        rtnval = respond_to?(:search_fu_before) ? search_fu_before : where("1=1")
-        return rtnval unless hash
-        @rel = [%q(where("1=1"))]
-        hash.each do |k,v|
-          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
-        rtnval.instance_eval(@rel.join('.'))
-      end
+    def search params={}
+      output = respond_to?(:search_fu_before) ? search_fu_before : where(nil)
+      params.each do |k, v|
+        query = search_fu_query(v[:name]).call(v[:value])
+        output = output.nil? ? query : output.merge(query)
+      end if params
+      output
+    end
 
-      def search_fu_names
-        a = []
-        @_search_fu_attributes.each do |h|
-          a << h[:name]
-        end
-        a
-      end
+    def search_fu_view_names
+      @search_fu_attrs.view_names
+    end
 
-      def search_fu(*args)
-        @_search_fu_attributes ||= []
-        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
+    def eval_text text, *term
+      op_text = replace_operator_tag_with_sql_operator(text, term.join)
+      op_val_text = replace_value_tag_with_eval_text(op_text, term.join)
+      class_eval op_val_text
+    end
 
-      private
-
-      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]
-        if attr[:ar_query].class == Proc
-          w = attr[:ar_query].call
-        else
-          w = attr[:ar_query]
-        end
-        w.gsub(/<op>/, op).gsub(/<value>/, val)
+    def where sql, *term
+      if use_fu_where? sql
+        op_sql = replace_operator_tag_with_sql_operator(sql, term.join)
+        op_val_sql = replace_value_tag_with_sql_value(op_sql, term.join)
+        super op_val_sql
+      else
+        super
       end
+    end
 
-      def assign_like(op, val)
-        op == "like" ? "%#{val.to_s}%" : val.to_s
-      end
+    private
 
-      def grab_operator_value(value)
-        a = value.split(' ')
-        operator = to_arel_operator(a[0])
-        a.delete_at(0) if operator
-        [operator, a.join(' ')]
-      end
+    def search_fu_query name
+      query = @search_fu_attrs.find!(name).query || generate_query(name)
+    end
 
-      def to_arel_operator(val)
-        {"~" => "like", "="  =>  "=", ">=" => ">=", "<=" => "<=", "<" => "<", ">" => ">", "<>" => "<>"}[val]
-      end
+    def generate_query name
+      colname = @search_fu_attrs.find!(name).column_name
+      lambda { |val| where("#{table_name}.#{colname} <_op_> <_val_>", val) }
+    end
 
-      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 operator_hash
+      { "~" => "like", "="  =>  "=", "=>" => ">=", "=<" => "<=",  ">=" => ">=",
+        "<=" => "<=", "<" => "<", ">" => ">", "<>" => "<>", "!=" => "<>" }
+    end
+
+    def operator_regexp
+      Regexp.new("^(" + operator_hash.map {|k, v| k }.sort_by {|t| 15 - t.length }.join("|") + ")?(.+)?")
+    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
+    def replace_value_tag_with_eval_text string, term
+      value = to_sql_value(grab_value_from(term), to_sql_operator(grab_operator_from(term)), true)
+      return string.gsub(/\<_val_\>/, value) if value
+      string
+    end
+
+    def replace_value_tag_with_sql_value string, term
+      value = to_sql_value(grab_value_from(term), to_sql_operator(grab_operator_from(term)))
+      return string.gsub(/\<_val_\>/, value) if value
+      string
+    end
+
+    def replace_operator_tag_with_sql_operator string, term
+      string.gsub /\<_op_\>/, to_sql_operator(grab_operator_from(term))
+    end
+
+    def operator_by_value_type val
+      parse_float(val) || parse_date(val) ? "=" : "~" if val
+    end
+
+    def grab_value_from term
+      term.scan(operator_regexp).flatten.map { |t| t.nil? ? t : t.strip }[1]
+    end
+
+    def to_sql_value val, operator, no_wild_card=false
+      if operator != 'like' and val
+        parse_float(val) || parse_date(val) || "'#{val}'"
+      else
+        no_wild_card ? "'#{val}'" : "'%#{val}%'"
       end
+    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],
-          convert:  hash[:convert]
-        }
+    def grab_operator_from term
+      term.scan(operator_regexp).flatten.map{ |t| t.nil? ? t : t.strip }[0] ||
+        operator_by_value_type(grab_value_from(term))
+    end
+
+    def parse_float value
+      (Float value).to_s
+    rescue ArgumentError
+      nil
+    end
+
+    def parse_date value
+      regex = /^(\d{1,2}(\/|\-|\.)\d{1,2}(\/|\-|\.)\d{4})$|^(\d{4}(\/|\-|\.)\d{1,2}(\/|\-|\.)\d{1,2})$|^(\d{1,2}(\/|\-|\.)[a-z]{3}(\/|\-|\.)\d{4}$)/
+      if value =~ regex
+        "'#{Date.parse(value).to_s(:db)}'"
+      else
+        nil
       end
+    end
 
+    def to_sql_operator(val)
+      return ''  if val.nil?
+      operator_hash[val]
     end
+
+    def use_fu_where? opts
+      if opts.kind_of? String
+        opts.scan(/\<_op_\>|\<_val_\>/).count > 0 ? true : false
+      else
+        false
+      end
+    end
+
   end
-end
 
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.send :include, SearchFu::ModelAdditions
 end
-

data/lib/search_fu/version.rb

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

data/lib/search_fu/view_helper.rb

@@ -27,7 +27,7 @@ module SearchFu
       (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
-          content_tag(:td, select_tag("search_fu[_new_#{rand_id}][name]", options_for_select(model_klass.search_fu_names, v[:name]))) +
+          content_tag(:td, select_tag("search_fu[_new_#{rand_id}][name]", options_for_select(model_klass.search_fu_view_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 #{remove_button_class}"))
         end
@@ -53,7 +53,7 @@ module SearchFu
       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, select_tag("search_fu[_NEW_][name]", options_for_select(model_klass.search_fu_view_names))) +
             content_tag(:td, text_field_tag("search_fu[_NEW_][value]")) +
             content_tag(:td, link_to("X", "#", class: "search_fu_remove #{remove_button_class}"))
           end

data/lib/search_fu_attribute.rb

@@ -0,0 +1,25 @@
+require 'active_support'
+
+class SearchFuAttribute
+  attr_accessor :column_name, :view_name, :query
+
+  def initialize name, view_name=nil, query=nil
+    @column_name = name
+    @view_name = humanzie_symbol name
+    @query = query if query
+    @query = view_name if view_name.respond_to? :call
+    if view_name and !view_name.respond_to? :call
+      @view_name = humanzie_symbol view_name
+    end
+  end
+
+  private
+  def humanzie_symbol name
+    if name.kind_of? Symbol
+      ActiveSupport::Inflector.humanize name.to_s
+    else
+      name
+    end
+  end
+end
+

data/lib/search_fu_attributes.rb

@@ -0,0 +1,33 @@
+require 'search_fu_attribute'
+
+class SearchFuAttributes < Array
+  class DuplicateViewName < RuntimeError; end
+  class NotSearchFuAttribute < RuntimeError; end
+  class ViewNameNotFound < RuntimeError; end
+
+  def << value
+    raise NotSearchFuAttribute if !value.kind_of? SearchFuAttribute
+    if find value.view_name
+      raise DuplicateViewName
+    else
+      super
+    end
+  end
+
+  def view_names
+    self.map { |t| t.view_name }
+  end
+
+  def find view_name
+    self.detect { |t| t.view_name == view_name }
+  end
+
+  def find! view_name
+    a = find view_name
+    raise ViewNameNotFound unless a
+    a
+  end
+
+end
+
+

data/search_fu.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
   s.add_dependency 'activerecord'
   s.add_dependency 'actionpack'
 end

data/spec/model_additions_spec.rb

@@ -0,0 +1,135 @@
+require 'active_record'
+require 'search_fu'
+require 'spec_helper'
+
+describe "SearchFu module" do
+  class Payment < ActiveRecord::Base
+    include SearchFu
+    belongs_to :account
+    scope :search_fu_before, where("10=10")
+    search_fu :note, "Description"
+    search_fu "Debit Account Name", lambda { |val| where("accounts.name1 <_op_> <_val_>", val).joins(:account) }
+    search_fu "Credit Account Name", lambda { |val| eval_text(%(where("note <_op_> <_val_>")), val) }
+  end
+
+  class Account < ActiveRecord::Base
+    include SearchFu
+    has_many :payments
+    search_fu :name1, lambda { |val| where("name1 <_op_> <_val_>", val) }
+    search_fu :name2, lambda { |val| where("name2 <_op_> <_val_>", val) }
+    search_fu :status, "Current Status"
+    search_fu :description
+  end
+
+  it "#search should retrun where(nil) if params == nil or params not provided" do
+    Account.search.to_sql.should == Account.where(nil).to_sql
+    Account.search(nil).to_sql.should == Account.where(nil).to_sql
+  end
+
+  it "search_fu_before should be where(nil) if not provided" do
+    Account.search.to_sql.should == Account.where(nil).to_sql
+  end
+
+  it "eval_text should change op val and eval result" do
+     Payment.search( a: { name: "Credit Account Name", value: "haha" } ).to_sql.should ==
+      Payment.where("10=10").where("note like 'haha'").to_sql
+  end
+
+  it "should combine search_fu_before scope, if exists" do
+    Payment.search( a: { name: "Debit Account Name", value: "haha" } ).to_sql.should ==
+      Payment.where("10=10").where("accounts.name1 like '%haha%'").joins(:account).to_sql
+  end
+
+  context "#search" do
+    context "will generate default query" do
+      it "if not provided, type C" do
+         Payment.search( a: { name: "Debit Account Name", value: "haha" } ).to_sql.should ==
+          Payment.where("10=10").where("accounts.name1 like '%haha%'").joins(:account).to_sql
+      end
+
+      it "if not provided, type A" do
+        Account.search( a: { name: "Current Status", value: "haha" } ).to_sql.should ==
+          Account.where("accounts.status like '%haha%'").to_sql
+      end
+
+      it "if not provided, type B" do
+        Account.search( a: { name: "Description", value: "haha" } ).to_sql.should ==
+          Account.where("accounts.description like '%haha%'").to_sql
+      end
+    end
+
+    it "should return ActiveRecord::Relation" do
+      Account.search( a: { name: "Name1", value: "stuff" }).class.should == ActiveRecord::Relation
+    end
+
+    it "should call search_fu lambda" do
+      Account.search( a: { name: "Name1", value: "stuff" }).to_sql.should ==
+        Account.where("name1 like '%stuff%'").to_sql
+    end
+
+    it "should combine lambda if more than 1 search_fu params" do
+       Account.search(a: { name: "Name1", value: "stuff"}, b: { name: "Name2", value: "stuff1"}).to_sql.should ==
+        Account.where("name1 like '%stuff%'").where("name2 like '%stuff1%'").to_sql
+    end
+  end
+
+  context "#where should provide default operator" do
+    it "= for numeric value and convert value to float" do
+      Account.where("name1 <_op_> <_val_>", "32").to_sql.should ==
+        Account.where("name1 = 32.0").to_sql
+    end
+
+    it "= for date value and convert value to db date format" do
+      Account.where("name1 <_op_> <_val_>", "31-dec-2011").to_sql.should ==
+        Account.where("name1 = '2011-12-31'").to_sql
+    end
+
+    it "like for string value and convert value to %value%" do
+      Account.where("name1 <_op_> <_val_>", "jimmy").to_sql.should ==
+        Account.where("name1 like '%jimmy%'").to_sql
+    end
+  end
+
+  context "#where replace <_val_>" do
+    it "should quote string" do
+      Account.where("name1 <_op_> <_val_>", "= somevalue").to_sql.should ==
+        Account.where("name1 = 'somevalue'").to_sql
+    end
+
+    it "should convert and quote date" do
+      Account.where("name1 <_op_> <_val_>", "= 31-dec-2011").to_sql.should ==
+        Account.where("name1 = '2011-12-31'").to_sql
+    end
+
+    it "should convert to float and not quote numeric" do
+       Account.where("name1 <_op_> <_val_>", "= 2011").to_sql.should ==
+        Account.where("name1 = 2011.0").to_sql
+    end
+  end
+
+  context "#where should replace <_op_>" do
+    { "~" => "like", "="  =>  "=", "=>" => ">=",  "=<" => "<=",  ">=" => ">=", "<=" => "<=",
+      "<" => "<",    ">" => ">",   "<>" => "<>", "!=" => "<>" }.each do |fc_op, sql_op|
+        it "#{fc_op} to #{sql_op}" do
+          Account.where("name1 <_op_> 'somevalue'", "#{fc_op}").to_sql.should ==
+            Account.where("name1 #{sql_op} 'somevalue'").to_sql
+        end
+      end
+  end
+
+  it "#where should not replace <_op_> if not provided" do
+    Account.where("name1 <_op_> 'somevalue'", '').to_sql.should ==
+      Account.where("name1 <_op_> 'somevalue'").to_sql
+  end
+
+  it "#where should not replace operator if no <_op_>" do
+    Account.where("name1 = 'somevalue'", '<>').to_sql.should ==
+      Account.where("name1 = 'somevalue'").to_sql
+  end
+
+  it "#search_fu_view_names should has a view_names" do
+    Account.search_fu_view_names.should == ["Name1", "Name2", "Current Status", "Description"]
+    Payment.search_fu_view_names.should == ["Description", "Debit Account Name", "Credit Account Name"]
+  end
+
+end

data/spec/schema.rb

@@ -3,26 +3,17 @@ ActiveRecord::Schema.define do
   create_table "accounts", :force => true do |t|
     t.string  "name1",           :null => false
     t.string  "name2"
-    t.integer "institution_id",  :null => false
-    t.string  "account_type_id", :null => false
     t.text    "description"
     t.string  "status",          :default => "Active"
     t.integer "lock_version"
   end
 
   create_table "payments", :force => true do |t|
-    t.integer "institution_id"
     t.date    "date"
     t.string  "collector"
     t.integer "to_account_id"
     t.integer "from_account_id"
-    t.string  "cheque_no"
-    t.date    "cheque_date"
-    t.string  "currency"
     t.integer "c_amount",            :default => 0
-    t.integer "charges_account_id"
-    t.string  "charges_particulars"
-    t.integer "c_charges_amount",    :default => 0
     t.text    "note"
     t.string  "status"
     t.integer "lock_version",        :default => 0

data/spec/search_fu_attribute_spec.rb

@@ -0,0 +1,51 @@
+require 'search_fu_attribute'
+
+describe SearchFuAttribute do
+
+  it "should have attr_accessor :view_name" do
+    SearchFuAttribute.new(:haha).respond_to?(:view_name).should be_true
+    SearchFuAttribute.new(:haha).respond_to?(:view_name=).should be_true
+  end
+
+  it "should have attr_accessor :query" do
+    SearchFuAttribute.new(:haha).respond_to?(:query).should be_true
+    SearchFuAttribute.new(:haha).respond_to?(:query=).should be_true
+  end
+
+  context "initialize" do
+
+    it "" do
+      SearchFuAttribute.new(:haha_baba).view_name.should == "Haha baba"
+    end
+
+    context "name != nil, view_name != nil, query == nil" do
+      it "should store humanize view_name or plain view_name" do
+        SearchFuAttribute.new(:haha, "HAHA BABA").view_name.should == "HAHA BABA"
+        SearchFuAttribute.new(:haha, :mama_papa).view_name.should == "Mama papa"
+      end
+    end
+
+    context "name != nil, view_name == query, query == nil" do
+      it "should store humanize name as view_name and store view_name as query" do
+        a = SearchFuAttribute.new("HAHA BABA", lambda { 123 })
+        a.view_name.should == "HAHA BABA"
+        a.query.call.should == 123
+        b = SearchFuAttribute.new(:mama_papa, lambda { 321})
+        b.view_name.should == "Mama papa"
+        b.query.call.should == 321
+      end
+    end
+
+    context "name != nil, view_name != nil, query != nil" do
+      it "should store view_name and store query" do
+        a = SearchFuAttribute.new(:haha, "HAHA BABA", lambda { 123 })
+        a.view_name.should == "HAHA BABA"
+        a.query.call.should == 123
+        b = SearchFuAttribute.new(:haha, :mama_papa, lambda { 321})
+        b.view_name.should == "Mama papa"
+        b.query.call.should == 321
+      end
+    end
+
+  end
+end

data/spec/search_fu_attributes_spec.rb

@@ -0,0 +1,73 @@
+require 'search_fu_attributes'
+require 'search_fu_attribute'
+
+describe SearchFuAttributes do
+
+  it "should raise error if insert class is not SearchFuAttribute" do
+    a = SearchFuAttributes.new
+    expect do
+      a << "fdsfsa"
+    end.to raise_error SearchFuAttributes::NotSearchFuAttribute
+  end
+
+  it "should not raise error if insert class is SearchFuAttribute" do
+    a = SearchFuAttributes.new
+    expect do
+      a << SearchFuAttribute.new(:fdsfas)
+    end.not_to raise_error SearchFuAttributes::NotSearchFuAttribute
+  end
+
+  it "should raise error if duplicate view_name was added" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    expect do
+      a << SearchFuAttribute.new(:aaaa)
+    end.to raise_error SearchFuAttributes::DuplicateViewName
+    a.count.should == 1
+  end
+
+  it "should not raise error if not duplicate view_name was added" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    a << SearchFuAttribute.new(:bbbb)
+    a.count.should == 2
+  end
+
+  it "find should return nil" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    a << SearchFuAttribute.new(:bbbb)
+    a.find("AAAA").should be_nil
+  end
+
+  it "find should return Aaaa" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    a << SearchFuAttribute.new(:bbbb)
+    a.find("Aaaa").should == a[0]
+  end
+
+  it "find! should raise error" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    a << SearchFuAttribute.new(:bbbb)
+    expect { a.find!("AAAA") }.to raise_error SearchFuAttributes::ViewNameNotFound
+  end
+
+  it "find! should return Aaaa" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    a << SearchFuAttribute.new(:bbbb)
+    a.find!("Aaaa").should == a[0]
+  end
+
+  it "view_names should return Aaaa" do
+    a = SearchFuAttributes.new
+    a << SearchFuAttribute.new(:aaaa)
+    a << SearchFuAttribute.new(:bbbb)
+    a.view_names.should == ["Aaaa", "Bbbb"]
+  end
+
+end
+
+

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
-require 'rubygems'
 require 'active_record'
-require 'search_fu'
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
@@ -14,21 +12,4 @@ end
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.before(:each) do
-    Payment.delete_all
-    Account.delete_all
-  end
 end
-
-class Payment < ActiveRecord::Base
-  belongs_to :to_account, :class_name => "Account", :foreign_key => :to_account_id
-  belongs_to :from_account, :class_name => "Account", :foreign_key => :from_account_id
-  belongs_to :charges_account, :class_name => "Account", :foreign_key => :charges_account_id
-end
-
-class Account < ActiveRecord::Base
-  has_many :to_payments, :class_name => 'Payment', :foreign_key => 'to_account_id'
-  has_many :from_payments, :class_name => 'Payment', :foreign_key => 'from_account_id'
-  has_many :charges_payments, :class_name => 'Payment', :foreign_key => 'charges_account_id'
-end
-

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: search_fu
 version: !ruby/object:Gem::Version
-  version: 0.0.8.beta
-  prerelease: 6
+  version: 0.9.0
+  prerelease: 
 platform: ruby
 authors:
 - Tan Kwang How
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000 Z
+date: 2012-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &77688230 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77688230
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &77688020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77688020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &77687810 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77687810
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &77687600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +85,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77687600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ActiveRecord method to allow user specify and combine query in views
 email:
 - tankwanghow@gmail.com
@@ -72,9 +108,13 @@ files:
 - lib/search_fu/model_additions.rb
 - lib/search_fu/version.rb
 - lib/search_fu/view_helper.rb
+- lib/search_fu_attribute.rb
+- lib/search_fu_attributes.rb
 - search_fu.gemspec
+- spec/model_additions_spec.rb
 - spec/schema.rb
-- spec/search_fu_spec.rb
+- spec/search_fu_attribute_spec.rb
+- spec/search_fu_attributes_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tankwanghow
 licenses: []
@@ -88,15 +128,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -403552339
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -403552339
 requirements: []
 rubyforge_project: search_fu
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Combine query in views

data/spec/search_fu_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-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 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
-
-    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 }
-
-        SearchFu.search_fu_attribute_hash("stuff", ar_query: 'haha', operator: 'kaka').should ==
-          { name: 'stuff', ar_query: 'haha', operator: 'kaka', convert: nil }
-
-        SearchFu.search_fu_attribute_hash("stuff", ar_query: 'haha', convert: 'caca').should ==
-          { name: 'stuff', ar_query: 'haha', operator: nil, convert: 'caca' }
-
-        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
-
-end
-