pg_search 0.6.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e731121eded3c8c6fc307d432507be225d61134
+  data.tar.gz: a19f47bb6292573ae715b2b055805a4b9992825f
+SHA512:
+  metadata.gz: 74a646b6bcac56df197514459c42789b69f6862d14340184444cf8438b24d8847e226f4ae0d0a23e20c1409611417702e6f47a9f0c18fbcf67aa77e86bafc663
+  data.tar.gz: 6b546e771fe0b0c1f6970b0812d15c71c155cce162f4ccdd11c63e2f180b98e1e74d024b42f196a753b18c4c038d49ad4053effa53a11097ff5f9e8e45a53fc7

data/.travis.yml

@@ -19,6 +19,7 @@ matrix:
   allow_failures:
     - rvm: rbx-18mode
     - rvm: rbx-19mode
+    - rvm: jruby-19mode
     - env: ACTIVE_RECORD_VERSION="~> 4.0.0.beta1"
   exclude:
     - rvm: 1.8.7

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = PgSearch
 
+== 0.6.2
+
+* Add workaround for issue with how ActiveRecord relations handle Arel OR
+  nodes.
+
 == 0.6.1
 
 * Fix issue with Arel::InfixOperation that prevented #count from working,

data/lib/pg_search/scope_options.rb

@@ -36,7 +36,7 @@ module PgSearch
       config.features.map do |feature_name, feature_options|
         feature_for(feature_name).conditions
       end.inject do |accumulator, expression|
-        Arel::Nodes::Or.new(accumulator, expression)
+        Arel::Nodes::Or.new(accumulator, expression).to_sql
       end
     end
 

data/lib/pg_search/version.rb

@@ -1,3 +1,3 @@
 module PgSearch
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/integration/associations_spec.rb

@@ -426,4 +426,45 @@ describe PgSearch do
       results.should_not include(*excluded)
     end
   end
+
+  context "chained onto a has_many association" do
+    with_model :Company do
+      model do
+        has_many :positions
+      end
+    end
+
+    with_model :Position do
+      table do |t|
+        t.string :title
+        t.belongs_to :company
+      end
+
+      model do
+        include PgSearch
+        pg_search_scope :search, :against => :title, :using => [:tsearch, :trigram]
+      end
+    end
+
+    # https://github.com/Casecommons/pg_search/issues/106
+    it "should handle numbers in a trigram query properly" do
+      company = Company.create!
+      another_company = Company.create!
+
+      included = [
+        Position.create!(:company_id => company.id, :title => "teller 1")
+      ]
+
+      excluded = [
+        Position.create!(:company_id => nil, :title => "teller 1"),
+        Position.create!(:company_id => another_company.id, :title => "teller 1"),
+        Position.create!(:company_id => company.id, :title => "penn 1")
+      ]
+
+      results = company.positions.search('teller 1')
+
+      results.should include(*included)
+      results.should_not include(*excluded)
+    end
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_search
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.6.2
 platform: ruby
 authors:
 - Grant Hutchins
@@ -10,150 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   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: rdoc
   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: pry
   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: rspec
   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: with_model
   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: will_paginate
   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'
 description: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
@@ -224,27 +205,26 @@ files:
 homepage: https://github.com/Casecommons/pg_search
 licenses:
 - MIT
+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: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: PgSearch builds Active Record named scopes that take advantage of PostgreSQL's
   full text search
 test_files: