fetcha 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e8c9c65052bf4b3c082ad8a2e43ed4f0fa8cac6
-  data.tar.gz: 3d389201efbcc9c6e791742121a76eb2673b2f7c
+  metadata.gz: 1ea5c94f089b86302eddd095696c7ff51108df79
+  data.tar.gz: ccc829a691707b987e8bea5f46dce014e8c17517
 SHA512:
-  metadata.gz: 7f131e308da5f23d5804987c7c3ca8cd42c7c470e651ee2523c65ee0c4510b02175dba5ed5a990c318adcca080976ff5d35c5f4fcdffe38a9549c94d2fe7df9e
-  data.tar.gz: 8defd0ec82fec37fa4b1b6c02241cba77c7458eca7393fdb11c0535a20b99fe2b63023cf7490a7971f329ea017c946683082ada55a6e7ab1a0fa3f0479d83c42
+  metadata.gz: e024c2b7dd68455f771184c8e93ed6254ecbafd5ebab15f17922913125d8348223cbcb49ae133e2531682d0eab29cfdd48929c2cfc98517cdf871f59014e7d7d
+  data.tar.gz: 9ddb62e973f8ec1670e7257c24b706acbd1949c74f4c6a2a391aafccc66577010f3b96ca97153f21f9bc6ca0d46fbe9f9556be5109eed03e5f3b32fcfd689148

data/fetcha.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency("activesupport", ">= 3.0.0")
+  spec.add_dependency("pg_search")
   
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fetcha.rb

@@ -34,6 +34,11 @@ module Fetcha
         }
     end
 
+    def fulltext_search_on(*fields)
+      include PgSearch
+      self.pg_search_scope :search_full_text, against: fields, using: { trigram: { threshold: 0.1 }, tsearch: { prefix: true } }
+    end
+
     def filterable_on(*fields)
       fields.each do |field|
         fetchable_opts[:filtering][field.to_s] = nil
@@ -59,7 +64,19 @@ module Fetcha
       datasource.send(query_scope) if (fetchable_opts[:scopes].include? query_scope.to_sym)
     end
 
-    def process_filtering(datasource, filters = {})
+    def process_filtering(datasource, filters)
+      if filters.is_a?(String)
+        full_text_filtering(datasource, filters)
+      else
+        hash_filtering(datasource, filters)
+      end
+    end
+
+    def full_text_filtering(datasource, filter)
+      datasource.search_full_text(filter)
+    end
+
+    def hash_filtering(datasource, filters = {})
       filter_opts = fetchable_opts[:filtering]
       includes = Set.new()
       
@@ -117,7 +134,6 @@ module Fetcha
       datasource.where("#{field} ilike ?", "%#{value}%")
     end
 
-
     def starts_with_filter(datasource, field, value)
       datasource.where("#{field} ilike ?", "#{value}%")
     end

data/lib/fetcha/version.rb

@@ -1,3 +1,3 @@
 module Fetcha
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcha
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-05 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: pg_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement