data_tables-responder 0.4.4rc1 → 0.5.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5faa27861eee2591709eae8eb5eb1b6e24a4e35b56bc6f03fa6edb5d53584094
-  data.tar.gz: 59dd8eec6c905047b663cc511cf704e9f2501b0d30ae9a3ae825de21594ba088
+SHA1:
+  metadata.gz: 973286b550d47b37f1ea777940f52f5dcaab7f36
+  data.tar.gz: b3ed8b4330f79dd2956558c0a139ce91697959a4
 SHA512:
-  metadata.gz: 1fbb2fd0cda0f0870d40371275f9483ab6601296b63ccc21cb92d19974f250af9d81a89471b27d74e3bac17862759c66fd1d0314d80e5512751afd12f5349343
-  data.tar.gz: 0f09e4c09b931f285c05333dc9f77528b935d32edbd012794a2c6b514645c2f04e3134843490cc49e6de69f3cd3a5c1e0a394481aa4e7f5a69bf030e4d6f72f1
+  metadata.gz: 4eefb2fada6a7bf4add8e1090a758f2819f3b769bcfafd489c65bfc07bef5407dde0f2904d4ac786ea2af6f5fd811df4e9f6cf1a08153d5f7f64141bcf8d4009
+  data.tar.gz: 90d762f1a69a0b726f843bb557278384f4628620b43bd20ea4e8cf777b2b774f7b8a210287fba055e40b5f3587ed190b9ca24e7c53ae0aa49dfeedf07abf2997

data/.travis.yml

@@ -2,38 +2,27 @@ language: ruby
 sudo: false
 
 cache: bundler
-
-before_install:
-  - gem update --system
-  - gem install bundler
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-
 script:
   - bundle exec rspec
 
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+after_success:
+  - bundle exec codeclimate-test-reporter
 
 addons:
-  postgresql: 9.4
+  postgresql: "9.4"
 
 rvm:
-  - 2.6
-  - 2.5
   - 2.4
+  - 2.3
 
 gemfile:
-  - gemfiles/activerecord-4.2.Gemfile
-  - gemfiles/activerecord-5.0.Gemfile
   - gemfiles/activerecord-5.1.Gemfile
-  - gemfiles/activerecord-5.2.Gemfile
+  - gemfiles/activerecord-5.0.Gemfile
+  - gemfiles/activerecord-4.2.Gemfile
+  - gemfiles/activerecord-4.1.Gemfile
 
 matrix:
   exclude:
 
-  - rvm: 2.6
-    gemfile: gemfiles/activerecord-4.2.Gemfile
+  - rvm: 2.4
+    gemfile: gemfiles/activerecord-4.1.Gemfile

data/Gemfile

@@ -7,6 +7,9 @@ group :test do
   # Generates coverage stats of specs
   gem 'simplecov'
 
+  # Publishes coverage to codeclimate
+  gem 'codeclimate-test-reporter'
+
   # Gives CircleCI more perspective on our tests
   gem 'rspec_junit_formatter'
 
@@ -16,4 +19,6 @@ group :test do
 
   gem 'combustion'
 
+  gem 'pg'
+
 end

data/{LICENSE → LICENSE.txt}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Dale Stevens
+Copyright (c) 2016 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/README.md

@@ -1,7 +1,8 @@
-[![Version      ](https://img.shields.io/gem/v/data_tables-responder.svg)](https://rubygems.org/gems/data_tables-responder)
+[![Version      ](https://img.shields.io/gem/v/data_tables-responder.svg?maxAge=2592000)](https://rubygems.org/gems/data_tables-responder)
 [![Build Status ](https://travis-ci.org/TwilightCoders/data_tables-responder.svg)](https://travis-ci.org/TwilightCoders/data_tables-responder)
 [![Code Climate ](https://api.codeclimate.com/v1/badges/5032242cc2798697105a/maintainability)](https://codeclimate.com/github/TwilightCoders/data_tables-responder/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/5032242cc2798697105a/test_coverage)](https://codeclimate.com/github/TwilightCoders/data_tables-responder/test_coverage)
+[![Test Coverage](https://codeclimate.com/github/TwilightCoders/data_tables-responder/badges/coverage.svg)](https://codeclimate.com/github/TwilightCoders/data_tables-responder/coverage)
+[![Dependencies ](https://gemnasium.com/badges/github.com/TwilightCoders/data_tables-responder.svg)](https://gemnasium.com/github.com/TwilightCoders/data_tables-responder)
 
 # DataTables::Responder
 

data/data_tables-responder.gemspec

@@ -29,17 +29,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib', 'spec']
 
   rails_versions = ['>= 4.1', '< 6']
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.1'
 
   spec.add_runtime_dependency 'active_model_serializers', '~> 0'
-  spec.add_runtime_dependency 'quick_count', '~> 0.1'
+  spec.add_runtime_dependency 'quick_count', ['>= 0.0.3', '< 0.1.0']
   spec.add_runtime_dependency 'railties', rails_versions
 
   spec.add_development_dependency 'activerecord', rails_versions
-  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 '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 'combustion', '~> 0.7'
 
 end

data/gemfiles/activerecord-4.1.Gemfile

@@ -1,4 +1,3 @@
 eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
 
 gem 'activerecord', '~> 4.1.0'
-gem 'pg', '~> 0.20.0'

data/gemfiles/activerecord-4.2.Gemfile

@@ -1,4 +1,3 @@
 eval_gemfile File.join(File.dirname(__FILE__), "../Gemfile")
 
 gem 'activerecord', '~> 4.2.0'
-gem 'pg', '~> 0.20.0'

data/lib/data_tables/modules/search.rb

@@ -49,19 +49,12 @@ module DataTables
 
       def search_by_type(model, column, query, &block)
         arel_column = model.arel_table[column]
-        column_type = model.columns_hash[column.to_s]&.type
-
-        result = case column_type
+        result = case model.columns_hash[column.to_s]&.type
         when :string
-          query = Array.wrap(query)
           # I'm pretty sure this is safe from SQL Injection
-          arel_column.matches_any(query.map { |q| "%#{q}%" })
+          arel_column.matches("%#{query}%")
         when :integer
-          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))
+          value = query&.to_i and arel_column.eq(value)
         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.4rc1'
+    VERSION = '0.5.0rc1'
   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('"users"."email" ILIKE \'%foo@bar.baz%\'')
+      expect(response_sql).to include('WHERE ("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('"posts"."title" ILIKE \'%foo%\'')
+      expect(response_sql).to include('WHERE ("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,13 +25,6 @@ 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,
@@ -50,9 +43,8 @@ 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, engagement_rate: 0.5)
-      Post.create(title: 'bar', views: 3, engagement_rate: 1.0)
-      Post.create(title: 'baz', views: 2, engagement_rate: 2.0)
+      Post.create(title: 'foo', views: 4)
+      Post.create(title: 'bar', views: 3)
     end
 
     it 'integers' do
@@ -66,57 +58,12 @@ 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] = {
@@ -128,26 +75,12 @@ 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] = {
@@ -159,6 +92,7 @@ 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,8 +12,7 @@ ActiveRecord::Schema.define do
   create_table :posts, :force => true do |t|
     t.uuid :user_id
     t.string :title
-    t.integer :views
-    t.float :engagement_rate
+    t.integer :views # for testing integers
     t.timestamps
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.4.4rc1
+  version: 0.5.0rc1
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -28,16 +28,22 @@ dependencies:
   name: quick_count
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -82,58 +88,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: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +165,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - data_tables-responder.gemspec
@@ -167,7 +173,6 @@ 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
@@ -205,14 +210,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Respond to DataTable requests.

data/gemfiles/activerecord-5.2.Gemfile

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