isomorfeus-operation 1.0.0.zeta14 → 1.0.0.zeta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38fb10ba79914eb1e48b5e42a16bd50ead01a862cda25cd85b45f098b7faf440
-  data.tar.gz: 383b277430ae8bc41536d001debb2f9af02800d43757742285bd02d4fe7a1930
+  metadata.gz: d00f6ffa11f6782136e58a51ba27b03511a8401c9a582c7a195db27e6dd74dd4
+  data.tar.gz: bf17412a17c7dd68d6daddea536e854fe85ee1c938eb785afaf2a555bc5a85d3
 SHA512:
-  metadata.gz: bbbc04b328ab1d6f2dfd4b45ddb093ab6121e57880ef3b113ab2be61126ea1eeb5f02cefbf581f5e5b7f4510327408d6f8cde02928a08a0a83575f89ff610807
-  data.tar.gz: 23eec974042c13993bb05f96bd3acc43e65b7a5d0d64e9fbf8203a967c2304918995b6355db3629a92032c823c3307b1192550919420036bade7598bb96e9114
+  metadata.gz: 43ae731325bef3667ad4520cc27f11a9a75c2c9f4a16506edd5395c3228409e589512d13065532c13dcc385a2514ee4f59ea068fdfde1fe8c607722a5aad68ad
+  data.tar.gz: e6210ac995463e6c44505fa2dd7be525565300e32c70458facfcbd4814b9db37863bc9b42ea3b9b0aa2f731628681d1e0dfb1c9c693d912367106446cb0e62ab

data/README.md

@@ -6,53 +6,11 @@ Operations for Isomorfeus.
 At the [Isomorfeus Framework Project](http://isomorfeus.com) 
 
 ### Usage
-there are 3 kinds of Operations:
-- LucidQuickOp
-- LucidOperation
-- LucidLocalOperation
+Operations use Props like other parts of the system.
+See [the isomorfeus-react props documentation](https://github.com/isomorfeus/isomorfeus-react/blob/master/ruby/docs/props.md#prop-declaration).
 
-```ruby
-class MyQuickOp < LucidQuickOp::Base
-  prop :a_prop
+There are 3 kinds of Operations:
+- [LucidQuickOp](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-operation/docs/quick_op.md) - Quick simple operation, always executed on the server.
+- [LucidOperation](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-operation/docs/operation.md) - For complex multi-stepped operations, always executed on the server.
+- [LucidLocalOperation](https://github.com/isomorfeus/isomorfeus-project/blob/master/ruby/isomorfeus-operation/docs/operation.md) - For complex multi-stepped operations, always executed locally.
 
-  op do
-    props.a_prop == 'a_value'
-    # do something
-  end
-end
-
-MyQuickOp.promise_run(a_prop: 'a_value')
-
-# or
-
-MyQuickOp.promise_run(props: { a_prop: 'a_value' })
-```
-
-Quick remote procedure call, always executed on the server.
-LucidOperation too is always executed on the Server. It allows to define Operations in gherkin human language style:
-```ruby
-class MyOperation < LucidOperation::Base
-  prop :a_prop
-
-  procedure <<~TEXT
-     Given a bird
-     When it flies
-     Then be happy
-  TEXT
-
-  Given /a bird/ do
-     props.a_prop == 'a_value'
-  end
-
-  # etc ...
-end
-
-MyOperation.promise_run(a_prop: 'a_value')
-
-# or
-
-MyOperation.promise_run(props: { a_prop: 'a_value' })
-```
-
-LucidLocalOperation is the same as LucidOperation, except its always executed locally, wherever that may be.
-Its barely tested so far and no other docs.

data/lib/isomorfeus/operation/handler/operation_handler.rb

@@ -10,13 +10,19 @@ module Isomorfeus
             if Isomorfeus.valid_operation_class_name?(operation_class_name)
               operation_class = Isomorfeus.cached_operation_class(operation_class_name)
               if operation_class
-                props_json = response_agent.request[operation_class_name]
+                props = response_agent.request[operation_class_name]
+                props.transform_keys!(&:to_sym)
                 begin
-                  props = Oj.load(props_json, mode: :strict)
                   if Isomorfeus.current_user.authorized?(operation_class, :promise_run, props)
-                    operation_promise = operation_class.promise_run(props)
+                    operation_promise = operation_class.promise_run(**props)
                     if operation_promise.realized?
-                      response_agent.agent_result = { success: 'ok' , result: operation_promise.value }
+                      state = operation_promise.resolved? ? :resolved : :rejected
+                      result_hash = { state => operation_promise.value }
+                      if operation_promise.error
+                        e = operation_promise.error
+                        result_hash[:error] = { message: e.message, class_name: e.class.to_s, back_trace: e.backtrace }
+                      end
+                      response_agent.agent_result = { success: 'ok' , result: result_hash }
                     else
                       start = Time.now
                       timeout = false
@@ -30,7 +36,13 @@ module Isomorfeus
                       if timeout
                         response_agent.error = { error: 'Timeout' }
                       else
-                        response_agent.agent_result = { success: 'ok' , result: operation_promise.value }
+                        state = operation_promise.resolved? ? :resolved : :rejected
+                        result_hash = { state => operation_promise.value }
+                        if operation_promise.error
+                          e = operation_promise.error
+                          result_hash[:error] = { message: e.message, class_name: e.class.to_s, back_trace: e.backtrace }
+                        end
+                        response_agent.agent_result = { success: 'ok' , result: result_hash }
                       end
                     end
                   else

data/lib/isomorfeus/operation/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Operation
-    VERSION = '1.0.0.zeta14'
+    VERSION = '1.0.0.zeta15'
   end
 end

data/lib/isomorfeus_operation/lucid_local_operation/mixin.rb

@@ -14,17 +14,20 @@ module LucidLocalOperation
       base.include(LucidOperation::PromiseRun)
 
       base.instance_exec do
-        def promise_run(props_hash = nil, props: nil)
-          props_hash = props_hash || props
-          validate_props(props_hash)
-          self.new(props_hash).promise_run
+        def promise_run(**props_hash)
+          self.new(**props_hash).promise_run
         end
       end
     end
 
-    attr_accessor :props
+    attr_reader :props
     attr_accessor :step_result
 
+    def initialize(**props_hash)
+      props_hash = self.class.validated_props(props_hash)
+      @props = LucidProps.new(props_hash)
+    end
+
     def current_user
       Isomorfeus.current_user
     end

data/lib/isomorfeus_operation/lucid_operation/mixin.rb

@@ -36,14 +36,10 @@ module LucidOperation
             @finally_defined = true
           end
 
-          def promise_run(props_hash = nil)
-            props_hash = props_hash || props
-            validate_props(props_hash)
-            props_json = Isomorfeus::PropsProxy.new(props_hash).to_json
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::Operation::Handler::OperationHandler', self.name, props_json).then do |agent|
-              if agent.processed
-                agent.result
-              else
+          def promise_run(**props_hash)
+            props = validated_props(props_hash)
+            Isomorfeus::Transport.promise_send_path('Isomorfeus::Operation::Handler::OperationHandler', self.name, props).then do |agent|
+              unless agent.processed
                 agent.processed = true
                 if agent.response.key?(:error)
                   `console.error(#{agent.response[:error].to_n})`
@@ -51,6 +47,20 @@ module LucidOperation
                 end
                 agent.result = agent.response[:result]
               end
+              if agent.result.key?(:rejected)
+                if agent.result.key?(:error)
+                  e = agent.result[:error]
+                  exception_class_name = e[:class_name]
+                  exception_class = exception_class_name.constantize
+                  exception = exception_class.new(e[:message])
+                  exception.set_backtrace(e[:backtrace])
+                  raise exception
+                else
+                  raise agent.result[:rejected]
+                end
+              else
+                agent.result[:resolved]
+              end
             end
           end
         end
@@ -60,16 +70,19 @@ module LucidOperation
         base.include(LucidOperation::PromiseRun)
 
         base.instance_exec do
-          def promise_run(props_hash = nil)
-            props_hash = props_hash || props
-            validate_props(props_hash)
-            self.new(props_hash).promise_run
+          def promise_run(**props_hash)
+            self.new(**props_hash).promise_run
           end
         end
 
-        attr_accessor :props
+        attr_reader :props
         attr_accessor :step_result
 
+        def initialize(**props_hash)
+          props_hash = self.class.validated_props(props_hash)
+          @props = LucidProps.new(props_hash)
+        end
+
         def current_user
           Isomorfeus.current_user
         end

data/lib/isomorfeus_operation/lucid_operation/promise_run.rb

@@ -1,9 +1,5 @@
 module LucidOperation
   module PromiseRun
-    def initialize(validated_props_hash)
-      @props = Isomorfeus::PropsProxy.new(validated_props_hash)
-    end
-
     def promise_run
       promise = Promise.new
       original_promise = promise
@@ -55,10 +51,7 @@ module LucidOperation
           if match_data
             matched = true
 
-            promise = promise.then do |result|
-              operation.step_result = result
-              operation.instance_exec(*match_data, &step[1])
-            end.fail do |result|
+            promise = promise.ensure do |result|
               operation.step_result = result
               operation.instance_exec(*match_data, &step[1])
             end

data/lib/isomorfeus_operation/lucid_quick_op/mixin.rb

@@ -8,14 +8,10 @@ module LucidQuickOp
           def op
           end
 
-          def promise_run(props_hash = nil)
-            props_hash = props_hash || props
-            validate_props(props_hash)
-            props_json = Isomorfeus::PropsProxy.new(props_hash).to_json
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::Operation::Handler::OperationHandler', self.name, props_json).then do |agent|
-              if agent.processed
-                agent.result
-              else
+          def promise_run(**props_hash)
+            props = validated_props(props_hash)
+            Isomorfeus::Transport.promise_send_path('Isomorfeus::Operation::Handler::OperationHandler', self.name, props).then do |agent|
+              unless agent.processed
                 agent.processed = true
                 if agent.response.key?(:error)
                   `console.error(#{agent.response[:error].to_n})`
@@ -23,6 +19,20 @@ module LucidQuickOp
                 end
                 agent.result = agent.response[:result]
               end
+              if agent.result.key?(:rejected)
+                if agent.result.key?(:error)
+                  e = agent.result[:error]
+                  exception_class_name = e[:class_name]
+                  exception_class = exception_class_name.constantize
+                  exception = exception_class.new(e[:message])
+                  exception.set_backtrace(e[:backtrace])
+                  raise exception
+                else
+                  raise agent.result[:rejected]
+                end
+              else
+                agent.result[:resolved]
+              end
             end
           end
         end
@@ -34,31 +44,29 @@ module LucidQuickOp
             @op = block
           end
 
-          def promise_run(props_hash = nil)
-            props_hash = props_hash || props
-            validate_props(props_hash)
-            self.new(props_hash).promise_run
+          def promise_run(**props_hash)
+            self.new(**props_hash).promise_run
           end
         end
       end
     end
 
-    attr_accessor :props
+    attr_reader :props
 
-    def initialize(validated_props_hash)
-      @props = Isomorfeus::PropsProxy.new(validated_props_hash)
-      @on_fail_track = false
+    def initialize(**props_hash)
+      props_hash = self.class.validated_props(props_hash)
+      @props = LucidProps.new(props_hash)
     end
 
     def promise_run
       original_promise = Promise.new
 
       operation = self
-      promise = original_promise.then do |result|
-        operation.instance_exec(&self.class.instance_variable_get(:@op))
+      promise = original_promise.then do |_|
+        operation.instance_exec(&operation.class.instance_variable_get(:@op))
       end
 
-      original_promise.resolve(true)
+      original_promise.resolve
       promise
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-operation
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta14
+  version: 1.0.0.zeta15
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.14
+        version: 16.12.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.14
+        version: 16.12.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta14
+        version: 1.0.0.zeta15
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement