isomorfeus-operation 1.0.0.zeta12 → 1.0.0.zeta13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6658f36d7b9bff0810c5e57f9e0aa4e72980e544dc9ea5674ac9c2e0528217a2
-  data.tar.gz: 66b4cc58e9d866b13e78fceb709ecb1865814bf45b4fb332c4caf8bd509254e4
+  metadata.gz: 6db4cbfe8ccb8fc09b927687cba57d15ec20139916c762f26eee0880248b37da
+  data.tar.gz: 0abf87b9875035ebfac2427663c85f5b09c5ab2e1581624f7d3332ee973a78b5
 SHA512:
-  metadata.gz: 3e1d4fa270a2711fdc5fac1b68c06ad5b946776f5f55b4b6ce0353b733d91749c9d7d6e669955f2b40bffa6dd1345cf1a78e659225b175499649a8ba0d0bda6c
-  data.tar.gz: fc6c803efd837f7e965a18ae7001f87677d8e5887b6f58d4adbe5731fca465593366279afd32455b260c33c7da051937289dd1bd4f979b37f45aff506f13a5a0
+  metadata.gz: a958cb2146c8b7e2f1de81f44eefbe15f509c647e99e202d7b6eb2f2693ff291511f506211984f112d1b41a56f899f2deea17a1b2fd25892dd468ef0eea3a766
+  data.tar.gz: ed134f2be6909d2909b2a3ecf0f42825cf8b8ec56d181e283d90a50e245457099393c571e36911d1035e027c7690d97a9c63e89b919769eafad467472cc8e6ca

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

@@ -4,7 +4,7 @@ module Isomorfeus
   module Operation
     module Handler
       class OperationHandler < LucidHandler::Base
-        on_request do |pub_sub_client, current_user, response_agent|
+        on_request do |response_agent|
           # promise_send_path('Isomorfeus::Operation::Handler::OperationHandler', self.to_s, props_hash)
           response_agent.request.each_key do |operation_class_name|
             if Isomorfeus.valid_operation_class_name?(operation_class_name)
@@ -13,8 +13,7 @@ module Isomorfeus
                 props_json = response_agent.request[operation_class_name]
                 begin
                   props = Oj.load(props_json, mode: :strict)
-                  props.merge!({pub_sub_client: pub_sub_client, current_user: current_user})
-                  if current_user.authorized?(operation_class, :promise_run, props)
+                  if Isomorfeus.current_user.authorized?(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 }
@@ -38,17 +37,13 @@ module Isomorfeus
                     response_agent.error = { error: 'Access denied!' }
                   end
                 rescue Exception => e
-                  response_agent.error = if Isomorfeus.production?
-                                           { error: { operation_class_name => 'No such thing!' }}
-                                         else
-                                           { error: { operation_class_name => "Isomorfeus::Operation::Handler::OperationHandler: #{e.message}" }}
-                                         end
+                  response_agent.error = { error: { operation_class_name => "Isomorfeus::Operation::Handler::OperationHandler: #{e.message}" }}
                 end
               else
-                response_agent.error = { error: { operation_class_name => 'No such thing!' }}
+                response_agent.error = { error: { operation_class_name => 'Could not get operation class!' }}
               end
             else
-              response_agent.error = { error: { operation_class_name => 'No such thing!' }}
+              response_agent.error = { error: { operation_class_name => 'No such operation class!' }}
             end
           end
         end

data/lib/isomorfeus/operation/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Operation
-    VERSION = '1.0.0.zeta12'
+    VERSION = '1.0.0.zeta13'
   end
 end

data/lib/isomorfeus_operation/lucid_local_operation/mixin.rb

@@ -3,6 +3,10 @@ module LucidLocalOperation
     def self.included(base)
       if RUBY_ENGINE != 'opal'
         Isomorfeus.add_valid_operation_class(base) unless base == LucidLocalOperation::Base
+
+        def pub_sub_client
+          Isomorfeus.pub_sub_client
+        end
       end
 
       base.extend(LucidPropDeclaration::Mixin)
@@ -20,5 +24,9 @@ module LucidLocalOperation
 
     attr_accessor :props
     attr_accessor :step_result
+
+    def current_user
+      Isomorfeus.current_user
+    end
   end
 end

data/lib/isomorfeus_operation/lucid_operation/base.rb

@@ -5,9 +5,6 @@ module LucidOperation
     if RUBY_ENGINE != 'opal'
       def self.inherited(base)
         Isomorfeus.add_valid_operation_class(base)
-
-        base.prop :pub_sub_client, default: nil
-        base.prop :current_user, default: Anonymous.new
       end
     end
   end

data/lib/isomorfeus_operation/lucid_operation/gherkin.rb

@@ -28,30 +28,30 @@ module LucidOperation
       lines.each do |line|
         case line
         when STAR, GIVEN, WHEN, THEN, AND
-          raise FINALLY_EXCEPTION if has_finally
+          Isomorfeus.raise_error(message: FINALLY_EXCEPTION) if has_finally
           operation[:steps] << $1.strip
         when ENSURE
           operation[:ensure] << $1.strip
         when IW_FAILING, IF_ITT_FAILED, FAILED
           operation[:failure] << $1.strip
         when FIRST
-          raise FIRST_EXCEPTION if operation[:steps].size > 0
+          Isomorfeus.raise_error(message: FIRST_EXCEPTION) if operation[:steps].size > 0
           operation[:steps] << $1.strip
         when FINALLY
-          raise FINALLY_EXCEPTION if has_finally
+          Isomorfeus.raise_error(message: FINALLY_EXCEPTION) if has_finally
           operation[:steps] << $1.strip
           has_finally = true
         when PROCEDURE
-          raise 'No Operation defined!' if operation[:operation].empty?
-          raise 'Procedure already defined!' unless operation[:procedure].empty?
+          Isomorfeus.raise_error(message: 'No Operation defined!') if operation[:operation].empty?
+          Isomorfeus.raise_error(message: 'Procedure already defined!') unless operation[:procedure].empty?
           operation[:procedure] = $1.strip
         when OPERATION
-          raise 'Operation already defined!' unless operation[:operation].empty?
+          Isomorfeus.raise_error(message: 'Operation already defined!') unless operation[:operation].empty?
           operation[:operation] = $1.strip
         when WHITE_SPACE, COMMENT
           # nothing, just skip
         else
-          raise "Unknown key word(s) at the beginning of the line: #{line}" unless operation[:procedure].empty?
+          Isomorfeus.raise_error(message: "Unknown key word(s) at the beginning of the line: #{line}") unless operation[:procedure].empty?
           operation[:description] = [] unless operation.key?(:description)
           operation[:description] << line.strip
         end

data/lib/isomorfeus_operation/lucid_operation/mixin.rb

@@ -27,19 +27,19 @@ module LucidOperation
           alias :If_that_failed :steps
 
           def First(regular_expression, &block)
-            raise "#{self}: First already defined, can only be defined once!" if @first_defined
+            Isomorfeus.raise_error(message: "#{self}: First already defined, can only be defined once!") if @first_defined
             @first_defined = true
           end
 
           def Finally(regular_expression, &block)
-            raise "#{self}: Finally already defined, can only be defined once!" if @finally_defined
+            Isomorfeus.raise_error(message: "#{self}: Finally already defined, can only be defined once!") if @finally_defined
             @finally_defined = true
           end
 
           def promise_run(props_hash = nil)
             props_hash = props_hash || props
             validate_props(props_hash)
-            props_json = Isomorfeus::Transport::PropsProxy.new(props_hash).to_json
+            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
@@ -47,7 +47,7 @@ module LucidOperation
                 agent.processed = true
                 if agent.response.key?(:error)
                   `console.error(#{agent.response[:error].to_n})`
-                  raise agent.response[:error]
+                  Isomorfeus.raise_error(message: agent.response[:error])
                 end
                 agent.result = agent.response[:result]
               end
@@ -59,11 +59,6 @@ module LucidOperation
         base.extend(LucidOperation::Steps)
         base.include(LucidOperation::PromiseRun)
 
-        unless base == LucidOperation::Base
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
-        end
-
         base.instance_exec do
           def promise_run(props_hash = nil)
             props_hash = props_hash || props
@@ -74,6 +69,14 @@ module LucidOperation
 
         attr_accessor :props
         attr_accessor :step_result
+
+        def current_user
+          Isomorfeus.current_user
+        end
+
+        def pub_sub_client
+          Isomorfeus.pub_sub_client
+        end
       end
     end
   end

