make_model_searchable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 991de978ccef72bc0863c5397700e2c296641b02
-  data.tar.gz: 94300071ad25d62ba74a4dbc895ee04d88b44f05
+  metadata.gz: 648050f19bf2182a6c7fd2831efb9abe048ed2d5
+  data.tar.gz: 5051a9071d1da32de090dc14679f4851b537df8a
 SHA512:
-  metadata.gz: 431aa130285c9c5a9506e495d9650d26976486cb506faca2dccaff74aa6988396f744565bdab584eb5ae98b55a1a4852a9e8f7d894f22cc9f20cbec54bfc7ecd
-  data.tar.gz: 3556cc7169598aadfae0ff9874ac01d31f852118439de5ddd41aa0df62c45b5bfc0ace18f56ed5a6135c8bdd42ea37e2607bd488a2a64ac1f0623b51d4b865c2
+  metadata.gz: 27a94d9a4c6269ce01dde0496f730dd3a960f525c7c69ec159a77faeee6606964ac6302da1a868265f6ac2f97215c68460cdacd4889bd7655890b796c91c56b3
+  data.tar.gz: 2ddb9171f8e56db3e78a9cb301ce1bfd560ddf83d169fa400d76de5e5130ad98b82277dff7233c9ee4d0f981ef5fffae8c3ad6f3db6e321f9884479b6c05a649

data/lib/make_model_searchable.rb

@@ -1,5 +1,6 @@
 require "make_model_searchable/version"
 require 'active_record'
+require 'models/searchable_field'
 
 module MakeModelSearchable
 
@@ -17,17 +18,17 @@ module MakeModelSearchable
   def setup_joined_fields(options_array)
     joined_fields = []
     association_names = self.reflect_on_all_associations.map(&:name)
-    valid_opts = options_array.first.select {|k,v| association_names.include?(k)}
-    if valid_opts
-      valid_opts.each do |key, val|
-        joined_fields << get_valid_joined_fields(key, val)
-      end
-      if joined_fields.present?
-        self.instance_variable_set(:@joined_fields, joined_fields.flatten)
+    valid_opts = options_array.first.select {|k,v| association_names.include?(k)  }
+    searchable_fields = []
+
+    valid_opts.each do |key, val|
+      assoc =  self.reflect_on_association(key)
+      joined_fields << get_valid_joined_fields(key, val)
+      joined_fields.flatten.each do |f|
+        searchable_fields << SearchableField.new(f.name, f.type, assoc.name,  assoc.klass)
       end
-    else
-      raise Exception.new,  "Please pass valid attributes for class: #{self.name}"
     end
+    self.instance_variable_set(:@joined_fields, searchable_fields.flatten) if searchable_fields.present?
   end
 
   def setup_fields(options)
@@ -84,19 +85,19 @@ module MakeModelSearchable
             end
           end
           join_table_names = []
+          
           if joined_fields.present?
             joined_fields.each do |field|
-              if field.respond_to? "table_name"
-                join_table_names << field.table_name.to_sym
-                associated_relation = self.reflect_on_association(field.table_name).klass.arel_table
-                if arel_node.present?
-                  arel_node = arel_node.or(associated_relation[field.name].lower.matches(search_term))
-                else
-                  arel_node = associated_relation[field.name].lower.matches(search_term)
-                end
+              associated_relation = field.associated_klass.arel_table
+              join_table_names << field.association_name
+              if arel_node.present?
+                arel_node = arel_node.or(associated_relation[field.name].lower.matches(search_term))
+              else
+                arel_node = associated_relation[field.name].lower.matches(search_term)
               end
             end
           end
+
           joins(join_table_names).where(arel_node)
         else
           all

data/lib/make_model_searchable/version.rb

@@ -1,3 +1,3 @@
 module MakeModelSearchable
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/models/searchable_field.rb

@@ -0,0 +1,10 @@
+class SearchableField
+	attr_accessor :name, :field_type, :association_name, :associated_klass
+	
+	def initialize(name, field_type, association_name, associated_klass)
+    @name = name
+    @field_type = field_type
+    @association_name = association_name
+    @associated_klass = associated_klass
+  end
+end

data/make_model_searchable.gemspec

@@ -29,10 +29,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'activerecord', '~> 4.0', '>= 4.0.0'
   spec.add_development_dependency 'activesupport', '~> 4.0', '>= 4.0.0'
-  spec.add_development_dependency 'sqlite3', '~> 0'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'rspec', '~> 0'
-  spec.add_development_dependency 'factory_girl', '~> 0'
-  spec.add_development_dependency 'pry', '~> 0'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'factory_girl'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_model_searchable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - 8parth
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -54,14 +54,14 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -96,42 +96,42 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Moduler solution to add search functionality for selected fields.
@@ -154,6 +154,7 @@ files:
 - bin/setup
 - lib/make_model_searchable.rb
 - lib/make_model_searchable/version.rb
+- lib/models/searchable_field.rb
 - make_model_searchable.gemspec
 homepage: https://github.com/8parth/make_model_searchable
 licenses: