vayacondios-server 0.2.2 → 0.2.4

data/Gemfile

@@ -1,3 +1,5 @@
+# -*- ruby -*-
+
 source 'http://rubygems.org'
 
 gemspec name: 'vayacondios-server'

data/lib/vayacondios/client/itemset.rb

@@ -2,7 +2,7 @@ require 'gorillib/logger/log'
 require 'net/http'
 require 'multi_json'
 require_relative 'config'
-require_relative '../legacy_switch'
+require_relative 'legacy_switch'
 
 class Vayacondios
   class Client

data/lib/vayacondios/client/legacy_switch.rb

@@ -0,0 +1,46 @@
+require 'gorillib/logger/log'
+
+class Vayacondios
+  # Are we operating on JSON Hashes (Vayacondios) or on JSON arrays
+  # (Vayacondios Legacy)? These classes determine which to use.
+
+  class StandardContentsHandler
+    def wrap_contents(contents) {contents: contents} end
+    def extract_contents(document) document['contents'] end
+    def extract_response(document) document['contents'] end
+    def proper_request(document)
+      document.is_a? Hash and document.fetch('_json', {}).is_a? Hash
+    end
+  end
+
+  class LegacyContentsHandler
+    def wrap_contents(contents) contents end
+    def extract_contents(document) document.fetch('_json', {}) end
+    def extract_response(document) document end
+    def proper_request(document)
+      document.is_a? Array or document.fetch('_json', {}).is_a? Array
+    end
+  end
+
+  @@legacy_switch = nil
+
+  def self.legacy_switch
+    legacy_mode_on = Settings[:vayacondios][:legacy]
+    if @@legacy_switch.nil?
+      @@legacy_switch = get_legacy_switch(legacy_mode_on)
+      Log.info("using #{legacy_mode_on ? 'legacy' : 'standard'} mode")
+    end
+    @@legacy_switch
+  end
+
+  def self.force_legacy_mode on
+    @@legacy_switch = get_legacy_switch on
+  end
+
+  private
+
+  def self.get_legacy_switch on
+    (on ? LegacyContentsHandler : StandardContentsHandler).new
+  end
+end
+

data/lib/vayacondios/server/legacy_switch.rb

@@ -0,0 +1,46 @@
+require 'gorillib/logger/log'
+
+class Vayacondios
+  # Are we operating on JSON Hashes (Vayacondios) or on JSON arrays
+  # (Vayacondios Legacy)? These classes determine which to use.
+
+  class StandardContentsHandler
+    def wrap_contents(contents) {contents: contents} end
+    def extract_contents(document) document['contents'] end
+    def extract_response(document) document['contents'] end
+    def proper_request(document)
+      document.is_a? Hash and document.fetch('_json', {}).is_a? Hash
+    end
+  end
+
+  class LegacyContentsHandler
+    def wrap_contents(contents) contents end
+    def extract_contents(document) document.fetch('_json', {}) end
+    def extract_response(document) document end
+    def proper_request(document)
+      document.is_a? Array or document.fetch('_json', {}).is_a? Array
+    end
+  end
+
+  @@legacy_switch = nil
+
+  def self.legacy_switch
+    legacy_mode_on = Settings[:vayacondios][:legacy]
+    if @@legacy_switch.nil?
+      @@legacy_switch = get_legacy_switch(legacy_mode_on)
+      Log.info("using #{legacy_mode_on ? 'legacy' : 'standard'} mode")
+    end
+    @@legacy_switch
+  end
+
+  def self.force_legacy_mode on
+    @@legacy_switch = get_legacy_switch on
+  end
+
+  private
+
+  def self.get_legacy_switch on
+    (on ? LegacyContentsHandler : StandardContentsHandler).new
+  end
+end
+

data/lib/vayacondios/server/model/itemset_document.rb

@@ -1,5 +1,5 @@
 require 'vayacondios/server/model/document'
-require 'vayacondios/legacy_switch'
+require 'vayacondios/server/legacy_switch'
 
 # The configuration model
 #

data/lib/vayacondios/version.rb

@@ -1,3 +1,3 @@
 class Vayacondios
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/spec/client/itemset_legacy_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require_relative '../../lib/vayacondios/legacy_switch'
+require_relative '../../lib/vayacondios/server/legacy_switch'
 
 require 'multi_json'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vayacondios-server
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -208,6 +208,7 @@ files:
 - lib/vayacondios/client/cube_client.rb
 - lib/vayacondios/client/http_client.rb
 - lib/vayacondios/client/itemset.rb
+- lib/vayacondios/client/legacy_switch.rb
 - lib/vayacondios/client/notifier.rb
 - lib/vayacondios/client/zabbix_client.rb
 - lib/vayacondios/legacy_switch.rb
@@ -216,6 +217,7 @@ files:
 - lib/vayacondios/server/handlers/config_handler.rb
 - lib/vayacondios/server/handlers/event_handler.rb
 - lib/vayacondios/server/handlers/itemset_handler.rb
+- lib/vayacondios/server/legacy_switch.rb
 - lib/vayacondios/server/model/config_document.rb
 - lib/vayacondios/server/model/document.rb
 - lib/vayacondios/server/model/event_document.rb
@@ -277,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2368824716653400706
+      hash: -3470064849041831815
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -286,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2368824716653400706
+      hash: -3470064849041831815
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25