active_job-arguments_plus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4453a702970a4c1eae1ef9eaa71186ae0ec440b
-  data.tar.gz: d9e1dd31fe8e646b110cfe0488a112fc1b2bc836
+  metadata.gz: faf18c2e832c03c9b94389f0b778f47dab382b67
+  data.tar.gz: '0486b471b37a4132d484c266879f69d33847f3a9'
 SHA512:
-  metadata.gz: 99cb9c9e3673c202046a1d023260b3645d885d3bc1ef77a6416e0a2f40bbe69cc41f899271abefb6f6a1f86d1c015a0c0ee6c4d47a841e95dcd1e123b437a993
-  data.tar.gz: 578a208b4f59b0fd6a6a52ec8a7beb6b47fdd7fce0036ca8886220c0a9599dea24767ed17fbdbf66236f1f7b0577ee09ca941a73bb52fbc3093c9f5e720c3888
+  metadata.gz: 396b4bbd83eb683b6b06ca103a215d909578b9155d8534f910aa2f7a5669bc99299e73e43f04675027270b903f03823512c604279bbfe8ff0d74ed7832ccb661
+  data.tar.gz: a32d88774ca7fe6793b9732143f7bc51b69a7172f6861663fc307ad110b82f13be6b31687a41137e8e8b0ca147cd985ad26aa5cc1212c279e4ca3aadcfa55819

data/lib/active_job/arguments_plus.rb

@@ -1,5 +1,11 @@
 require 'logger'
-require 'ph_model'
+
+begin
+  require 'ph_model'
+rescue LoadError
+  # ignore
+end
+
 require 'active_job/arguments'
 require_relative 'arguments_plus/version'
 
@@ -7,20 +13,27 @@ ActiveJob::Arguments # pre-load so we extend the module
 
 module ActiveJob
   module ArgumentsPlus
-    TYPE_KEYS = {
-      Module => '_aj_module',
-      Logger => '_aj_logger',
-      PhModel => '_aj_ph_model'
-    }
+    def self.type_keys
+      @type_keys ||= begin
+        add_if_defined = lambda { |tk, klass_name|
+          tk[klass_name.constantize] = "_aj_#{klass_name.underscore}" if const_defined?(klass_name)
+        }
+        tk = {}
+        add_if_defined.call(tk, 'Module')
+        add_if_defined.call(tk, 'Logger')
+        add_if_defined.call(tk, 'PhModel')
+        tk
+      end
+    end
 
     def serialize_argument(argument)
-      arg_klass, info = TYPE_KEYS.find { |klass, _| klass === argument }
+      arg_klass, info = type_keys.find { |klass, _| klass === argument }
       arg_klass ? send("serialize_#{class_to_method(arg_klass.name)}", argument) : super
     end
 
     def deserialize_argument(argument)
       if argument.is_a?(Hash) && argument.size == 1
-        arg_klass, _ = TYPE_KEYS.find { |_, key| argument.key?(key) }
+        arg_klass, _ = type_keys.find { |_, key| argument.key?(key) }
         arg_klass ? send("deserialize_#{class_to_method(arg_klass.name)}") : super
       else
         super
@@ -34,11 +47,11 @@ module ActiveJob
     end
 
     def key_for(klass)
-      case TYPE_KEYS[klass]
+      case type_keys[klass]
       when Hash
-        TYPE_KEYS[klass][:key]
+        type_keys[klass][:key]
       else
-        TYPE_KEYS[klass]
+        type_keys[klass]
       end
     end
 
@@ -61,7 +74,7 @@ module ActiveJob
 
     def serialize_ph_model(argument)
       {
-        key_for(Logger) => {
+        key_for(PhModel) => {
           'type' => argument.class.name,
           'data' => argument.as_json,
         }
@@ -69,8 +82,8 @@ module ActiveJob
     end
 
     def deserialize_ph_model(argument)
-      info = argument[key_for(Logger)]
-      info['type'].constantize.build(info['data'])
+      info = argument[key_for(PhModel)]
+      info['type'].constantize.send(:build, info['data'])
     end
   end
 

data/lib/active_job/arguments_plus/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module ArgumentsPlus
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_job-arguments_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Piotr Banasik
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ph_model
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement