RubyGems - where_any - Versions diffs - 0.1.1 → 0.2.0 - Mend

where_any 0.1.1 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9757fc6639c9875f9ab31bcae335740807d9c9f63fe0765dea00b2775080efa3
-  data.tar.gz: 94089af17bba4a0b175b9cf23ce6d033eae826aa6c74f6f8086a891a3ed3359a
+  metadata.gz: 930a0740bda2d6e5ac5e38698b3d531e4017bbf49a6fa794289fbcdbc5ac4854
+  data.tar.gz: 44d486df6091aa20df8c27fcf58d28aa056af842b0ec913f7e417c29a711185b
 SHA512:
-  metadata.gz: 36d5778b3983606cda22f424715bfbfc324619fe275730571274a26aef99459cbffefa8994784ac1f5b97be1537cedcf357aae216eb5d0256fd895cc65950c1d
-  data.tar.gz: a5618216ea0d08d3e6a108bc3f8a78868ab6ecde769e7a32ee2d54503d92f3179dd2200cb1d17ab2857c79289296f1154ea5d8eeca9746e83b5df562ba880242
+  metadata.gz: 7136ed58fff6cb369e9ed58011923994472107fd6e5d02143f728aaea5741652463cdd8c2749472bdb569543e776346712968eea7e5c41d4f04a9586f645af2f
+  data.tar.gz: 973436a1caee3b0f06e2ba4ee67f3d55dd58fb845c9561dc05d118f4f17b9c570aa22a8f9aed958f89ffbd25e2f314671a88005809b2e42f2f503935b2dfa471

data/.github/workflows/main.yml CHANGED Viewed

@@ -1,18 +1,56 @@
 name: Ruby
-on: [push,pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+env:
+  RAILS_ENV: test
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.6.10
+          - 2.7.8
+          - 3.0.7
+          - 3.1.6
+          - 3.2.7
+          - 3.3.7
+          - 3.4.2
+    services:
+      postgres:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: where_any_test
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.1
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Rubocop
         run: bin/rubocop
       - name: RSpec
+        env:
+          PGHOST: localhost
+          PGPORT: 5432
+          PGUSER: postgres
+          PGPASSWORD: postgres
         run: bin/rspec

data/.gitignore CHANGED Viewed

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

data/.rubocop.yml CHANGED Viewed

@@ -1,11 +1,15 @@
 require:
+  - rubocop-performance
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   NewCops: enable
   SuggestExtensions: false
+Gemspec/DevelopmentDependencies:
+  EnforcedStyle: gemspec
 Layout/LineLength:
   Max: 120
@@ -19,3 +23,9 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
+RSpec/InstanceVariable:
+  Enabled: false
+RSpec/BeforeAfterAll:
+  Enabled: false

data/Gemfile CHANGED Viewed

@@ -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/README.md CHANGED Viewed

@@ -135,7 +135,7 @@ https://www.postgresql.org/docs/current/functions-subquery.html#FUNCTIONS-SUBQUE
 ## Development
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. Be aware that the test suite requires that PostgreSQL is installed and running locally. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).

data/Rakefile CHANGED Viewed

@@ -3,7 +3,14 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
+namespace :db do
+  task :prepare do
+    system('dropdb where_any_test --if-exists')
+    system('createdb where_any_test')
+  end
+end
+RSpec::Core::RakeTask.new(spec: 'db:prepare')
 require 'rubocop/rake_task'

data/bin/rspec CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/config/database.yml ADDED Viewed

@@ -0,0 +1,8 @@
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  prepared_statements: true
+test: &test
+  <<: *default
+  database: where_any_test

data/lib/where_any/version.rb CHANGED Viewed

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

data/lib/where_any.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -11,7 +11,8 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Postgres ANY() and ALL() expressions for ActiveRecord.'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/thriver/where_any'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = '>= 2.6.0'
   spec.metadata['allowed_push_host']     = 'https://rubygems.org/'
   spec.metadata['rubygems_mfa_required'] = 'true'
@@ -30,5 +31,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency 'activerecord', '>= 5.2.0', '< 8'
+  spec.add_dependency 'activerecord', '>= 5.2.0', '< 8.1'
+  spec.add_development_dependency 'concurrent-ruby'
+  spec.add_development_dependency 'pg', '~> 1.5'
+  spec.add_development_dependency 'psych', '~> 5'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.50.2'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.17.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.20.0'
 end

metadata CHANGED Viewed

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: where_any
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Minty Fresh
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +18,7 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +28,119 @@ dependencies:
         version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '8.1'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: psych
+  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'
+- !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.50.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.50.2
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.17.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.20.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.20.0
 description: Postgres ANY() and ALL() expressions for ActiveRecord.
 email:
 - 7896757+mintyfresh@users.noreply.github.com
@@ -42,13 +153,13 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
 - bin/rspec
 - bin/rubocop
 - bin/setup
+- config/database.yml
 - lib/where_any.rb
 - lib/where_any/version.rb
 - where_any.gemspec
@@ -59,7 +170,6 @@ metadata:
   rubygems_mfa_required: 'true'
   homepage_uri: https://github.com/thriver/where_any
   source_code_uri: https://github.com/thriver/where_any
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,15 +177,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Postgres ANY() and ALL() expressions for ActiveRecord.
 test_files: []

data/Gemfile.lock DELETED Viewed

@@ -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