active_flag 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ecbfa97d8afdcca992c0e0b77d09023b2c6dd8ede54fb43c9011e3ee559b0ec
-  data.tar.gz: ce658754f990281ffd1580a1d1e2816eee95321ccc114ef8ee71e78b5cb74f2f
+  metadata.gz: f0c50a1adb7f1144bb845ebe3495fbe228941a6d50260058ab4394a3c38000cb
+  data.tar.gz: 3a979d8a5bbcaea494b0b777517ba4874681bb7f55785b4baeeba69a3e6c5956
 SHA512:
-  metadata.gz: 2e6af3b01b495b285139924da98f99c81a56e523a9787938d3d3e074790e375bdf368546683606476a48194ddb828b54b383acea7e326de576a6904d1cfde580
-  data.tar.gz: 747ebe97bd1254bf34343e276b4b5fabd1b4ae4b12285f9dbcbf5c190fa8eef13c5e83f898aed071da9fa3f2f46671ca2ed950be17d4fa93150a7c3eeb035856
+  metadata.gz: c1a4fc979d15b430241681d90f6ec907694218155d1689f8205a0291714d14243b3df77d6f9ef9e1de805827f91beb7b43ccc6b83c492e319f01887fd9712557
+  data.tar.gz: 5845188ecbc52515197b2fb8ecd7277c4015f58a87a359de244fe9894bd173939942d22c0eb7552d003006fedab3aeb0381dfe50db4f360d6fa4d0947e8b1f84

data/.github/workflows/ci.yml

@@ -6,12 +6,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: ruby-head
-            rails_version: '7.2'
-          - ruby: '3.3'
-            rails_version: '7.2'
-          - ruby: '3.2'
-            rails_version: '7.2'
+          - ruby: '3.4'
+            rails_version: '8.0'
           - ruby: '3.1'
             rails_version: '7.2'
           - ruby: '3.1'
@@ -20,7 +16,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.rails_version }}.gemfile
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/active_flag.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'active_flag/version'
 
@@ -20,11 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activerecord', '>= 5'
-  spec.add_runtime_dependency 'logger'
-  spec.add_runtime_dependency 'mutex_m'
-  spec.add_runtime_dependency 'bigdecimal'
-  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'sqlite3', '< 2'
+  spec.add_development_dependency 'sqlite3'
 end

data/gemfiles/6.1.gemfile

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

data/gemfiles/7.2.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'activerecord', '~> 7.0.0'
+gem 'activerecord', '~> 7.2.0'
+gem 'sqlite3', '< 2'
 
 gemspec path: '../'

data/gemfiles/8.0.gemfile

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

data/lib/active_flag/definition.rb

@@ -5,8 +5,15 @@ module ActiveFlag
     def initialize(column, keys, klass)
       @column = column
       @keys = keys.freeze
-      @maps = Hash[keys.map.with_index{ |key, i| [key, 2**i] }].freeze
+      @maps = keys.map.with_index { |key, i| [key, 2**i] }.to_h.freeze
       @klass = klass
+      @scope = klass
+    end
+
+    def with_scope(scope)
+      dup.tap do |d|
+        d.instance_variable_set(:@scope, scope)
+      end
     end
 
     def humans
@@ -25,11 +32,13 @@ module ActiveFlag
     # http://stackoverflow.com/a/12928899/157384
 
     def set_all!(key)
-      @klass.update_all("#{@column} = COALESCE(#{@column}, 0) | #{@maps[key]}")
+      ensure_simple_scope!
+      @scope.update_all("#{@column} = COALESCE(#{@column}, 0) | #{@maps[key]}")
     end
 
     def unset_all!(key)
-      @klass.update_all("#{@column} = COALESCE(#{@column}, 0) & ~#{@maps[key]}")
+      ensure_simple_scope!
+      @scope.update_all("#{@column} = COALESCE(#{@column}, 0) & ~#{@maps[key]}")
     end
 
     def to_i(arg)
@@ -48,6 +57,17 @@ module ActiveFlag
 
   private
 
+    def ensure_simple_scope!
+      return unless @scope.is_a?(ActiveRecord::Relation)
+
+      extras = @scope.values.except(:where)
+      return if extras.values.all? {|value| value.nil? || (value.respond_to?(:empty?) && value.empty?) }
+
+      raise ArgumentError, "set_all!/unset_all! only support simple where scopes. " \
+                           "For complex queries, resolve to IDs first: " \
+                           "#{@klass.name}.where(id: scope.ids).#{@column}.set_all!(key)"
+    end
+
     # Human-friendly print on class level
     def human(key, options={})
       return if key.nil? # otherwise, key.to_s.humanize will return ""

data/lib/active_flag/railtie.rb

@@ -1,7 +1,7 @@
 module ActiveFlag
   if defined? Rails::Railtie
     class Railtie < Rails::Railtie
-      initializer 'active_flag.insert_into_active_record' do |app|
+      initializer 'active_flag.insert_into_active_record' do
         ActiveSupport.on_load :active_record do
           include ActiveFlag
         end

data/lib/active_flag/value.rb

@@ -54,5 +54,10 @@ module ActiveFlag
         super
       end
     end
+
+    def respond_to_missing?(symbol, include_private = false)
+      key = symbol.to_s.chomp('?').to_sym
+      @definition.keys.include?(key) || super
+    end
   end
 end

data/lib/active_flag/version.rb

@@ -1,3 +1,3 @@
 module ActiveFlag
-  VERSION = '2.0.3'
+  VERSION = '2.1.1'
 end

data/lib/active_flag.rb

@@ -29,10 +29,22 @@ 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)
+        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
+
+
       # Scopes
       define_singleton_method "where_#{column}" do |*args|
         integer, column_name = send("_where_#{column}", *args)
@@ -62,5 +74,13 @@ module ActiveFlag
         ]
       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

data/plan.md

@@ -0,0 +1,52 @@
+# active_flag v2.1.0 Cleanup Plan
+
+## Files to Modify
+
+### 1. `lib/active_flag/definition.rb`
+
+- `Hash[keys.map.with_index{...}]` → `keys.map.with_index{...}.to_h`
+
+### 2. `lib/active_flag/value.rb`
+
+- Add `respond_to_missing?` to match `method_missing` (so `respond_to?(:english?)` works)
+
+### 3. `lib/active_flag/railtie.rb`
+
+- Remove unused `|app|` block param
+
+### 4. `active_flag.gemspec`
+
+- Remove `# coding: utf-8` (unnecessary since Ruby 2.0)
+- `File.expand_path('../lib', __FILE__)` → `File.expand_path('lib', __dir__)`
+- Remove `logger` from dev deps (stdlib)
+- Remove `bundler` from dev deps (assumed)
+
+### 5. `test/load_fixtures.rb`
+
+- `File.dirname(__FILE__)` → `__dir__`
+
+### 6. `test/active_flag_test.rb`
+
+- Fix `assert @profile.languages, 0` → `assert_equal 0, @profile.languages.raw` (2 occurrences)
+- Add `test_respond_to` for `respond_to_missing?`
+
+### 7. `Rakefile`
+
+- `task :default => :test` → `task default: :test`
+
+### 8. `gemfiles/7.2.gemfile`
+
+- `~> 7.0.0` → `~> 7.2.0` (matches CI matrix)
+
+### 9. `lib/active_flag/version.rb`
+
+- Bump `VERSION = '2.0.3'` → `'2.1.0'`
+
+## Not Changing (would be breaking or adds implicit requirements)
+
+- `options={}` → `**options` in value.rb and definition.rb (breaking for positional hash callers)
+- `and` → `&&` in method_missing (needs rewrite, save for later)
+- Ruby/Rails version requirements (keep >= 5 for AR)
+- `s && @maps[...]` guard (protects against nil/false)
+- `map{...}.compact` → `filter_map` (requires Ruby 2.7+)
+- `bin/setup` noise (optional, leave as-is)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_flag
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2026-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,49 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mutex_m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bigdecimal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 description: Bit array for ActiveRecord
 email:
 - kenn.ejima@gmail.com
@@ -141,11 +85,13 @@ files:
 - bin/setup
 - gemfiles/6.1.gemfile
 - gemfiles/7.2.gemfile
+- gemfiles/8.0.gemfile
 - lib/active_flag.rb
 - lib/active_flag/definition.rb
 - lib/active_flag/railtie.rb
 - lib/active_flag/value.rb
 - lib/active_flag/version.rb
+- plan.md
 homepage: https://github.com/kenn/active_flag
 licenses: []
 metadata: {}