pg-searchable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf2e17acef704a8fd936d20b9716dace4e9f4319a26f8d72e4f4a79fa515bde
-  data.tar.gz: 8153451549b6fd494227f9c01377b0021241026188509778b2c3c430b087fa23
+  metadata.gz: 98b4ca6590b2d5fe5f93fd7d1aa02b4e0f893c8cfc599bffd25ef57d20eb5376
+  data.tar.gz: acdc3e6009e2e25583f88f5ec133df9a11948a2dda1d691162e2c5fa295f140d
 SHA512:
-  metadata.gz: 70964f08dad60214f6d87f7f5f2497ce7118ad92d3ced7df0d79bcf31435bb45d9d269ff096e700d27c840df4b67383435b1ef96978e6d95429756d9d5ab6e99
-  data.tar.gz: 4904c0b55c7c847f15a1f2b2097a684a577c3ae28d1380bd9fed5f290db3fc899e5b2e8fde7f26212e5a13921a1fb05228213e272683589ccf15e05718d157a3
+  metadata.gz: '0827967f7cfb2114b101d4f4125e7f28d26590f64bb26adde121053bb6b7515c7cb26ecc1deb9f73a21c242458f93ba31701ef199e73401c8f24d42e39089e41'
+  data.tar.gz: f2a20d8703128d5b0cb2af32e76eaedf2c7c6991ef425c5c9ab1de586105223b421fec90ff4deedf535383404a88b42602d055d3b5f42d02cd700f79f0644713

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 wyozi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -26,7 +26,7 @@ italian_pasta = Product.create!(name: "Italian pasta")
 rye_bread = Product.create!(name: "Rye bread")
 sushi = Product.create!(name: "Sour Sushi Itamae")
 
-# Basic options
+# Basic usage
 bread_condition = Product.search_name("bread")
 expect(Product.where(bread_condition)).to match_array [sour_bread, rye_bread]
 
@@ -36,12 +36,20 @@ expect(Product.where(ita_condition)).to match_array [italian_pasta, sushi]
 nonsour_condition = Product.search_name("!sour")
 expect(Product.where(nonsour_condition)).to match_array [italian_pasta, rye_bread]
 
-# Composing searches
+# Use Postgres built-in websearch
+ws_condition = Product.search_name("sushi or pasta", websearch: true)
+expect(Product.where(ws_condition)).to match_array [sushi, italian_pasta]
+
+# Composing basic searches
 non_sour_breads = Product.where(bread_condition.and(nonsour_condition))
 expect(non_sour_breads).to match_array [rye_bread]
 
 nonsour_or_ita = Product.where(nonsour_condition.or(ita_condition))
 expect(nonsour_or_ita).to match_array [rye_bread, italian_pasta, sushi]
+
+# Advanced options
+raw_condition = Product.search_name("sushi | pasta", raw: true)
+expect(Product.where(raw_condition)).to match_array [sushi, italian_pasta]
 ```
 
 ### Development

data/lib/pg-searchable/model.rb

@@ -24,15 +24,21 @@ module PgSearchable
         Arel::Nodes.build_quoted(:simple)
       end
   
-      def exec(column_name, query, raw:false, prefix:false)
+      def exec(column_name, query, raw:false, prefix:false, websearch:false)
         column_ref = "#{@model.quoted_table_name}.#{column_name}"
   
         vector = Arel::Nodes::NamedFunction.new(
           "to_tsvector",
           [dictionary, Arel.sql(column_ref)]
         )
+
+        opts = {
+          prefix: prefix,
+          raw: raw,
+          websearch: websearch
+        }
   
-        query = Builder.tsquery(query, prefix: prefix, raw: raw)
+        query = Builder.tsquery(query, opts)
   
         condition = Arel::Nodes::Grouping.new(
           Arel::Nodes::InfixOperation.new("@@", vector, query)
@@ -54,6 +60,21 @@ module PgSearchable
         x # TODO
       end
   
+      def self.tsquery(query, opts)
+        query_terms = query.split(" ").compact
+        tsq =
+          if query.blank?
+            Arel::Nodes.build_quoted("")
+          elsif opts[:raw] || opts[:websearch]
+            Arel::Nodes.build_quoted(query)
+          else
+            tsquery_for_terms(query_terms, prefix: opts[:prefix])
+          end
+  
+        fn_name = opts[:websearch] ? "websearch_to_tsquery" : "to_tsquery"
+        Arel::Nodes::NamedFunction.new(fn_name, [dictionary, tsq])
+      end
+  
       def self.tsquery_for_terms(terms, prefix:)
         terms = terms.map { |term| tsquery_term(term, prefix: prefix) }
         terms.inject do |memo, term|
@@ -90,20 +111,6 @@ module PgSearchable
           Arel::Nodes::InfixOperation.new("||", memo, Arel::Nodes.build_quoted(term))
         end
       end
-  
-      def self.tsquery(query, prefix:, raw:)
-        query_terms = query.split(" ").compact
-        tsq =
-          if query.blank?
-            Arel::Nodes.build_quoted("")
-          elsif raw
-            Arel::Nodes.build_quoted(query)
-          else
-            tsquery_for_terms(query_terms, prefix: prefix)
-          end
-  
-        Arel::Nodes::NamedFunction.new("to_tsquery", [dictionary, tsq])
-      end
     end
   end
 end

data/lib/pg-searchable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgSearchable
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/pg-searchable.gemspec

@@ -4,6 +4,8 @@ Gem::Specification.new do |gem|
   gem.authors = ["wyozi"]
   gem.name = "pg-searchable"
   gem.summary = "Simple full-text searching for Rails"
+  gem.homepage = "https://github.com/wyozi/pg-searchable"
+  gem.licenses = ["MIT"]
 
   gem.files = `git ls-files | grep -Ev '^(spec)'`.split("\n")
   gem.version = PgSearchable::VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg-searchable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - wyozi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 
@@ -22,6 +22,7 @@ files:
 - ".rspec"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - bin/local-docker-testing
 - config.ru
@@ -30,8 +31,9 @@ files:
 - lib/pg-searchable/model.rb
 - lib/pg-searchable/version.rb
 - pg-searchable.gemspec
-homepage: 
-licenses: []
+homepage: https://github.com/wyozi/pg-searchable
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []