istox 0.1.98 → 0.1.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b20425ff9b96da28ae9fdf1c6b47c7159df66d16b67d8e2fff99d8ed1d750312
-  data.tar.gz: a04b8779b0fa907bb8c58fcba28d26089836c1bfd6b055570d9222e57ebd530c
+  metadata.gz: 2485877c8909c883204a97adf7363c3c7a4448b2f6f8f1c057034164c9ffa0e3
+  data.tar.gz: 4f8a5c0c01e8023f52b0d14bf5022b04ed4d475919e9c1f0a81510e78e15948b
 SHA512:
-  metadata.gz: f44c23b065a529e8403bae9317316e34d2c41b91a33356b60cc816c5b25ce04b7096a3c1bbffae58097b4995541622011014f826c5c6c1a2515cf774b4613347
-  data.tar.gz: 8838d137671e85a48f18cd4b1d919bdd391f177e66ffcc64f97108dd014134a6d006e74bae944e1f2450b063225c7e71c2e66f5615741aa344d7ec6d705e2c73
+  metadata.gz: a113bf5ada59c04108ebd95c46b4d60bf24bbaa4f864dde10bf1a99c0c61d90e5ea528b163260bf074c2d684553ed60c7acb4d0319859ecf4edd00708c463b21
+  data.tar.gz: 86b2a11cc400ee880e0cf80c980f747a38928fbb400db37437fa4436eb993ac970da45c7351b9b1a91f5d217af808547d8c75996c3e771d1e0caed58f6ec5d79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.97)
+    istox (0.1.99)
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient

data/lib/istox/helpers/common_helper.rb

@@ -13,6 +13,10 @@ module Istox
       is_numeric ? Time.at(input.to_i).to_datetime : Time.parse(input)
     end
 
+    def self.to_boolean(input)
+      !(input.blank? || input.to_s.downcase == 'false' || input.to_s.downcase == '0')
+    end
+
     def self.to_open_struct(model)
       return nil if model.blank?
 

data/lib/istox/helpers/result_handler.rb

@@ -5,6 +5,9 @@ module Istox
       query = filter(query: query, meta: meta) unless exclude_filter
       query = order(query: query, meta: meta) unless exclude_order
 
+      # if never set limit, means no pagination is needed
+      return OpenStruct.new(data: query.all, pagination: nil) if meta.limit.blank? || meta.limit.zero?
+
       return paginate(query: query, meta: meta) unless exclude_paginate
 
       query
@@ -15,7 +18,8 @@ module Istox
 
       meta.filters.each do |filter|
         # chain the query with AND conditions
-        if filter.field.present?
+        # skip if there is no compare present, mean it is for inner filters
+        if filter.compare.present?
           validate_filter(filter)
           query = query.where("#{filter.field} #{transform_compare(filter.type, filter.compare)} ?",
                               transform_value(filter.type, filter.value))
@@ -23,7 +27,7 @@ module Istox
 
         next if filter.filters.blank?
 
-        # contains inner filters, chain the query with OR conditions
+        # contains inner filters, chain the query with AND condition but internally with OR condition
         columns = []
         values = []
         filter.filters.each do |inner_filter|
@@ -66,11 +70,11 @@ module Istox
         pagination: OpenStruct.new(
           page: current_page,
           limit: meta.limit,
-          previous_page: current_page - 1,
-          current_page: current_page,
-          next_page: current_page < page_count ? current_page + 1 : 0,
-          page_count: page_count,
-          total_count: total
+          previousPage: current_page - 1,
+          currentPage: current_page,
+          nextPage: current_page < page_count ? current_page + 1 : 0,
+          pageCount: page_count,
+          totalCount: total
         )
       )
     end
@@ -108,7 +112,9 @@ module Istox
       compare
     end
 
+    # rubocop:disable Metrics/PerceivedComplexity
     def self.transform_value(type, value)
+      # rubocop:enable Metrics/PerceivedComplexity
       return value if value.blank? || type.blank? || type.downcase == 'string'
 
       return 'NULL' if type.downcase == 'nullable' && %w[null true yes].include?(type.downcase)
@@ -119,6 +125,8 @@ module Istox
 
       return value.to_f if type.downcase == 'float'
 
+      return ::Istox::CommonHelper.to_boolean(value) if type.downcase == 'boolean'
+
       return ::Istox::CommonHelper.to_datetime(value) if type.downcase == 'date' || type.downcase == 'datetime'
     end
 

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.98'.freeze
+  VERSION = '0.1.100'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.98
+  version: 0.1.100
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny