data_tables-responder 0.4.3 → 0.4.4rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6521ba0906582dd0c35d5a654f516ab46c1e906e7b55268c6b33b2cc3c0a0e
-  data.tar.gz: 58fb522483dc1af6bac2b7204326b17ebacecef2b94f5ebaa07be02ea6da4815
+  metadata.gz: 5faa27861eee2591709eae8eb5eb1b6e24a4e35b56bc6f03fa6edb5d53584094
+  data.tar.gz: 59dd8eec6c905047b663cc511cf704e9f2501b0d30ae9a3ae825de21594ba088
 SHA512:
-  metadata.gz: f1d283ac5f9e594b3fe56656d1b27f30f8cc3f3414fde80c6c19ee7cfb59ef8e40e0246d8c3e6bfa5c9c47f5d64eff337f7e6fe1d113a3f5b510eb92ea52c4de
-  data.tar.gz: 4210d07b780dfa981d6d5d532ade9eaa174f73bcbdcb8f41c65d8909d230589492ad969b699d88a137dab4b11a01e11a782068badd28cfc565a7ac83c2d71fe5
+  metadata.gz: 1fbb2fd0cda0f0870d40371275f9483ab6601296b63ccc21cb92d19974f250af9d81a89471b27d74e3bac17862759c66fd1d0314d80e5512751afd12f5349343
+  data.tar.gz: 0f09e4c09b931f285c05333dc9f77528b935d32edbd012794a2c6b514645c2f04e3134843490cc49e6de69f3cd3a5c1e0a394481aa4e7f5a69bf030e4d6f72f1

data/.travis.yml

@@ -22,21 +22,18 @@ addons:
   postgresql: 9.4
 
 rvm:
+  - 2.6
   - 2.5
   - 2.4
-  - 2.3
 
 gemfile:
-  - gemfiles/activerecord-5.1.Gemfile
-  - gemfiles/activerecord-5.0.Gemfile
   - gemfiles/activerecord-4.2.Gemfile
-  - gemfiles/activerecord-4.1.Gemfile
+  - gemfiles/activerecord-5.0.Gemfile
+  - gemfiles/activerecord-5.1.Gemfile
+  - gemfiles/activerecord-5.2.Gemfile
 
 matrix:
   exclude:
 
-  - rvm: 2.4
-    gemfile: gemfiles/activerecord-4.1.Gemfile
-
-  - rvm: 2.5
-    gemfile: gemfiles/activerecord-4.1.Gemfile
+  - rvm: 2.6
+    gemfile: gemfiles/activerecord-4.2.Gemfile

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Dale Stevens
+Copyright (c) 2019 Dale Stevens
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/data_tables-responder.gemspec

@@ -36,10 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'railties', rails_versions
 
   spec.add_development_dependency 'activerecord', rails_versions
-  spec.add_development_dependency 'pg', '~> 0'
-  spec.add_development_dependency 'pry-byebug', '~> 3'
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'combustion', '~> 0.7'
 
 end

data/gemfiles/activerecord-5.2.Gemfile

@@ -0,0 +1,3 @@
+eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
+
+gem 'activerecord', '~> 5.2.0'

data/lib/data_tables/modules/search.rb

@@ -49,12 +49,19 @@ module DataTables
 
       def search_by_type(model, column, query, &block)
         arel_column = model.arel_table[column]
-        result = case model.columns_hash[column.to_s]&.type
+        column_type = model.columns_hash[column.to_s]&.type
+
+        result = case column_type
         when :string
+          query = Array.wrap(query)
           # I'm pretty sure this is safe from SQL Injection
-          arel_column.matches("%#{query}%")
+          arel_column.matches_any(query.map { |q| "%#{q}%" })
         when :integer
-          value = query&.to_i and arel_column.eq(value)
+          query = Array.wrap(query)
+          arel_column.eq_any(query.map(&:to_i))
+        when :float
+          query = Array.wrap(query)
+          arel_column.eq_any(query.map(&:to_f))
         when :datetime
           datetime = Time.parse(query)
           range = (datetime-1.second)..(datetime+1.second)

data/lib/data_tables/responder/version.rb

@@ -1,5 +1,5 @@
 module DataTables
   module Responder
-    VERSION = '0.4.3'
+    VERSION = '0.4.4rc1'
   end
 end

data/spec/data_tables/responder_spec.rb

@@ -208,7 +208,7 @@ describe DataTables::Responder do
       expect(response_sql).to include('"comments".* FROM "comments"')
       expect(response_sql).to include('INNER JOIN "posts" ON "posts"."id" = "comments"."post_id"')
       expect(response_sql).to include('JOIN "users" ON "users"."id" = "posts"."user_id"')
-      expect(response_sql).to include('WHERE ("users"."email" ILIKE \'%foo@bar.baz%\')')
+      expect(response_sql).to include('"users"."email" ILIKE \'%foo@bar.baz%\'')
       expect(response_sql).to include('ORDER BY "users"."email" ASC')
       expect(response_sql).to include('LIMIT 10 OFFSET 0')
     end
