active_hash_relation 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe8ba7c48a6ff435dd220d2b66c7b8945ddd1234
-  data.tar.gz: 81dc900c0146cc62cc9ec4fbc4f8828e7f8c7292
+  metadata.gz: fd3f17dc4f8f76b811c90453a566ff8356baf769
+  data.tar.gz: 3a2d2ed0091644d391fc8402879220fbd936c624
 SHA512:
-  metadata.gz: 31444ceef4793296c4cc128dd530a5a58653d7117c38fd78d38878c46dcd2e37fbe462c2c5a20add24a29fda19de6097e9e07702c3136c96c7ba137c31e09e1d
-  data.tar.gz: eec6a91578af20681ff700208b0da56b056ecab33020568b6091e4777194227839985b092b0839a8b1f311df6a8e8474c3707c2e5be6bdb30bc381fecb7de201
+  metadata.gz: f37a7bd401b3c5609d125ffdd669bdf41c75fb5b8b8e5e8f879ec9c5dacf66088afb692dfb3ca1e994927be2375a2a08867b7078b59203985fb90ebfe0da3441
+  data.tar.gz: e749fe442aef147137ef82991b06f70a62cf600762c7f6be420696736fcc824b26f1830197a847bda7c9b4cdac90db5b713ca42013c6304fd1fb10d7d66e1cf1

data/README.md

@@ -69,7 +69,12 @@ You can apply a filter a column which is a primary key by value or using an arra
 
 #### Integer, Float, Decimal, Date, Time or Datetime/Timestamp
 You can apply an equality filter:
+
 * `{example_column: 500}`
+
+or using an array
+* `{example_column: [500, 40]}`
+
 or using a hash as a value you get more options:
 * `{example_column: {le: 500}}`
 * `{example_column: {leq: 500}}`
@@ -79,7 +84,7 @@ or using a hash as a value you get more options:
 Of course you can provide a compination of those like:
 * `{example_column: {geq: 500, le: 1000}}`
 
-The same api is for Date, Time or Datetime/Timestamp.
+The same api is for a Float, Decimal, Date, Time or Datetime/Timestamp.
 
 #### Boolean
 The boolean value is converted from string using ActiveRecord's `TRUE_VALUES` through `value_to_boolean` method.. So for a value to be true must be one of the following: `[true, 1, '1', 't', 'T', 'true', 'TRUE']`. Anything else is false. 
@@ -88,9 +93,16 @@ The boolean value is converted from string using ActiveRecord's `TRUE_VALUES` th
 
 #### String or Text
 You can apply an incensitive matching filter (currently working only for Postgres):
-* `{example_column: test}`
+* `{example_column: 'test'}` `#runs EXAMPLE_COLUMN = 'test'`
+* `{example_column: ['test', 'another test']}` `#runs EXAMPLE_COLUMN = 'test' OR EXAMPLE_COLUMN = 'another test'`
+
+or using a hash as a value you get more options:
+* `{example_column: {eq: 'exact value'}}` `#runs: EXAMPLE_COLUMN = 'test'`
+* `{example_column: {starts_with: 'exac'}}` `#runs: EXAMPLE_COLUMN LIKE 'test%'`
+* `{example_column: {ends_with: 'alue'}}` `#runs: EXAMPLE_COLUMN LIKE '%test'`
+* `{example_column: {like: 'ct_va}}` `#runs: EXAMPLE_COLUMN LIKE '%test%'`
 
-The above filter will search all records that include `test` in the `example_column` field. A better would be nice here, for instance, setting the search sensitive or insensitive, start or end with a string etch
+**Please note that ILIKE and especially LIKE are quite slow if you have millions of records in the db even with an index.**
 
 ### Limit
 A limit param defines the number of returned resources. For instance:

data/lib/active_hash_relation/column_filters.rb

@@ -4,10 +4,13 @@ module ActiveHashRelation::ColumnFilters
   end
 
   def filter_integer(resource, column, table_name, param)
-    if !param.is_a? Hash
-      return resource.where(column => param)
-    else
+    if param.is_a? Array
+      n_param = param.to_s.gsub("\"","'").gsub("[","").gsub("]","") #fix this!
+      return resource.where("#{table_name}.#{column} IN (#{n_param})")
+    elsif param.is_a? Hash
       return apply_leq_geq_le_ge_filters(resource, table_name, column, param)
+    else
+      return resource.where("#{table_name}.#{column} = ?", param)
     end
   end
 
@@ -21,10 +24,12 @@ module ActiveHashRelation::ColumnFilters
 
   def filter_string(resource, column, table_name, param)
     if param.is_a? Array
-      n_param = param.to_s.gsub("\"","'").gsub("[","").gsub("]","")
-      return resource = resource.where("#{table_name}.#{column} IN (#{n_param})")
+      n_param = param.to_s.gsub("\"","'").gsub("[","").gsub("]","") #fix this!
+      return resource.where("#{table_name}.#{column} IN (#{n_param})")
+    elsif param.is_a? Hash
+      return apply_like_filters(resource, table_name, column, param)
     else
-      return resource = resource.where("#{table_name}.#{column} ILIKE ?", "%#{param}%")
+      return resource.where("#{table_name}.#{column} = ?", param)
     end
   end
 
@@ -33,20 +38,26 @@ module ActiveHashRelation::ColumnFilters
   end
 
   def filter_date(resource, column, table_name, param)
-    if !param.is_a? Hash
-      resource = resource.where(column => param[column])
-    else
+    if param.is_a? Array
+      n_param = param.to_s.gsub("\"","'").gsub("[","").gsub("]","") #fix this!
+      return resource.where("#{table_name}.#{column} IN (#{n_param})")
+    elsif param.is_a? Hash
       return apply_leq_geq_le_ge_filters(resource, table_name, column, param)
+    else
+      resource = resource.where(column => param)
     end
 
     return resource
   end
 
   def filter_datetime(resource, column, table_name, param)
-    if !param.is_a? Hash
-      resource = resource.where(column => param[column])
-    else
+    if param.is_a? Array
+      n_param = param.to_s.gsub("\"","'").gsub("[","").gsub("]","") #fix this!
+      return resource = resource.where("#{table_name}.#{column} IN (#{n_param})")
+    elsif param.is_a? Hash
       return apply_leq_geq_le_ge_filters(resource, table_name, column, param)
+    else
+      resource = resource.where(column => param)
     end
 
     return resource
@@ -75,4 +86,27 @@ module ActiveHashRelation::ColumnFilters
 
     return resource
   end
+
+  def apply_like_filters(resource, table_name, column, param)
+    like_method = "LIKE"
+    like_method = "ILIKE" if param[:with_ilike]
+
+    if !param[:starts_with].blank?
+      resource = resource.where("#{table_name}.#{column} #{like_method} ?", "#{param[:starts_with]}%")
+    end
+
+    if !param[:ends_with].blank?
+      resource = resource.where("#{table_name}.#{column} #{like_method} ?", "%#{param[:ends_with]}")
+    end
+
+    if !param[:like].blank?
+      resource = resource.where("#{table_name}.#{column} #{like_method} ?", "%#{param[:like]}%")
+    end
+
+    if !param[:eq].blank?
+      resource = resource.where("#{table_name}.#{column} = ?", param[:eq])
+    end
+
+    return resource
+  end
 end

data/lib/active_hash_relation/version.rb

@@ -1,3 +1,3 @@
 module ActiveHashRelation
-  VERSION = "1.0.5"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash_relation
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Filippos Vasilakis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler