isomorfeus-operation 23.9.0.rc7 → 23.9.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e6a1abcdbe84fdca6f1bb487a1eb3f218ba82219ae43c9270b3155eed7ded9
-  data.tar.gz: b0eebb080b480092464928b2a24edcaa79448035440d98b940a46562a992300a
+  metadata.gz: 52a3ac481df1bb0bd9d0faee7497c02d8bf09445e8217dfcc0f49d9f81b58c97
+  data.tar.gz: d8295fa118ff351da81f0d193339449d36a8f5ded0e2a89aed86d3c10eeb965f
 SHA512:
-  metadata.gz: 16d0156d48a26f9805f7d62b683a77a465d67867607a3d62d05ee006a1003fe4628ddae135f9dd74bc3eb81cdfb8564123880247953b02dd00fa7019012bb5f4
-  data.tar.gz: dea9caada9f221f06908ac9ba518c1b8931ce521ce648dcec9c0bc966e0243812fe184fd1acb42fba3f6697614551d28a60b8b22f83f8bca9ab892951d1b0134
+  metadata.gz: 00d63b08ba6fa3f50fded72376ba7e380ade93dffd9cc1d7facbd4e953b2fef5c8aceafe7da2c90f4ccff6944e711ea9dacb9bb12ae90533d3e9e6d11dc79ad9
+  data.tar.gz: 1e1e9ab82660732babf137ee33f195cfefd92a947575a78d9c01d9d3bca7bd673c10b80eeadc6177b435b366d800b0dbf2564ad8a5932b9a95ffefef6b0b0014

data/README.md