@@ -244,7 +244,7 @@ describe DataTables::Responder do
       response_sql = response.to_sql
 
       expect(response.count).to eq(1)
-      expect(response_sql).to include('WHERE ("posts"."title" ILIKE \'%foo%\')')
+      expect(response_sql).to include('"posts"."title" ILIKE \'%foo%\'')
       expect(response_sql).to include('ORDER BY "posts"."title" ASC')
       expect(response_sql).to include('LIMIT 10 OFFSET 0')
     end

data/spec/data_tables/search_spec.rb

@@ -25,6 +25,13 @@ describe DataTables::Modules::Search do
           "searchable": true,
           "orderable": true,
           "search": { "value": "", "regex": false }
+        },
+        {
+          "data": "engagement_rate",
+          "name": "",
+          "searchable": true,
+          "orderable": true,
+          "search": { "value": "", "regex": false }
         }
       ],
       "draw": 3,
@@ -43,8 +50,9 @@ describe DataTables::Modules::Search do
     before(:each) do
       User.create(email: 'foo@bar.com')
       User.create(email: 'foo2@bar.com')
-      Post.create(title: 'foo', views: 4)
-      Post.create(title: 'bar', views: 3)
+      Post.create(title: 'foo', views: 4, engagement_rate: 0.5)
+      Post.create(title: 'bar', views: 3, engagement_rate: 1.0)
+      Post.create(title: 'baz', views: 2, engagement_rate: 2.0)
     end
 
     it 'integers' do
@@ -58,12 +66,57 @@ describe DataTables::Modules::Search do
 
       posts = dt_module.search
 
-      # expect{dt_module.search}.to_not raise_error()
       expect(posts.count).to eq(1)
       expect(posts[0].views).to eq(4)
 
     end
 
+    it 'integers for any of many values' do
+
+      complex_params[:columns][2][:search] = {
+        "value": ["4", "3", "1"],
+        "regex": false
+      }
+
+      dt_module = DataTables::Modules::Search.new(Post, Post.all, complex_params)
+
+      posts = dt_module.search
+
+      expect(posts.count).to eq(2)
+
+    end
+
+    it 'floats' do
+
+      complex_params[:columns][3][:search] = {
+        "value": ".5",
+        "regex": false
+      }
+
+      dt_module = DataTables::Modules::Search.new(Post, Post.all, complex_params)
+
+      posts = dt_module.search
+
+      expect(posts.count).to eq(1)
+      expect(posts[0].views).to eq(4)
+
+    end
+
+    it 'floats for any of many values' do
+
+      complex_params[:columns][3][:search] = {
+        "value": ["1", ".5", "1.5"],
+        "regex": false
+      }
+
+      dt_module = DataTables::Modules::Search.new(Post, Post.all, complex_params)
+
+      posts = dt_module.search
+
+      expect(posts.count).to eq(2)
+
+    end
+
     it 'strings' do
 
       complex_params[:columns][1][:search] = {
@@ -75,12 +128,26 @@ describe DataTables::Modules::Search do
 
       posts = dt_module.search
 
-      # expect{dt_module.search}.to_not raise_error()
       expect(posts.count).to eq(1)
       expect(posts[0].title).to eq('foo')
 
     end
 
+    it 'strings for any of many values' do
+
+      complex_params[:columns][1][:search] = {
+        "value": ["foo", "bar"],
+        "regex": false
+      }
+
+      dt_module = DataTables::Modules::Search.new(Post, Post.all, complex_params)
+
+      posts = dt_module.search
+
+      expect(posts.count).to eq(2)
+
+    end
+
     it 'uuids' do
 
       complex_params[:columns][0][:search] = {
@@ -92,7 +159,6 @@ describe DataTables::Modules::Search do
 
       users = dt_module.search
 
-      # expect{dt_module.search}.to_not raise_error()
       expect(users.count).to eq(1)
       expect(users[0].email).to eq('foo@bar.com')
 

data/spec/support/rails/db/schema.rb

@@ -12,7 +12,8 @@ ActiveRecord::Schema.define do
   create_table :posts, :force => true do |t|
     t.uuid :user_id
     t.string :title
-    t.integer :views # for testing integers
+    t.integer :views
+    t.float :engagement_rate
     t.timestamps
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4rc1
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -82,58 +82,58 @@ dependencies:
   name: pg
   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-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - data_tables-responder.gemspec
@@ -167,6 +167,7 @@ files:
 - gemfiles/activerecord-4.2.Gemfile
 - gemfiles/activerecord-5.0.Gemfile
 - gemfiles/activerecord-5.1.Gemfile
+- gemfiles/activerecord-5.2.Gemfile
 - lib/data_tables.rb
 - lib/data_tables/active_model_serializers/adapter.rb
 - lib/data_tables/active_model_serializers/adapter/meta.rb
@@ -207,12 +208,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Respond to DataTable requests.