phat_pgsearch 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/phat_pgsearch/active_record.rb

@@ -34,20 +34,47 @@ module PhatPgsearch
 
         search_query = pgsearch_query(args.first, args.second, options)
 
+        if args.first.is_a? Symbol or args.first.to_s.split('.', 2) == 1
+          vector_column = "#{self.connection.quote_table_name(self.table_name)}.#{self.connection.quote_column_name(args.first.to_s)}"
+        else
+          vector_column = args.first.split('.', 2).collect{ |f| self.connection.quote_column_name(f) }.join('.')
+        end
+
         if rank.nil? or rank == true
-          scope = scope.select("#{self.connection.quote_table_name(self.table_name)}.*, ts_rank_cd(#{self.connection.quote_column_name(args.first)}, #{search_query}, #{normalization.to_i}) AS rank")
+          scope = scope.select("#{self.connection.quote_table_name(self.table_name)}.*, ts_rank_cd(#{vector_column}, #{search_query}, #{normalization.to_i}) AS rank")
         end
 
-        scope.where("#{self.connection.quote_table_name(self.table_name)}.#{self.connection.quote_column_name(args.first)} @@ #{search_query}")
+        scope.where("#{vector_column} @@ #{search_query}")
       end
 
       def pgsearch_query(*args)
         options = args.extract_options!
-        raise ArgumentError, "invalid field given" unless pgsearch_definitions.include? args.first.to_sym
-        raise ArgumentError, "invalid query" if not args.second or not args.second.is_a? String
+        raise ArgumentError, "invalid field given" if args.first.nil? or not (args.first.is_a? String or args.first.is_a? Symbol)
+        raise ArgumentError, "invalid query given" if args.second.nil? or not (args.second.is_a? String)
+
+        field = args.first.to_s.split(".", 2)
 
-        definition = pgsearch_definitions[args.first.to_sym]
-        catalog = options[:catalog] || definition.catalog
+        table_class = self
+
+        if field.count == 2
+          begin
+            table_class = field.first.classify.constantize
+          rescue
+            p field.first.classify
+            raise ArgumentError, "unknown table in field given"
+          end
+        end
+
+        raise ArgumentError, "table has no index defined" unless table_class.respond_to? :pgsearch_definitions
+        raise ArgumentError, "table has no index defined for '#{field.last.to_sym}'" if table_class.pgsearch_definitions[field.last.to_sym].nil?
+
+
+        definition = table_class.pgsearch_definitions[field.last.to_sym]
+        if definition
+          catalog = options[:catalog] || definition.catalog
+        else
+          catalog = options[:catalog] || definition.catalog
+        end
 
         "plainto_tsquery(#{self.sanitize(catalog)}, #{self.sanitize(args.second)})"
       end

data/phat_pgsearch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phat_pgsearch}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marco Scholl"]
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/phatworx/phat_pgsearch}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{a postgresql based search plugin}
   s.test_files = [
     "spec/active_record_spec.rb",

data/spec/active_record_spec.rb

@@ -45,6 +45,22 @@ describe PhatPgsearch::ActiveRecord do
       @sample_header.save
     end
 
+    describe "#pgsearch with table-field in string" do
+      before { @pgsearch = SampleItem.pgsearch("sample_items.tsv", 'kommentar') }
+      subject { @pgsearch }
+      it "should do something" do
+        subject.to_a
+      end
+    end
+
+    describe "#pgsearch with field in string" do
+      before { @pgsearch = SampleItem.pgsearch("tsv", 'kommentar') }
+      subject { @pgsearch }
+      it "should do something" do
+        subject.to_a
+      end
+    end
+
     describe SampleItem do
       describe "#pgsearch :tsv, 'kommentar'" do
         before { @pgsearch = SampleItem.pgsearch(:tsv, 'kommentar') }

metadata

@@ -2,7 +2,7 @@
 name: phat_pgsearch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Marco Scholl
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1864774936392185091
+      hash: -2944819788268572641
       segments: 
       - 0
       version: "0"
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: a postgresql based search plugin