evostream-event 0.2.7.pre.44 → 0.2.7.pre.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 794a3be245e97a616d9b0529910a8a3322bd569a
-  data.tar.gz: f548d4ff94e9135dbcdc231114c40ea7f0d52c23
+  metadata.gz: 82fdefeb366413c3f31d9268dae79e8d0b56952e
+  data.tar.gz: 03bd68889b09bd26dc3ebe3c406ae265a001913b
 SHA512:
-  metadata.gz: 7ff4cc2457e54465d0177b929c554ed3d70dc9b5a5608bb25e7aacef1e9db1c8f7530c2815f8e9e9f682e88912551319b7a657530dc8efffa2916ed26c89ad7f
-  data.tar.gz: 0e3de0987227d7465c70efe0694a79995d4e37d1e9df9f2ebe3203b4b323e81923c7767307224ca4dccf8039659e4002694217ba35072a4e6fc80750610ad47d
+  metadata.gz: 029f338ad9ca3a80e3e90d20a4d787900e198b0d757a9d55be11339d973890e91296e0d4b259cb0e7e8e17c41a7506a6d5a9cd63815fe81aae1f06914bc029fe
+  data.tar.gz: bab214053fde0b1eb0f5286fc3301b0d4ba4f645ed00cac5a46bb2dcffc25921f59ec5b290ea89fb9c910e3b4b68d60a0aa0cec4af08589eba1cf7ee35be2752

data/lib/evostream/event.rb

@@ -14,13 +14,7 @@ require 'evostream/event/response/mock'
 module Evostream
   def self.send_command(cmd)
     Evostream.logger "CMD : #{cmd}"
-    response = case Evostream::Service.response_format
-               when :hash
-                 Evostream::Response::FormatHash
-               else
-                 Evostream::Response::FormatJSON
-               end.new(prepare_request(cmd))
-    response.message
+    Evostream::Responses.new(prepare_request(cmd)).message
   end
 
   def self.logger(message)

data/lib/evostream/event/response/response.rb

@@ -1,49 +1,43 @@
 # frozen_string_literal: true
 
 module Evostream
-  module Response
-    # Create a response
-    class Responses
-      attr_reader :status, :message, :data
-
-      def initialize(evostream_response)
-        @evostream = evostream_response.body
-        Evostream.logger "EVO #{@evostream.class}"
-
-        @status = define_status
-        @message = define_message
-        @data = @evostream['data'] if @status.eql?(200)
-      end
+  # Create a response
+  class Responses
+    attr_reader :status, :message, :data
 
-      def message
-        {
-          status: @status,
-          message: @message,
-          data: @data
-        }
-      end
+    def initialize(evostream_response)
+      @evostream = JSON.parse(evostream_response.body)
+
+      @status = define_status
+      @message = define_message
+      @data = @evostream['data'] if @status.eql?(200)
+    end
 
-      private
+    def message
+      {
+        status: @status,
+        message: @message,
+        data: @data
+      }.deep_symbolize_keys!
+    end
+
+    private
 
-      attr_accessor :evostream
+    attr_accessor :evostream
 
-      def define_status
-        case @evostream['status']
-        when 'FAIL' then 500
-        when 'SUCCESS' then 200
-        end
+    def define_status
+      case @evostream['status']
+      when 'FAIL' then 500
+      when 'SUCCESS' then 200
       end
+    end
 
-      def define_message
-        if @status.eql?(500)
-          'Error with EvoStream server.'
-        else
-          'Object was successfully created/updated.'
-        end
+    def define_message
+      if @status.eql?(500)
+        'Error with EvoStream server.'
+      else
+        'Object was successfully created/updated.'
       end
     end
   end
 end
-
-require 'evostream/event/response/format_hash'
-require 'evostream/event/response/format_json'

data/lib/evostream/event/service.rb

@@ -7,7 +7,7 @@ module Evostream
   # DSL configuration for this gem
   class Service
     mattr_accessor :web_root, :uri_in, :uri_out, :name, :model, :model_id,
-                   :environment, :response_format
+                   :environment
 
     def self.configuration(&block)
       block.call(self)
@@ -23,9 +23,5 @@ module Evostream
     def self.web_root
       @@web_root || '/var/www/html'
     end
-
-    def self.response_format
-      @@response_format || :json
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evostream-event
 version: !ruby/object:Gem::Version
-  version: 0.2.7.pre.44
+  version: 0.2.7.pre.45
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -276,8 +276,6 @@ files:
 - lib/evostream/event/event/events/in_stream_created.rb
 - lib/evostream/event/event/events/out_stream_created.rb
 - lib/evostream/event/info.rb
-- lib/evostream/event/response/format_hash.rb
-- lib/evostream/event/response/format_json.rb
 - lib/evostream/event/response/mock.rb
 - lib/evostream/event/response/response.rb
 - lib/evostream/event/service.rb

data/lib/evostream/event/response/format_hash.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Evostream
-  module Response
-    # Return a response to Hash format
-    class FormatHash < Responses
-      def message
-        super
-      end
-    end
-  end
-end

data/lib/evostream/event/response/format_json.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Evostream
-  module Response
-    # Return a response to JSON format
-    class FormatJSON < Responses
-      def message
-        super.to_json
-      end
-    end
-  end
-end