active_job-arguments_plus 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 56c423843a34137cf4a0097db95cf5af56e9f4af
-  data.tar.gz: 54a9c43a542709b4157236df9e93747b41112ee5
+SHA256:
+  metadata.gz: 31db58fabeb5463eee87082fcc2d37054e442f902aff17347d01806ef57f06b2
+  data.tar.gz: 57ca467cba0f7973f0d381351c6298a03b6714698ed3fe39e1dda9d6ec44c78d
 SHA512:
-  metadata.gz: 6c0dfa8b07f4e590a49bc80ef5ea53c9dd0c79d51c6753dc039e64899a9696f5ee76a3683500fa5291f0a2157f624c8bb0014ea09876e86486da59027eb65d4d
-  data.tar.gz: 363fcbe36d244fb2b162f9d9250d1ad52aa1d367ac084dc45a20d671413932b2fa59777d5ca95942770155d42531a89f1ea768e1acebe22e4b87b2ccc6628a64
+  metadata.gz: 28359af628b4dd7df6a777f45a5e31435b23c607715ddacc8759dff7f69e5df2fae6ab09c33b1a4a4699190551f7492aade83d35a7d913d4707ca7edbf67f3a5
+  data.tar.gz: 75eb938bb765324d2894e3ea3754c360249ab493ef5e2108f50b789c3bf258628161987a5d751e4efd95a74630e800b825cb1337ebbe1640bb8793c4ead1ba57

data/lib/active_job/arguments_plus.rb

@@ -7,6 +7,7 @@ rescue LoadError
 end
 
 require 'active_job/arguments'
+require 'globalid'
 require_relative 'arguments_plus/version'
 
 ActiveJob::Arguments # pre-load so we extend the module
@@ -22,19 +23,20 @@ module ActiveJob
         add_if_defined.call(tk, 'Module')
         add_if_defined.call(tk, 'Logger')
         add_if_defined.call(tk, 'PhModel')
+        add_if_defined.call(tk, 'Time')
         tk
       end
     end
 
     def serialize_argument(argument)
-      arg_klass, info = type_keys.find { |klass, _| klass === argument }
-      arg_klass ? send("serialize_#{class_to_method(arg_klass.name)}", argument) : super
+      arg_klass, _ = type_keys.find { |klass, _| klass === argument }
+      arg_klass ? serialize_local_argument(arg_klass, 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 ? send("deserialize_#{class_to_method(arg_klass.name)}", argument) : super
+        arg_klass ? deserialize_local_argument(arg_klass, argument) : super
       else
         super
       end
@@ -42,6 +44,16 @@ module ActiveJob
 
     private
 
+    def serialize_local_argument(arg_klass, argument)
+      value = send("serialize_#{class_to_method(arg_klass.name)}", argument)
+      serialize_generic(arg_klass, value)
+    end
+
+    def deserialize_local_argument(arg_klass, argument)
+      value = deserialize_generic(arg_klass, argument)
+      send("deserialize_#{class_to_method(arg_klass.name)}", value)
+    end
+
     delegate :type_keys, to: 'ActiveJob::ArgumentsPlus'
 
     def class_to_method(klass_name)
@@ -57,8 +69,16 @@ module ActiveJob
       end
     end
 
+    def serialize_generic(klass, value)
+      {key_for(klass) => value}
+    end
+
+    def deserialize_generic(klass, argument)
+      argument[key_for(klass)]
+    end
+
     def serialize_logger(_)
-      { key_for(Logger) => true }
+      true
     end
 
     def deserialize_logger(_)
@@ -66,27 +86,32 @@ module ActiveJob
       Logger.new(STDOUT)
     end
 
-    def serialize_module(argument)
-      { key_for(Module) => argument.name }
+    def serialize_module(klass)
+      klass.name
     end
 
-    def deserialize_module(argument)
-      argument[key_for(Module)].constantize
+    def deserialize_module(klass_name)
+      klass_name.constantize
     end
 
-    def serialize_ph_model(argument)
+    def serialize_ph_model(model)
       {
-        key_for(PhModel) => {
-          'type' => argument.class.name,
-          'data' => argument.as_json,
-        }
+        'type' => model.class.name,
+        'data' => model.as_json,
       }
     end
 
-    def deserialize_ph_model(argument)
-      info = argument[key_for(PhModel)]
+    def deserialize_ph_model(info)
       info['type'].constantize.send(:build, info['data'])
     end
+
+    def serialize_time(time)
+      time.to_f
+    end
+
+    def deserialize_time(unixtime)
+      Time.at(unixtime)
+    end
   end
 
   module Arguments

data/lib/active_job/arguments_plus/version.rb

@@ -1,5 +1,5 @@
 module ActiveJob
   module ArgumentsPlus
-    VERSION = '0.1.2'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_job-arguments_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Banasik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "."
 email: piotr.banasik@gmail.com
 executables: []
@@ -122,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: ActiveJob Argument Serialization Extension