active_module 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743570de05b5e510d10408fe3b95eaab2789e4432311538bda978bf52d893355
-  data.tar.gz: 72057e516212b80260b45fe9b2bd5c97530fc5f6ceaab42c0578d48581bf3b50
+  metadata.gz: e84ab7b0e8dd2d33b4eb6dc9ade177bb57361eb23bd62aa774d5e57fab95b831
+  data.tar.gz: 02d82ee773888a155453d8765044661bffa180fc0aedf5465a034cc5b34ad03e
 SHA512:
-  metadata.gz: 7c4ee2bc7ae24fb246f9744f161088222af6c02d85c99d62e39f196257b90d24abcea21de0217ea578d8755acfd61bf4d078d9f7290f3cc0cc28110bca893cd9
-  data.tar.gz: '02582a7cbe08a616e35828e0537bacf41714cd4cfae0d5272188fb9feb8aa970c44670391b1cef6926781ebe53f28ce966a0eeda46d32e2149be22370cf19daf'
+  metadata.gz: 28f2e81b006c7928e176f8ff91491601fb21ac77223c5096905d703cb54b695ea5e463972d4102f3dd6ca119b2e4df032cfc3531f191d109fd1e6270436d93f9
+  data.tar.gz: e06b59e2b248d106e4928cd9d69a6c665d6022d11bba45c258a708b8e4e1a48d7fb29db934fc57ee32f7aaf65491fa6db9aa552c7ccda578b6a7167339e8c05d

data/README.md

@@ -1,6 +1,12 @@
 
-# active_module 
-![alt text](https://img.shields.io/badge/coverage-100%25-brightgreen)
+# active_module
+[![Gem Version](https://img.shields.io/gem/v/active_module)](https://rubygems.org/gems/active_module)
+[![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
+[![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/pedrorolo/active_module/main.yml)](https://github.com/pedrorolo/active_module/blob/main/Rakefile)
+[![100% Coverage](https://img.shields.io/badge/coverage-100%25-brightgreen)](https://github.com/pedrorolo/active_module/blob/main/spec/spec_helper.rb)
+[![Gem Total Downloads](https://img.shields.io/gem/dt/active_module?style=flat)](https://bestgems.org/gems/active_module)
+
+
 
 #### *Modules and Classes as first-class active record values!*
 
@@ -64,7 +70,7 @@ end
 Add to your gemfile - and if you are using rails - that's all you need:
 
 ```ruby
-gem 'active_module', "~> 0.2"
+gem 'active_module', "~> 0.3"
 ```
 
 If you are not using rails, just issue this command after loading active record

data/lib/active_module/base.rb

@@ -7,24 +7,20 @@ module ActiveModule
   class Base < ActiveModel::Type::Value
     attr_reader :possible_modules, :mapping
 
-    def initialize(possible_modules_or_mapping = nil,
+    def initialize(possible_modules_or_mapping = [],
                    possible_modules: [],
                    mapping: {})
-      @possible_modules =
-        if possible_modules_or_mapping.is_a?(Array)
-          possible_modules_or_mapping + possible_modules
-        else
-          possible_modules
-        end
-      mapping_arg = if possible_modules_or_mapping.is_a?(Hash)
-                      possible_modules_or_mapping.merge(mapping)
-                    else
-                      mapping
-                    end
-      @mapping =
-        @possible_modules.each_with_object(mapping_arg.dup) do |mod, result|
-          result[mod] ||= mod.name
-        end
+      if possible_modules_or_mapping.is_a?(Array)
+        @possible_modules =
+          (possible_modules_or_mapping + possible_modules + mapping.keys).uniq
+        @mapping = default_mapping.merge(mapping)
+      else
+        @possible_modules =
+          (possible_modules_or_mapping.keys + possible_modules + mapping.keys)
+          .uniq
+        @mapping = default_mapping.merge(possible_modules_or_mapping)
+                                  .merge(mapping)
+      end
       super()
     end
 
@@ -104,5 +100,9 @@ module ActiveModule
     def from_db
       @from_db ||= mapping.invert
     end
+
+    def default_mapping
+      @possible_modules.index_by(&:name).invert
+    end
   end
 end

data/lib/active_module/register.rb

@@ -6,6 +6,8 @@ module ActiveModule
 
     def call(type_symbol = :active_module)
       ActiveModel::Type.register(type_symbol, ActiveModule::Base)
+      return unless defined?(ActiveRecord::Type)
+
       ActiveRecord::Type.register(type_symbol, ActiveModule::Base)
     end
   end

data/lib/active_module/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveModule
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_module
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pedro Rolo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-22 00:00:00.000000000 Z
+date: 2024-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"