eventq_base 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f980a0a7d00cd7ae3afde6b14bbf1d0ac2458532
-  data.tar.gz: aa0195339109ced497fdb7ba64be7d11e2eb0c8f
+  metadata.gz: c7bc52253b5e75c043fcdb12327c7ebdda89d225
+  data.tar.gz: 80c4aec87566f6a76c0968fd1bc928764408170a
 SHA512:
-  metadata.gz: ba37017768a9ce6ebd23949b28d573e798e531f8783108b7f5a29ba7c69f3991dc803d0216810615825269d794adec1533758c2788568cd3f4de705daa1fd84e
-  data.tar.gz: 5d38ccd26ac916312661160e8ed99ffd1ed4fdfd195b87e674b83e4cca7c24d31bec8dc1109352a049d989c7fa97bf5c42c819acefe6b423f4d793845081a865
+  metadata.gz: 98ba8648aba395b3cf0d0e2ee8901315d410fc0e201a6a6d194fcd2cf895e96ee6011388aca8d9d6c4400b6ba1c4cc41d1754cda3f7a2cd8fd777fdff74e76f9
+  data.tar.gz: 06072ad359b209d8e31d4f3b5ce420ae8356e979807b7563324e58ffc1ed0dd30ded3aa42f0e6bf0ed2758a20912e6c034829505c234b42e7f38af0f0a8ca868

data/lib/eventq_base/serialization_providers.rb

@@ -2,6 +2,7 @@ require_relative 'serialization_providers/json_serialization_provider'
 unless RUBY_PLATFORM =~ /java/
   require_relative 'serialization_providers/oj_serialization_provider'
 end
+require_relative 'serialization_providers/jruby'
 require_relative 'serialization_providers/binary_serialization_provider'
 
 module EventQ
@@ -14,7 +15,9 @@ module EventQ
     class Manager
       def initialize
         @providers = {}
-        unless RUBY_PLATFORM =~ /java/
+        if RUBY_PLATFORM =~ /java/
+          @providers[OJ_PROVIDER] = EventQ::SerializationProviders::JRuby::OjSerializationProvider
+        else
           @providers[OJ_PROVIDER] = EventQ::SerializationProviders::OjSerializationProvider
         end
         @providers[JSON_PROVIDER] = EventQ::SerializationProviders::JsonSerializationProvider
@@ -23,11 +26,11 @@ module EventQ
 
       def get_provider(provider_type)
         provider = @providers[provider_type]
-        if provider == nil
+        if provider.nil?
           raise "Invalid provider type specified: #{provider_type}"
         end
         return provider.new
       end
     end
   end
-end
+end

data/lib/eventq_base/serialization_providers/jruby.rb

@@ -0,0 +1,2 @@
+require_relative 'jruby/oj'
+require_relative 'jruby/oj_serialization_provider'

data/lib/eventq_base/serialization_providers/jruby/oj.rb

@@ -0,0 +1,10 @@
+require_relative 'oj/attribute_writer'
+require_relative 'oj/class_writer'
+require_relative 'oj/rational_writer'
+require_relative 'oj/date_time_writer'
+require_relative 'oj/date_writer'
+require_relative 'oj/time_writer'
+require_relative 'oj/array_writer'
+require_relative 'oj/hash_writer'
+require_relative 'oj/value_writer'
+require_relative 'oj/serializer'

data/lib/eventq_base/serialization_providers/jruby/oj/array_writer.rb

@@ -0,0 +1,20 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class ArrayWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(Array)
+          end
+          def exec(obj)
+            array = []
+            obj.each do |a|
+              array << AttributeWriter.exec(a)
+            end
+            array
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/attribute_writer.rb

@@ -0,0 +1,24 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class AttributeWriter
+
+          def self.exec(obj)
+            aw = descendants.detect { |a| a.new.valid?(obj) } || ClassWriter
+            aw.new.exec(obj)
+          end
+
+          def self.descendants
+            descendants = []
+            ObjectSpace.each_object(singleton_class) do |k|
+              next if k.singleton_class?
+              descendants.unshift k unless k == self
+            end
+            descendants
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/class_writer.rb

@@ -0,0 +1,20 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class ClassWriter < AttributeWriter
+          def valid?(obj)
+            false
+          end
+          def exec(obj)
+            hash = { '^o': obj.class }
+            obj.instance_variables.each do |key|
+              hash[key[1..-1]] = AttributeWriter.exec(obj.instance_variable_get(key))
+            end
+            hash
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/date_time_writer.rb

@@ -0,0 +1,33 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class DateTimeWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(DateTime)
+          end
+          def exec(obj)
+            seconds = obj.strftime('%S%N')
+            d = 1_000_000_000
+            if seconds.start_with?('0')
+              seconds[0] = ''
+              d = 100_000_000
+            end
+
+            {
+              '^O': 'DateTime',
+              year: obj.year,
+              month: obj.month,
+              day: obj.day,
+              hour: obj.hour,
+              min: obj.min,
+              sec: RationalWriter.new.exec(Rational(Integer(seconds), d)),
+              offset: RationalWriter.new.exec(obj.offset),
+              start: obj.start
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/date_writer.rb

@@ -0,0 +1,22 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class DateWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(Date) && !obj.is_a?(DateTime)
+          end
+          def exec(obj)
+            {
+              '^O': 'Date',
+              year: obj.year,
+              month: obj.month,
+              day: obj.day,
+              start: obj.start
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/hash_writer.rb

@@ -0,0 +1,18 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class HashWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(Hash)
+          end
+          def exec(obj)
+            obj.each do |key, value|
+              obj[key] = AttributeWriter.exec(value)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/rational_writer.rb

@@ -0,0 +1,20 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class RationalWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(Rational)
+          end
+          def exec(obj)
+            {
+              '^O': 'Rational',
+              numerator: obj.numerator,
+              denominator: obj.denominator
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/serializer.rb

@@ -0,0 +1,17 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class Serializer
+          def dump(obj)
+            JSON.dump(AttributeWriter.exec(obj))
+          end
+
+          def load(json)
+            raise NotImplementedError.new("[#{self.class}] - #load method has not yet been implemented.")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/time_writer.rb

@@ -0,0 +1,18 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class TimeWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(Time)
+          end
+          def exec(obj)
+            {
+              '^t': obj.to_f
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj/value_writer.rb

@@ -0,0 +1,16 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      module Oj
+        class ValueWriter < AttributeWriter
+          def valid?(obj)
+            obj.is_a?(String) || obj.is_a?(Integer) || obj.is_a?(Float)
+          end
+          def exec(obj)
+            obj
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/serialization_providers/jruby/oj_serialization_provider.rb

@@ -0,0 +1,25 @@
+module EventQ
+  module SerializationProviders
+    module JRuby
+      class OjSerializationProvider
+        def initialize
+          @json_serializer = EventQ::SerializationProviders::JsonSerializationProvider.new
+          @oj_serializer = Oj::Serializer.new
+        end
+
+        def serialize(object)
+          @oj_serializer.dump(object)
+        end
+
+        def deserialize(json)
+          begin
+            return @oj_serializer.load(json)
+          rescue
+            EventQ.log(:debug, "[#{self.class}] - Failed to deserialize using Oj, falling back to JsonSerializationProvider.")
+            return @json_serializer.deserialize(json)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eventq_base/version.rb

@@ -1,3 +1,3 @@
 module EventqBase
-  VERSION = "1.15.0"
+  VERSION = "1.16.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_base
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,6 +134,19 @@ files:
 - lib/eventq_base/queue_worker_contract.rb
 - lib/eventq_base/serialization_providers.rb
 - lib/eventq_base/serialization_providers/binary_serialization_provider.rb
+- lib/eventq_base/serialization_providers/jruby.rb
+- lib/eventq_base/serialization_providers/jruby/oj.rb
+- lib/eventq_base/serialization_providers/jruby/oj/array_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/attribute_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/class_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/date_time_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/date_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/hash_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/rational_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/serializer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/time_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj/value_writer.rb
+- lib/eventq_base/serialization_providers/jruby/oj_serialization_provider.rb
 - lib/eventq_base/serialization_providers/json_serialization_provider.rb
 - lib/eventq_base/serialization_providers/oj_serialization_provider.rb
 - lib/eventq_base/signature_providers.rb