syto 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6afed86906556c9b2b7c0ca426763ab01d7c704863c3e1c33e5d73c5750643b1
-  data.tar.gz: 3590d320491b80c9d6d9828f5da5286fa2bc756ec891880a262167e9eb8ce610
+  metadata.gz: af0ab05e31639381af798d997f30b3ae2a9501eedea8e4dd957664470f220b34
+  data.tar.gz: 306a9a88c49031e7b7c51c35f3ad6be9cfa4db3ac2596b01d33a65380ad98893
 SHA512:
-  metadata.gz: 6dd6297c0f8554b70600dc17a6e9acb2879b4af14563e886dd21b0883a991cd03931c2376e67c2a9de8dd3187f6b4aeaeb9e51f0dfe17bbdb1ea1505e99a7be9
-  data.tar.gz: 82391c9e0819b8cc177cc8f595455cfc8df20f131be8662877f384446d4d8a0e1334dd9a13a857dc900245f2711b2614d7c6c85a58915a9eeab480b3024c5af6
+  metadata.gz: edb0033f9f3757b4269d0dd0b3ffdb638748c565c01727784df40041e6defa07658c3766ea98078233d8f32bdea6f9d2a5f88d1739bbea7d59f346c7411d842f
+  data.tar.gz: ad7e6e1dc71ff96a682c1196e4eb41bd18756b5e0e8b5c7961ad55eff53f36b897bf46939830f30a66d96f3a20aa91fba70c7a4aa99d1d44864d6b43285f969a

data/README.md

@@ -1,6 +1,6 @@
 # Syto
 
-Simple gem to filter data for ruby on rails models
+Simple and lightweight library to filter data for Ruby on Rails models
 
 ## Installation
 

data/lib/syto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syto
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/syto.rb

@@ -54,10 +54,16 @@ module Syto
     #
     # @param [Array] attrs_map
     #
-    def syto_attrs_map(*attrs_map)
+    def syto_filters_attrs_map(*attrs_map)
       @syto_attrs_map = attrs_map
     end
 
+    # Getter for @syto_attrs_map
+    #
+    def attrs_map
+      @syto_attrs_map
+    end
+
     # Filtering method
     #
     # @param [Hash] params
@@ -68,7 +74,7 @@ module Syto
       return all if params.blank? || params.empty?
 
       @filter_klass ||= Syto::Base
-      @filter_klass.new(self, all, params.symbolize_keys, @syto_attrs_map).perform
+      @filter_klass.new(self, all, params.symbolize_keys).perform
     end
   end
 
@@ -80,13 +86,12 @@ module Syto
     # @param [Class] base_class
     # @param [ActiveRecord::Relation] result
     # @param [Hash] params
-    # @param [Array] attrs_map
     #
-    def initialize(base_class, result, params, attrs_map)
+    def initialize(base_class, result, params)
       @base_class = base_class
       @result     = result
       @params     = params
-      @attrs_map  = attrs_map
+      @attrs_map  = (base_class.attrs_map || []) + (self.class.attrs_map || [])
     end
 
     def perform
@@ -98,7 +103,15 @@ module Syto
     end
 
     def extended_filters
-      puts '[WARNING] Filters not defined'
+      puts "[WARNING] Syto filters not defined for #{self.class.name}"
+    end
+
+    class << self
+      attr_reader :attrs_map
+
+      def filters_attrs_map(*attrs)
+        @attrs_map = attrs
+      end
     end
 
     private
@@ -145,11 +158,8 @@ module Syto
     end
 
     def filter_hash_options(attr, options)
-      if options.key?(:key)
-        filter_by_value attr, options
-      else
-        filter_by_range attr, options
-      end
+      filter_by_value attr, options if options.key?(:key)
+      filter_by_range attr, options if options.key?(:key_from) && options.key?(:key_to)
     end
 
     # Filter by single value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syto
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vadym Lukavyi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord