queryko 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b6fc3082f0af793f3662b64c9d8adb44011876052d3ad668df7ac6c3e091022
-  data.tar.gz: 46c52021042f4ee7fa94c414e7bc46ff8d864db23d22a59f75bf52a54f292f0f
+  metadata.gz: c7a137e9ef74fc1cb784fa9f67e9245bde68ff624adfd984e5ee2dc09439169c
+  data.tar.gz: 60df495dfd96bb8e25c2ec271f20eed65dc87883fb8f9519b812de8b35c65c04
 SHA512:
-  metadata.gz: 7c07e549329d0a33b30c35d331571ab02c81b88b7f87a7a7056ac6b39154cfe707ae552ed054c9287908ed2010b6b1142997840012f3c8eac69a7f77f5345e87
-  data.tar.gz: 87f949beb23627b5c1cda6d220269bb674234b589d7d61886e04b8f8ee095e923ede7b0a069340da87edc4272857063f2f194f0be24569c7632e0485db0cb156
+  metadata.gz: 110cc3fc4e8ccea70c773ff32efaba9af14883980d40af9f5a2d908aada62a460346bd41548a72437963ea626e1139c5af9252d4c1a6d996bc3790643b979e43
+  data.tar.gz: e4750c2293eae142af7b9f5bbddf8e5c94736468fa9a96cd949be4bdc5715377da645f9b2c472a3eb7f2e9b8d68a3c5b7b691faaef925b48c0087160ad289b92

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    queryko (1.0.2)
+    queryko (1.1.0)
       activerecord (>= 4.0)
-      activesupport
+      activesupport (>= 4.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,11 +1,15 @@
 [![Gem Version](https://badge.fury.io/rb/queryko.svg)](https://badge.fury.io/rb/queryko)
 # Queryko
-This gem provides additional functionality on your query objects. It will filter and paginate your query by supplying an option
+This gem provides additional functionality on your query objects. It will filter and paginate your query by supplying arguments directly from controller params
 
 ## Installation
-For now, it only works with kaminari
 ```ruby
+# Pagination
 gem 'kaminari'
+#or
+gem 'will_paginate'
+
+# Query Object
 gem 'queryko'
 ```
 
@@ -24,6 +28,8 @@ class ProductsQuery < Queryko::QueryObject
   add_range_attributes :created_at, :price
   add_searchables :name, :vendor
 
+  table_name 'my_products' # optional
+
   def initialize params={}, relation = Product.all
     super(params, relation)
   end
@@ -34,7 +40,13 @@ end
 Filter your query by appending `_min` or `_max` on your defined attributes. You can also filter searc3h by attribute.
 As long as you defined it in your query object definition.
 ``` ruby
+# Collection
 products = ProductsQuery.new(price_min: 100, price_max: 150, name: 'Milk').call
+products = ProductsQuery.new(since_id: 26).call
+
+# Count
+products = ProductsQuery.new(created_at_min: 'Jan 1, 2019').count
+products = ProductsQuery.new(name: 'Bag').count
 ```
 
 #### Object Methods

data/lib/queryko/after_attributes.rb

@@ -16,7 +16,7 @@ module Queryko
         end
       end
       def filter_after attribute
-        self.relation = relation.where("#{attribute} > ?", params["after_#{attribute}".to_sym])
+        self.relation = relation.where("'#{defined_table_name}'.'#{attribute}' > ?", params["after_#{attribute}".to_sym])
       end
     end
   end

data/lib/queryko/naming.rb

@@ -0,0 +1,31 @@
+module Queryko
+  module Naming
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.class_eval do
+        class_attribute :defined_table_name, default: :table, instance_writer: false
+        set_table_name
+
+        def table_name
+          self.defined_table_name
+        end
+      end
+    end
+
+    module ClassMethods
+      def set_table_name
+        self.defined_table_name = self.inferered_from_class_name
+      end
+
+      def table_name(name = nil)
+        return self.defined_table_name unless name
+        self.defined_table_name = name.to_s
+      end
+
+      def inferered_from_class_name
+        # class names should be in plural form by default. No need to tableize
+        self.class.name.chomp('Query').split('::').last.underscore
+      end
+    end
+  end
+end

data/lib/queryko/query_object.rb

@@ -2,11 +2,14 @@ require "active_support/core_ext/class/attribute"
 require "queryko/range_attributes"
 require "queryko/searchables"
 require "queryko/after_attributes"
+require "queryko/naming"
+
 module Queryko
   class QueryObject
     attr_reader :countable_resource
     include Queryko::RangeAttributes
     include Queryko::Searchables
+    include Queryko::Naming
     # include AfterAttributes
 
     def initialize(params = {}, rel)
@@ -90,7 +93,7 @@ module Queryko
     end
 
     def since_id
-      relation.where("id > ?", params[:since_id])
+      relation.where("'#{defined_table_name}'.'id' > ?", params[:since_id])
     end
 
   end

data/lib/queryko/range_attributes.rb

@@ -19,13 +19,13 @@ module Queryko
         def attribute_min key
           # Calm down. column_name is whitelisted. check #add_range_attributes method
           column_name = key.to_s.gsub(/_min$/, "")
-          relation.where("#{column_name} >= ?", params[key.to_sym])
+          relation.where("'#{defined_table_name}'.'#{column_name}' >= ?", params[key.to_sym])
         end
 
         def attribute_max key
           # Calm down. column_name is whitelisted. check #add_range_attributes method
           column_name = key.to_s.gsub(/_max$/, "")
-          relation.where("#{column_name} <= ?", params[key.to_sym])
+          relation.where("'#{defined_table_name}'.'#{column_name}' <= ?", params[key.to_sym])
         end
       end
     end

data/lib/queryko/version.rb

@@ -1,3 +1,3 @@
 module Queryko
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/queryko.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 	spec.add_dependency 'activerecord', '>= 4.0'
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", '>= 4.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queryko
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Joseph Nelson Valeros
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +143,7 @@ files:
 - bin/setup
 - lib/queryko.rb
 - lib/queryko/after_attributes.rb
+- lib/queryko/naming.rb
 - lib/queryko/query_object.rb
 - lib/queryko/range_attributes.rb
 - lib/queryko/searchables.rb