hyper-operation 1.0.alpha1.4 → 1.0.alpha1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a53a1488f00a9d27e8522384b6d3f3ac62048a26f218b13bb40422c8ebc3f255
-  data.tar.gz: 3caa24d2d23cb2e84216ec85bb636f8da3dcd3acc722e5aabed4b7f77fd04df5
+  metadata.gz: 65b352cb39f23e41aa0f4adc29ba892a8d9cf269c7345314851f2a68bccddf86
+  data.tar.gz: 71f10e8f1dfc3f38b968b694c0535169211a374dc404fa3da79a864791e075f2
 SHA512:
-  metadata.gz: 4d939b37c53b280ae4e29fedf525e02b3badd3469619bd0d7957f753aa556451462dbe8c700fd629a81251e56217fa821e3328d0e6e4c5d5c2eb6f3f488554fe
-  data.tar.gz: 817800180407bfaec631fb91fadc7d595f15cba5a50c4dec4563cb9d5fa426679264684cebabc80b450919234279cede3a4745d9c6c78b43c7eaa197d7923d30
+  metadata.gz: ba63a89809105c28b96d246a9958d0aab4ea121bcd59d5ee0f7fb1f96d88b1832dcafe35421f8220a13b401acba73d08cf7b27ce798c382336a2c9d844e7533f
+  data.tar.gz: afaea58dfe7c97007f3d70cebe53d02258c938e3fa4c863788a259f2478fbf45dcf7bc8472fc46967c60b797b693594d1e2468b45671b58281bcaed2925e7e0f

data/lib/hyper-operation/promise.rb

@@ -1,3 +1,15 @@
+# Caution.  For now Hyperstack maintains its own copy of the Promise class.
+# Eventually the diff between hyperstacks version and the official Opal version
+# should be put into a PR.
+
+# A key feature add is the Fail Exception class which is simply there to allow
+# a `always` block to reject without raising an error.  To use this see the run.rb
+# module.
+
+# Also see exception! method for the part of the code that detects the Fail exception.
+
+# See https://github.com/opal/opal/issues/1967 for details.
+
 class Promise
   def self.value(value)
     new.resolve(value)
@@ -11,6 +23,13 @@ class Promise
     When.new(promises)
   end
 
+  class Fail < StandardError
+    attr_reader :result
+    def initialize(result)
+      @result = result
+    end
+  end
+
   attr_reader :error, :prev, :next
 
   def initialize(action = {})
@@ -164,8 +183,15 @@ class Promise
   end
 
   def exception!(error)
-    @exception = true
-
+    # If the error is a Promise::Fail, then
+    # the error becomes the error.result value
+    # this allows code to raise an error on an
+    # object that is not an error.
+    if error.is_a? Promise::Fail
+      error = error.result
+    else
+      @exception = true
+    end
     reject!(error)
   end
 

data/lib/hyper-operation/railway/run.rb

@@ -21,7 +21,7 @@ module Hyperstack
           @tracks ||= []
         end
 
-        def to_opts(tie, args, block)
+        def build_tie(tie, args, block)
           if args.count.zero?
             { run: block }
           elsif args[0].is_a?(Hash)
@@ -41,7 +41,7 @@ module Hyperstack
 
         [:step, :failed, :async].each do |tie|
           define_method :"add_#{tie}" do |*args, &block|
-            tracks << to_opts(tie, args, block)
+            tracks << build_tie(tie, args, block)
           end
         end
 
@@ -55,44 +55,33 @@ module Hyperstack
       end
 
       def step(opts)
-        if @last_result.is_a? Promise
-          @last_result = @last_result.then do |*result|
-            @last_result = result
-            apply(opts, :in_promise)
-          end
-        elsif @state == :success
-          apply(opts)
-        end
+        @promise_chain = @promise_chain
+          .then { |result| apply(result, :success, opts) }
       end
 
       def failed(opts)
-        if @last_result.is_a? Promise
-          @last_result = @last_result.fail do |e|
-            @last_result = e
-            apply(opts, :in_promise)
-            raise @last_result if @last_result.is_a? Exception
-            raise e
-          end
-        elsif @state == :failed
-          apply(opts)
-        end
+        @promise_chain = @promise_chain
+          .always { |result| apply(result, :failed, opts) }
       end
 
       def async(opts)
-        apply(opts) if @state != :failed
+        @promise_chain = @promise_chain_start = Promise.new
+        @promise_chain.resolve(@last_async_result)
+        step(opts)
       end
 
-      def apply(opts, in_promise = nil)
+      def apply(result, state, opts)
+        return result unless @state == state
         if opts[:scope] == :class
-          args = [@operation, *@last_result]
+          args = [@operation, *result]
           instance = @operation.class
         else
-          args = @last_result
+          args = result
           instance = @operation
         end
         block = opts[:run]
         block = instance.method(block) if block.is_a? Symbol
-        @last_result =
+        last_result =
           if block.arity.zero?
             instance.instance_exec(&block)
           elsif args.is_a?(Array) && block.arity == args.count
