exnum 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0eb597ee0732dc06f4b3bc40185a72b60e66deef74d5d316375a8d30edc1c91
-  data.tar.gz: f7feab5a390467426f4382b878e87dde7da108379474fc4088005407fe256471
+  metadata.gz: 49cbdd6311a9cc80e75a4ef18be88d27571c93c048ca53ff7acd90673c8c4693
+  data.tar.gz: 1aed32ca6299bc08966e314015e480a7e7b7a6eb275492b3772aff67ece132a8
 SHA512:
-  metadata.gz: e7d4dd9a76bc8d775247f57dc616cc00f9b2d290d3a61a560306f72eb0f46711cc35ea6d48ec400ed835fcc9879694fd6bca708bbcb4af7aac7443000f89ce45
-  data.tar.gz: b52fcad419966bd7ef14101e0984657e1b3949c03e6e6a6e4e15d2718d612c861d7db995226e57fd7899bec79b0a71634a1d7283a75fd98528fa850e6a793ff9
+  metadata.gz: 84d9b0ac1bda89ff395172e025ce077f87cd0fba30164b207a61034d0b9ad01bc047899e47e8f277bdc05d8ad36f87954ca8f5f83648415fb6ab5741b1306101
+  data.tar.gz: 339c08e50874e5aa07dd390da07dd53a9fa6d150c43742a50323642d069dadb604c686cf972fbcdfc19c9f143dfa4d6e10d091c7a5bb95f8cdbdfd805be109ee

data/exnum.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', "~> 7.0"
+  spec.add_dependency 'activerecord', ">= 7.0"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/exnum/active_record/exnum.rb

@@ -1,5 +1,6 @@
 module ActiveRecord
   module Exnum
+    OPTIONS = %i[_prefix _suffix]
 
     def self.prepended(base)
       base.singleton_class.class_eval { self.prepend(ClassMethods) }
@@ -21,13 +22,11 @@ module ActiveRecord
     #--------------------------------------------------------------------------
 
     def exnum(definitions)
-      enum_definitions = definitions.each_with_object({}) do |(name, values), ret|
-        ret[name] = extract_enums(values)
-      end
-      enum(**enum_definitions)
+      enum_num, enum_values, enum_options = extract_enum_args(definitions)
+      enum(enum_num, enum_values, **enum_options)
 
       pram_definitions = definitions.each_with_object({}) do |(name, values), ret|
-        next if %i[_prefix _suffix].include?(name)
+        next if OPTIONS.include?(name)
 
         ret[name] = extract_params(values)
         self.send(name.to_s.pluralize).each do |k, v|
@@ -44,7 +43,25 @@ module ActiveRecord
     #++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
     private
-    def extract_enums(values)
+
+    def extract_enum_args(definitions)
+      enum_name = nil
+      enum_values = nil
+      enum_options = {}
+
+      definitions.each do |name, value|
+        if OPTIONS.include?(name)
+          enum_options[name.to_s.delete_prefix('_').to_sym] = value
+        else
+          enum_name = name
+          enum_values = extract_enum_values(value)
+        end
+      end
+
+      [enum_name, enum_values, enum_options]
+    end
+
+    def extract_enum_values(values)
       return values unless values.kind_of?(Hash)
 
       values.each_with_object({}) do |(field, value), ret|

data/lib/exnum/version.rb

@@ -1,3 +1,3 @@
 module Exnum
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: exnum
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kta-M
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-05 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Enum extention for Rails