@@ -10,6 +10,4 @@ Operations use Props like other parts of the system.
 See [the isomorfeus-preact props documentation](https://github.com/isomorfeus/isomorfeus-preact/blob/master/docs/props.md#prop-declaration).
 
 There are 3 kinds of Operations:
-- [LucidSimpleOperation](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-operation/docs/simple_operation.md) - Simple operation, always executed on the server, also deferred or daily.
-- [LucidOperation](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-operation/docs/operation.md) - For complex multi-stepped operations, always executed on the server, also deferred or daily.
-- [LucidLocalOperation](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-operation/docs/operation.md) - For complex multi-stepped operations, always executed locally.
+- [LucidOperation](https://github.com/isomorfeus/isomorfeus-project/blob/master/isomorfeus-operation/docs/simple_operation.md) - Simple operation, always executed on the server, also deferred or daily.

data/lib/isomorfeus/operation/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Operation
-    VERSION = '23.9.0.rc7'
+    VERSION = '23.9.0.rc8'
   end
 end

data/lib/isomorfeus-operation.rb

@@ -1,12 +1,9 @@
 require 'isomorfeus-transport'
+require 'isomorfeus-i18n'
 require 'isomorfeus-policy'
+require 'isomorfeus-preact'
 require 'isomorfeus/operation/config'
 require 'isomorfeus/operation/generic_class_api'
-require 'lucid_operation/gherkin'
-require 'lucid_operation/steps'
-require 'lucid_operation/promise_run'
-require 'lucid_local_operation'
-require 'lucid_simple_operation'
 require 'lucid_operation'
 
 if RUBY_ENGINE == 'opal'

data/lib/lucid_operation.rb

@@ -1,49 +1,45 @@
 class LucidOperation
   extend Preact::PropDeclarationMixin
   extend Isomorfeus::Operation::GenericClassApi
+  include LucidI18nMixin
 
-  if RUBY_ENGINE == 'opal'
-    class << self
-      def procedure(gherkin_text); end
-      def steps; end
-
-      alias :gherkin :steps
-      alias :ensure_steps :steps
-      alias :failure_steps :steps
-      alias :Given :steps
-      alias :And :steps
-      alias :Then :steps
-      alias :When :steps
-      alias :Ensure :steps
-      alias :Failed :steps
-      alias :If_failing :steps
-      alias :When_failing :steps
-      alias :If_this_failed :steps
-      alias :If_that_failed :steps
-      alias :First :steps
-      alias :Finally :steps
-    end
-  else
-    extend LucidOperation::Steps
-    include LucidOperation::PromiseRun
+  class << self
+    if RUBY_ENGINE == 'opal'
+      def op; end
+    else
+      def inherited(base)
+        Isomorfeus.add_valid_operation_class(base)
+      end
 
-    def self.inherited(base)
-      Isomorfeus.add_valid_operation_class(base)
+      def op(&block)
+        @op = block
+      end
     end
+  end
 
-    attr_reader :props
-    attr_accessor :step_result
+  attr_reader :props
 
-    def initialize(**props_hash)
-      @props = self.class.validated_props(props_hash)
-    end
+  def initialize(**props_hash)
+    @props = self.class.validated_props(props_hash)
+  end
 
-    def current_user
-      Isomorfeus.current_user
-    end
+  def promise_run
+    original_promise = Promise.new
 
-    def pub_sub_client
-      Isomorfeus.pub_sub_client
+    operation = self
+    promise = original_promise.then do |_|
+      operation.instance_exec(&operation.class.instance_variable_get(:@op))
     end
+
+    original_promise.resolve
+    promise
+  end
+
+  def current_user
+    Isomorfeus.current_user
+  end
+
+  def pub_sub_client
+    Isomorfeus.pub_sub_client
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-operation
 version: !ruby/object:Gem::Version
-  version: 23.9.0.rc7
+  version: 23.9.0.rc8
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,84 +92,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 23.9.0.rc8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 23.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc7
+        version: 23.9.0.rc8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,12 +229,7 @@ files:
 - lib/isomorfeus/operation/init_timer_tasks.rb
 - lib/isomorfeus/operation/run_task.rb
 - lib/isomorfeus/operation/version.rb
-- lib/lucid_local_operation.rb
 - lib/lucid_operation.rb
-- lib/lucid_operation/gherkin.rb
-- lib/lucid_operation/promise_run.rb
-- lib/lucid_operation/steps.rb
-- lib/lucid_simple_operation.rb
 homepage: https://isomorfeus.com
 licenses:
 - MIT

data/lib/lucid_local_operation.rb

@@ -1,32 +0,0 @@
-class LucidLocalOperation
-  extend Preact::PropDeclarationMixin
-  extend LucidOperation::Steps
-  include LucidOperation::PromiseRun
-
-  class << self
-    if RUBY_ENGINE != 'opal'
-      def inherited(base)
-        Isomorfeus.add_valid_operation_class(base)
-      end
-    end
-
-    def promise_run(**props_hash)
-      self.new(**props_hash).promise_run
-    end
-  end
-
-  attr_reader :props
-  attr_accessor :step_result
-
-  def initialize(**props_hash)
-    @props = self.class.validated_props(props_hash)
-  end
-
-  def current_user
-    Isomorfeus.current_user
-  end
-
-  def pub_sub_client
-    Isomorfeus.pub_sub_client
-  end
-end

data/lib/lucid_operation/gherkin.rb

@@ -1,63 +0,0 @@
-class LucidOperation
-  module Gherkin
-    FIRST_EXCEPTION = "First must be the first one that is used and can only used once!"
-    FINALLY_EXCEPTION = "Finally, except for Ensure and Failed, must be the last one to be used and can only be used once!"
-
-    NEWLINE = /\r?\n/
-    OPERATION = /^\s*Operation: (.*)$/
-    PROCEDURE = /^\s*Procedure: (.*)$/
-    STAR = /^\s*\* (.*)$/
-    GIVEN = /^\s*Given (.*)$/
-    WHEN = /^\s*When (.*)$/
-    THEN = /^\s*Then (.*)$/
-    AND = /^\s*And (.*)$/
-    FIRST = /^\s*First (.*)$/
-    ENSURE = /^\s*Ensure (.*)$/
-    FINALLY = /^\s*Finally (.*)$/
-    IW_FAILING = /^\s*(?:When|If) failing (.*)$/
-    IF_ITT_FAILED = /^\s*If (?:that|this|it) failed (.*)$/
-    FAILED = /^\s*Failed (.*)$/
-    COMMENT = /^\s*# (.*)$/
-    WHITE_SPACE = /^\s*$/
-
-    def self.parse(gherkin_text)
-      operation = { operation: '', procedure: '', steps: [], failure: [], ensure: [] }
-      has_finally = false
-      lines = gherkin_text.split(NEWLINE)
-
-      lines.each do |line|
-        case line
-        when STAR, GIVEN, WHEN, THEN, AND
-          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
-          Isomorfeus.raise_error(message: FIRST_EXCEPTION) if operation[:steps].size > 0
-          operation[:steps] << $1.strip
-        when FINALLY
-          Isomorfeus.raise_error(message: FINALLY_EXCEPTION) if has_finally
-          operation[:steps] << $1.strip
-          has_finally = true
-        when PROCEDURE
-          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
-          Isomorfeus.raise_error(message: 'Operation already defined!') unless operation[:operation].empty?
-          operation[:operation] = $1.strip
-        when WHITE_SPACE, COMMENT
-          # nothing, just skip
-        else
-          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
-      end
-
-      operation
-    end
-  end
-end

data/lib/lucid_operation/promise_run.rb

@@ -1,67 +0,0 @@
-class LucidOperation
-  module PromiseRun
-    def promise_run
-      promise = Promise.new
-      original_promise = promise
-      operation = self
-
-      # steps
-      self.class.gherkin[:steps].each do |gherkin_step|
-        matched = false
-        self.class.steps.each do |step|
-          # step[0] -> regular_expression
-          # step[1] -> block
-          match_data = gherkin_step.match(step[0])
-          if match_data
-            matched = true
-            promise = promise.then do |result|
-              operation.step_result = result
-              operation.instance_exec(*match_data, &step[1])
-            end
-          end
-        end
-        Isomorfeus.raise_error(message: "No match found for step #{gherkin_step}!") unless matched
-      end
-
-      # fail track
-      self.class.gherkin[:failure].each do |gherkin_step|
-        matched = false
-        self.class.failure_steps.each do |step|
-          # step[0] -> regular_expression
-          # step[1] -> block
-          match_data = gherkin_step.match(step[0])
-          if match_data
-            matched = true
-            promise = promise.fail do |result|
-              operation.step_result = result
-              operation.instance_exec(*match_data, &step[1])
-            end
-          end
-        end
-        Isomorfeus.raise_error(message: "No match found for failure step #{gherkin_step}!") unless matched
-      end
-
-      # ensure
-      self.class.gherkin[:ensure].each do |gherkin_step|
-        matched = false
-        self.class.ensure_steps.each do |step|
-          # step[0] -> regular_expression
-          # step[1] -> block
-          match_data = gherkin_step.match(step[0])
-          if match_data
-            matched = true
-
-            promise = promise.ensure do |result|
-              operation.step_result = result
-              operation.instance_exec(*match_data, &step[1])
-            end
-          end
-        end
-        Isomorfeus.raise_error(message: "No match found for ensure step #{gherkin_step}!") unless matched
-      end
-
-      original_promise.resolve
-      promise
-    end
-  end
-end

data/lib/lucid_operation/steps.rb

@@ -1,61 +0,0 @@
-class LucidOperation
-  module Steps
-    def procedure(gherkin_text)
-      feature_line = gherkin_text.include?('Operation: ') ? '' : "Operation: #{self.name}\n"
-      scenario_line = feature_line == '' || gherkin_text.include?('Procedure: ') ? '' : "  Procedure: #{self.name} executing\n"
-      @procedure = feature_line + scenario_line + gherkin_text
-    end
-
-    def gherkin
-      @gherkin ||= LucidOperation::Gherkin.parse(@procedure)
-    end
-
-    def ensure_steps
-      @ensure_steps ||= []
-    end
-
-    def failure_steps
-      @failure_steps ||= []
-    end
-
-    def steps
-      @steps ||= []
-    end
-
-    def First(regexp_or_string, &block)
-      Isomorfeus.raise_error(message: "#{self}: First already defined, can only be defined once!") if @first_defined
-      @first_defined = true
-      steps << [_re_from_res(regexp_or_string), block]
-    end
-
-    def Given(regexp_or_string, &block)
-      steps << [_re_from_res(regexp_or_string), block]
-    end
-    alias :And :Given
-    alias :Then :Given
-    alias :When :Given
-
-    def Finally(regexp_or_string, &block)
-      Isomorfeus.raise_error(message: "#{self}: Finally already defined, can only be defined once!") if @finally_defined
-      @finally_defined = true
-      steps << [_re_from_res(regexp_or_string), block]
-    end
-
-    def Ensure(regexp_or_string, &block)
-      ensure_steps << [_re_from_res(regexp_or_string), block]
-    end
-
-    def Failed(regexp_or_string, &block)
-      failure_steps << [_re_from_res(regexp_or_string), block]
-    end
-
-    def _re_from_res(regexp_or_string)
-      regexp_or_string.is_a?(String) ? Regexp.new(regexp_or_string) : regexp_or_string
-    end
-
-    alias :If_failing :Failed
-    alias :When_failing :Failed
-    alias :If_this_failed :Failed
-    alias :If_that_failed :Failed
-  end
-end

data/lib/lucid_simple_operation.rb

@@ -1,44 +0,0 @@
-class LucidSimpleOperation
-  extend Preact::PropDeclarationMixin
-  extend Isomorfeus::Operation::GenericClassApi
-
-  class << self
-    if RUBY_ENGINE == 'opal'
-      def op; end
-    else
-      def inherited(base)
-        Isomorfeus.add_valid_operation_class(base)
-      end
-
-      def op(&block)
-        @op = block
-      end
-    end
-  end
-
-  attr_reader :props
-
-  def initialize(**props_hash)
-    @props = self.class.validated_props(props_hash)
-  end
-
-  def promise_run
-    original_promise = Promise.new
-
-    operation = self
-    promise = original_promise.then do |_|
-      operation.instance_exec(&operation.class.instance_variable_get(:@op))
-    end
-
-    original_promise.resolve
-    promise
-  end
-
-  def current_user
-    Isomorfeus.current_user
-  end
-
-  def pub_sub_client
-    Isomorfeus.pub_sub_client
-  end
-end