queryko 1.1.4 → 1.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5abee021e4a9e6e10f599c8d96f78c5b2790d515f91c672425542e5e830f0a94
-  data.tar.gz: b908d039c63428311f2801ae8b1144668188de4654407635e2d48504127354ff
+  metadata.gz: 11e57021d0bfe6379466a379cb14975b281f328683dbe7a33acbda07524e9dec
+  data.tar.gz: 614d9a1789c273a5a7ca00896f343ae55e1d79e802973793feff7eb0b044c66a
 SHA512:
-  metadata.gz: da10402916196e7302f9b577046f09a17a7670953608f0bf91f1b64af8265c7c5708ed59b9907d65b76017da376b2efe754957f7bc5f7085a7712011834224f1
-  data.tar.gz: a842ff4737ac477f374cc1cf2788fcfc9b716c5f0e3a624e6825d033fb1215925b35005d9e10d4d2b888ab0eff956f78562c64995b5591022ab7d806d5027046
+  metadata.gz: 9220fa20b26cf34c7e2db0ae2dc8a0db229d33cd970815f5d251f849be2661783c9c6400be27434fca0e40e0ea81e48348e7e2aacde16759c315cd39df9b63ee
+  data.tar.gz: a1f98bbc374decd1f572ddac4308c5a91faf5afca06a89e7f2716fb0efebe8d576aa9384d0de43ba75af2a24d3552d188ccb10c2e4a285a86a641901480c1110

data/.gitignore

@@ -10,3 +10,4 @@
 # rspec failure tracking
 .rspec_status
 .ruby-version
+sandbox

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    queryko (1.1.4)
+    queryko (1.2.0.beta)
       activerecord (>= 4.0)
       activesupport (>= 4.0)
 

data/lib/queryko/able.rb

@@ -0,0 +1,33 @@
+module Queryko
+  module Able
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.class_eval do
+        class_attribute :filters, default: {}, instance_writer: false
+        class_attribute :features, default: {}, instance_writer: false
+        class_attribute :fields, default: {}, instance_writer: false
+        self.filters = {}
+        self.features = {}
+        self.fields = {}
+
+        private
+      end
+    end
+
+    module ClassMethods
+      def feature(feature_name, filter, options = {})
+        # returns the feature if it exists
+        feat = self.features[feature_name.to_sym] ||= Queryko::Feature.new feature_name, self
+        self.filters[filter] ||= Array.new
+
+        # creates a filter
+        filt = feat.create_filter filter, options
+        self.filters[filter].push(filt)
+
+        # appends new field
+        self.fields[filt.field.to_sym] ||= Array.new
+        self.fields[filt.field.to_sym].push(filt)
+      end
+    end
+  end
+end

data/lib/queryko/after_attributes.rb

@@ -1,31 +1,15 @@
 module Queryko
   module AfterAttributes
-  def self.included(base)
-    base.extend(ClassMethods)
-    base.class_eval do
-      class_attribute :after_attributes, default: [], instance_writer: false
-      self.after_attributes = []
-
-      private
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
-      def filter_after_attributes
-        self.after_attributes.each do |attribute|
-          if params["after_#{attribute}".to_sym].present?
-            filter_after attribute
-          end
+    module ClassMethods
+      def add_after_attributes(*args)
+        args.each do |arg|
+          feature arg.to_sym, :after, as: "after_#{arg}"
         end
       end
-      def filter_after attribute
-        self.relation = relation.where("#{defined_table_name}.#{attribute} > ?", params["after_#{attribute}".to_sym])
-      end
     end
   end
-
-  module ClassMethods
-    def add_after_attributes(*args)
-      self.after_attributes ||= []
-      self.after_attributes += args
-    end
-  end
-end
 end

data/lib/queryko/feature.rb

@@ -0,0 +1,28 @@
+class Queryko::Feature
+  attr_reader :name, :filters, :query_object
+  def initialize(name, query_object)
+    @name = name
+    @query_object = query_object
+    @filters = {}
+  end
+
+  def add_filter(filter_name, options = {})
+    self.filters[filter_name] << create_filter(name, options)
+  end
+
+  def create_filter(filter_name, options = {})
+    case filter_name
+    when :after
+      result = filters[:after] ||= Queryko::Filters::After.new(options, self)
+    when :before
+      result = filters[:before] ||= Queryko::Filters::Before.new(options, self)
+    when :min
+      result = filters[:min] ||= Queryko::Filters::Min.new(options, self)
+    when :max
+      result = filters[:max] ||= Queryko::Filters::Max.new(options, self)
+    when :search
+      result = filters[:search] ||= Queryko::Filters::Search.new(options, self)
+    end
+    result
+ end
+end

data/lib/queryko/filterer.rb

@@ -0,0 +1,11 @@
+module Queryko
+  module Filterer
+    def filter_by_filters
+      fields.each do |field, filter|
+        # puts field
+        # puts filter, filter.first.class.name
+        self.relation = filter.first.perform(relation, params[field]) if params[field]
+      end
+    end
+  end
+end

