chatbox 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b66ba083f1d159cc4e17b4006dfc9890501b5a8
-  data.tar.gz: efdf4191ca17f8f92a5820efe735df7f39bbc888
+  metadata.gz: 6a7102f898c92e32f3843ea185051e1f94f36fa4
+  data.tar.gz: e154a6d559969dc26dc21c03b865c06eb95e570b
 SHA512:
-  metadata.gz: 77bffe68cca61f58b1f0d177d3f5db898382c02030513a843f60f43cd5d3d8b854dca0d7140cfd34f13ed2f1ee7972f52f7e36af0c9b1aa1b1101f08a97e4997
-  data.tar.gz: 80f8b7d68f4c4bbcd38f29947440a805f59e46b68f2d47656e85f4a7b7b77d01d66f97fbee88e3cf27153d42fde073768b5e2f62654805aba1084f147f78a935
+  metadata.gz: 4d95f9cbbbb6a9657fb2ed75308778d2b805e7eb25224ea3f41b9abb8e3434197fe0241aef5d160e78ecb11203f95fb51f11d0909a23f162be3d40e71e9f980e
+  data.tar.gz: 39ad72ddf662f81938854ab686d742e48219ef0afd2770c21679c162a91bd4179e24f083ab32a43ee065e6e0b82d651da8a2a8cd5fb8361a4bfc7caab18231e9

data/.travis.yml

@@ -7,3 +7,5 @@ before_install:
   - gem install bundler
 notifications:
   email: false
+services:
+  - memcached

data/lib/chatbox/inbox.rb

@@ -30,7 +30,7 @@ module Chatbox
 
     def messages
       @messages ||= begin
-        records = store.find_all_messages_by_to_id id
+        records = store.find_messages_by_to_id id
         records.map { |record| Message.new record: record, store: store }
       end
     end

data/lib/chatbox/memcached_store.rb

@@ -1,54 +1,52 @@
-require 'dalli'
 require 'json'
 
 module Chatbox
   class MemcachedStore
-    def initialize(namespace: nil)
-      @dalli = Dalli::Client.new nil, namespace: namespace
+    def initialize(client)
+      @client = client
     end
 
-    delegate :flush, to: :dalli
-
     def add_message(attrs)
