active_hash_relation 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ba8d3aaed9463815f83717410dabf1d47fd2959
-  data.tar.gz: 14e4eea13e73d7f60ada9f9313a0739e3311fb0f
+  metadata.gz: a00b135d8162d8af7a2c6ae06cb0758685d966a3
+  data.tar.gz: bbcc1dd606649abd029ac56115debd1e1d505545
 SHA512:
-  metadata.gz: 608d20958f7fd3f37e121abbe57c7c4aa546af10112edcd27e47cbc05f0e702139e6cc23e3bced226c7af8eee354d886b779ffb7c7cd385b639d063c7609ad35
-  data.tar.gz: ebfd652d954d006b0fc13eb4b4b146f95dce213821d52a78f661f7b1a5a80f2a3a9f6723893c5440fae771526bbf45afb36348b47b8d329ef1b0f24db1c781d4
+  metadata.gz: 12a6921f13269ea6a38cd2c02f7315f4656c3f9321ff94a8e258dbb57af3309e83541ae436757d9e83a4d452ca3a34d74146ade783486ca476d23ef5bf64d561
+  data.tar.gz: c93ff9befda47f60fe7ce86f9fa287ad07c479a2d25cf2d8d842e8625045ffcce39d8831045cd7bb6c507949df1afe72e4d26755aa6d837d03b24a688f4b8db4

data/README.md

@@ -32,7 +32,7 @@ which might or might not be a security issue. If you don't like that check you c
 
 Add this line to your application's Gemfile:
 
-    gem 'active_hash_relation', '~> 1.3.0
+    gem 'active_hash_relation', '~> 1.4.1'
 
 And then execute:
 

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

data/lib/active_hash_relation/column_filters.rb

@@ -53,8 +53,8 @@ module ActiveHashRelation::ColumnFilters
     end
   end
 
-  def filter_text(resource, column, param)
-    return filter_string(resource, column, param)
+  def filter_text(resource, column, table_name, param)
+    return filter_string(resource, column, table_name, param)
   end
 
   def filter_date(resource, column, table_name, param)
@@ -201,7 +201,7 @@ module ActiveHashRelation::ColumnFilters
   end
   
   def null_filters(resource, table_name, column, param)
-    if param[:null] == true
+    if param[:null] == true || param[:null] == 'true' || param[:null] == 1 || param[:null] == '1'
       if @is_not
         resource = resource.where.not("#{table_name}.#{column} IS NULL")
       else
@@ -209,7 +209,7 @@ module ActiveHashRelation::ColumnFilters
       end
     end
     
-    if param[:null] == false
+    if param[:null] == false || param[:null] == 'false' || param[:null] == 0 || param[:null] == '0'
       if @is_not
         resource = resource.where.not("#{table_name}.#{column} IS NOT NULL")
       else

data/lib/active_hash_relation/filter_applier.rb

@@ -33,6 +33,9 @@ module ActiveHashRelation
 
         case c.type
         when :integer
+          if @model.defined_enums[c.name] && @model.defined_enums[c.name][@params[c.name]]
+            @params[c.name] = @model.defined_enums[c.name][@params[c.name]]
+          end
           @resource = filter_integer(@resource, c.name, table_name, @params[c.name])
         when :float
           @resource = filter_float(@resource, c.name, table_name, @params[c.name])

data/lib/active_hash_relation/version.rb

@@ -1,3 +1,3 @@
 module ActiveHashRelation
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/tests/numbers_spec.rb

@@ -137,6 +137,17 @@ describe ActiveHashRelation do
 
         expect(strip(query)).to eq expected_query.to_s
       end
+
+      it 'rails string enum' do
+        hash = {status: 'published'}
+
+        query = HelperClass.new.apply_filters(Micropost.all, hash).to_sql
+        expected_query = q(
+          "SELECT microposts.* FROM microposts WHERE (microposts.status = #{Micropost.statuses[:published]})"
+        )
+
+        expect(strip(query)).to eq expected_query.to_s
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_hash_relation
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Filippos Vasilakis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -209,6 +209,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _config.yml
 - active_hash_relation.gemspec
 - lib/active_hash_relation.rb
 - lib/active_hash_relation/aggregation.rb
@@ -359,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Simple gem that allows you to run multiple ActiveRecord::Relation using hash.