eventq_base 1.15.0-java → 1.16.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e775e37e2b345a940c9c1c639661ed173a077b787dc28efb4245448a218083c
-  data.tar.gz: 5ee3ac3fb1810b18c8f4510cdaa17d98f4d01eac46cdbf960df1da0cd174d765
+  metadata.gz: be631fe763d5b378958552cdad1e6d611333ab246cf65701f44bd0c3c4ebbea7
+  data.tar.gz: 554006ae4e44b39110632c0f1a9950dcec3313bfe3b1c9495ff37d5b468e9d85
 SHA512:
-  metadata.gz: 879bccd09f01df061bd0e2ad3ba2e110f38da121358f9ab8ee05f9b41f101dc1df655676546a82dfd64c1abaabe8c7922811d173e539b1ecd22e90943728da3a
-  data.tar.gz: 85d1945fda553fe7d61a272eec97e3443ef247f4f69c7f567e1c1568b9fb79a449811da475f19d7d1aef7e2e5499ba67b75013db4843e2f34f35f383b662429e
+  metadata.gz: 9a12003164ca23896aaff1350cf1d7f594efb1377603a7a0a976e404df73e189e829a64394baac9503c51394d8daf47ea45ba6544657738eb3a4b98b72d4d8f1
+  data.tar.gz: 5cd4c5eb5dd9eed3f74a9f8e3931d9d9b8f72ffb3051bdeb66fa25254341d4a7f95f10b96d9aae9e8c12f18392bd691d02b2b2ecd8b37ab4657427a573884737

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.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_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/serialization_providers/jruby.rb

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

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/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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,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