grenache-ruby-base 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e8035e90c79ffd2365fb9d611ff7a4946eb8ce
-  data.tar.gz: fa4eb920d8c1eeff691cee8d44f199cc2529b90b
+  metadata.gz: 4e91f26c0f0deb5dba7e24141c3b36018e433cde
+  data.tar.gz: 9717cd2268b5abbc4a5959e092938647adf65fda
 SHA512:
-  metadata.gz: a3802b911bbe4ed4ac4c18d7cde97fe19fee8eaf430d05c7b38b55c9161e96d82b73f5aa2528323a2471b677b692a84a2b7ee35b06792aa3743f468ba543510d
-  data.tar.gz: 149e0cee45a89216e3db27c8e5713df2ca7cc494234ab48e3674f113ae5b655cfbf2075276caccdd39a6ad759877136c263cbc43176e6fdc0c7233fb486efeba
+  metadata.gz: 9377a986184ebe4644ecef2b29ab56e2344bcfffb336511b4b259f7c9142ecbf3010c334bc9a1c31cf994354ee3b955174c1f8f02f960ec77e5d5badca25f0e4
+  data.tar.gz: ed068257e54d165553858e0af93bb69f15536e3b27f2e8fadd0d25928315f84cfd94cd490e4f46b61c02363cc3779d24e8ada95bdc6699ba3519841ea200d4f8

data/grenache-ruby-base.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "eventmachine", "~> 1.0"
+  spec.add_runtime_dependency "eventmachine", "~> 1.2"
   spec.add_runtime_dependency "faye-websocket", "~> 0.10"
   spec.add_runtime_dependency "oj", "~> 2.17"
   spec.add_runtime_dependency "httparty", "~> 0.14.0"

data/lib/grenache/message.rb

@@ -9,10 +9,32 @@ module Grenache
       @payload = payload
       @type = type
       @opts = opts
+      @rid = opts[:rid]  if opts[:rid]
       @_ts = Time.now
       @block = block
     end
 
+    def self.parse(json)
+      rid,type,payload = Oj.load(json)
+      new(type,payload, {rid:rid})
+    end
+
+    def self.req(payload)
+      new('req',payload)
+    end
+
+    def self.response_to(req,payload)
+      new('res',payload,{rid: req.rid})
+    end
+
+    def request?
+      @type == 'req'
+    end
+
+    def response?
+      @type == 'res'
+    end
+
     def block_given?
       !!@block
     end

data/lib/grenache/version.rb

@@ -1,3 +1,3 @@
 module Grenache
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

data/lib/grenache-ruby-base.rb

@@ -8,5 +8,5 @@ require 'grenache/cache'
 require 'grenache/base'
 require 'grenache/version'
 require 'grenache/link'
-require 'grenache/request'
+require 'grenache/message'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-base
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Bitfinex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -85,7 +85,6 @@ files:
 - lib/grenache/configurable.rb
 - lib/grenache/link.rb
 - lib/grenache/message.rb
-- lib/grenache/request.rb
 - lib/grenache/version.rb
 homepage: https://github.com/bitfinexcom/grenache-ruby-base
 licenses:
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Grenache Base Client implementation.

data/lib/grenache/request.rb

@@ -1,47 +0,0 @@
-module Grenache
-
-  # Store a single request information
-  class Message
-    attr_accessor :payload, :type, :opts, :_ts
-
-    def initialize(type, payload, opts={}, &block)
-      @payload = payload
-      @type = type
-      @opts = opts
-      @_ts = Time.now
-      @block = block
-    end
-
-    def request?
-      @type == 'req'
-    end
-
-    def response?
-      @type == 'res'
-    end
-
-    def block_given?
-      !!@block
-    end
-
-    def yield(params={})
-      @block.call(params)
-    end
-
-    def rid
-      @rid ||= SecureRandom.uuid
-    end
-
-    def qhash
-      "#{type}#{dump_payload}"
-    end
-
-    def dump_payload
-      @dump_payload ||= Oj.dump(payload)
-    end
-
-    def to_json
-      Oj.dump([rid,type,payload])
-    end
-  end
-end