Merge branch 'master' into no_call_by_class_name

adamcreekroad · adamcreekroad · commit f4f23ab6412d · 2017-07-12T11:31:19.000-04:00
diff --git a/lib/hyper-operation/railway/validations.rb b/lib/hyper-operation/railway/validations.rb
@@ -24,6 +24,7 @@ def add_error(param, symbol, message, *args, &block)
           add_validation do
             begin
               add_error(param, symbol, message) if instance_eval(&block)
+              true
             rescue Exit => e
               raise e unless e.state == :failed
               add_error(param, symbol, message)
diff --git a/lib/hyper-operation/server_op.rb b/lib/hyper-operation/server_op.rb
@@ -17,12 +17,16 @@ def run(*args)
         end
       end if RUBY_ENGINE == 'opal'
 
-      def run_from_client(security_param, operation, params)
+      def run_from_client(security_param, controller, operation, params)
         operation.constantize.class_eval do
-          raise AccessViolation unless _Railway.params_wrapper.method_defined? security_param
+          if _Railway.params_wrapper.method_defined?(:controller)
+            params[:controller] = controller
+          elsif !_Railway.params_wrapper.method_defined?(security_param)
+            raise AccessViolation
+          end
           run(params)
           .then { |r| return { json: { response: serialize_response(r) } } }
-          .fail { |e| return { json: { error: e}, status: 500 } }
+          .fail { |e| return { json: { error: e }, status: 500 } }
         end
       rescue Exception => e
         { json: {error: e}, status: 500 }
@@ -95,4 +99,16 @@ def dispatch_from_server(params_hash)
       end
     end
   end
+
+  class ControllerOp < ServerOp
+    param :controller
+    alias pre_controller_op_method_missing method_missing
+    def method_missing(name, *args, &block)
+      if params.controller.respond_to? name
+        params.controller.send(name, *args, &block)
+      else
+        pre_controller_op_method_missing(name, *args, &block)
+      end
+    end
+  end
 end
diff --git a/lib/hyper-operation/transport/client_drivers.rb b/lib/hyper-operation/transport/client_drivers.rb
@@ -121,6 +121,7 @@ def self.sync_dispatch(data)
         client_logging: Hyperloop.client_logging,
         pusher_fake_js: pusher_fake_js,
         key: Hyperloop.key,
+        cluster: Hyperloop.cluster,
         encrypted: Hyperloop.encrypted,
         channel: Hyperloop.channel,
         form_authenticity_token: controller.send(:form_authenticity_token),
@@ -153,6 +154,18 @@ def self.get_queued_data(operation, channel = nil, opts = {})
 
     def self.initialize_client_drivers_on_boot
 
+      if @initialized
+        # 1) skip initialization if already initialized
+        # 2) if running action_cable make sure connection is up after pinging the server_up
+        #    action cable closes the connection if files change on the server
+        HTTP.get("#{`window.HyperloopEnginePath`}/server_up") do
+          `#{Hyperloop.action_cable_consumer}.connection.open()` if `#{Hyperloop.action_cable_consumer}.connection.disconnected`
+        end if Hyperloop.action_cable_consumer
+        return
+      end
+
+      @initialized = true
+
       if RUBY_ENGINE == 'opal'
         @opts = Hash.new(`window.HyperloopOpts`)
       end
@@ -176,6 +189,7 @@ def self.initialize_client_drivers_on_boot
             %x{
               h = {
                 encrypted: #{opts[:encrypted]},
+                cluster: #{opts[:cluster]},
                 authEndpoint: window.HyperloopEnginePath+'/hyperloop-pusher-auth',
                 auth: {headers: {'X-CSRF-Token': #{opts[:form_authenticity_token]}}}
               };
diff --git a/lib/hyper-operation/transport/hyperloop.rb b/lib/hyper-operation/transport/hyperloop.rb
@@ -74,6 +74,11 @@ def self.secret
     opts[:secret] || Pusher.secret if transport == :pusher
   end
 
+  def self.cluster
+    # mt1 is the default Pusher app cluster
+    opts[:cluster] || 'mt1' if transport == :pusher
+  end
+
   def self.encrypted
     opts.key?(:encrypted) ? opts[:encrypted] : true
   end
@@ -125,7 +130,7 @@ def self.pusher
         raise '******** NO CHANNEL PREFIX SET ***************'
       end
       @pusher = Pusher::Client.new(
-        opts || { app_id: app_id, key: key, secret: secret }
+        opts || { app_id: app_id, key: key, secret: secret, cluster: cluster }
       )
     end
     @pusher
diff --git a/lib/hyper-operation/transport/hyperloop_controller.rb b/lib/hyper-operation/transport/hyperloop_controller.rb
@@ -131,13 +131,18 @@ def connect_to_transport
       def execute_remote
         parsed_params = JSON.parse(params[:json]).symbolize_keys
         render ServerOp.run_from_client(
-          :acting_user, parsed_params[:operation], parsed_params[:params].merge(acting_user: acting_user))
+          :acting_user,
+          self,
+          parsed_params[:operation],
+          parsed_params[:params].merge(acting_user: acting_user)
+        )
       end
 
       def execute_remote_api
-        parsed_params = params[:params].symbolize_keys
+        params.require(:params).permit!
+        parsed_params = params[:params].to_h.symbolize_keys
         raise AccessViolation unless parsed_params[:authorization]
-        render ServerOp.run_from_client(:authorization, params[:operation], parsed_params)
+        render ServerOp.run_from_client(:authorization, self, params[:operation], parsed_params)
       end
 
       def console_update # TODO this should just become an execute-remote-api call
diff --git a/lib/hyper-operation/version.rb b/lib/hyper-operation/version.rb
@@ -1,5 +1,5 @@
 module Hyperloop
   class Operation
-    VERSION = '0.5.7'
+    VERSION = '0.5.12'
   end
 end
diff --git a/lib/sources/hyperloop/pusher.js b/lib/sources/hyperloop/pusher.js
diff --git a/spec/hyper-operation/validation_spec.rb b/spec/hyper-operation/validation_spec.rb
diff --git a/spec/test_app/test_db_name b/spec/test_app/test_db_name
