active_flag 1.5.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2138875041460aa14daf08205e785d254a98de7480493ba02384b0e7532e46ec
-  data.tar.gz: 2d73e184d76e622527418ee6f7d631d94af443d0e64af90784d57e924eee7377
+  metadata.gz: 82f147cd96182a6ca152eac3fee6a96f96ece8d3c209430c25b65a3a2a9e77bc
+  data.tar.gz: 668c06b6d9d999e412dd5c69d3c9ce756940baea19be40d54d1434104abf01ee
 SHA512:
-  metadata.gz: d3df91d0240c5974605780a6a20adfbe251421b85232c12fd422bd222f42e5822cb4896aeb08ea6c9e0103cc451c80d6018a1dd0ef1eec4f43f19fc21b4890fd
-  data.tar.gz: 455b9ed794b025f0c05235f6163053938565c3762f053469a0c9f3855de83918460bced3b28ebfaa56f2ca77fc41f996ed114fe10e7f99b003a484d7f23e0682
+  metadata.gz: fde22cc83423b2cd35c3b1bc5755a34bf47808cfe0916c3e86488fdecdd28e1895fe6167af1e5cc941b214144e65141c22b46a0dfc409bef0de83a540c2a9537
+  data.tar.gz: eab5b8de5a932f52ee03d598bc37f45b69289390e3002dc33c9026ddbbb5e3d082a723b7acb5db45ea0f2cd56c767804bc141b8eefd6b983fecfb728c820b6be

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+name: ci
+on: [pull_request, push]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.3'
+          - '3.2'
+          - '3.1'
+          - ruby-head
+        rails_version:
+          - '7.2'
+          - '6.1'
+        exclude:
+          - ruby: '3.2'
+            rails_version: '6.1'
+          - ruby: '3.3'
+            rails_version: '6.1'
+          - ruby: ruby-head
+            rails_version: '6.1'
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.rails_version }}.gemfile
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler: true
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea

data/README.md

@@ -1,6 +1,6 @@
 # ActiveFlag - Bit array for ActiveRecord
 
