evostream-event 0.2.3 → 0.2.4.pre.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aef4188d5a8087438593f34d1aa78d94a5c91c3
-  data.tar.gz: 1d2a5800a2245f9feaf55a53e3e1a6350bc1db31
+  metadata.gz: 5f81886b80f646e5667351832115afeddf3d166e
+  data.tar.gz: 9de2250347b899d3f30cd8d9224d22e7e85ee2b6
 SHA512:
-  metadata.gz: 1464f4208173fc09369d40af29471c8cc44bbd2d9f67ac35fe5d1c1cdba492e56bb7b99f847ce7c8bac650c804353505b6023da33ed685171f01de7aa2f015b8
-  data.tar.gz: 5d9ca90975ba4c1ea7a8dba5abe9d52186e07998e7185c316406b81699785cb79343fc380da1971397eecbc72e68d5ebe3ef835a653e0e146c92c7d1300b84ee
+  metadata.gz: 3da7f11d9882c0b823d0ae04447ddf383d655318e4b8e4eb262ba43a02c0eead56ae084b81222e510c09d6872f79d8190abc2920baba78d3486d8b501ad04bef
+  data.tar.gz: e14106b57b10fe1e99adf4d2b95746f1a86bd0384ee48bb5f6234e8aa2f767daa1816d52913a877582fe765601585e649baf4e278fcf419cfb9fb4a2bee9ee45

data/lib/evostream/event.rb

@@ -10,15 +10,38 @@ require 'net/http'
 # Primary command to gem
 module Evostream
   def self.send_command(cmd)
-    uri = URI.parse("#{Evostream::Service.uri_in}/#{cmd}")
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.request(Net::HTTP::Get.new(uri.request_uri))
+    response = prepare_request(cmd)
+    body = JSON.parse(response.body).to_hash
+    { status: Evostream.status(body), message: body['description'] }
+  end
+
+  def self.send_command_action(cmd)
+    response = prepare_request(cmd)
+    body = response.body
+    if body.blank?
+      { status: 403, message: 'Error with evostream !' }
+    else
+      body = JSON.parse(body).to_hash
+      { status: 200, message: body['description'] }
+    end
   end
 
   def self.logger(message)
     Rails.logger.debug "[#{Evostream::GEM_NAME}] #{message}" if defined?(Rails)
   end
 
+  def self.status(body)
+    body['status'].eql?('FAIL') ? 403 : 200
+  end
+
+  def self.prepare_request(cmd)
+    uri = URI.parse("#{Evostream::Service.uri_in}/#{cmd}")
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.request(Net::HTTP::Get.new(uri.request_uri))
+  end
+end
+
+module Evostream
   # Send an action to evostream server
   class Action
     def initialize(payload)
@@ -28,7 +51,7 @@ module Evostream
     def execute_action(command_name)
       cmd = command_name.sub(/^(\w)/, &:capitalize)
       klass = "Evostream::Commands::#{cmd}".constantize
-      Evostream.send_command(klass.new(@payload).cmd)
+      Evostream.send_command_action(klass.new(@payload).cmd)
     end
   end
 

data/lib/evostream/event/events.rb

@@ -9,11 +9,13 @@ module Evostream
         Evostream.logger "Initialize event #{class_name}"
         @id_flux = id_flux
         @model = Service.model.find_by(Service.model_id => id_flux)
+        @result = nil
       end
 
-      def execute(type_flux = %w(hls dash))
+      def execute(type_flux = %w[hls dash])
         Evostream.logger "Execute action for event #{class_name}"
         type_flux.each { |flux| yield(flux) } if block_given?
+        @result
       end
 
       def class_name
@@ -27,6 +29,7 @@ module Evostream
       private
 
       attr_reader :id_flux, :model
+      attr_accessor :result
     end
   end
 end

data/lib/evostream/event/events/in_stream_closed.rb

@@ -12,8 +12,8 @@ module Evostream
       def execute
         super do |type_flux|
           klass = Evostream::Commands::Destroy.new(remove_config(type_flux))
-          Evostream.send_command(klass.cmd)
-          yield if block_given?
+          @result = Evostream.send_command(klass.cmd)
+          # yield if block_given?
         end
       end
 

data/lib/evostream/event/events/in_stream_created.rb

@@ -8,7 +8,7 @@ module Evostream
         super do |type_flux|
           klass = "Evostream::Commands::Create#{type_flux.upcase}".constantize
           command = send(type_flux, type_flux)
-          Evostream.send_command(klass.new(command).cmd)
+          @result = Evostream.send_command(klass.new(command).cmd)
         end
       end
 

data/lib/evostream/event/events/out_stream_created.rb

@@ -13,6 +13,7 @@ module Evostream
         stream_flux = what_flux.upcase.constantize
         model.streams.push(stream_flux.new(config_id: ex_config, flux: ex_flux))
         model.save
+        @result = { status: 201, message: 'Action successfully executed.' }
       end
 
       private

data/lib/evostream/event/info.rb

@@ -6,7 +6,7 @@
 # Define constant to gem.
 module Evostream
   # Define version to gem
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 
   # Name to gem
   GEM_NAME = 'evostream-event'

data/spec/support/examples_actions.rb

@@ -3,5 +3,5 @@
 RSpec.shared_examples 'test request action' do
   let(:request) { action.execute_action(action_name) }
 
-  it { expect(request).to be_an_instance_of(Net::HTTPOK) }
+  it { expect(request).to be_kind_of(Hash) }
 end

data/spec/support/examples_events.rb

@@ -4,11 +4,7 @@ RSpec.shared_examples 'payload is correct' do |request = true|
   include_examples 'body type'
   include_examples 'evostream::event new'
   include_examples 'instance variable model'
-  if request
-    include_examples 'request test'
-  else
-    include_examples 'type stream'
-  end
+  include_examples 'type stream' unless request
   it { expect(type).to eql(type_default) }
 end
 
@@ -34,11 +30,6 @@ RSpec.shared_examples 'instance variable model' do
   it { expect(evo.instance_variable_get(:@model)).to eql(model) }
 end
 
-RSpec.shared_examples 'request test' do
-  let(:response) { Evostream::Event.new(type, payload).execute_action }
-  it { expect(response).to be_an_instance_of(Array) }
-end
-
 RSpec.shared_examples 'type stream' do
   let(:stream) do
     Evostream::Events::OutStreamCreated.new(1234, payload).send(:what_flux)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evostream-event
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4.pre.31
 platform: ruby
 authors:
 - VAILLANT Jeremy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -303,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5