-      @dalli.set "messages/#{attrs['id']}", JSON.generate(
+      client.set "messages/#{attrs['id']}", JSON.generate(
         'from_id' => attrs['from_id'],
         'to_id' => attrs['to_id'],
         'body' => attrs['body'],
+        'read' => false,
       )
 
-      from_list = JSON.parse(@dalli.get("from/#{attrs['from_id']}") || '[]')
+      from_list = JSON.parse(client.get("from/#{attrs['from_id']}") || '[]')
       from_list << {'from_id' => attrs['from_id'], 'message_id' => attrs['id']}
-      @dalli.set "from/#{attrs['from_id']}", JSON.generate(from_list)
+      client.set "from/#{attrs['from_id']}", JSON.generate(from_list)
 
-      to_list = JSON.parse(@dalli.get("to/#{attrs['to_id']}") || '[]')
+      to_list = JSON.parse(client.get("to/#{attrs['to_id']}") || '[]')
       to_list << {'to_id' => attrs['to_id'], 'message_id' => attrs['id']}
-      @dalli.set "to/#{attrs['to_id']}", JSON.generate(to_list)
+      client.set "to/#{attrs['to_id']}", JSON.generate(to_list)
     end
 
     ##########
 
     def mark_message_read!(id)
-      attrs = JSON.parse @dalli.get("messages/#{id}")
+      attrs = JSON.parse client.get("messages/#{id}")
       attrs['read'] = true
-      @dalli.set "messages/#{id}", JSON.generate(attrs)
+      client.set "messages/#{id}", JSON.generate(attrs)
     end
 
     def mark_message_unread!(id)
-      attrs = JSON.parse @dalli.get("messages/#{id}")
+      attrs = JSON.parse client.get("messages/#{id}")
       attrs['read'] = false
-      @dalli.set "messages/#{id}", JSON.generate(attrs)
+      client.set "messages/#{id}", JSON.generate(attrs)
     end
 
     ##########
 
     def find_message(id)
-      if json = @dalli.get("messages/#{id}")
+      if json = client.get("messages/#{id}")
         Record.new id, JSON.parse(json)
       end
     end
 
-    def find_all_messages_by_to_id(id)
-      if json = @dalli.get("to/#{id}")
+    def find_messages_by_to_id(id)
+      if json = client.get("to/#{id}")
         JSON.parse(json).map do |attrs|
           find_message attrs['message_id']
         end
@@ -57,8 +55,8 @@ module Chatbox
       end
     end
 
-    def find_all_messages_by_from_id(id)
-      if json = @dalli.get("from/#{id}")
+    def find_messages_by_from_id(id)
+      if json = client.get("from/#{id}")
         JSON.parse(json).map do |attrs|
           find_message attrs['message_id']
         end
@@ -69,7 +67,7 @@ module Chatbox
 
     private
 
-    attr_reader :dalli
+    attr_reader :client
 
     class Record
       def initialize(id, attrs)

data/lib/chatbox/memory_store.rb

@@ -1,9 +1,11 @@
 module Chatbox
   class MemoryStore
     def add_message(attrs)
-      attrs_list << attrs
+      attrs_list << attrs.merge('read' => false)
     end
 
+    ##########
+
     def mark_message_read!(id)
       attrs_list.detect { |attrs| attrs['id'] == id }.merge! 'read' => true
     end
@@ -20,11 +22,11 @@ module Chatbox
       end
     end
 
-    def find_all_messages_by_to_id(id)
+    def find_messages_by_to_id(id)
       attrs_list.select { |attrs| attrs['to_id'] == id }.map { |attrs| Record.new attrs }
     end
 
-    def find_all_messages_by_from_id(id)
+    def find_messages_by_from_id(id)
       attrs_list.select { |attrs| attrs['from_id'] == id }.map { |attrs| Record.new attrs }
     end
 

data/lib/chatbox/outbox.rb

@@ -30,7 +30,7 @@ module Chatbox
 
     def messages
       @messages ||= begin
-        records = store.find_all_messages_by_from_id(id)
+        records = store.find_messages_by_from_id(id)
         records.map { |record| Message.new record: record, store: store }
       end
     end

data/lib/chatbox/version.rb

@@ -1,3 +1,3 @@
 module Chatbox
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/{integration_spec.rb → integration/chatbox_spec.rb}

@@ -1,3 +1,4 @@
+require 'dalli'
 require 'chatbox/memcached_store'
 
 describe 'chatbox' do
@@ -10,9 +11,9 @@ describe 'chatbox' do
     context "using #{store_type} store" do
       before do
         if store_type == :memcached
-          memcached_store = Chatbox::MemcachedStore.new namespace: 'chatbox-text'
-          memcached_store.flush
-          Chatbox.configure { |config| config.store = memcached_store }
+          client = Dalli::Client.new nil, namespace: 'chatbox-test'
+          client.flush
+          Chatbox.configure { |config| config.store = Chatbox::MemcachedStore.new client }
         end
       end
 

data/spec/integration/stores_spec.rb

@@ -0,0 +1,93 @@
+require 'dalli'
+require 'chatbox/memcached_store'
+require 'chatbox/memory_store'
+
+describe 'stores' do
+  [:memcached, :memory].each do |store_type|
+    context "using #{store_type} store" do
+      before do
+        @store = case store_type
+        when :memcached
+          client = Dalli::Client.new nil, namespace: 'chatbox-test'
+          client.flush
+          Chatbox::MemcachedStore.new client
+        when :memory
+          Chatbox::MemoryStore.new
+        end
+
+        [
+          {'id' => 1, 'from_id' => 20, 'to_id' => 30, 'body' => 'Hi'},
+          {'id' => 2, 'from_id' => 20, 'to_id' => 31, 'body' => 'Hello'},
+          {'id' => 3, 'from_id' => 21, 'to_id' => 31, 'body' => 'Howdy'},
+        ].each do |attrs|
+          @store.add_message attrs
+        end
+
+        @values_list = [
+          {id: 1, from_id: 20, to_id: 30, body: 'Hi', read: false},
+          {id: 2, from_id: 20, to_id: 31, body: 'Hello', read: false},
+          {id: 3, from_id: 21, to_id: 31, body: 'Howdy', read: false},
+        ]
+      end
+
+      it 'finding messages by id' do
+        [1, 2, 3].each_with_index do |id, index|
+          message = @store.find_message id
+          @values_list[index].each do |name, value|
+            expect(message.public_send name).to eq value
+          end
+        end
+      end
+
+      it 'finding messages by to_id' do
+        messages = @store.find_messages_by_to_id 30
+        expect(messages.size).to eq 1
+        message = messages[0]
+        @values_list[0].each do |name, value|
+          expect(message.public_send name).to eq value
+        end
+
+        messages = @store.find_messages_by_to_id 31
+        expect(messages.size).to eq 2
+        [
+          [messages[0], @values_list[1]],
+          [messages[1], @values_list[2]],
+        ].each do |message, values|
+          values.each do |name, value|
+            expect(message.public_send name).to eq value
+          end
+        end
+      end
+
+      it 'finding messages by from_id' do
+        messages = @store.find_messages_by_from_id 21
+        expect(messages.size).to eq 1
+        message = messages[0]
+        @values_list[2].each do |name, value|
+          expect(message.public_send name).to eq value
+        end
+
+        messages = @store.find_messages_by_from_id 20
+        expect(messages.size).to eq 2
+        [
+          [messages[0], @values_list[0]],
+          [messages[1], @values_list[1]],
+        ].each do |message, values|
+          values.each do |name, value|
+            expect(message.public_send name).to eq value
+          end
+        end
+      end
+
+      it 'marking messages as read/unread' do
+        @store.mark_message_read! 1
+        message = @store.find_message 1
+        expect(message.read).to eq true
+
+        @store.mark_message_unread! 1
+        message = @store.find_message 1
+        expect(message.read).to eq false
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatbox
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Austin Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,7 +106,8 @@ files:
 - lib/chatbox/outbox.rb
 - lib/chatbox/version.rb
 - spec/chatbox_spec.rb
-- spec/integration_spec.rb
+- spec/integration/chatbox_spec.rb
+- spec/integration/stores_spec.rb
 - spec/lib/draft_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -135,6 +136,7 @@ specification_version: 4
 summary: Simple messaging system.
 test_files:
 - spec/chatbox_spec.rb
-- spec/integration_spec.rb
+- spec/integration/chatbox_spec.rb
+- spec/integration/stores_spec.rb
 - spec/lib/draft_spec.rb
 - spec/spec_helper.rb