Merge pull request #29 from dsalahutdinov/master

feature: logux actions behaive as action params

lib/logux.rb

@@ -4,6 +4,7 @@
 require 'rest-client'
 require 'rails/engine'
 require 'active_support'
+require 'action_controller'
 require 'hashie/mash'
 require 'logux/engine'
 require 'nanoid'

lib/logux/actions.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 module Logux
-  class Actions < Hashie::Mash
-    disable_warnings
-
+  class Actions < ::ActionController::Parameters
     def action_name
       type&.split('/')&.dig(0)
     end
@@ -20,8 +18,12 @@ def channel_id
       channel&.split('/')&.last
     end
 
-    def to_s
-      to_h.to_s
+    def type
+      require(:type)
+    end
+
+    def channel
+      require(:channel)
     end
   end
 end

spec/factories/logux_actions_factory.rb

@@ -4,32 +4,40 @@
   factory :logux_actions, class: Logux::Actions do
     factory :logux_actions_subscribe do
       skip_create
-      type { 'logux/subscribe' }
-      channel { 'user/1' }
+      initialize_with do
+        new({ type: 'logux/subscribe', channel: 'user/1' }.merge(attributes))
+      end
     end
 
     factory :logux_actions_add do
       skip_create
-      type { 'user/add' }
-      key { 'name' }
-      value { 'test' }
+      initialize_with do
+        new({ type: 'user/add', key: 'name', value: 'test' }.merge(attributes))
+      end
     end
 
     factory :logux_actions_update do
       skip_create
-      type { 'user/update' }
-      key { 'name' }
-      value { 'test1' }
+      initialize_with do
+        new({ type: 'user/add', key: 'name', value: 'test' }.merge(attributes))
+      end
     end
 
     factory :logux_actions_unknown do
       skip_create
-      type { 'unknown/action' }
+      initialize_with do
+        new({ type: 'unknown/action' }.merge(attributes))
+      end
     end
 
     factory :logux_actions_unknown_subscribe do
-      type { 'logux/subscribe' }
-      channel { 'unknown/channel' }
+      skip_create
+      initialize_with do
+        new(
+          { type: 'logux/subscribe', channel: 'unknown/channel' }
+            .merge(attributes)
+        )
+      end
     end
   end
 end

spec/logux/actions_spec.rb

@@ -4,7 +4,9 @@
 
 describe Logux::Actions do
   let(:actions) do
-    described_class.new(type: 'user/add', channel: 'project/123')
+    described_class.new(
+      type: 'user/add', channel: 'project/123', data: 'data'
+    )
   end
 
   describe '#action_type' do
@@ -30,4 +32,14 @@
 
     it { is_expected.to eq '123' }
   end
+
+  describe 'permitted attributes' do
+    it 'has actions params unpermitted' do
+      expect(actions).not_to be_permitted
+    end
+
+    it 'permits params' do
+      expect(actions.permit(:data)).to be_permitted
+    end
+  end
 end

spec/logux/client_spec.rb

@@ -5,7 +5,9 @@
 describe Logux::Client do
   let(:client) { described_class.new }
   let(:meta) { create(:logux_meta) }
-  let(:commands) { [['action', { id: 1 }, meta], ['action', { id: 2 }, meta]] }
+  let(:commands) do
+    [['action', { id: 1 }, meta], ['action', { id: 2 }, meta]]
+  end
   let(:params) do
     {
       version: 0,