enummer 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7e1c544817a7e7b874a4ca20372880f20d7cafe6cc5bb663e2224cd99d7ff2
-  data.tar.gz: 3d18b5a7b106387dc8e76631f0b84204a7d11520f5dbb36b70bd8aa403b9569c
+  metadata.gz: 3c5046553ca9c053f2632d3bc1ca202a9c8da4b1d93fdca16c5d35606e774932
+  data.tar.gz: 06651c73f0aacb682d4a8dbb7b22387504eb2e6f6bc02d6de7dec88ef41605b7
 SHA512:
-  metadata.gz: d16b48b263ca8ecf943e301993283ce356e3cf12961bd66839ce5a2400a3069197beeb4c75d24b2f7565a7c31fb1fe741e3a8c9a65f72d2b3d08549bf5ee3966
-  data.tar.gz: 2b4d0c8c13b4133299c16e29034233c98fd1446c477f48bdc1acc6fc62db687da4ed8df47db6354475fab593043bf9e8ce0f11ca9bbc4e41796d62d678d69ab4
+  metadata.gz: e11ec3eabc2ede11eb342fc5022ef48c3905a338180ce925452d36baed39597a351fe183494e4ae18a3e63e2956e61a2cf7439d85111f08d8a3a5712d9cddf49
+  data.tar.gz: 7fa79d2c2d7743ab75c26c1754aa010894bfb99314869118e075f663ac33511b435c9200d360c16ddcb0fba55c21600a28c5b0076e75fb323dc6727dc9bb8690

data/README.md

@@ -33,6 +33,18 @@ Now set up enummer with the available values in your model:
 enummer permissions: %i[read write execute]
 ```
 
+Similar to `enum`, enummer can also be initialized with a hash, where the numeric index represents the position of the bit that maps to the flag:
+
+``` ruby
+enummer permissions: {
+  read: 0,
+  write: 1,
+  execute: 2
+}
+```
+
+This makes it easier to add/remove entries without worrying about migrating historical data.
+
 ### Scopes
 
 Scopes will now be provided for `<option>` and `not_<option>`.

data/lib/enummer/enummer_type.rb

@@ -4,17 +4,16 @@ require "active_record/type"
 
 module Enummer
   class EnummerType < ::ActiveRecord::Type::Value
-    # @param [Array<Symbol>] value_names list of all possible values for this type
-    def initialize(value_names:)
-      @value_names = value_names
-      @bit_pairs = determine_bit_pairs(value_names)
+    # @param [Array<Symbol>] values hash with bit-value pairs for all possible values for this type
+    def initialize(values:)
+      @values = values
     end
 
     # @return Symbol Representation of this type
     # @example
     #   :enummer[read|write|execute]
     def type
-      "enummer[#{@value_names.join("|")}]".to_sym
+      :"enummer[#{@values.keys.join("|")}]"
     end
 
     # @param [Symbol|Array<Symbol>] value Current value represented as one or more symbols
@@ -22,7 +21,7 @@ module Enummer
     def serialize(value)
       return unless value
 
-      Array.wrap(value).sum { |value_name| @bit_pairs.fetch(value_name.to_sym, 0) }
+      Array.wrap(value).sum { |value_name| @values.fetch(value_name, 0) }
     end
 
     # @param [Numeric] value Numeric representation of values
@@ -31,19 +30,17 @@ module Enummer
       return [] unless value
       return [] if value.to_i.zero?
 
-      @bit_pairs.each_with_object([]) do |(pair_name, pair_value), value_names|
+      @values.each_with_object([]) do |(pair_name, pair_value), value_names|
         next if (value & pair_value).zero?
 
         value_names << pair_name
       end
     end
 
-    private
-
-    def determine_bit_pairs(value_names)
-      value_names.map.with_index do |name, shift|
-        [name, 1 << shift]
-      end.to_h
+    # @param [Array<Symbol>] value Current value represented as one or more symbols or strings
+    # @return [Array<Symbol>] Current value represented as symbols
+    def cast(value)
+      Array.wrap(value).map(&:to_sym)
     end
   end
 end

data/lib/enummer/extension.rb

@@ -13,10 +13,11 @@ module Enummer
       options[:_suffix] = values.delete(:_suffix)
 
       name, values = values.first
+      values = _enummer_determine_bit_pairs(values)
 
-      attribute(name, :enummer, value_names: values)
+      attribute(name, :enummer, values: values)
 
-      singleton_class.__send__(:define_method, name) { values }
+      singleton_class.__send__(:define_method, name) { values.keys }
 
       _enummer_build_with_scope(name, values)
       _enummer_build_values(name, values, options)
@@ -24,32 +25,31 @@ module Enummer
 
     private
 
-    def _enummer_build_with_scope(attribute_name, value_names)
+    def _enummer_build_with_scope(attribute_name, values)
       scope "with_#{attribute_name}", lambda { |desired|
-        expected = Array.wrap(desired).sum(0) { |value| 1 << value_names.index(value) }
+        expected = Array.wrap(desired).sum(0) { |value| values[value.to_sym] }
 
         where("#{attribute_name} & :expected = :expected", expected: expected)
       }
     end
 
-    def _enummer_build_values(attribute_name, value_names, options)
-      value_names.each_with_index do |name, i|
+    def _enummer_build_values(attribute_name, values, options)
+      values.each do |name, bit|
         method_name = _enummer_method_name(attribute_name, name, options)
 
-        define_method("#{method_name}?") { self[attribute_name].include?(name) }
-        define_method("#{method_name}=") do |new_value|
-          if new_value
-            self[attribute_name].push(name)
+        define_method(:"#{method_name}?") { self[attribute_name].include?(name) }
+        define_method(:"#{method_name}=") do |new_value|
+          if ActiveModel::Type::Boolean.new.cast(new_value)
+            self[attribute_name] += [name]
           else
-            self[attribute_name].delete(name)
+            self[attribute_name] -= [name]
           end
+          self[attribute_name].uniq!
         end
-        define_method("#{method_name}!") do
+        define_method(:"#{method_name}!") do
           update(attribute_name => self[attribute_name] + [name])
         end
 
-        bit = 1 << i
-
         scope method_name, -> { where("#{attribute_name} & :bit = :bit", bit: bit) }
         scope "not_#{method_name}", -> { where("#{attribute_name} & :bit != :bit", bit: bit) }
       end
@@ -68,5 +68,12 @@ module Enummer
 
       value
     end
+
+    def _enummer_determine_bit_pairs(values)
+      values = values.map.with_index { |value, i| [value, i] }.to_h if values.is_a?(Array)
+      values.transform_values do |shift|
+        1 << shift
+      end
+    end
   end
 end

data/lib/enummer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enummer
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/tasks/enummer_tasks.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :enummer do
 #   # Task goes here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enummer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Jamie Schembri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -55,14 +55,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Multi-value enums for Rails.