active_module 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743570de05b5e510d10408fe3b95eaab2789e4432311538bda978bf52d893355
-  data.tar.gz: 72057e516212b80260b45fe9b2bd5c97530fc5f6ceaab42c0578d48581bf3b50
+  metadata.gz: fb059e4cacb00c0531503dbc9994110e4c735ba4e70dd926571998381f8977d4
+  data.tar.gz: 9182e410141940ad1beccbbb9556cca0fe0b801eaa6f9bb2b461005f59b75f12
 SHA512:
-  metadata.gz: 7c4ee2bc7ae24fb246f9744f161088222af6c02d85c99d62e39f196257b90d24abcea21de0217ea578d8755acfd61bf4d078d9f7290f3cc0cc28110bca893cd9
-  data.tar.gz: '02582a7cbe08a616e35828e0537bacf41714cd4cfae0d5272188fb9feb8aa970c44670391b1cef6926781ebe53f28ce966a0eeda46d32e2149be22370cf19daf'
+  metadata.gz: 5b11253775eb6a2ddb1d20664784a62f9528ab0213d1670a9c8d31187719106fe27d0eb926f71bd4233da08e817820a52a7dbe74521c58b4b0b6f3d0a3ee19c8
+  data.tar.gz: 9ddad0a60a5afb1dc3e5b923bac3fb8800aa9af022e2312fbc44928e55a0b5eb5fd0c3b5941ed15d8965f747769fdc9aa280c8446085611131722c2360b2be5c

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_module
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Pedro Rolo