active_flag 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92070a4cfdecda2177518adcf91809607614849a64566c05361669b030775c27
-  data.tar.gz: 2f9cb34e47a8cce372521d22a8faca84befd100c2d2cf664e96c44565cd0966f
+  metadata.gz: 37791570bee7b350b62d7d547e466f53b5bd19fc864fae7f7955644d3eca38b7
+  data.tar.gz: 4546c4d82ac631c1dc6f014e8a6ca6041680a58e395f5b1d2148f2e7b4bda538
 SHA512:
-  metadata.gz: 2335c49a3c24629650c5bc197d577b2e3faaff940e0afde74f8c01d1d001329d1f094d0ba7bdb2df65480e10917ff6614e9b8bd2d598af9a664de9d0e6e491f8
-  data.tar.gz: a0f6a1a9ecce9dfb935300762b7baf77d3b37b08a8a3ef8ba74403e1ed3148681f3440269606f9c06d6f6e42e7f70ee14165f208b00fbf66df5017475aaadfc5
+  metadata.gz: 2efffbe31062bc874b31bdea68a33be717b81bb25e74d0ecc87c72b249ca9bac9d44ce228a699a84f00cda0cc913c82673380b7e5342cfd2c49f942c273a1076
+  data.tar.gz: 71f209ddce3c75c0939fdffacbfa2b3e506778f931a0f74b294acef0afe0c1993842ce9a07c9e14540c5af82c984af1d1a33546be3c608a40d58aa58803b08d4

data/.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.rails_version }}.gemfile
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/active_flag.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '>= 5'
+  spec.add_runtime_dependency 'activerecord', '>= 6.1'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'sqlite3'

data/lib/active_flag/version.rb

@@ -1,3 +1,3 @@
 module ActiveFlag
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/active_flag.rb

@@ -29,14 +29,17 @@ module ActiveFlag
       end
 
       # Reference to definition
-      define_singleton_method column.to_s.pluralize do
+      relation_method_name = column.to_s.pluralize
+      define_singleton_method relation_method_name do
         active_flags[column]
       end
 
       if respond_to?(:generated_relation_methods, true)
-        send(:generated_relation_methods).module_eval do
-          define_method column.to_s.pluralize do
-            klass.active_flags[column].with_scope(self)
+        unless relation_method_conflict?(relation_method_name)
+          send(:generated_relation_methods).module_eval do
+            define_method relation_method_name do
+              klass.active_flags[column].with_scope(self)
+            end
           end
         end
       end
@@ -44,32 +47,40 @@ module ActiveFlag
 
       # Scopes
       define_singleton_method "where_#{column}" do |*args|
-        integer, column_name = send("_where_#{column}", *args)
-        where("#{column_name} & #{integer} > 0")
+        integer, attribute = send("_where_#{column}", *args)
+        where((attribute & integer).gt(0))
       end
 
       define_singleton_method "where_all_#{column}" do |*args|
-        integer, column_name = send("_where_#{column}", *args)
-        where("#{column_name} & #{integer} = #{integer}")
+        integer, attribute = send("_where_#{column}", *args)
+        where((attribute & integer).eq(integer))
       end
 
       define_singleton_method "where_not_#{column}" do |*args|
-        integer, column_name = send("_where_#{column}", *args)
-        where("#{column_name} & #{integer} = 0")
+        integer, attribute = send("_where_#{column}", *args)
+        where((attribute & integer).eq(0))
       end
 
       define_singleton_method "where_not_all_#{column}" do |*args|
-        integer, column_name = send("_where_#{column}", *args)
-        where("#{column_name} & #{integer} < #{integer}")
+        integer, attribute = send("_where_#{column}", *args)
+        where((attribute & integer).lt(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)}"
+          arel_table[column]
         ]
       end
     end
+
+  private
+
+    def relation_method_conflict?(method_name)
+      name = method_name.to_sym
+      ActiveRecord::Relation.method_defined?(name) ||
+        ActiveRecord::Relation.private_method_defined?(name)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_flag
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-05 00:00:00.000000000 Z
+date: 2026-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement