make_model_searchable 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40b9aa918e683ff3a2c69064985c789c5aa32baa
-  data.tar.gz: c39755155c83ee41154df9d1bb30283684561f71
+  metadata.gz: 869edeb1e4a767676fe077bb8d00d291b887147c
+  data.tar.gz: 52989316f144003d1382cd8ad6d339a53ab50b06
 SHA512:
-  metadata.gz: e51507163e4ed61a46a496fc5efa113ea1156d2d8f4664a5292dd13c624e01f4dc6071b664f1dd563c5e0d6774b85f4018d97f0973f168eaeff46f2aac2d076f
-  data.tar.gz: 3d947d6e30df665dec40b6062c4da352cff128f25711ecdbd9c4d83a27d9c30cd769657a491b89cfdbaf4f227c4029071a32d1fabaf40523384adbdd682812a4
+  metadata.gz: 1d2618c99d9d70b8b3b7732329a0f2eed38083eab7b7fb41aff661299286ac27bee626038bc3dcfb09ce98844f47efcfa5835b1718bc1cb14ec56fd652eee9f0
+  data.tar.gz: 71de900ab1b4eeb9e92e4306e4523d1384b8eb0ff6cbbd4ce0a9dc24fbff9130340b02ffec1b3f6d8ee5079ab84c5e67ae45f0bf67ec468501445c83fdc2b252

data/lib/make_model_searchable.rb

@@ -2,6 +2,7 @@ require "make_model_searchable/version"
 require 'active_record'
 
 module MakeModelSearchable
+
 	def searchable_attributes(*options)
     options = options.collect{ |option| option.to_s }
     self.connection
@@ -17,10 +18,21 @@ module MakeModelSearchable
     self.instance_variable_set(:@selected_fields, valid_fields)
   end
 
-  def get_valid_fields(fields)
-    column_names = self.column_names
-    column_types = self.column_types
-    fields.reject { |element| !column_names.include?(element) or column_types[element].type != :string }
+  def get_valid_fields(options)
+    column_names = self.columns.map(&:name)
+    column_types = self.columns.map(&:type)
+    searchable_columns = []
+    if column_names.length == column_types.length
+      column_names.each_with_index do |column_name, index|
+        searchable_columns << column_name if column_types[index].to_sym == :string 
+      end
+    end
+    if searchable_columns.present?
+      options.select{ |option| searchable_columns.include?(option) }
+    else
+      options = []
+    end
+    options
   end
 
   module ClassMethods 
@@ -30,7 +42,6 @@ module MakeModelSearchable
         if search_term
           search_term = "%#{search_term.downcase}%"
           users = self.arel_table
-          # valid_fields = ["first_name", "last_name"]
           arel_node = Arel::Nodes::Node.new
           valid_fields.each_with_index do |val, index|
             if index == 0
@@ -48,30 +59,30 @@ module MakeModelSearchable
       end
     end
 
-    def get_valid_fields(fields)
-      column_names = self.column_names
-      column_types = self.column_types
-      fields.reject { |element| !column_names.include?(element) or column_types[element].type != :string }
-    end
+    # def get_valid_fields(fields)
+    #   column_names = self.columns.map(&:name)
+    #   column_types = self.columns.map(&:type)
+    #   fields.reject { |element| !column_names.include?(element) or column_types[element].type != :string }
+    # end
 
-    def get_join_fields(fields, associations)
-      # self.reflect_on_association(:emails).class_name.constantize.column_names
-      column_names = []
-      associations.each do |association_name|
-        # association_name
-        column_names << self.reflect_on_association(association_name).class_name.constantize.column_names
-      end
-      column_names.flatten!
-      column_names.uniq!
+    # def get_join_fields(fields, associations)
+    #   # self.reflect_on_association(:emails).class_name.constantize.column_names
+    #   column_names = []
+    #   associations.each do |association_name|
+    #     # association_name
+    #     column_names << self.reflect_on_association(association_name).class_name.constantize.column_names
+    #   end
+    #   column_names.flatten!
+    #   column_names.uniq!
 
-      fields.reject { |element| !column_names.include?(element) }
-    end
+    #   fields.reject { |element| !column_names.include?(element) }
+    # end
 
-    def get_valid_associations(associations)
-      associations.collect! { |assoc| assoc.to_sym }
-      association_names = self.reflect_on_all_associations.collect{|assoc| assoc.name  }
-      associations.reject { |element| !association_names.include?(element) }
-    end
+    # def get_valid_associations(associations)
+    #   associations.collect! { |assoc| assoc.to_sym }
+    #   association_names = self.reflect_on_all_associations.collect{|assoc| assoc.name  }
+    #   associations.reject { |element| !association_names.include?(element) }
+    # end
   end
   ActiveRecord::Base.extend MakeModelSearchable
 end

data/lib/make_model_searchable/version.rb

@@ -1,3 +1,3 @@
 module MakeModelSearchable
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/make_model_searchable.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "activerecord", '>= 3.0.0'
-  spec.add_development_dependency "activesupport", '>= 3.0.0'
+  spec.add_development_dependency 'activerecord', '~> 3.0', '>= 3.0.0'
+  spec.add_development_dependency 'activesupport', '~> 3.0', '>= 3.0.0'
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: make_model_searchable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - 8parth
@@ -14,6 +14,9 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -28,6 +34,9 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0