grenache-ruby-base 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c584733c4084dbb644918ed0b484941df6f579dd
-  data.tar.gz: d2e816d767f7d3162c01b5fd89a349251500b8a7
+  metadata.gz: 262059ec64c44d41d769ff4003848cfc33abc23f
+  data.tar.gz: da4517e84d0a5340f90c33176f436dec5e6e5f69
 SHA512:
-  metadata.gz: d484d57baee1bcffdb298489905a7cb18b544a85d4bf0a21722ebeba379ed0fc2cc682b627eaea6e5a042669bf47411a53283f3edfe14bae31c57e1da1562e06
-  data.tar.gz: 1f200b0bf1633669e4cf066968f0dbe2d73b5b80f2b1f64460a7bcc058acc48d3478b69b47437ed821a5c2db4549d68a400729b57fc64376433ceff7e9d80bef
+  metadata.gz: d97d7cd9e20382f1367c85e6aa1307c0e78792e6f0e6f48594763f5d0109dcbcd5cd6f95853efbadf4a42f03e0330e73c6f892543f131262d7c1d7d1810206fa
+  data.tar.gz: d84e9c844a2bff695f005898e220ce52521e904cb2ea3ed77a727b65faee9f6ea0038247e91e7856854b50b25b6f04b4cf88817ddb310716ca87fe6f5689881b

data/lib/grenache/base.rb

@@ -2,9 +2,18 @@ module Grenache
   class Base
     include Grenache::Configurable
 
+    # Set default configuration values for BASE
+    default_conf do |conf|
+      conf.grape_address = "http://127.0.0.1:40001/"
+      conf.auto_announce = true
+      conf.timeout = 5
+      conf.auto_announce_interval = 5
+      conf.service_host = "0.0.0.0"
+    end
+
     # Initialize can accept custom configuration parameters
     def initialize(params = {})
-      @configuration = Configuration.new(params) unless params.empty?
+      @configuration = Configuration.new(params)
     end
 
     # Lookup for a specific service `key`

data/lib/grenache/configurable.rb

@@ -1,53 +1,36 @@
 module Grenache
+  class BaseConfiguration
+    def values
+      @values ||= {}
+    end
 
-  # Encapsulate Configuration parameters
-  class Configuration
-    # grape configuration
-    attr_accessor :grape_address, :timeout
-
-    # service configuration parameters
-    attr_accessor :service_timeout, :auto_announce_interval, :auto_announce, :service_host
+    def method_missing(name, *args, &block)
+      if name[-1] == "="
+        values[name[0,name.size-1]] = args.first
+      else
+        values[name.to_s]
+      end
+    end
+  end
 
-    # service SSL specific configuration
-    # Cert is supposed to be PKCS12
-    attr_accessor :key, :cert_pem, :ca, :reject_unauthorized, :verify_mode
+  class Configuration <BaseConfiguration
 
-    # Initialize default values
     def initialize(params = {})
-      set_val :grape_address, params, "http://127.0.0.1:40001/"
-      set_val :timeout, params, 5
-
-      set_val :auto_announce_interval, params, 5
-      set_bool :auto_announce, params, true
-      set_val :service_timeout, params, 5
-      set_val :service_host, params, "0.0.0.0"
-
-      set_val :key, params, nil
-      set_val :cert_pem, params, nil
-      set_val :ca, params, nil
-      set_val :reject_unauthorized, params, nil
-      set_val :verify_mode, params, Grenache::SSL_VERIFY_PEER
-    end
+      @values = self.class.default.values
 
-    private
-    def set_bool(name, params, default)
-      method = "#{name}=".to_sym
-      if params[name].nil?
-        send(method, default)
-      else
-        send(method, params[name])
+      params.keys.each do |k|
+        @values[k.to_s] = params[k]
       end
     end
 
-    def set_val(name, params, default)
-      method = "#{name}=".to_sym
+    def self.set_default &block
+      yield default
+    end
 
-      if params[name]
-        send(method, params[name])
-      else
-        send(method, default)
-      end
+    def self.default
+      @defaults ||= BaseConfiguration.new
     end
+
   end
 
   # Configuration helpers
@@ -56,8 +39,9 @@ module Grenache
       base.extend(ClassMethods)
     end
 
+    # Instance configuration, can be altered indipendently
     def config
-      @configuration || self.class.config
+      @configuration ||= Configuration.new
     end
 
     module ClassMethods
@@ -65,9 +49,14 @@ module Grenache
         yield config
       end
 
+      # Class configuration
       def config
         @configuration ||= Configuration.new
       end
+
+      def default_conf &block
+        Grenache::Configuration.set_default &block
+      end
     end
   end
 end

data/lib/grenache/link.rb

@@ -7,57 +7,19 @@ module Grenache
       @config = config
     end
 
-    # Connect to grape
-    def connect
-      unless connected?
-        ws_connect
-      end
-    end
-
-    # Return true if it's connected to Grape
-    def connected?
-      @connected
-    end
-
-    # Disconnect from grape
-    def disconnect
-      @ws.close
-      @ws = nil
-    end
-
     # Send a message to grape
     def send(type, payload, opts = {}, &block)
-      if http?
-        res = http_send type, Oj.dump({"rid" => uuid, "data" => payload})
-        block.call(res) if block
-        res
-      else
-        m = GrapeMessage.new(type,payload,opts, &block)
-        messages[m.rid] = m
-        ws_send m.to_json
-      end
+      res = http_send type, Oj.dump({"rid" => uuid, "data" => payload})
+      block.call(res) if block
+      res
     end
 
     private
 
-    def messages
-      @messages ||= {}
-    end
-
     def grape_url
       @grape_url ||= @config.grape_address
     end
 
-    def http?
-      grape_url.start_with? "http"
-    end
-
-    def ws_send(payload)
-      ws_connect unless connected?
-    ensure
-      @ws.send(payload)
-    end
-
     def http_send(type, payload)
       url = grape_url + type
       options = {
@@ -72,29 +34,6 @@ module Grenache
       end
     end
 
-    def ws_connect
-      @ws = Faye::WebSocket::Client.new(grape_url)
-      @ws.on(:open, method(:on_open))
-      @ws.on(:message, method(:on_message))
-      @ws.on(:close, method(:on_close))
-    end
-
-    def on_open(ev)
-      @connected = true
-    end
-
-    def on_message(ev)
-      msg = Oj.load(ev.data)
-      if req = messages[msg[0]]
-        messages.delete(msg[0])
-        req.yield(msg[1]) if req.block_given?
-      end
-    end
-
-    def on_close(ev)
-      @connected = false
-    end
-
     def uuid
       SecureRandom.uuid
     end

data/lib/grenache/version.rb

@@ -1,3 +1,3 @@
 module Grenache
-  VERSION = '0.2.9'
+  VERSION = '0.2.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grenache-ruby-base
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Bitfinex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine