where_any 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9757fc6639c9875f9ab31bcae335740807d9c9f63fe0765dea00b2775080efa3
-  data.tar.gz: 94089af17bba4a0b175b9cf23ce6d033eae826aa6c74f6f8086a891a3ed3359a
+  metadata.gz: 2660b55e57253d50a6351dfdefc6d71c799d16f3526dd08eda9a47b5673f6370
+  data.tar.gz: 68c89d9bb75abf508d7ea9acb17651533787c795d1db4342cfabae5fdbe74a88
 SHA512:
-  metadata.gz: 36d5778b3983606cda22f424715bfbfc324619fe275730571274a26aef99459cbffefa8994784ac1f5b97be1537cedcf357aae216eb5d0256fd895cc65950c1d
-  data.tar.gz: a5618216ea0d08d3e6a108bc3f8a78868ab6ecde769e7a32ee2d54503d92f3179dd2200cb1d17ab2857c79289296f1154ea5d8eeca9746e83b5df562ba880242
+  metadata.gz: 9fe3bed82bfed43c3e564651883fe1bee31f863e38cb3a3e76ebb3d62ff6146c9c91add1dfc707437ecfcd4dcbba7db590f1355c8ec21469d4bcbd39f864b398
+  data.tar.gz: e7e87fde492f824c7d4d4778beb2ee85cc8faf262cf539e68a1e0557875675162ce3429a4caf7afef7c313ca448d3d335d1c53e6d225036fea650ed415c117af

data/.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.1
+          ruby-version: 3.1.2
           bundler-cache: true
       - name: Rubocop
         run: bin/rubocop

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,4 +1,5 @@
 require:
+  - rubocop-performance
   - rubocop-rspec
 
 AllCops:
@@ -6,6 +7,9 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
 
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
+
 Layout/LineLength:
   Max: 120
 

data/Gemfile

@@ -4,8 +4,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in where_any_of.gemspec
 gemspec
-
-gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 1.23'
-gem 'rubocop-rspec', '~> 2.6'

data/bin/rspec

@@ -15,7 +15,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
 bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/bin/rubocop

@@ -15,7 +15,7 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
 bundle_binstub = File.expand_path('bundle', __dir__)
 
 if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+  if File.read(bundle_binstub, 300).include?('This file was generated by Bundler')
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.

data/lib/where_any/version.rb

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

data/lib/where_any.rb

@@ -42,10 +42,18 @@ module WhereAny
   def where_any(column, values)
     return none if values.blank?
 
+    if (includes_null = values.include?(nil))
+      values = values.compact
+      return where(column => nil) if values.empty?
+    end
+
     arel_column   = arel_table[column]
     any_of_values = Arel::Nodes::NamedFunction.new('ANY', [bind_array(column, values)])
 
-    where(arel_column.eq(any_of_values))
+    scope = where(arel_column.eq(any_of_values))
+    scope = scope.or(where(column => nil)) if includes_null
+
+    scope
   end
 
   # @param column [String, Symbol]
@@ -54,9 +62,17 @@ module WhereAny
   def where_none(column, values)
     return all if values.blank?
 
+    if (includes_null = values.include?(nil))
+      values = values.compact
+      return where.not(column => nil) if values.empty?
+    end
+
     arel_column   = arel_table[column]
     all_of_values = Arel::Nodes::NamedFunction.new('ALL', [bind_array(column, values)])
 
-    where(arel_column.not_eq(all_of_values))
+    scope = where(arel_column.not_eq(all_of_values))
+    scope = scope.where.not(column => nil) if includes_null
+
+    scope
   end
 end

data/where_any.gemspec

@@ -31,4 +31,10 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency 'activerecord', '>= 5.2.0', '< 8'
+
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.23'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.19'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: where_any
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Minty Fresh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,76 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.19'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Postgres ANY() and ALL() expressions for ActiveRecord.
 email:
 - 7896757+mintyfresh@users.noreply.github.com
@@ -42,7 +112,6 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -74,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Postgres ANY() and ALL() expressions for ActiveRecord.

data/Gemfile.lock

@@ -1,75 +0,0 @@
-PATH
-  remote: .
-  specs:
-    where_any (0.1.1)
-      activerecord (>= 5.2.0, < 8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.4.4)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.16.3)
-    parallel (1.21.0)
-    parser (3.0.3.2)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.2.0)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.23.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.6.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.23)
-  rubocop-rspec (~> 2.6)
-  where_any!
-
-BUNDLED WITH
-   2.2.17