rad_core_rails 0.8.3 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '014856ac16f8d40063feb80c47e97120f02ddcf2f8a6717fad3472aefb6c0e4b'
-  data.tar.gz: d0ec03250fb3b8b868ce3694b3d029b86469563d9fede11fb8b34b690ea2fef5
+  metadata.gz: aee20fb677577f2bdbae21a0a002968a70e0f11c052580713f2538e0321252d4
+  data.tar.gz: fb22e9d2d70617d2b5acc150cda26f662a67b8b58d00dbf264507de870553d3d
 SHA512:
-  metadata.gz: 410ed03d6ddd007f220ce1ceeeea8cedc1a7df95b044d8417ed7d11a00579b8eb980befc9fc2fc81dde7131502dcba08bb1d462bb50a0fe34cf577be9e606a27
-  data.tar.gz: 4a1fe8b16e4bda9f0631624cd769d67610a67efbd6c59e012c0c68b13f8b50496fbc8e5e08a3a6c69a5280537bf30f77a0cd55064537253224950e577c587a02
+  metadata.gz: 36809f265234f02255bd581587a4e362f985e7eee3f1bf1e2d0dfcde1c1a90b6d4d9e32f20adb1cbbbd35e8e593b376c02b40fe1aacb7435affad55a54f59392
+  data.tar.gz: '08fea0c02b655b2e8f8ee15453d6bb42afe4e35eaed7461e9d16f06275646a8972e783e92c3290f5652ecd9dac29b7da6d695280280d3bd7237e31100f67554b'

data/Gemfile

@@ -5,9 +5,18 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in new_gem.gemspec
 gemspec
 
+gem "activesupport", '>= 4.2'
+gem "activemodel", '>= 4.2'
+gem "activerecord", '>= 4.2'
+gem "actionpack", '>= 4.2'
+gem "bundler", '>= 1.17.3'
+gem "rake"
+
 group :test do
   gem 'byebug'
   gem 'pg'
   gem 'database_cleaner-active_record'
-  gem "factory_bot_rails"
+  gem 'factory_bot_rails'
+  gem 'rspec-rails'
+  gem 'shoulda-matchers', '>= 4.0'
 end

data/lib/rad_core_rails/query_generator.rb

@@ -178,15 +178,37 @@ module RadCoreRails
         [str, args]
       end
 
-      def generate_model_clause(column_name, filter, optional_exclusion_clause = nil)
-        str = if optional_exclusion_clause.present? && filter[:option] == '!='
-                optional_exclusion_clause
-              else
-                # probably should fix this.
-                # somtimes we arent sending a filter option, so just default it to =
-                "(#{column_name} #{filter[:option] || '='} ANY(ARRAY[?]))"
-              end
-        args = [filter[:values]]
+      def generate_model_clause(column_name, filter, optional_exclusion_clause = nil, optional_blank_clause = nil)
+        if optional_exclusion_clause.present? && filter[:option] == '!='
+          str = optional_exclusion_clause
+          args = [filter[:values]]
+        elsif filter[:option] == '!!'
+          optional_blank_clause ||= "(#{column_name} IS NULL)"
+          str = optional_blank_clause
+          args = []
+        else
+          # probably should fix this.
+          # somtimes we arent sending a filter option, so just default it to =
+          str = "(#{column_name} #{filter[:option] || '='} ANY(ARRAY[?]))"
+          args = [filter[:values]]
+        end
+
+        [str, args]
+      end
+
+      def generate_string_clause(column_name, filter, optional_exclusion_clause = nil)
+        if optional_exclusion_clause.present? && filter[:option] == '!='
+          str = optional_exclusion_clause
+          args = [filter[:values]]
+        elsif filter[:option] == '!!'
+          str = "(#{column_name} IS NULL OR #{column_name} = '')"
+          args = []
+        else
+          # probably should fix this.
+          # somtimes we arent sending a filter option, so just default it to =
+          str = "(LOWER(TRIM(#{column_name})) #{filter[:option] || '='} ANY(ARRAY[?]))"
+          args = [filter[:values].map(&:strip).map(&:downcase)]
+        end
 
         [str, args]
       end
@@ -263,8 +285,13 @@ module RadCoreRails
       end
 
       def generate_zip_codes_clause(column_name, filter)
-        str = "(#{column_name} = ANY(#{zip_code_class.distance_query}))"
-        args = zip_code_class.distance_args(filter)
+        if filter[:option] != '!!'
+          str = "(#{column_name} = ANY(#{zip_code_class.distance_query}))"
+          args = zip_code_class.distance_args(filter)
+        elsif filter[:option] == '!!'
+          str = "(#{column_name} IS NULL OR #{column_name} = '')"
+          args = []
+        end
 
         [str, args]
       end
@@ -273,6 +300,9 @@ module RadCoreRails
         if filter[:option] == '!='
           str = "(SELECT NOT(#{column_name}::text[] && ARRAY[?]::text[]))"
           args = [filter[:values]]
+        elsif filter[:option] == '!!'
+          str = "(#{column_name}::text[] = '{}')"
+          args = []
         else
           str = "(SELECT (#{column_name}::text[] && ARRAY[?]::text[]))"
           args = [filter[:values]]

data/lib/rad_core_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RadCoreRails
-  VERSION = '0.8.3'
+  VERSION = '0.8.8'
 end

data/rad_core_rails.gemspec

@@ -27,18 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_dependency "rails", '>= 4.2'
-  spec.add_dependency "activesupport", '>= 4.2'
-  spec.add_dependency "activemodel", '>= 4.2'
-  spec.add_dependency "activerecord", '>= 4.2'
-
-  spec.add_development_dependency "actionpack", '>= 4.2'
-  spec.add_development_dependency "bundler", '>= 1.17.3'
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "factory_bot_rails"
-  spec.add_development_dependency "shoulda-matchers", '>= 4.0'
-  spec.add_development_dependency 'pg', '>= 0.19'
-  spec.add_development_dependency 'railties', '>= 5'
-  # spec.add_development_dependency "simplecov", '~> 0.17', '>= 0.18.5'
+  spec.add_dependency "activesupport"
+  spec.add_dependency "activemodel"
+  spec.add_dependency "activerecord"
 end

metadata

@@ -1,93 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: rad_core_rails
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.8
 platform: ruby
 authors:
 - Oleksandr Poltavets, James Marrs
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.17.3
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,13 +25,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,61 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description: RadCoreRails lib
 email:
 - sancho.ck@gmail.com