act_with_flags 0.2.4 → 3.1.1

data/act_with_flags.gemspec

@@ -1,28 +1,28 @@
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'act_with_flags/version'
+require "act_with_flags/version"
 
 Gem::Specification.new do |s|
-  s.name        = 'act_with_flags'
-  s.version     = ActWithFlags::VERSION
-  s.summary     = %(act_with_flags gem)
-  s.description = %(Handles flags in a Rails model instance)
-  s.authors     = ['Dittmar Krall']
-  s.email       = ['dittmar.krall@matique.de']
-  s.homepage    = 'http://matique.de'
+  s.name = "act_with_flags"
+  s.version = ActWithFlags::VERSION
+  s.summary = %(act_with_flags gem)
+  s.description = %(Handles flags/booleans in a Rails model instance)
+  s.authors = ["Dittmar Krall"]
+  s.email = ["dittmar.krall@matiq.com"]
+  s.homepage = "http://matiq.com"
 
-  s.license     = 'MIT'
-  s.platform    = Gem::Platform::RUBY
+  s.license = "MIT"
+  s.platform = Gem::Platform::RUBY
+  s.metadata["source_code_uri"] = "https://github.com/matique/act_with_flags"
 
-  s.files         = `git ls-files -z`.split("\x0")
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ['lib']
+  s.files = `git ls-files -z`.split("\x0")
+  s.require_paths = ["lib"]
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'appraisal'
-  s.add_development_dependency 'combustion'
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "appraisal"
+  s.add_development_dependency "combustion"
 
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "sqlite3"
 end

data/gemfiles/rails_6.0.gemfile

@@ -8,7 +8,8 @@ group :test do
   gem "observr"
   gem "rubocop", require: false
   gem "simplecov", require: false
-  gem "benchmark-ips"
+  gem "benchmark-ips", require: false
+  gem "ricecream", require: false
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0"
+
+group :test do
+  gem "observr"
+  gem "rubocop", require: false
+  gem "simplecov", require: false
+  gem "benchmark-ips", require: false
+  gem "ricecream", require: false
+end
+
+gemspec path: "../"

data/lib/act_with_flags/admin.rb

@@ -1,68 +1,26 @@
-# rubocop:disable all
 # frozen_string_literal: true
 
 class ActWithFlags::Admin
-
-  attr_reader :model
-  attr_reader :origin
-  attr_reader :delete_mask
+  attr_reader :model, :ranges
 
   def initialize(model)
+    @locations = {}
+    @clears = {}
+    @ranges = {}
     @model = model
-    @origin = :flags
-    @map = {}
-    @delete_mask = 0
-    @max_position = 512 - 1
     @boolean_hash = {}
-    [true,  'true',  1, '1'].each { |x| @boolean_hash[x] = true }
-    [false, 'false', 0, '0'].each { |x| @boolean_hash[x] = false }
+    [true, "true", 1, "1"].each { |x| @boolean_hash[x] = true }
+    [false, "false", 0, "0"].each { |x| @boolean_hash[x] = false }
   end
 
   def reset_model(model)
     initialize model
   end
 
-  def names
-    @map.keys.sort
-  end
-
   def to_boolean(value)
     res = @boolean_hash[value]
-    return res  unless res.nil?
+    return res unless res.nil?
 
     raise "invalid boolean <#{value}>"
   end
-
-  def origin=(name)
-    raise 'invalid update of origin'  unless @map.empty? || (origin == name)
-    @origin = name
-  end
-
-  def position(name)
-    pos = @map[name]
-    return pos  if pos
-
-    parent = self.model.superclass.act_with_flags
-    return parent.position(name)  if parent
-
-    raise "unknown flag '#{model}##{name}'"
-  end
-
-  def mask(*names)
-    names.inject(0) { |msk, name| msk | ( 1 << position(name) ) }
-  end
-
-  def add(name, pos)
-    values = @map.values
-    pos ||= (0..@max_position).detect { |i| !values.include?(i) }
-    raise "invalid position '#{name} @ #{pos}'"  unless pos
-    raise "name in use '#{name} @ #{pos}'"       if @map.key?(name)
-    raise "position in use '#{name} @ #{pos}'"   if @map.value?(pos)
-    @map[name] = pos
-  end
-
-  def add_to_delete_mask(name)
-    @delete_mask |= mask(name)
-  end
-
 end

data/lib/act_with_flags/clear.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class ActWithFlags::Admin
+  attr_reader :clears
+
+  def clear_at_save(*flags)
+    flags.each { |name| add_to_clear_mask(name) }
+    clears.each { |orig, mask|
+      before_save(orig, mask)
+    }
+    @clears = {}
+  end
+
+  private
+
+  def add_to_clear_mask(name)
+    _model, orig, _pos = location(name).values
+    mask = @clears[orig] || 0
+    mask |= 1 << position(name)
+    @clears[orig] = mask
+  end
+
+  def before_save(orig, mask)
+    model.class_eval %(
+      before_save do |row|
+        row.#{orig} &= ~#{mask}
+      end
+    ), __FILE__, __LINE__ - 4
+  end
+end

data/lib/act_with_flags/define.rb

@@ -1,16 +1,13 @@
-# rubocop:disable all
 # frozen_string_literal: true
 
 class ActWithFlags::Admin
-
-  def add_accessors(origin, accessor, mask)
-#p ["act_with_flags#add_accessors:", model, origin, accessor, mask]
+  def add_accessors(accessor, origin, mask)
     unless model.method_defined?(:act_with_flags)
       model.class_eval %(
         def act_with_flags
           #{model}.act_with_flags
         end
-      )
+      ), __FILE__, __LINE__ - 4
     end
 
     model.class_eval %(
@@ -19,7 +16,7 @@ class ActWithFlags::Admin
       end
 
       def #{accessor}?
-        raise "Uninitialized '#{model}.#{origin}'"  if #{origin}.nil?
+        raise "Uninitialized '#{model}.#{origin}'" if #{origin}.nil?
         if #{origin}.is_a?(String)
           flags = self.#{origin}.to_i
           !( flags & #{mask} ).zero?
@@ -29,9 +26,9 @@ class ActWithFlags::Admin
       end
 
       def #{accessor}=(value)
-        raise "Uninitialized '#{model}.#{origin}'"  if #{origin}.nil?
+        raise "Uninitialized '#{model}.#{origin}'" if #{origin}.nil?
         is_a_string = #{origin}.is_a?(String)
-        flags = is_a_string ? self.#{origin}.to_i : self.#{origin}
+        flags = self.#{origin}.to_i
         flags ||= 0
 
         result = self.act_with_flags.to_boolean(value)
@@ -44,36 +41,10 @@ class ActWithFlags::Admin
 
         result
       end
-    )
+    ), __FILE__, __LINE__ - 31
   end
 
   def remove_accessor(accessor)
     my_undef model, accessor, "#{accessor}?", "#{accessor}="
   end
-
-  def validate_accessor(*names)
-    names.each { |acc|
-      raise "redefining #{acc} rejected"  if model.method_defined?(acc)
-    }
-  end
-
-  def my_undef(*names)
-    names.each { |name|
-      model.class_eval %(
-        begin
-          undef #{name}
-        rescue
-        end
-      )
-    }
-  end
-
-  def before_save
-    model.class_eval %(
-      before_save do |row|
-        row.#{origin} &= ~row.class.act_with_flags.delete_mask
-      end
-    )
-  end
-
 end

data/lib/act_with_flags/flags.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+class ActWithFlags::Admin
+  Location = Struct.new(:model, :origin, :position)
+
+  attr_reader :locations
+
+  def mask(*flags)
+    return 0 if flags.empty?
+
+    res = mask2d(*flags)
+    raise "Mixing origins fails: #{flags}" unless res.length == 1
+
+    res.values.first
+  end
+
+  def mask2d(*flags)
+    res = {}
+    flags.each { |flag|
+      model, orig, pos = location(flag).values
+      idx = "#{model}##{orig}"
+      mask = res[idx] || 0
+      res[idx] = mask | (1 << pos)
+    }
+    res
+  end
+
+  def location(name)
+    location = @locations[name]
+    return location if location
+
+    parent = model.superclass.act_with_flags
+    return parent.location(name) if parent
+
+    raise "unknown flag '#{model}##{name}'"
+  end
+
+  private
+
+  def position(name)
+    location(name).position
+  end
+
+  def add_to_locations(flag, location)
+    who = "<#{flag}: #{location.origin}@#{location.position}>"
+    raise "name already used #{who}" if @locations.key?(flag)
+    bool = @locations.has_value?(location)
+    raise "position already used #{who}" if bool
+    @locations[flag] = location
+  end
+
+  def check_pos(model, origin, pos)
+    return pos if pos
+
+    max_position = -1
+    @locations.each { |name, location|
+      model2, orig2, pos2 = location.values
+      next unless model == model2 && origin == orig2
+
+      max_position = pos2 if pos2 > max_position
+    }
+
+    max_position + 1
+  end
+end

data/lib/act_with_flags/print.rb

@@ -1,44 +1,40 @@
-# rubocop:disable all
 # frozen_string_literal: true
 
 class ActWithFlags::Admin
-
   def to_s
     res = []
-    res << title('Variables')
-    res << variables(:origin, :boolean_hash)
-    res << variables(:delete_mask)
-
-    res << title('Flags sorted alfabetically')
-    @map.sort.each { |key, pos| res << "#{key}  #{position(key)}" }
+    res << title("Variables")
+    res << variables(:boolean_hash)
 
-    res << title('Flags sorted by position')
-    @map.sort.sort_by(&:last).each { |key, pos|
-      res << "#{key}  #{position(key)}"
+    res << blk("Flags sorted alfabetically") { |key, loc|
+      "#{key} #{loc}"
     }
-
-    res << title('Flags and mask; sorted alfabetically')
-    @map.sort.each { |key, pos|
-      res << "#{key}  #{sprintf('0x%08X', mask(key))}"
-    }
-
-    res << title('FLAG assignment; sorted alfabetically')
-    @map.sort.each { |key, pos|
-      res << "FLAG_#{key.upcase} = #{sprintf('0x%08X', mask(key))}"
+    res << blk("Flags and mask; sorted alfabetically") { |key, loc|
+      "#{key}  #{sprintf("0x%08X", mask(key))}"
     }
-
-    res << title('FLAG assignment; sorted by position')
-    @map.sort.sort_by(&:last).each { |key, pos|
-      res << "FLAG_#{key.upcase} = #{sprintf('0x%08X', mask(key))}"
+    res << blk("FLAG assignment; sorted alfabetically") { |key, loc|
+      "FLAG_#{key.upcase} = #{sprintf("0x%08X", mask(key))}"
     }
 
+    res << title("@ranges")
+    res << @ranges
+    res << title("@locations")
+    res << @locations
     res.flatten.join("\n")
   end
 
- private
+  private
+
   def title(msg)
-    sep = '#' * 10
-    ['', "#{sep} #{msg} #{sep}"]
+    sep = "#" * 10
+    ["", "#{sep} #{msg} #{sep}"]
+  end
+
+  def blk(legend, &block)
+    res = [title(legend)]
+    sorted = @locations.sort
+    sorted.each { |key, loc| res << block.call(key, loc) }
+    res
   end
 
   def variables(*names)
@@ -47,5 +43,4 @@ class ActWithFlags::Admin
       "#{name} #{value}"
     }
   end
-
 end

data/lib/act_with_flags/utils.rb

@@ -1,16 +1,22 @@
-# rubocop: disable all
+# frozen_string_literal: true
 
 class ActWithFlags::Admin
-
-  def add_accessor(name, pos)
-#p "** act_with_flags: add_accessor '#{name} @ #{pos}'"
+  def add_flag(name, pos, origin)
+    range = ranges[origin]
     accessor = name.to_sym
     validate_accessor accessor, "#{accessor}?", "#{accessor}="
 
-    add accessor, pos
+    pos = check_pos(model, origin, pos)
+    msg = "Invalid position <#{pos}>"
+    raise(ArgumentError, msg) unless pos.is_a?(Integer)
+    raise(ArgumentError, msg) unless pos >= 0
+    loc = Location.new(model, origin, pos)
+    add_to_locations accessor, loc
+
+    validate_position(range, pos)
+
     mask = mask(accessor)
-    origin = self.origin
-    add_accessors(origin, accessor, mask)
+    add_accessors(accessor, origin, mask)
   end
 
   def add_mask_et_all(origin)
@@ -33,19 +39,41 @@ class ActWithFlags::Admin
         mask = self.class.act_with_flags.mask(*names)
         ( self.#{origin} & mask ).zero?
       end
-    )
-  end
-
-  def delete_mask_et_all
-    my_undef :flags_mask, :flags_any?, :flags_all?, :flags_none?
+    ), __FILE__, __LINE__ - 19
   end
 
   def reset
-    delete_mask_et_all
+    names = @locations.keys.sort
     names.each { |name|
       remove_accessor name
     }
     reset_model model
   end
 
+  def validate_position(range, position)
+    return if range.nil?
+    return if range.cover?(position)
+
+    msg = "Position #{position} out of range #{range}"
+    raise RangeError, msg
+  end
+
+  private
+
+  def validate_accessor(*names)
+    names.each { |acc|
+      raise "redefining #{acc} rejected" if model.method_defined?(acc)
+    }
+  end
+
+  def my_undef(*names)
+    names.each { |name|
+      model.class_eval %(
+        begin
+          undef #{name}
+        rescue
+        end
+      ), __FILE__, __LINE__ - 5
+    }
+  end
 end

data/lib/act_with_flags/version.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
-# rubocop: disable all
 
 module ActWithFlags
-  VERSION = '0.2.4'     # 2021-06-21
-# VERSION = '0.2.3'     # 2020-07-14
-# VERSION = '0.2.2'     # 2020-04-27
-# VERSION = '0.2.1'     # 2020-03-01
-# VERSION = '0.2.0'     # 2019-10-04
-# VERSION = '0.1.0'     # 2019-04-07
+  VERSION = "3.1.1" # 2022-09-01
+  # VERSION = "3.1.0" # 2022-08-29
+  # VERSION = "3.0.1" # 2022-08-07
+  # VERSION = "3.0.0" # 2022-07-27
+  # VERSION = "0.2.4" # 2021-06-21
+  # VERSION = "0.2.3" # 2020-07-14
+  # VERSION = "0.2.2" # 2020-04-27
+  # VERSION = "0.2.1" # 2020-03-01
+  # VERSION = "0.2.0" # 2019-10-04
+  # VERSION = "0.1.0" # 2019-04-07
 end

data/lib/act_with_flags.rb

@@ -1,4 +1,3 @@
-# rubocop:disable all
 # frozen_string_literal: true
 
 # Principles:
@@ -8,47 +7,80 @@
 #  POLS
 #  DEI
 #  TDD considered harmful
+#  TGCB
 
-class << ActiveRecord::Base
+module ActWithFlags
+  module Base
+    attr_reader :act_with_flags
 
-  attr_accessor :act_with_flags
+    def add_to_flags(*flags, origin: :flags, range: nil, **hash)
+      origin = origin.to_sym
+      init(origin, range)
 
-  def add_to_flags(*flags, origin: :flags, **hash)
-#p "act_with_flags: add_to_flags #{flags.inspect}"
-#p "act_with_flags: origin #{origin.inspect}"
-#p "act_with_flags: hash   #{hash.inspect}"
+      flags.each { |name| @act_with_flags.add_flag(name, nil, origin) }
+      hash.each { |name, pos| @act_with_flags.add_flag(name, pos, origin) }
 
-    @act_with_flags ||= ActWithFlags::Admin.new self
-    if origin.is_a?(Integer)
-      hash[:origin] = origin
-    else
-      @act_with_flags.origin = origin
-      @act_with_flags.delete_mask_et_all
-      @act_with_flags.add_mask_et_all origin
+      @act_with_flags
     end
 
-    flags.each { |name|      @act_with_flags.add_accessor(name, nil) }
-    hash.each  { |name, pos| @act_with_flags.add_accessor(name, pos) }
+    def remove_from_flags(*flags)
+      flags.each { |name| @act_with_flags.remove_accessor(name) }
+    end
 
-    @act_with_flags
-  end
+    def clear_flags_at_save(*flags)
+      @act_with_flags.clear_at_save(*flags)
+    end
 
-  def remove_from_flags(*flags)
-#p "remove_from_flags #{flags.inspect}"
-    flags.each { |name| @act_with_flags.remove_accessor(name) }
-  end
+    private
+
+    def init(origin, range)
+      unless @act_with_flags
+        @act_with_flags ||= ActWithFlags::Admin.new self
+        @act_with_flags.add_mask_et_all origin
+      end
+
+      unless range.nil?
+        validate_range_value range.begin
+        validate_range_value range.end
+      end
+
+      rng = @act_with_flags.ranges[origin]
+      unless range.nil? || (range == rng)
+        msg = "incompatible ranges #{range} - #{rng}"
+        raise ArgumentError, msg unless rng.nil?
+        @act_with_flags.ranges[origin] = range if range
+        validate_previous_positions(origin, range)
+      end
+    end
 
-  def clear_flags_at_save(*flags)
-#p "clear_flags_at_save #{flags.inspect}"
-    flags.each { |name| @act_with_flags.add_to_delete_mask(name) }
-    @act_with_flags.before_save
+    def validate_previous_positions(origin, range)
+      return if range.nil?
+
+      @act_with_flags.locations.each do |name, location|
+        next unless location.origin == origin
+
+        @act_with_flags.validate_position(range, location.position)
+      end
+    end
+
+    def validate_range_value(range_value)
+      return if range_value.nil?
+      return if range_value.is_a?(Integer) && range_value >= 0
+
+      raise RangeError, "Invalid range value #{range_value}"
+    end
   end
+end
 
+class ActiveRecord::Base
+  extend ActWithFlags::Base
 end
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
-require 'act_with_flags/version'
-require 'act_with_flags/utils'
-require 'act_with_flags/define'
-require 'act_with_flags/admin'
-require 'act_with_flags/print'
+require "act_with_flags/version"
+require "act_with_flags/utils"
+require "act_with_flags/define"
+require "act_with_flags/admin"
+require "act_with_flags/flags"
+require "act_with_flags/clear"
+require "act_with_flags/print"

data/test/any_all_none_test.rb

@@ -1,8 +1,6 @@
-# rubocop: disable all
+require "test_helper"
 
-require 'test_helper'
-
-describe 'any? all? and none?' do
+describe "any? all? and none?" do
   let(:order) { Order.create }
 
   def setup
@@ -10,28 +8,28 @@ describe 'any? all? and none?' do
     Order.add_to_flags a: 1, b: 7, c: 3
   end
 
-  it 'checks any?' do
+  it "checks any?" do
     order.a = true
     assert order.flags_any?(:a, :b)
     order.a = false
     refute order.flags_any?(:a, :b)
   end
 
-  it 'checks any? #2' do
+  it "checks any? #2" do
     order.b = true
     assert order.flags_any?(:a, :b)
     order.b = false
     refute order.flags_any?(:a, :b)
   end
 
-  it 'checks all?' do
+  it "checks all?" do
     order.a = order.b = true
     assert order.flags_all?(:a, :b)
     order.a = false
     refute order.flags_all?(:a, :b)
   end
 
-  it 'checks none? #2' do
+  it "checks none? #2" do
     order.a = order.b = true
     refute order.flags_none?(:a, :b)
     order.a = false
@@ -39,5 +37,4 @@ describe 'any? all? and none?' do
     order.b = false
     assert order.flags_none?(:a, :b)
   end
-
 end