textacular 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8a6ebc9cec369bbf3fea444970d281234f2805
-  data.tar.gz: ce91d4843d41ecf94ddc8dd1029ed9228d38b240
+  metadata.gz: 3bd98a4fec2d72714909b49059a7f8b50298d734
+  data.tar.gz: 9b3fc608d5192296392da8323048c65440146cbd
 SHA512:
-  metadata.gz: 318a0c57177384cf44d0080106a38b8e460b92b545ca98ccc3855964fb2d0a4dd7f9b2727f9b18b0285f6f6301f0fe35e506d0f9aa300e79e0c2b81cf0a75c83
-  data.tar.gz: 70a5011bcd8d2de558749b8d7a57f666db3c2fb90d6929a7f26cda05f1d241ff7752c356a75bc90063353b48720d7306b5e5602c6c3d6542d1b620e8deae0603
+  metadata.gz: 7e1cd1fdce05d21df1e9803ca0bd1db66fc18ba371a4980175824ad5c46df5eb1e4cfd1aed857e5cea384887734f7f563ce498cc860c8c8827873f669a9ca584
+  data.tar.gz: 6237664f59c95a81b48283b3f761289a8c63199c908fba347e3931be9f93c59f5be897c971434266a7d1a203dfc3aa11af217736ca2e3313cea180c73c0d16c3

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 5.1.0
+
+* ActiveRecord 5.2 compatibility by wrapping string queries with `Arel.sql()`
+* Adds latest Ruby, Rails and Postgres-dependencies to Travis.
+* Rewrite development migration code to support Rails 5.0-5.2.
+
 ## 5.0.0
 
 * ActiveRecord 5.1 compatibility

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'activerecord', '~> 5.2.x'

data/Rakefile

@@ -43,12 +43,22 @@ namespace :db do
 
     desc 'Run the test database migrations'
     task :up => :'db:connect' do
-      ActiveRecord::Migrator.up 'db/migrate'
+      migrations = if ActiveRecord.version.version >= '5.2'
+        ActiveRecord::Migration.new.migration_context.migrations
+      else
+        ActiveRecord::Migrator.migrations('db/migrate')
+      end
+      ActiveRecord::Migrator.new(:up, migrations, nil).migrate
     end
 
     desc 'Reverse the test database migrations'
     task :down => :'db:connect' do
-      ActiveRecord::Migrator.down 'db/migrate'
+      migrations = if ActiveRecord.version.version >= '5.2'
+        ActiveRecord::Migration.new.migration_context.migrations
+      else
+        ActiveRecord::Migrator.migrations('db/migrate')
+      end
+      ActiveRecord::Migrator.new(:down, migrations, nil).migrate
     end
   end
   task :migrate => :'migrate:up'

data/lib/textacular.rb

@@ -123,9 +123,9 @@ module Textacular
   def assemble_query(similarities, conditions, exclusive)
     rank = connection.quote_column_name('rank' + rand(100000000000000000).to_s)
 
-    select("#{quoted_table_name + '.*,' if select_values.empty?} #{similarities.join(" + ")} AS #{rank}").
+    select(Arel.sql("#{quoted_table_name + '.*,' if select_values.empty?} #{similarities.join(" + ")} AS #{rank}")).
       where(conditions.join(exclusive ? " AND " : " OR ")).
-      order("#{rank} DESC")
+      order(Arel.sql("#{rank} DESC"))
   end
 
   def select_values
@@ -151,7 +151,7 @@ module Textacular
   module Helper
     class << self
       def normalize(query)
-        query.to_s.gsub(/\s(?![\&|\!|\|])/, '\\\\ ')
+        query.to_s.gsub(/\s(?![\&\!\|])/, '\\\\ ')
       end
     end
   end

data/lib/textacular/migration_generator.rb

@@ -4,6 +4,7 @@ class Textacular::MigrationGenerator
   def initialize(filename, content)
     @filename = filename
     @content = content
+    @output_stream = nil
   end
 
   def generate_migration

data/lib/textacular/version.rb

@@ -1,5 +1,5 @@
 module Textacular
-  VERSION = '5.0.1'
+  VERSION = '5.1.0'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textacular
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Ben Hamill
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -103,20 +103,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 description: |-
   Textacular exposes full text search capabilities from PostgreSQL, extending
       ActiveRecord with scopes making search easy and fun!
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Textacular exposes full text search capabilities from PostgreSQL