wildsearcher 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69b532db7a71a9e4a6b4c34192ea9b32e7abd84
-  data.tar.gz: 9ea5664549fb2853c805809845a8526e9ec4256f
+  metadata.gz: 88f537d6cce32f90a38386610a57cb960cbfd521
+  data.tar.gz: ff6e97796a0db8ce2dcb4b3aa4a740a258620b82
 SHA512:
-  metadata.gz: 970196e6d1b48fdc967b9a39b3d8e2c86e158066e4a53d15fcb21d93a5913983d748d52538b547dec340f24be6ac81caeac03e54ca80885a684b8044714bc532
-  data.tar.gz: c126d1a84f775962db83362564d6efdc8fb0d946e678b4363c6bf4022e6e73ec0f52886c6c78c0407b414808d6b89f371f0c3e8e5efc122355d4420ac170ae3f
+  metadata.gz: b398f14d06f54626b98b5d51eff51f97bc9b25122674957ba6d43a0f7c5ff83e950d4753f5c7df7cc15f11a7d43e2191cba6fbe612171e68172bf5d141f72f8c
+  data.tar.gz: acf77fd3a8269aeca1209128cf75e01814717309ac5af3746e298c230484d4d5c4d958e243ebd7a05a1a56eac86021c979e8cbd54591688b09297608e9d2f472

data/README.md

@@ -1,6 +1,7 @@
-[![Build Status](https://travis-ci.org/vivekbisen/wildsearcher.svg)](https://travis-ci.org/vivekbisen/wildsearcher)
-[![Code Climate](https://codeclimate.com/github/vivekbisen/wildsearcher/badges/gpa.svg)](https://codeclimate.com/github/vivekbisen/wildsearcher)
 [![Gem Version](https://badge.fury.io/rb/wildsearcher.svg)](https://badge.fury.io/rb/wildsearcher)
+[![Code Climate](https://codeclimate.com/github/vivekbisen/wildsearcher/badges/gpa.svg)](https://codeclimate.com/github/vivekbisen/wildsearcher)
+[![Build Status](https://travis-ci.org/vivekbisen/wildsearcher.svg)](https://travis-ci.org/vivekbisen/wildsearcher)
+[![Dependency Status](https://gemnasium.com/vivekbisen/wildsearcher.svg)](https://gemnasium.com/vivekbisen/wildsearcher)
 [![Gem Downloads](https://img.shields.io/gem/dt/wildsearcher.svg)](https://rubygems.org/gems/wildsearcher) 
 
 # Wildsearcher

data/lib/wildsearcher.rb

@@ -1,7 +1,10 @@
 require "wildsearcher/version"
+require "wildsearcher/active_record_helper"
 require "active_record"
 
 module Wildsearcher
+  include ActiveRecordHelper
+
   def wildsearcher(params = {})
     field_array = params[:search_fields].to_s.split(",")
     term = params[:search_term].to_s.strip
@@ -10,35 +13,49 @@ module Wildsearcher
 
   def filter_records(search_fields: [], search_term: "")
     return default_scope if search_fields.empty? || search_term.blank?
+    check_missing_associations(search_fields)
     where(conditions(filter_fields(search_fields), search_term))
   end
 
   private def filter_fields(fields)
-    fields.keep_if do |f|
-      f.to_s.downcase.in? column_names
-    end
+    fields = add_table_name(fields)
+    fields.keep_if { |f| f.to_s.downcase.in?(joined_model_columns(fields)) }
   end
 
   private def conditions(fields, term)
     term = "%" + term.strip + "%" if db_like == "ILIKE"
-    [fields.map { |f| "cast(#{f} as text) #{db_like} ?" }.join(" OR ")] + ([term] * fields.count)
+    [fields.map { |f| "CAST(#{f} AS TEXT) #{db_like} ?" }.join(" OR ")] + ([term] * fields.count)
   end
 
-  private def default_scope
-    ::ActiveRecord::VERSION::MAJOR >= 4 ? all : scoped
+  private def joined_model_columns(search_fields)
+    @joined_model_columns ||= begin
+      extract_model_names(search_fields).flat_map do |model_name|
+        extract_column_names(model_name).map do |column_name|
+          "#{model_name.pluralize}.#{column_name}"
+        end
+      end
+    end
   end
 
-  private def db_like
-    case ::ActiveRecord::Base.connection.class.name.demodulize
-    when "PostgreSQLAdapter"
-      "ILIKE"
-    when "MysqlAdapter"
-      "LIKE"
-    else
-      raise NotImplementedError.new("Wildsearcher currently supports only Mysql and Postgresql.")
-    end
+  private def extract_model_names(fields)
+    fields.map { |f| f.split('.').first if f.to_s.include?('.') }.compact.uniq
+  end
+
+  private def extract_column_names(model_name)
+    model_name.classify.safe_constantize.try(:column_names).to_a
+  end
+
+  private def add_table_name(fields)
+    fields.map { |f| f.include?('.') ? f : (table_name + '.' + f) }
   end
 
+  private def check_missing_associations(search_fields)
+    extract_model_names(search_fields).map do |n|
+      unless table_name == n || reflect_on_association(n).present?
+        raise ActiveRecord::AssociationNotFoundError.new(new, n)
+      end
+    end
+  end
 end
 
 ::ActiveRecord::Base.extend(Wildsearcher)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wildsearcher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Vivek Bisen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 description: Filter your records for your rails app with one line change.
 email:
 - vivek@luther.edu