wampus 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e79cb9e7b99c33ed789828ebe831a943f1613e
-  data.tar.gz: ebaae0ad6da9e25be70144855b23e3a5d352125c
+  metadata.gz: 24dd3f5e9601271d25b1ba20bb489dcdc9d9282c
+  data.tar.gz: 8af28ecdb9b6db135c99082f74b40e918be2e5c7
 SHA512:
-  metadata.gz: 071a2bd09533edf1719c350245781206639fa919319e6306fa3d69eccebd5b7252e128805b2fff0c7d9f7fe6bb359a78c8afca03b78dcecc91c5e29a0e331c62
-  data.tar.gz: 1b84d5f9be5b1606dbc863efc2b0c1babfc47326e650edccc8f7c0b877826c873066a26bd5cc25d75126f15afdcfe4aa944d3398e0d2b812375e2ec9718c1af0
+  metadata.gz: e475438bf58140e41989c659525af5af26a3b0305aafec3cd5af6cc10068eb179a374a847c0768dc3b5b59d9832511c18fd1822187768dfe3f4a7092de52cdfe
+  data.tar.gz: 033812f181b04eb2dfd3295fd68f98917965be1b5718bceb4ad058fdaefc6d16316747f2bbf174f5dacf391b156f9fcf3bb324e09963a6bbe2c8e2454893345e

data/lib/wampus/backends/redis.rb

@@ -6,45 +6,47 @@ module Wampus
     module Redis
       extend ActiveSupport::Concern
 
+      attr_reader :redis_config
+
+      def initialize(*args)
+        @redis_config = redis_defaults.dup
+        super(*args) if defined? super
+      end
+
       included do
-        class_attribute :backend_redis_defaults
-        self.backend_defaults = {
-          :redis => {
-            :host => 'localhost',
-            :port => 6379,
-            :database => 0,
-            :password => nil,
-            :gc => 60,
-            :lock_timeout => 120,
-            :namespace => ''
-          }
+        class_attribute :redis_defaults
+        self.redis_defaults = {
+          :host => 'localhost',
+          :port => 6379,
+          :database => 0,
+          :password => nil,
+          :gc => 60,
+          :lock_timeout => 120,
+          :namespace => ''
         }
-        class_attribute :backend_redis_config
-        self.backend_config = {:redis => {}}
       end
 
       module ClassMethods
-        def configure_backend(backend, options = {})
-          backend_config[backend] = backend_defaults[backend].merge options
-
+        def configure_redis(options = {})
+          redis_config = redis_defaults.merge options
         end
       end
 
-      def connect_backend
-        @events_namespace = backend_config[:redis][:namespace] + ':events'
+      def connect_to_redis
+        @events_namespace = redis_config[:namespace] + ':events'
 
         @completed_events = []
 
-        @redis = ::Redis.new(:host => backend_config[:redis][:host], :port => backend_config[:redis][:port])
-        @subscriber = ::Redis.new(:host => backend_config[:redis][:host], :port => backend_config[:redis][:port])
+        @redis = ::Redis.new(:host => redis_config[:host], :port => redis_config[:port])
+        @subscriber = ::Redis.new(:host => redis_config[:host], :port => redis_config[:port])
 
-        if backend_config[:redis][:password]
-          @redis.auth(backend_config[:redis][:password])
-          @subscriber.auth(backend_config[:redis][:password])
+        if redis_config[:password]
+          @redis.auth(redis_config[:password])
+          @subscriber.auth(redis_config[:password])
         end
 
-        @redis.select(backend_config[:redis][:database])
-        @subscriber.select(backend_config[:redis][:database])
+        @redis.select(redis_config[:database])
+        @subscriber.select(redis_config[:database])
 
         Thread.new do
           @subscriber.subscribe(@events_namespace) do |on|
@@ -56,45 +58,45 @@ module Wampus
 
       end
 
-        def create_event(connection, topic, payload, excluded, included)
-          create_event_on_redis(connection.id, topic.uri, payload, excluded, included)
-        end
+      def create_event(connection, topic, payload, excluded, included)
+        create_event_on_redis(connection.id, topic.uri, payload, excluded, included)
+      end
 
-        private
+      private
 
-        def create_event_on_redis(connection_id, topic_uri, payload, excluded, included)
-          @redis.publish @events_namespace, [SecureRandom.uuid, connection_id, topic_uri, payload, excluded, included].to_json
-        end
+      def create_event_on_redis(connection_id, topic_uri, payload, excluded, included)
+        @redis.publish @events_namespace, [SecureRandom.uuid, connection_id, topic_uri, payload, excluded, included].to_json
+      end
 
-        def subscribe_to_events
-          Thread.new do
-            @subscriber.subscribe(@events_ns) do |on|
-              on.message do |channel, message|
-                handle_message_from_redis(message)
-              end
+      def subscribe_to_events
+        Thread.new do
+          @subscriber.subscribe(@events_ns) do |on|
+            on.message do |channel, message|
+              handle_message_from_redis(message)
             end
           end
         end
+      end
 
-        def handle_message_from_redis(message)
-          begin
-            id, connection_id, uri, payload, excluded, included = JSON.parse(message)
+      def handle_message_from_redis(message)
+        begin
+          id, connection_id, uri, payload, excluded, included = JSON.parse(message)
 
-            connection = find_connections(:id => connection_id).first
-            topic = topic_for_uri uri
+          connection = find_connections(:id => connection_id).first
+          topic = topic_for_uri uri
 
-            return unless topic
+          return unless topic
 
-            topic.subscribers(connection, excluded, included) do |subscribers|
-              subscribers.each do |connection|
-                connection.write event_msg(topic.uri, payload)
-              end
+          topic.subscribers(connection, excluded, included) do |subscribers|
+            subscribers.each do |connection|
+              connection.write event_msg(topic.uri, payload)
             end
-          rescue => error
-            # TODO Handle Error
           end
+        rescue => error
+          # TODO Handle Error
         end
-
       end
+
     end
-  end
+  end
+end

data/lib/wampus/version.rb

@@ -1,3 +1,3 @@
 module Wampus
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wampus
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Stack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler