api_queries 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1958a30567b647aa2bc495824621610186e7c5b44b20dd9608910ef36c255b7
-  data.tar.gz: 852282cd93676f3bd1aa6049e040ed9be527516b902f13c2751f8a9153e47f64
+  metadata.gz: 93b808894b70a8e924bcab8f3ff94c917bc8c0324e3f7b5a1befb57763e90e1d
+  data.tar.gz: 22c5ba0a71eecf4fc8bd3b79d8b5eaf1849c7b75c6faaee67d6eab572063f90e
 SHA512:
-  metadata.gz: e3e3c14fe9ebdbf0963cd38464840a8b2b7f3aed9b1455eb12220e54a7d286c09a181d0fe80ea5f238bed9afdc6c78b45a78baaffe725c1672067d9baa8c02dd
-  data.tar.gz: a72bc82ee0d9b79ccc3d7d333d1a8efbd7c6601c850cf4e78a4629f10c0893b399448481c56a4958cc8353e987be90e9bb6dd2599b20eb1465872d012b681d7c
+  metadata.gz: db8a65e84b463e4ce753fcfdac1887a75331298c047cb89f85631b3cb40cb69867972d6d74f60489ba09938e120331e0f74d8861293ee59104b192981ffb8e4a
+  data.tar.gz: 32395d8f1180d8825ccb67fbc7840753b400bbcccae02678c25ebc1ef81d8d82c4ecde313e85b75718fa0bf662bf5fa8b5c94788f66b46f52d431058157caac0

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 .rspec_status
-Guardfile
+Guardfile
+./rspec_status
+./builds/*.*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_queries (0.1.7)
+    api_queries (0.1.8)
       will_paginate (>= 3.0)
 
 GEM

data/lib/api_queries.rb

@@ -27,19 +27,22 @@ module ApiQueries
 
         # AFTER: updated_at > given_date
         if opts[:after].present?
-          conditions = ["#{opts[:column_date]} > ?", fdate(opts[:after])]
+          conditions = ["#{table_name}.#{opts[:column_date]} > ?", fdate(opts[:after])]
         # BEFORE: updated_at < given_date
         elsif opts[:before].present?
-          conditions = ["#{opts[:column_date]} < ?", fdate(opts[:before])]
+          conditions = ["#{table_name}.#{opts[:column_date]} < ?", fdate(opts[:before])]
         # FROM & TO: between "from date" to "to date"
         elsif opts[:from].present? && opts[:to].present?
-          conditions[opts[:column_date].to_sym] = (fdate(opts[:from])..fdate(opts[:to]))
+          # conditions[opts[:column_date].to_sym] = (fdate(opts[:from])..fdate(opts[:to]))
+          # conditions = ["#{self.table_name}.#{opts[:column_date]} >= ?"]
+          conditions = { table_name.to_sym => { opts[:column_date].to_sym => fdate(opts[:from])..fdate(opts[:to]) } }
+
         # FROM: updated_at >= given_date
         elsif opts[:from].present?
-          conditions = ["#{opts[:column_date]} >= ?", fdate(opts[:from])]
+          conditions = ["#{table_name}.#{opts[:column_date]} >= ?", fdate(opts[:from])]
         # TO: updated_at <= given_date
         elsif opts[:to].present?
-          conditions = ["#{opts[:column_date]} <= ?", fdate(opts[:to])]
+          conditions = ["#{table_name}.#{opts[:column_date]} <= ?", fdate(opts[:to])]
         end
       else
         raise Errors::UnknownColumn, 'Invalid value for column_date.' unless opts[:column_date] == 'updated_at'

data/lib/api_queries/version.rb

@@ -1,3 +1,3 @@
 module ApiQueries
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_queries
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nujian Den Mark Meralpis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate