swarmclient 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 896a19138be9eaac88bc4817295d0549b019ae8f
-  data.tar.gz: 8472d806fba9fcf2e4bb94a118de8bdb838409ad
+SHA256:
+  metadata.gz: 7e95eff9380f3baca4790e174a8da717d24f6e0ac0f00527cb6553b9aab6f202
+  data.tar.gz: 37cb9aa517d9c20d797f80b0fefd27a50faac32cdf2ce2efa65c3c4450ab30b1
 SHA512:
-  metadata.gz: 2b591c078a7fe50a131766e16b9c59740a48d8c8a26b80dd5e9c71da70a4af8fe12020bec1094fcff5f4363533a88549e2758d13459dc5aa3362f375d4e725af
-  data.tar.gz: 3a3d221ea3eb8f15cab47c0025d0595a3c1832bec4dd09d670e5babc848698e9536eee02da2523ce0cd0bedc6723ec305753ce170ecc9dcaca1c82c060295e72
+  metadata.gz: 7ce1f8bd41ebd42a81ca039bdd7e812c2bb8f6a9671cd3bd31854d488e51940036f98ce0d1d43fdf5f4e3b6254a580ae22fd18825b9913171121b0ff17c73cb5
+  data.tar.gz: 3e6d750e25d49cce360bfed471e237753a029f0c706fb23056857b26de680c0dcc79bd061191e1c2eed10cf0194840196b3995bb190743ecf45982614fd945fb

data/README.md

@@ -17,8 +17,9 @@ And then execute:
 Or build and install from src:
 
     $ git clone https://github.com/wlwanpan/swarmclient-rb.git
+    $ cd swarmclient-rb && bundle install
     $ gem build swarmclient.gemspec
-    $ gem install swarmclient-0.1.0.gem
+    $ gem install swarmclient-{GEM_VERSION}.gem
 
 ## Communication API (Swarmclient::Communication)
 
@@ -26,7 +27,7 @@ Require and Initialize
 ```
 require 'swarmclient'
 
-bluzelle = Swarmclient::Communication.new endpoint: "ws://127.0.0.1", port: 50001, uuid: "80174b53-2dda-49f1-9d6a-6a780d4"
+bluzelle = Swarmclient::Communication.new endpoint: "127.0.0.1", port: 50001, uuid: "80174b53-2dda-49f1-9d6a-6a780d4"
 ```
 
 Note: The uuid is the uniq id of a referenced db hosted in the swarm.
@@ -35,17 +36,25 @@ Refer to https://bluzelle.github.io/api/ for more info.
 
 Create New Entry (key-value)
 ```
-bluzelle.create key: 'myKey', value: 'Your Value'
+bluzelle.create 'myKey', 'Your Value'
 ```
 
 Read Key
 ```
-res = bluzelle.read 'myKey'
-puts res
+bluzelle.read 'myKey'
 ```
 - Result
 ```
-=> {:data=>{:value=>"Your Value"}, :"request-id"=>0.5304515448110283}
+{:value => "Your Value"}
+```
+
+Read Multiple Keys
+```
+bluzelle.read ['myKey', 'myKey2']
+```
+- Result
+```
+[{:myKey => "Your Value"}, {:myKey2 => nil}]
 ```
 
 Update Key value
@@ -60,12 +69,11 @@ bluzelle.remove 'myKey'
 
 Check if key exist
 ```
-res = bluzelle.has 'myKey'
-puts res
+bluzelle.has 'myKey'
 ```
 - Result
 ```
-=> {:data=>{:"key-exists"=>true}, :"request-id"=>0.7938161241077408}
+=> {:"key-exists" => true}
 ```
 
 Read all keys stored
@@ -74,7 +82,7 @@ bluzelle.keys
 ```
 - Result
 ```
- => {:data=>{:keys=>["myKey"]}, :"request-id"=>0.7472509525271954}
+ => {:keys => ["myKey"]}
 ```
 
 ## Pubsub (Swarmclient::Pubsub)

data/lib/swarmclient/communication.rb

@@ -1,9 +1,8 @@
-require 'faye/websocket'
-require 'eventmachine'
 require 'websocket-client-simple'
+require 'eventmachine'
 require 'json'
 
-DEFAULT_IP = '127.0.0.1'
+DEFAULT_IP = 'ws://127.0.0.1'
 DEFAULT_PORT = 8080
 
 module Swarmclient
@@ -28,8 +27,12 @@ module Swarmclient
       send cmd: 'read', data: { key: key }
     end
 
+    def read_multiple keys
+      send_multiple cmd: 'read', keys: keys
+    end
+
     def update key, value
-      send cmd: 'update', data: { key: key }
+      send cmd: 'update', data: { key: key, value: value }
     end
 
     def remove key
@@ -46,6 +49,13 @@ module Swarmclient
 
   private
 
+    def send_multiple cmd:, keys:
+      keys.map do |key|
+        res = send cmd: cmd, data: { key: key }
+        Hash[key, res ? res[:value] : nil]
+      end
+    end
+
     def send cmd:, data:
 
       endpoint, req = [
@@ -73,7 +83,7 @@ module Swarmclient
 
           when nil
 
-            return res
+            return res[:data]
 
           else
 
@@ -89,28 +99,32 @@ module Swarmclient
 
       res, err = [nil, nil]
 
-      EventMachine.run do
+      begin
+        EventMachine.run do
 
-        ws = WebSocket::Client::Simple.connect endpoint
+          ws = WebSocket::Client::Simple.connect endpoint
 
-        ws.on :message do |msg|
-          res = msg.data
-          EventMachine::stop_event_loop
-        end
+          ws.on :message do |msg|
+            res = msg.data
+            EventMachine::stop_event_loop
+          end
 
-        ws.on :open do
-          ws.send req.to_json
-        end
+          ws.on :open do
+            ws.send req.to_json
+          end
 
-        ws.on :close do |e|
-          EventMachine::stop_event_loop
-        end
+          ws.on :close do |e|
+            EventMachine::stop_event_loop
+          end
 
-        ws.on :error do |e|
-          err = e
-          EventMachine::stop_event_loop
-        end
+          ws.on :error do |e|
+            err = e
+            EventMachine::stop_event_loop
+          end
 
+        end
+      rescue => e
+        err = e
       end
 
       [err, res]

data/lib/swarmclient/version.rb

@@ -1,3 +1,3 @@
 module Swarmclient
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/swarmclient.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "faye-websocket", "~> 0.10"
   spec.add_development_dependency "eventmachine", "~> 1.2"
-  spec.add_development_dependency "json", "~> 2.1"
   spec.add_development_dependency "websocket-client-simple", "~> 0.3"
+  spec.add_development_dependency "json", "~> 2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swarmclient
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Warren
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -81,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '2.1'
 description: 
 email:
 - wlwanpan@uwaterloo.ca
@@ -150,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem for the bluzele SwarmDB