data/lib/isomorfeus_operation/lucid_operation/promise_run.rb

@@ -1,7 +1,7 @@
 module LucidOperation
   module PromiseRun
     def initialize(validated_props_hash)
-      @props = Isomorfeus::Transport::PropsProxy.new(validated_props_hash)
+      @props = Isomorfeus::PropsProxy.new(validated_props_hash)
     end
 
     def promise_run
@@ -24,7 +24,7 @@ module LucidOperation
             end
           end
         end
-        raise "No match found for step #{gherkin_step}!" unless matched
+        Isomorfeus.raise_error(message: "No match found for step #{gherkin_step}!") unless matched
       end
 
       # fail track
@@ -42,7 +42,7 @@ module LucidOperation
             end
           end
         end
-        raise "No match found for failure step #{gherkin_step}!" unless matched
+        Isomorfeus.raise_error(message: "No match found for failure step #{gherkin_step}!") unless matched
       end
 
       # ensure
@@ -64,7 +64,7 @@ module LucidOperation
             end
           end
         end
-        raise "No match found for ensure step #{gherkin_step}!" unless matched
+        Isomorfeus.raise_error(message: "No match found for ensure step #{gherkin_step}!") unless matched
       end
 
       original_promise.resolve

data/lib/isomorfeus_operation/lucid_operation/steps.rb

@@ -25,7 +25,7 @@ module LucidOperation
     end
 
     def First(regular_expression, &block)
-      raise "#{self}: First already defined, can only be defined once!" if @first_defined
+      Isomorfeus.raise_error(message: "#{self}: First already defined, can only be defined once!") if @first_defined
       @first_defined = true
       steps << [regular_expression, block]
     end
@@ -38,7 +38,7 @@ module LucidOperation
     alias :When :Given
 
     def Finally(regular_expression, &block)
-      raise "#{self}: Finally already defined, can only be defined once!" if @finally_defined
+      Isomorfeus.raise_error(message: "#{self}: Finally already defined, can only be defined once!") if @finally_defined
       @finally_defined = true
       steps << [regular_expression, block]
     end

data/lib/isomorfeus_operation/lucid_quick_op/base.rb

@@ -5,9 +5,6 @@ module LucidQuickOp
     if RUBY_ENGINE != 'opal'
       def self.inherited(base)
         Isomorfeus.add_valid_operation_class(base)
-
-        base.prop :pub_sub_client, default: nil
-        base.prop :current_user, default: Anonymous.new
       end
     end
   end

data/lib/isomorfeus_operation/lucid_quick_op/mixin.rb

@@ -11,7 +11,7 @@ module LucidQuickOp
           def promise_run(props_hash = nil)
             props_hash = props_hash || props
             validate_props(props_hash)
-            props_json = Isomorfeus::Transport::PropsProxy.new(props_hash).to_json
+            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
@@ -19,7 +19,7 @@ module LucidQuickOp
                 agent.processed = true
                 if agent.response.key?(:error)
                   `console.error(#{agent.response[:error].to_n})`
-                  raise agent.response[:error]
+                  Isomorfeus.raise_error(message: agent.response[:error])
                 end
                 agent.result = agent.response[:result]
               end
@@ -29,11 +29,6 @@ module LucidQuickOp
       else
         Isomorfeus.add_valid_operation_class(base) unless base == LucidQuickOp::Base
 
-        unless base == LucidQuickOp::Base
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
-        end
-
         base.instance_exec do
           def op(&block)
             @op = block
@@ -51,7 +46,7 @@ module LucidQuickOp
     attr_accessor :props
 
     def initialize(validated_props_hash)
-      @props = Isomorfeus::Transport::PropsProxy.new(validated_props_hash)
+      @props = Isomorfeus::PropsProxy.new(validated_props_hash)
       @on_fail_track = false
     end
 
@@ -66,5 +61,13 @@ module LucidQuickOp
       original_promise.resolve(true)
       promise
     end
+
+    def current_user
+      Isomorfeus.current_user
+    end
+
+    def pub_sub_client
+      Isomorfeus.pub_sub_client
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-operation
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta12
+  version: 1.0.0.zeta13
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-27 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.9
+        version: 16.12.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.9
+        version: 16.12.14
 - !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.zeta12
+        version: 1.0.0.zeta13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement