pg_search_scope 0.1.7 → 0.1.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8f2ef54178f521230b95924c5bcfc66d39eec323
+  data.tar.gz: 18762a7573132d83971d7c6976216ed43a456908
+SHA512:
+  metadata.gz: 311674c09aeb714f86c22c42e59606d177ffa860b1a1c0165cf757bc2548b98403612de3cc97a38f7ab0d7dd6e682f3f1b2669b7bca6635a2a75de9409b56678
+  data.tar.gz: fd72df8d924704eff25d06388ac1015a08fee7ced54ddefb9e44e1265568cf86fcf26c71627a72d98c2f52f42c27af8b952d30f26bc451c2e798e3be47a66adb

data/README.md

@@ -1,6 +1,6 @@
-### PG Search Scope
+### PG Search Scope ;
 
-PostgreSQL full text search using Rails 3 scopes
+PostgreSQL full text search using Rails 3 and 4 scopes
 
 ## Basic usage
 
@@ -38,7 +38,7 @@ You can set additional search options:
 
     :rank_function - Ranking function. Valid values  are  'ts_rank' and 'ts_rank_cd'
 
-    :rank_columns - If you want to sort table by rank only by specific fields - input column names  hear
+    :rank_columns - If you want to sort table by rank only by specific fields - input column names here
 
 If you use `:language` option, you need to use the same option for `add_fulltext_index`
 
@@ -57,4 +57,4 @@ Examples:
 ## Copyright
 
 Copyright (c) 2011 Ivan Efremov, Ilia Ablamonov, Cloud Castle Inc.
-See LICENSE for details.
+See LICENSE for details.

data/lib/pg_search_scope/model_helper.rb

@@ -1,5 +1,7 @@
 module PgSearchScope
   module ModelHelper
+    SCOPE_METHOD = defined?(ActiveRecord) && ActiveRecord::VERSION::MAJOR > 3 ? :all : :scoped
+    
     DEFAULT_OPTIONS = {
             :as => nil,
             :wildcard => true,
@@ -33,7 +35,7 @@ module PgSearchScope
     #
     # * <tt>:language</tt> - Search language, e.g. 'simple' (without magic), 'english'
     # * <tt>:rank_function</tt> - Ranking function. Valid values  are  'ts_rank' and 'ts_rank_cd'
-    # * <tt>:rank_columns</tt> - If you want to sort table by rank only by specific fields - input column names  hear
+    # * <tt>:rank_columns</tt> - If you want to sort table by rank only by specific fields - input column names  here
     #
     # == Usage
     #
@@ -56,7 +58,8 @@ module PgSearchScope
         options = scope_options.merge(options || {})
         search_string ||= ''
 
-        terms = search_string.scan(/'*([\p{Lu}\p{Ll}\d\.'@]+)/u).map { |s, _| s.gsub /'/, "''" }
+        terms = search_string.scan(/([\p{Lu}\p{Ll}\d][\p{Lu}\p{Ll}\d\.'@]*)/u).map {|s,_| s.gsub /'/, "''"}
+
 
         if terms.present?
           prefix = arel_table.table_alias || arel_table.name
@@ -79,7 +82,7 @@ module PgSearchScope
 
           rank = "#{scope_options[:rank_function]}(#{rank_tsvector}, #{tsquery}, #{options[:normalization]})"
 
-          search_scope = scoped
+          search_scope = send(SCOPE_METHOD)
 
           if options[:select_rank]
             search_scope = search_scope.select("#{rank} #{scope_name}_rank")
@@ -96,4 +99,4 @@ module PgSearchScope
   end
 end
 
-ActiveRecord::Base.send :extend, PgSearchScope::ModelHelper
+ActiveRecord::Base.send :extend, PgSearchScope::ModelHelper

data/lib/pg_search_scope/version.rb

@@ -1,3 +1,3 @@
 module PgSearchScope
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_search_scope
 version: !ruby/object:Gem::Version
-  version: 0.1.7
-  prerelease: 
+  version: 0.1.9
 platform: ruby
 authors:
 - Ivan Efremov, Ilia Ablamonov, Cloud Castle Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -19,7 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -31,26 +30,25 @@ files:
 - pg_search_scope.gemspec
 homepage: https://github.com/cloudcastle/pg_search_scope
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: pg_search_scope
-rubygems_version: 1.8.21
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PostgreSQL full text search using Rails 3 scopes
 test_files: []