data/lib/queryko/filters/after.rb

@@ -0,0 +1,11 @@
+require "queryko/filters/base"
+
+class Queryko::Filters::After < Queryko::Filters::Base
+  def intialize(options = {}, feature)
+    super options, feature
+  end
+
+  def perform(collection, token)
+    collection.where("\"#{table_name}\".\"#{column_name}\" > ?", token)
+  end
+end

data/lib/queryko/filters/base.rb

@@ -0,0 +1,22 @@
+module Queryko
+  module Filters
+    class Base
+      attr_reader :table_name, :column_name, :feature, :as, :field
+
+      def initialize(options = {}, feature)
+        @feature = feature
+        @table_name = options.fetch(:table_name) { @feature.query_object.defined_table_name }
+        @column_name = options.fetch(:column_name) { @feature.name }
+        @as = options[:as]
+      end
+
+      def field
+        @field ||= as || build_field_from_column
+      end
+
+      def build_field_from_column
+        "#{column_name}_#{self.class.name.split('::').last.underscore}"
+      end
+    end
+  end
+end

data/lib/queryko/filters/before.rb

@@ -0,0 +1,11 @@
+require "queryko/filters/base"
+
+class Queryko::Filters::Before < Queryko::Filters::Base
+  def intialize(options = {}, feature)
+    super options, feature
+  end
+
+  def perform(collection, token)
+    collection.where("\"#{table_name}\".\"#{column_name}\" < ?", token)
+  end
+end

data/lib/queryko/filters/max.rb

@@ -0,0 +1,11 @@
+require "queryko/filters/base"
+
+class Queryko::Filters::Max < Queryko::Filters::Base
+  def intialize(options = {}, feature)
+    super options, feature
+  end
+
+  def perform(collection, token)
+    collection.where("\"#{table_name}\".\"#{column_name}\" <= ?", token)
+  end
+end

data/lib/queryko/filters/min.rb

@@ -0,0 +1,16 @@
+require "queryko/filters/base"
+
+class Queryko::Filters::Min < Queryko::Filters::Base
+  def intialize(options = {}, feature)
+    super options, feature
+  end
+
+  def perform(collection, token)
+    collection.where("\"#{table_name}\".\"#{column_name}\" >= ?", token)
+  end
+
+
+  def build_field_from_column
+    "#{column_name}_min"
+  end
+end

data/lib/queryko/filters/search.rb

@@ -0,0 +1,28 @@
+require "queryko/filters/base"
+
+class Queryko::Filters::Search < Queryko::Filters::Base
+  attr_reader :cond, :token_format
+  def initialize(options = {}, feature)
+    @cond = options.fetch(:cond) { :like }
+    @token_format = options[:token_format] || '%token%'
+    super options, feature
+  end
+
+  def perform(collection, token)
+    query_cond, query_token = format_query_params(token)
+    table_property = "\"#{table_name}\".\"#{column_name}\""
+
+    collection.where("#{table_property} #{query_cond} ?", query_token)
+  end
+
+  def format_query_params(token)
+    @sql_cond ||= case cond.to_sym
+    when :like
+      ['LIKE', token_format.gsub('token', token)]
+    when :eq
+      ['=', token]
+    when :neq
+      ['IS NOT', token]
+    end
+  end
+end

data/lib/queryko/naming.rb

@@ -26,6 +26,10 @@ module Queryko
         # class names should be in plural form by default. No need to tableize
         klass.name.chomp('Query').split('::').last.underscore
       end
+
+      def inferred_model
+        inferred_from_class_name.last.singularize.constantize
+      end
     end
   end
 end

data/lib/queryko/query_object.rb

@@ -3,6 +3,8 @@ require "queryko/range_attributes"
 require "queryko/searchables"
 require "queryko/after_attributes"
 require "queryko/naming"
+require "queryko/able"
+require "queryko/filterer"
 
 module Queryko
   class QueryObject
@@ -10,6 +12,8 @@ module Queryko
     include Queryko::Naming
     include Queryko::RangeAttributes
     include Queryko::Searchables
+    include Queryko::Able
+    include Queryko::Filterer
     # include AfterAttributes
 
     def self.inherited(subclass)
@@ -18,7 +22,7 @@ module Queryko
     end
 
     def initialize(params = {}, rel)
-      @relation = @original_relation = rel
+      @relation = @original_relation = rel || inferred_model.all
       @params = params
     end
 
@@ -34,8 +38,7 @@ module Queryko
       @performed = true
       pre_filter
       filter
-      filter_by_range_attributes
-      filter_by_searchables
+      filter_by_filters
       @countable_resource = relation
     end
 
@@ -112,12 +115,11 @@ module Queryko
     end
 
     def by_ids
-      relation.where(id: params[:ids])
+      relation.where(id: params[:ids].split(','))
     end
 
     def since_id
-      relation.where("#{defined_table_name}.id > ?", params[:since_id])
+      relation.where("\"#{defined_table_name}\".\"id\" > ?", params[:since_id])
     end
-
   end
 end

data/lib/queryko/range_attributes.rb

@@ -2,38 +2,14 @@ module Queryko
   module RangeAttributes
     def self.included(base)
       base.extend(ClassMethods)
-      base.class_eval do
-        class_attribute :range_attributes, default: Array.new, instance_writer: false
-        self.range_attributes = []
-
-        private
-
-        def filter_by_range_attributes
-          self.range_attributes.each do |range_attribute|
-            self.relation = attribute_max("#{range_attribute}_max") if params["#{range_attribute}_max".to_sym]
-            self.relation = attribute_min("#{range_attribute}_min") if params["#{range_attribute}_min".to_sym]
-          end
-        end
-
-
-        def attribute_min key
-          # Calm down. column_name is whitelisted. check #add_range_attributes method
-          column_name = key.to_s.gsub(/_min$/, "")
-          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("#{defined_table_name}.#{column_name} <= ?", params[key.to_sym])
-        end
-      end
     end
 
     module ClassMethods
       def add_range_attributes(*args)
-        self.range_attributes ||= []
-        self.range_attributes += args
+        args.each do |arg|
+          feature arg.to_sym, :min
+          feature arg.to_sym, :max
+        end
       end
     end
   end

data/lib/queryko/searchables.rb

@@ -1,27 +1,15 @@
 module Queryko
   module Searchables
-  def self.included(base)
-    base.extend(ClassMethods)
-    base.class_eval do
-      class_attribute :searchables, default: Array.new, instance_writer: false
-      self.searchables = []
-
-      private
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
-      def filter_by_searchables
-        self.searchables.each do |searchable|
-          column = searchable.to_sym
-          self.relation = relation.where(column => params[column]) if params[column].present?
+    module ClassMethods
+      def add_searchables(*args)
+        args.each do |arg|
+          feature arg.to_sym, :search, as: arg.to_sym
         end
       end
     end
   end
-
-  module ClassMethods
-    def add_searchables(*args)
-      self.searchables ||= []
-      self.searchables += args
-    end
-  end
-end
 end

data/lib/queryko/version.rb

@@ -1,3 +1,3 @@
 module Queryko
-  VERSION = "1.1.4"
+  VERSION = "1.2.0.beta"
 end

data/lib/queryko.rb

@@ -1,5 +1,14 @@
 require "queryko/version"
 require "queryko/query_object"
+require "queryko/filters/base"
+require "queryko/filters/after"
+require "queryko/filters/before"
+require "queryko/filters/min"
+require "queryko/filters/max"
+require "queryko/filters/search"
+require "queryko/feature"
+require "queryko/able"
+require "queryko/filterer"
 module Queryko
   # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queryko
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0.beta
 platform: ruby
 authors:
 - Joseph Nelson Valeros
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -143,14 +143,22 @@ files:
 - bin/console
 - bin/setup
 - lib/queryko.rb
+- lib/queryko/able.rb
 - lib/queryko/after_attributes.rb
+- lib/queryko/feature.rb
+- lib/queryko/filterer.rb
+- lib/queryko/filters/after.rb
+- lib/queryko/filters/base.rb
+- lib/queryko/filters/before.rb
+- lib/queryko/filters/max.rb
+- lib/queryko/filters/min.rb
+- lib/queryko/filters/search.rb
 - lib/queryko/naming.rb
 - lib/queryko/query_object.rb
 - lib/queryko/range_attributes.rb
 - lib/queryko/searchables.rb
 - lib/queryko/version.rb
 - queryko.gemspec
-- sandbox/users_query.rb
 - test.html
 homepage: https://github.com/neume/queryko
 licenses:
@@ -167,9 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 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.6

data/sandbox/users_query.rb

@@ -1,20 +0,0 @@
-class UsersQuery
-  feature [:created_at, :updated_at, :deleted_at], filters: [
-    after: { as: -> (name) { "#{name}_after"}},
-    :before, :min, :max, search: { cond: :like, token_format: -> (token) { token.upcase }, as: :search_keyword}],
-    table_name: :users
-
-  feature :created_at, :search, cond: :like, token_format: '%token%'
-  feature :created_at, :min
-  feature :created_at, :max
-
-  feature :created_at, filters: [:after, :before, :min, :max, search: { cond: :like, token_format: '%token%', as: :q}]
-
-  feature :search, search: [{ column_name: :first_name, cond: :eq, token_format: 'token%'}]
-
-    # users.last_name ? ? OR users.name OR profiles.created_at
-
-  # def add_feature(name, options)
-  #   features[name] = Queryko::Feature.new(name, options, self)
-  # end
-end