@@ -100,40 +89,54 @@ module Hyperstack
           else
             instance.instance_exec(args, &block)
           end
-        return @last_result unless @last_result.is_a? Promise
-        raise @last_result.error if @last_result.rejected?
-        @last_result = @last_result.value if @last_result.resolved?
-        @last_result
+        @last_async_result = last_result unless last_result.is_a? Promise
+        last_result
       rescue Exit => e
-        @state = e.state
-        @last_result = (e.state != :failed || e.result.is_a?(Exception)) ? e.result : e
-        raise e
+        # the promise chain ends with an always block which will process
+        # any immediate exits by checking the value of @state.   All other
+        # step/failed/async blocks will be skipped because state will not equal
+        # :succeed or :failed
+        if e.state == :failed
+          @state = :abort
+          # exit via the final always block with the exception
+          raise e.result.is_a?(Exception) ? e.result : e
+        else
+          @state = :succeed
+          # exit via the final then block with the success value
+          e.result
+        end
       rescue Exception => e
         @state = :failed
-        @last_result = e
-        raise e if in_promise
+        raise e
       end
 
       def run
-        if @operation.has_errors? || @state
-          @last_result ||= ValidationException.new(@operation.instance_variable_get('@errors'))
-          return if @state  # handles abort out of validation
-          @state = :failed
-        else
-          @state = :success
-        end
-        tracks.each { |opts| opts[:tie].bind(self).call(opts) }
-      rescue Exit
+        # if @operation.has_errors? || @state
+        #   @last_result ||= ValidationException.new(@operation.instance_variable_get('@errors'))
+        #   # following handles abort out of validation.  if state is already set then we are aborting
+        #   # otherwise if state is not set but we have errors then we are failed
+        #   @state ||= :failed
+        # else
+        #   @state = :success
+        # end
+        @state ||= :success
+        @promise_chain_start = @promise_chain = Promise.new
+        @promise_chain_start.resolve(@last_result)
+        tracks.each { |opts| opts[:tie].bind(self).call(opts) } unless @state == :abort
       end
 
       def result
-        return @last_result if @last_result.is_a? Promise
-        @last_result =
-          if @state == :success
-            Promise.new.resolve(@last_result)
+        @result ||= @promise_chain.always do |e|
+          if %i[abort failed].include? @state
+            if e.is_a? Exception
+              raise e
+            else
+              raise Promise::Fail.new(e)
+            end
           else
-            Promise.new.reject(@last_result)
+            e
           end
+        end
       end
     end
   end

data/lib/hyper-operation/railway/validations.rb

@@ -28,6 +28,8 @@ module Hyperstack
             rescue Exit => e
               raise e unless e.state == :failed
               add_error(param, symbol, message)
+              # use a bogus exit state which will skip adding
+              # a validation error (see catch block in process_validations method)
               raise Exit.new(:abort_from_add_error, e.result)
             end
           end
@@ -47,17 +49,22 @@ module Hyperstack
             when :failed
               add_validation_error(i, "param validation #{i+1} aborted")
             end
-            @state = :failed
+            @state = :abort
             return # break does not work in Opal
           rescue AccessViolation => e
             add_validation_error(i, e)
-            @state = :failed
+            @state = :abort
             @last_result = e
             return # break does not work in Opal
           rescue Exception => e
             add_validation_error(i, e)
           end
         end
+      ensure
+        if @operation.has_errors?
+          @last_result ||= ValidationException.new(@operation.instance_variable_get('@errors'))
+          @state ||= :failed
+        end
       end
     end
   end

data/lib/hyper-operation/server_op.rb

@@ -14,7 +14,7 @@ module Hyperstack
             Hyperstack::HTTP.post(
               "#{`window.HyperstackEnginePath`}/execute_remote",
               payload: {json: {operation: name, params: hash}.to_json},
-              headers: {'X-CSRF-Token' => Hyperstack::ClientDrivers.opts[:form_authenticity_token] }
+              headers: headers.merge('X-CSRF-Token' => Hyperstack::ClientDrivers.opts[:form_authenticity_token])
               )
             .then do |response|
               deserialize_response response.json[:response]
@@ -129,6 +129,10 @@ module Hyperstack
         promise.reject e
       end
 
+      def headers
+        {}
+      end
+
       def serialize_params(hash)
         hash
       end

data/lib/hyper-operation/transport/client_drivers.rb

@@ -35,16 +35,35 @@ module Hyperstack
 
 
   if RUBY_ENGINE == 'opal'
+    # Patch in a dummy copy of Model.load in case we are not using models
+    # this will be defined properly by hyper-model
+    module Model
+      def self.load
+        Promise.new.tap { |promise| promise.resolve(yield) }
+      end unless respond_to?(:load)
+    end
+
     def self.connect(*channels)
       channels.each do |channel|
         if channel.is_a? Class
           IncomingBroadcast.connect_to(channel.name)
         elsif channel.is_a?(String) || channel.is_a?(Array)
           IncomingBroadcast.connect_to(*channel)
-        elsif channel.id
-          IncomingBroadcast.connect_to(channel.class.name, channel.id)
+        elsif channel.respond_to?(:id)
+          Hyperstack::Model.load do
+            channel.id
+          end.then do |id|
+            raise "Hyperstack.connect cannot connect to #{channel.inspect}.  "\
+                  "The id is nil. This can be caused by connecting to a model "\
+                  "that is not saved, or that does not exist." unless id
+            IncomingBroadcast.connect_to(channel.class.name, id)
+          end
         else
-          raise "cannot connect to model before it has been saved"
+          raise "Hyperstack.connect cannot connect to #{channel.inspect}.\n"\
+                "Channels must be either a class, or a class name,\n"\
+                "a string in the form 'ClassName-id',\n"\
+                "an array in the form [class, id] or [class-name, id],\n"\
+                "or an object that responds to the id method with a non-nil value"
         end
       end
     end
@@ -65,12 +84,14 @@ module Hyperstack
 
       def self.add_connection(channel_name, id = nil)
         channel_string = "#{channel_name}#{'-'+id.to_s if id}"
+        return if open_channels.include? channel_string
         open_channels << channel_string
         channel_string
       end
 
       def self.connect_to(channel_name, id = nil)
         channel_string = add_connection(channel_name, id)
+        return unless channel_string # already connected!
         if ClientDrivers.opts[:transport] == :pusher
           channel = "#{ClientDrivers.opts[:channel]}-#{channel_string}"
           %x{
@@ -78,6 +99,7 @@ module Hyperstack
             channel.bind('dispatch', #{ClientDrivers.opts[:dispatch]})
             channel.bind('pusher:subscription_succeeded', #{lambda {ClientDrivers.get_queued_data("connect-to-transport", channel_string)}})
           }
+          @pusher_dispatcher_registered = true
         elsif ClientDrivers.opts[:transport] == :action_cable
           channel = "#{ClientDrivers.opts[:channel]}-#{channel_string}"
           Hyperstack::HTTP.post(ClientDrivers.polling_path('action-cable-auth', channel), headers: { 'X-CSRF-Token' => ClientDrivers.opts[:form_authenticity_token] }).then do |response|
@@ -163,12 +185,17 @@ module Hyperstack
         # not sure why the second check is needed.  It happens in the test app
         route.app == Hyperstack::Engine or (route.app.respond_to?(:app) and route.app.app == Hyperstack::Engine)
       end
-      raise 'Hyperstack::Engine mount point not found.  Check your config/routes.rb file' unless path
-      path = path.path.spec
-      "<script type='text/javascript'>\n"\
-        "window.HyperstackEnginePath = '#{path}';\n"\
-        "window.HyperstackOpts = #{config_hash.to_json}\n"\
-      "</script>\n"
+      if path
+        path = path.path.spec
+        "<script type='text/javascript'>\n"\
+          "window.HyperstackEnginePath = '#{path}';\n"\
+          "window.HyperstackOpts = #{config_hash.to_json}\n"\
+        "</script>\n"
+      else
+        "<script type='text/javascript'>\n"\
+          "window.HyperstackOpts = #{config_hash.to_json}\n"\
+        "</script>\n"
+      end
     end if RUBY_ENGINE != 'opal'
 
     class << self
@@ -222,6 +249,9 @@ module Hyperstack
 
         @opts = Hash.new(`window.HyperstackOpts`)
 
+        if opts[:transport] != :none && `typeof(window.HyperstackEnginePath) == 'undefined'`
+          raise "No hyperstack mount point found!\nCheck your Rails routes.rb file";
+        end
 
         if opts[:transport] == :pusher
 

data/lib/hyper-operation/transport/hyperstack.rb

@@ -59,6 +59,8 @@ module Hyperstack
     end
   end
 
+  define_setting(:send_to_server_timeout, 10)
+
   define_setting :opts, {}
   define_setting :channel_prefix, 'synchromesh'
   define_setting :client_logging, true
@@ -163,7 +165,10 @@ module Hyperstack
     request.body = {
       channel: channel, data: data, salt: salt, authorization: authorization
     }.to_json
-    http.request(request)
+    Timeout::timeout(Hyperstack.send_to_server_timeout) { http.request(request) }
+  rescue Timeout::Error
+    puts "\n********* FAILED TO RECEIVE RESPONSE FROM SERVER WITHIN #{Hyperstack.send_to_server_timeout} SECONDS. CHANGES WILL NOT BE SYNCED ************\n"
+    raise 'no server running'
   end
 
   def self.dispatch(data)

data/lib/hyper-operation/version.rb

@@ -1,5 +1,5 @@
 module Hyperstack
   class Operation
-    VERSION = '1.0.alpha1.4'
+    VERSION = '1.0.alpha1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-operation
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.4
+  version: 1.0.alpha1.5
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
 - !ruby/object:Gem::Dependency
   name: mutations
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.4
+        version: 1.0.alpha1.5
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -441,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: HyperOperations are the swiss army knife of the Hyperstack