farcall 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94be337904ffb80e4699091e65d7ccd85c5abfbd
-  data.tar.gz: 267901a2112a6502d4f6226338eda4a326567452
+SHA256:
+  metadata.gz: ef4214b7086263085157f0c0933815afcfafac6e2c1edb3f3a75ef83c6a371d4
+  data.tar.gz: bc5dc845c3f8f418b219c99ec437c12676008192bf18d2a6c2a411ae6e9946be
 SHA512:
-  metadata.gz: 281679347ac52ba8e630b36021982e98edb70571e1ccf4d80a486c15474a1a6439d95cae037f57a5571c97121be8acf43af035a1208dbe6b3b035e7fbe6c542f
-  data.tar.gz: 8d22d1ddfc96c928d9f9c4aa3cef2002d385feb4c44fcb62e82392419fffb696cb73a06c6ba55b82f9611678d7999686a591db0dfcb47c65ca13b301ab6318fa
+  metadata.gz: 8c29cd434eb643778ec39f9f14c47a26cd9c1011acc1f69c2b0a386b8f038ba9d0f739c8712f1030e252dd69428ce77d3cf0e96395645d18d32eee72bf76b2b8
+  data.tar.gz: 574e9bd05e4269a4f60bce45abcc8269c2de04ae9886348a71c4040a5ffad539c1dd0baca5983211b1df9e16b9ff5415e35dc932ea33686684d0eb6e16175d5e

data/farcall.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hashie'
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 1.7'
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'em-websocket'
   spec.add_development_dependency 'websocket-client-simple'

data/lib/farcall.rb

@@ -1,5 +1,5 @@
-
 require 'farcall/version'
+require 'farcall/smart_hash'
 require 'farcall/transport'
 require 'farcall/json_transport'
 require 'farcall/endpoint'
@@ -15,8 +15,6 @@ rescue LoadError
   $!.to_s =~ /em-websocket/ or raise
 end
 
-  
-
 module Farcall
   # Your code goes here...
 end

data/lib/farcall/em_farcall.rb

@@ -1,7 +1,8 @@
-require 'hashie'
 require 'eventmachine'
 require_relative './promise'
 
+include Farcall
+
 # As the eventmachine callback paradigm is completely different from the threaded paradigm
 # of the Farcall, that runs pretty well under JRuby and in multithreaded MRI, we provide
 # compatible but different implementations: {EmFarcall::Endpoint}, {EmFarcall::Interface}
@@ -14,7 +15,7 @@ require_relative './promise'
 #     require 'eventmachine'
 #     require 'farcall'
 module EmFarcall
-  
+
   # Endpoint that run in the reactor thread of the EM. Eventmachine should run by the time of
   # creation of the endpoint. All the methods can be called from any thread, not only
   # EM's reactor thread.
@@ -195,7 +196,7 @@ module EmFarcall
     # :nodoc: important that this method is called from reactor thread only
     def process_input data
       # To be free from :keys and 'keys'
-      data = Hashie::Mash.new(data) unless data.is_a?(Hashie::Mash)
+      data = SmartHash.new(data) unless data.is_a?(SmartHash)
       if data.serial != @in_serial
         error "framing error (wrong serial:)"
       else
@@ -206,7 +207,7 @@ module EmFarcall
           ref = data.ref
           if ref
             if (block = @callbacks.delete(ref)) != nil
-              block.call(Hashie::Mash.new(result: data.result, error: data.error))
+              block.call(SmartHash.new(result: data.result, error: data.error))
             end
           else
             error "framing error: no ref in block #{data.inspect}"

data/lib/farcall/endpoint.rb

@@ -1,4 +1,3 @@
-require 'hashie'
 require_relative 'promise'
 
 module Farcall
@@ -7,7 +6,7 @@ module Farcall
   # it. You can use it direcly or with Farcall::RemoteInterface and Farcall::LocalProvider helper
   # classes.
   #
-  # Note that the returned data is converted to Hashie::Mash primarily for the sake of :key vs.
+  # Note that the returned data is converted to SmartHash primarily for the sake of :key vs.
   # 'key' ambigity that otherwise might appear depending on the transport encoding protocol. Anyway
   # it is better than ruby hash ;)
   #
@@ -84,7 +83,7 @@ module Farcall
     # Optionally the block could be provided
     # that takes |error, result| parameters. Error must be  nil or
     #
-    #     Hashie::Mash.new({'class' =>, 'text' => text [, data: {some_data}] })
+    #     SmartHash.new({'class' =>, 'text' => text [, data: {some_data}] })
     #
     # if error is presented, the result is always the nil.
     #
@@ -118,7 +117,7 @@ module Farcall
     # Farcall::RemoteInterface rather than this low-level method.
     #
     # @param [String] name of the remote command
-    # @return [Object] any data that remote party retruns. If it is a hash, it is a Hashie::Mash
+    # @return [Object] any data that remote party retruns. If it is a hash, it is a SmartHash
     #     instance.
     # @raise [Farcall::RemoteError]
     #
@@ -197,7 +196,7 @@ module Farcall
 
     def _received(data)
       # p [:r, data]
-      data = Hashie::Mash.new data
+      data = SmartHash.new data
 
       cmd, serial, args, kwargs, ref, result, error =
           %w{cmd serial args kwargs ref result error}.map { |k| data[k] || data[k.to_sym] }

data/lib/farcall/smart_hash.rb

@@ -0,0 +1,11 @@
+require 'hashie'
+
+module Farcall
+
+  class SmartHash < Hashie::Mash
+
+    disable_warnings
+
+  end
+
+end

data/lib/farcall/version.rb

@@ -1,3 +1,3 @@
 module Farcall
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/websock_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 require 'eventmachine'
 
+include Farcall
+
 def standard_check_wsclient(cnt1, r1, r2, r3)
-  r1 = Hashie::Mash.new(r1)
-  r2 = Hashie::Mash.new(r2)
+  r1 = SmartHash.new(r1)
+  r2 = SmartHash.new(r2)
 
   r1.kwargs.hello.should == 'world'
   r1.superpong.should == [1, 2, 3]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: farcall
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -28,28 +28,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -135,6 +135,7 @@ files:
 - lib/farcall/json_transport.rb
 - lib/farcall/monitor_lock.rb
 - lib/farcall/promise.rb
+- lib/farcall/smart_hash.rb
 - lib/farcall/transport.rb
 - lib/farcall/version.rb
 - lib/farcall/wsclient_transport.rb
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple, elegant and cross-platofrm RPC protocol