textacular 3.2.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c424e3436f89ec19e61d9f932a17fb2b4eaafae
-  data.tar.gz: 7d53e4d8a74f6948943a7db4c6e5dd4fce49ba30
+  metadata.gz: 7b88b1c0a51ee49341f51fe2c2c6010b7d929644
+  data.tar.gz: fbe37bec170667ee3b828aa8156bd16aab704919
 SHA512:
-  metadata.gz: b931560f6e448f9bd3c391641780816e130b3e48a9f5255bf6fdf19e1f4ba0e9994291d826908b5d5f910c543130613d48cb8120bdc7db7e932442c3bcb45821
-  data.tar.gz: 03b42bb0a6ee835d797596bb770de66881b759c43aa1c477b77080cb8d0c733bedd1185c2a3a0f8ab9d3a7d27aef769c9809d6ead794a9e18f89bca281a4d77b
+  metadata.gz: 484b15d62a5bb4e87b3a90766b80fe6bf76106b732d271669ced769abfbec8703388d18239262e4bb670371b7e7d8f98968f0d4315c2d0386e9d9c893a8078eb
+  data.tar.gz: 94c859fc1ba3d8d71c052daeac3b3056ac3a5de68c0c9bc5399c8b442d45e264ac32f7417edb742e94a39f34330c2a85221568f0c9c09d3a322aa1c446944c31

data/CHANGELOG.md

@@ -8,6 +8,7 @@
 * Fix search term escaping
 * Trigram installation migration only install extension if not installed yet.
 * Update the README to illustrate how to change the similarity threshold.
+* Remove deprecated dynamic search methods.
 
 ## 3.2.1
 

data/README.md

@@ -25,7 +25,7 @@ extending ActiveRecord with scopes making search easy and fun!
 
 ### Quick Start
 
-#### Rails 3 (or 4!)
+#### Rails 3, Rails 4 and Rails 5!
 
 In the project's Gemfile add
 

data/lib/textacular.rb

@@ -37,34 +37,6 @@ module Textacular
     assemble_query(similarities, conditions, exclusive)
   end
 
-  def method_missing(method, *search_terms)
-    return super if self.abstract_class?
-    if Helper.dynamic_search_method?(method, self.columns)
-      warn("You are using a dynamic Textacular search method #{method}. These methods are deprecated and will be removed at the next major version release. Please use the has syntax for basic_search and advanced_search.")
-      exclusive = Helper.exclusive_dynamic_search_method?(method, self.columns)
-      columns = exclusive ? Helper.exclusive_dynamic_search_columns(method) : Helper.inclusive_dynamic_search_columns(method)
-      metaclass = class << self; self; end
-      metaclass.__send__(:define_method, method) do |*args|
-        query = columns.inject({}) do |query, column|
-          query.merge column => args.shift
-        end
-        self.send(Helper.search_type(method), query, exclusive)
-      end
-      __send__(method, *search_terms, exclusive)
-    else
-      super
-    end
-  rescue ActiveRecord::StatementInvalid
-    super
-  end
-
-  def respond_to?(method, include_private = false)
-    return super if self.abstract_class?
-    Helper.dynamic_search_method?(method, self.columns) or super
-  rescue StandardError
-    super
-  end
-
   private
 
   def munge_exclusive_and_query(exclusive, query)
@@ -157,7 +129,7 @@ module Textacular
   end
 
   def select_values
-    if ActiveRecord::VERSION::MAJOR == 4
+    if ActiveRecord::VERSION::MAJOR >= 4
       all.select_values
     else
       scoped.select_values
@@ -181,55 +153,6 @@ module Textacular
       def normalize(query)
         query.to_s.gsub(/\s(?![\&|\!|\|])/, '\\\\ ')
       end
-
-      def method_name_regex
-        /^(?<search_type>((basic|advanced|fuzzy)_)?search)_by_(?<columns>[_a-zA-Z]\w*)$/
-      end
-
-      def search_type(method)
-        method.to_s.match(method_name_regex)[:search_type]
-      end
-
-      def exclusive_dynamic_search_columns(method)
-        if match = method.to_s.match(method_name_regex)
-          match[:columns].split('_and_')
-        else
-          []
-        end
-      end
-
-      def inclusive_dynamic_search_columns(method)
-        if match = method.to_s.match(method_name_regex)
-          match[:columns].split('_or_')
-        else
-          []
-        end
-      end
-
-      def exclusive_dynamic_search_method?(method, class_columns)
-        string_columns = class_columns.map(&:name)
-        columns = exclusive_dynamic_search_columns(method)
-        unless columns.empty?
-          columns.all? {|column| string_columns.include?(column) }
-        else
-          false
-        end
-      end
-
-      def inclusive_dynamic_search_method?(method, class_columns)
-        string_columns = class_columns.map(&:name)
-        columns = inclusive_dynamic_search_columns(method)
-        unless columns.empty?
-          columns.all? {|column| string_columns.include?(column) }
-        else
-          false
-        end
-      end
-
-      def dynamic_search_method?(method, class_columns)
-        exclusive_dynamic_search_method?(method, class_columns) or
-          inclusive_dynamic_search_method?(method, class_columns)
-      end
     end
   end
 end

data/lib/textacular/version.rb

@@ -1,5 +1,5 @@
 module Textacular
-  VERSION = '3.2.2'
+  VERSION = '4.0.0'
 
   def self.version
     VERSION

data/spec/textacular_spec.rb

@@ -259,77 +259,6 @@ RSpec.describe Textacular do
           end
         end
 
-        context "via dynamic method names" do
-          it "only exists prior to 4.0.0" do
-            current_version = Gem::Version.new(Textacular.version)
-
-            expect(current_version).to be < Gem::Version.new("4.0.0")
-          end
-
-          it "generates methods for each string column" do
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_title("Mario")
-            ).to eq([mario])
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_system("Saturn")
-            ).to eq([takun])
-          end
-
-          it "generates methods for each text column" do
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_description("platform")
-            ).to eq([mario])
-          end
-
-          it "generates methods for any combination of string and text columns" do
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_title_and_system("Mario", "NES")
-            ).to eq([mario])
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_system_and_title("Genesis", "Sonic")
-            ).to eq([sonic])
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_title_and_title("Mario", "Mario")
-            ).to eq([mario])
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_title_and_description("Man", "Brain")
-            ).to eq([mega_man])
-          end
-
-          it "generates methods for inclusive searches" do
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_system_or_title("Saturn", "Mega Man").to_set
-            ).to eq(Set.new([mega_man, takun]))
-          end
-
-          it "scopes consecutively" do
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_system("Genesis").advanced_search_by_title("Street Fighter")
-            ).to eq([sf_genesis])
-          end
-
-          it "generates methods for non-string columns" do
-            expect(
-              GameExtendedWithTextacular.advanced_search_by_id(mario.id)
-            ).to eq([mario])
-          end
-
-          it "works with #respond_to?" do
-            expect(GameExtendedWithTextacular).to respond_to(:advanced_search_by_system)
-            expect(GameExtendedWithTextacular).to respond_to(:advanced_search_by_title)
-            expect(GameExtendedWithTextacular).to respond_to(:advanced_search_by_system_and_title)
-            expect(GameExtendedWithTextacular).to respond_to(:advanced_search_by_system_or_title)
-            expect(GameExtendedWithTextacular).to respond_to(:advanced_search_by_title_and_title_and_title)
-            expect(GameExtendedWithTextacular).to respond_to(:advanced_search_by_id)
-
-            expect(GameExtendedWithTextacular).to_not respond_to(:advanced_search_by_title_and_title_or_title)
-          end
-
-          it "allows for 2 arguments to #respond_to?" do
-            expect(GameExtendedWithTextacular.respond_to?(:searchable_language, true)).to be_truthy
-          end
-        end
-
         context "after selecting columns to return" do
           it "doesn't fetch extra columns" do
             expect {
@@ -348,7 +277,7 @@ RSpec.describe Textacular do
 
           it "finds results" do
             expect(
-              GameExtendedWithTextacularAndCustomLanguage.advanced_search_by_title("harry")
+              GameExtendedWithTextacularAndCustomLanguage.advanced_search(title: "harry")
             ).to eq([harry_potter_7])
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textacular
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Ben Hamill
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -104,7 +104,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
@@ -114,7 +114,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '5.0'
 description: |-
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Textacular exposes full text search capabilities from PostgreSQL