-[![Build Status](https://travis-ci.org/kenn/active_flag.svg)](https://travis-ci.org/kenn/active_flag)
+![Build Status](https://github.com/kenn/active_flag/actions/workflows/ci.yml/badge.svg)
 
 Store up to 64 multiple flags ([bit array](https://en.wikipedia.org/wiki/Bit_array)) in a single integer column with ActiveRecord. From a UI standpoint, it can be used as a  multi-select checkbox storage.
 
@@ -43,6 +43,9 @@ Profile.languages.to_array(3)               #=> [:english, :spanish]
 
 # Scope methods
 Profile.where_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 > 0
+Profile.where_all_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 = 10
+Profile.where_not_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 = 0
+Profile.where_not_all_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 < 10
 Profile.languages.set_all!(:chinese)        #=> UPDATE "profiles" SET languages = COALESCE(languages, 0) | 4
 Profile.languages.unset_all!(:chinese)      #=> UPDATE "profiles" SET languages = COALESCE(languages, 0) & ~4
 ```
@@ -67,7 +70,8 @@ add_column :users, :languages, :integer, null: false, default: 0, limit: 8
 
 ## Query
 
-For a querying purpose, use `where_[column]` scope.
+For a querying purpose, use `where_[column]`, `where_all_[column]`,
+`where_not_[column]` and `where_not_all_[column]` scopes.
 
 ```ruby
 Profile.where_languages(:french)            #=> SELECT * FROM profiles WHERE languages & 8 > 0
@@ -79,12 +83,24 @@ Also takes multiple values.
 Profile.where_languages(:french, :spanish)  #=> SELECT * FROM profiles WHERE languages & 10 > 0
 ```
 
-By default, it searches with `or` operation, so the query above returns profiles that have either French or Spanish.
+By default, it returns profiles that have either French or Spanish.
 
-If you want to change it to `and` operation, you can specify:
+To get profiles that have both French and Spanish, use:
 
 ```ruby
-Profile.where_languages(:french, :spanish, op: :and) #=> SELECT * FROM profiles WHERE languages = 10
+Profile.where_all_languages(:french, :spanish) #=> SELECT * FROM profiles WHERE languages & 10 = 10
+```
+
+To get profiles that do not have either French or Spanish, use:
+
+```ruby
+Profile.where_not_languages(:french, :spanish) #=> SELECT * FROM profiles WHERE languages & 10 = 0
+```
+
+To get profiles that do not have both French and Spanish, use:
+
+```ruby
+Profile.where_not_all_languages(:french, :spanish) #=> SELECT * FROM profiles WHERE languages & 10 < 10
 ```
 
 ## Translation

data/gemfiles/5.0.gemfile

@@ -1,12 +1,5 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.0"
+gem 'activerecord', '~> 5.0.0'
 
-group :development, :test do
-  gem "bundler"
-  gem "rake"
-  gem "minitest"
-  gem "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/5.1.gemfile

@@ -1,12 +1,5 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.1"
+gem 'activerecord', '~> 5.1.1'
 
-group :development, :test do
-  gem "bundler"
-  gem "rake"
-  gem "minitest"
-  gem "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/5.2.gemfile

@@ -1,12 +1,5 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 5.2"
+gem 'activerecord', '~> 5.2.0'
 
-group :development, :test do
-  gem "bundler"
-  gem "rake"
-  gem "minitest"
-  gem "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/6.0.gemfile

@@ -1,12 +1,5 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "activerecord", "~> 6"
+gem 'activerecord', '~> 6.0.0'
 
-group :development, :test do
-  gem "bundler"
-  gem "rake"
-  gem "minitest"
-  gem "sqlite3"
-end
-
-gemspec :path => "../"
+gemspec path: '../'

data/gemfiles/6.1.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.0'
+
+gemspec path: '../'

data/gemfiles/7.0.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 7.0.0'
+
+gemspec path: '../'

data/lib/active_flag/version.rb

@@ -1,3 +1,3 @@
 module ActiveFlag
-  VERSION = '1.5.2'
+  VERSION = '2.0.0'
 end

data/lib/active_flag.rb

@@ -35,14 +35,31 @@ module ActiveFlag
 
       # Scopes
       define_singleton_method "where_#{column}" do |*args|
-        options = args.extract_options!
-        integer = active_flags[column].to_i(args)
-        column_name = connection.quote_table_name_for_assignment(table_name, column)
-        if options[:op] == :and
-          where("#{column_name} & #{integer} = #{integer}")
-        else
-          where("#{column_name} & #{integer} > 0")
-        end
+        integer, column_name = send("_where_#{column}", *args)
+        where("#{column_name} & #{integer} > 0")
+      end
+
+      define_singleton_method "where_all_#{column}" do |*args|
+        integer, column_name = send("_where_#{column}", *args)
+        where("#{column_name} & #{integer} = #{integer}")
+      end
+
+      define_singleton_method "where_not_#{column}" do |*args|
+        integer, column_name = send("_where_#{column}", *args)
+        where("#{column_name} & #{integer} = 0")
+      end
+
+      define_singleton_method "where_not_all_#{column}" do |*args|
+        integer, column_name = send("_where_#{column}", *args)
+        where("#{column_name} & #{integer} < #{integer}")
+      end
+
+      # utility method to extract parameters
+      define_singleton_method "_where_#{column}" do |*args|
+        return [
+          active_flags[column].to_i(args),
+          "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(column)}"
+        ]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_flag
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -87,8 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -100,6 +101,8 @@ files:
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
 - gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
+- gemfiles/7.0.gemfile
 - lib/active_flag.rb
 - lib/active_flag/definition.rb
 - lib/active_flag/railtie.rb
@@ -123,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Bit array for ActiveRecord

data/.travis.yml

@@ -1,11 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install: gem install bundler -v 1.16.2
-gemfile:
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.1.gemfile
-  - gemfiles/5.2.gemfile
-  - gemfiles/6.0.gemfile