farcall 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4d68141e1f69c5dc1e4e367ef061e3469cc9b88
-  data.tar.gz: 699df7d0a42dfd4d4f1c982d9fa6091c2fe7372a
+  metadata.gz: e62f0ec5501d7053137341f5ec5f46100b692b61
+  data.tar.gz: 9549befd37e328bef65639d99953ee15bae8da2c
 SHA512:
-  metadata.gz: 9a639e7585e6b18c123b41b780d99015c2fbab18e9076b3a9b1e735dc50223dd2ad9c55b796cdd80b16179de1ec69360c6dc10ab09a07b0fb46a897442eeec83
-  data.tar.gz: d813cc94cc211544084de25c8aaa1b30cfa29f00851ab1437be7ea0c57e38d4574319dc1265d109061fb0e086171dc409145656b346611001c2c1545ad51a563
+  metadata.gz: 37f168b9631e06851ca3ebb9f84b19dd145836878210a3d7050b343b43f6e57c9bf7790f1969e9fb951270e941a7a10b14bb0f9b537ed6c2e6d805989ce2f974
+  data.tar.gz: 103a6f0f987801726f1876bf6f696926aada0644ed815d6ec50a06d04ced6c483f972d4011494957daec606aadc7b34e0a00793aa3e74123248bb7529b470f07

data/lib/farcall/version.rb

@@ -1,3 +1,3 @@
 module Farcall
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/farcall/wsclient_transport.rb

@@ -1,55 +1,59 @@
 require 'farcall'
-require 'websocket-client-simple'
-require_relative './monitor_lock'
-require 'json'
+begin
+  require 'websocket-client-simple'
+  require_relative './monitor_lock'
+  require 'json'
 
-module Farcall
-  # Websocket client transport using JSON encodeing. Works with ruby threads, pure ruby, runs
-  # everywhere. Use if like any thoer Farcall::Transport, for example:
-  #
-  # in your Gemfile
-  #
-  #     gem 'websocket-client-simple'
-  #
-  # in the code
-  #
-  #     wst = Farcall::WebsocketJsonClientTransport.new 'ws://icodici.com:8080/test'
-  #     i = Farcall::Interface.new transport: wst
-  #     result = i.authenticate(login, password) # remote call via interface...
-  #
-  class WebsocketJsonClientTransport < Farcall::Transport
+  module Farcall
+    # Websocket client transport using JSON encodeing. Works with ruby threads, pure ruby, runs
+    # everywhere. Use if like any thoer Farcall::Transport, for example:
+    #
+    # in your Gemfile
+    #
+    #     gem 'websocket-client-simple'
+    #
+    # in the code
+    #
+    #     wst = Farcall::WebsocketJsonClientTransport.new 'ws://icodici.com:8080/test'
+    #     i = Farcall::Interface.new transport: wst
+    #     result = i.authenticate(login, password) # remote call via interface...
+    #
+    class WebsocketJsonClientTransport < Farcall::Transport
 
-    # Create transport connected to the specified websocket url. Constructor blocks
-    # until connected, or raise error if connection can't be established. Transport uses
-    # JSON encodgin over standard websocket protocol.
-    def initialize ws_url
-      # The stranges bug around in the WebSocket::Client (actually in his eventemitter)
-      me = self
+      # Create transport connected to the specified websocket url. Constructor blocks
+      # until connected, or raise error if connection can't be established. Transport uses
+      # JSON encodgin over standard websocket protocol.
+      def initialize ws_url
+        # The stranges bug around in the WebSocket::Client (actually in his eventemitter)
+        me = self
 
-      is_open = Semaphore.new
-      @ws     = WebSocket::Client::Simple.connect(ws_url)
+        is_open = Semaphore.new
+        @ws     = WebSocket::Client::Simple.connect(ws_url)
 
-      @ws.on(:open) {
-        # if me != self
-        #   puts "\n\n\nSelf is set to wrong in the callback in #{RUBY_VERSION}\n\n\n"
-        # end
-        # puts "client is open"
-        is_open.set
-      }
+        @ws.on(:open) {
+          # if me != self
+          #   puts "\n\n\nSelf is set to wrong in the callback in #{RUBY_VERSION}\n\n\n"
+          # end
+          # puts "client is open"
+          is_open.set
+        }
 
-      @ws.on(:message) { |m|
-        # puts "ws client received #{JSON.parse m.data}"
-        me.on_data_received and me.on_data_received.call(JSON.parse m.data)
-        # puts "and sent"
-      }
-      @ws.on(:close) { close }
-      is_open.wait_set
-    end
+        @ws.on(:message) { |m|
+          # puts "ws client received #{JSON.parse m.data}"
+          me.on_data_received and me.on_data_received.call(JSON.parse m.data)
+          # puts "and sent"
+        }
+        @ws.on(:close) { close }
+        is_open.wait_set
+      end
 
-    # :nodoc:
-    def send_data data
-      @ws.send JSON[data]
-    end
+      # :nodoc:
+      def send_data data
+        @ws.send JSON[data]
+      end
 
+    end
   end
+rescue LoadError
+  $!.to_s =~ /websocket/ or raise
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: farcall
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie