chatbox 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a7102f898c92e32f3843ea185051e1f94f36fa4
-  data.tar.gz: e154a6d559969dc26dc21c03b865c06eb95e570b
+  metadata.gz: b8e11dde0a77434ce3d109d0dafe7379723ea402
+  data.tar.gz: f7231a1d739ddd0db1ee719c0cb66b49d3c928cc
 SHA512:
-  metadata.gz: 4d95f9cbbbb6a9657fb2ed75308778d2b805e7eb25224ea3f41b9abb8e3434197fe0241aef5d160e78ecb11203f95fb51f11d0909a23f162be3d40e71e9f980e
-  data.tar.gz: 39ad72ddf662f81938854ab686d742e48219ef0afd2770c21679c162a91bd4179e24f083ab32a43ee065e6e0b82d651da8a2a8cd5fb8361a4bfc7caab18231e9
+  metadata.gz: 2a9aa4f200df75d0b2bf21b185c34bb4598f62e69a0bdfff0aab6fe9d5a1777fa8f95500e0d87c2ee3be6c309fe686a8d17ccac887974a004310d460a8af4c19
+  data.tar.gz: 0d42ecf210544a3f5e29d5c4b01f0b6c27f56beacac496be77c41a5a0a5de739c9b0212a8194fdb7a94b5561d4edfd576935db8a683c75f3a6def906be9c38df

data/lib/chatbox/draft.rb

@@ -1,29 +1,22 @@
-require 'securerandom'
 require 'chatbox/fake_missing_keywords'
 
 module Chatbox
   class Draft
     include FakeMissingKeywords
 
-    def initialize(from: req(:from), to: req(:to), body: req(:body), store: req(:store), id_generator: -> { SecureRandom.uuid })
+    def initialize(from: req(:from), to: req(:to), body: req(:body), store: req(:store))
       @from = from
       @to = to
       @body = body
       @store = store
-      @id_generator = id_generator
     end
 
     def deliver!
-      store.add_message(
-        'id' => id_generator.(),
-        'from_id' => from.chatbox_id,
-        'to_id' => to.chatbox_id,
-        'body' => body,
-      )
+      store.add_message from_id: from.chatbox_id, to_id: to.chatbox_id, body: body
     end
 
     private
 
-    attr_reader :from, :to, :body, :store, :id_generator
+    attr_reader :from, :to, :body, :store
   end
 end

data/lib/chatbox/memcached_store.rb

@@ -1,54 +1,58 @@
+require 'securerandom'
 require 'json'
 
 module Chatbox
   class MemcachedStore
-    def initialize(client)
+    def initialize(client, id_generator: -> { SecureRandom.uuid })
       @client = client
+      @id_generator = id_generator
     end
 
     def add_message(attrs)
-      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(client.get("from/#{attrs['from_id']}") || '[]')
-      from_list << {'from_id' => attrs['from_id'], 'message_id' => attrs['id']}
-      client.set "from/#{attrs['from_id']}", JSON.generate(from_list)
-
-      to_list = JSON.parse(client.get("to/#{attrs['to_id']}") || '[]')
-      to_list << {'to_id' => attrs['to_id'], 'message_id' => attrs['id']}
-      client.set "to/#{attrs['to_id']}", JSON.generate(to_list)
+      id = id_generator.()
+
+      write "messages/#{id}", {
+        from_id: attrs[:from_id],
+        to_id: attrs[:to_id],
+        body: attrs[:body],
+        read: false,
+      }
+
+      from_list = read("from/#{attrs[:from_id]}") || []
+      from_list << {from_id: attrs[:from_id], message_id: id}
+      write "from/#{attrs[:from_id]}", from_list
+
+      to_list = read("to/#{attrs[:to_id]}") || []
+      to_list << {to_id: attrs[:to_id], message_id: id}
+      write "to/#{attrs[:to_id]}", to_list
     end
 
     ##########
 
     def mark_message_read!(id)
-      attrs = JSON.parse client.get("messages/#{id}")
-      attrs['read'] = true
-      client.set "messages/#{id}", JSON.generate(attrs)
+      attrs = read "messages/#{id}"
+      attrs[:read] = true
+      write "messages/#{id}", attrs
     end
 
     def mark_message_unread!(id)
-      attrs = JSON.parse client.get("messages/#{id}")
-      attrs['read'] = false
-      client.set "messages/#{id}", JSON.generate(attrs)
+      attrs = read "messages/#{id}"
+      attrs[:read] = false
+      write "messages/#{id}", attrs
     end
 
     ##########
 
     def find_message(id)
-      if json = client.get("messages/#{id}")
-        Record.new id, JSON.parse(json)
+      if attrs = read("messages/#{id}")
+        Record.new id, attrs
       end
     end
 
     def find_messages_by_to_id(id)
-      if json = client.get("to/#{id}")
-        JSON.parse(json).map do |attrs|
-          find_message attrs['message_id']
+      if attrs_list = read("to/#{id}")
+        attrs_list.map do |attrs|
+          find_message attrs[:message_id]
         end
       else
         []
@@ -56,9 +60,9 @@ module Chatbox
     end
 
     def find_messages_by_from_id(id)
-      if json = client.get("from/#{id}")
-        JSON.parse(json).map do |attrs|
-          find_message attrs['message_id']
+      if attrs_list = read("from/#{id}")
+        attrs_list.map do |attrs|
+          find_message attrs[:message_id]
         end
       else
         []
@@ -67,7 +71,17 @@ module Chatbox
 
     private
 
-    attr_reader :client
+    attr_reader :client, :id_generator
+
+    def read(key)
+      if value = client.get(key)
+        JSON.parse value, symbolize_names: true
+      end
+    end
+
+    def write(key, value)
+      client.set key, JSON.generate(value)
+    end
 
     class Record
       def initialize(id, attrs)
@@ -77,7 +91,7 @@ module Chatbox
 
       attr_reader :id
 
-      %w[from_id to_id body read].each do |name|
+      %i[from_id to_id body read].each do |name|
         define_method name do
           attrs[name]
         end

data/lib/chatbox/memory_store.rb

@@ -1,37 +1,46 @@
+require 'securerandom'
+
 module Chatbox
   class MemoryStore
+    def initialize(id_generator: -> { SecureRandom.uuid })
+      @id_generator = id_generator
+    end
+
     def add_message(attrs)
-      attrs_list << attrs.merge('read' => false)
+      attrs = attrs.merge id: id_generator.(), read: false
+      attrs_list << attrs
     end
 
     ##########
 
     def mark_message_read!(id)
-      attrs_list.detect { |attrs| attrs['id'] == id }.merge! 'read' => true
+      attrs_list.detect { |attrs| attrs[:id] == id }.merge! read: true
     end
 
     def mark_message_unread!(id)
-      attrs_list.detect { |attrs| attrs['id'] == id }.merge! 'read' => false
+      attrs_list.detect { |attrs| attrs[:id] == id }.merge! read: false
     end
 
     ##########
 
     def find_message(id)
-      if attrs = attrs_list.detect { |attrs| attrs['id'] == id }
+      if attrs = attrs_list.detect { |attrs| attrs[:id] == id }
         Record.new attrs
       end
     end
 
     def find_messages_by_to_id(id)
-      attrs_list.select { |attrs| attrs['to_id'] == id }.map { |attrs| Record.new attrs }
+      attrs_list.select { |attrs| attrs[:to_id] == id }.map { |attrs| Record.new attrs }
     end
 
     def find_messages_by_from_id(id)
-      attrs_list.select { |attrs| attrs['from_id'] == id }.map { |attrs| Record.new attrs }
+      attrs_list.select { |attrs| attrs[:from_id] == id }.map { |attrs| Record.new attrs }
     end
 
     private
 
+    attr_reader :id_generator
+
     def attrs_list
       @attrs_list ||= []
     end
@@ -41,7 +50,7 @@ module Chatbox
         @attrs = attrs
       end
 
-      %w[id from_id to_id body read].each do |name|
+      %i[id from_id to_id body read].each do |name|
         define_method name do
           attrs[name]
         end

data/lib/chatbox/version.rb

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

data/spec/integration/stores_spec.rb

@@ -6,19 +6,21 @@ describe 'stores' do
   [:memcached, :memory].each do |store_type|
     context "using #{store_type} store" do
       before do
+        id = 0
+        id_generator = -> { id += 1 }
         @store = case store_type
         when :memcached
           client = Dalli::Client.new nil, namespace: 'chatbox-test'
           client.flush
-          Chatbox::MemcachedStore.new client
+          Chatbox::MemcachedStore.new client, id_generator: id_generator
         when :memory
-          Chatbox::MemoryStore.new
+          Chatbox::MemoryStore.new id_generator: id_generator
         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'},
+          {from_id: 20, to_id: 30, body: 'Hi'},
+          {from_id: 20, to_id: 31, body: 'Hello'},
+          {from_id: 21, to_id: 31, body: 'Howdy'},
         ].each do |attrs|
           @store.add_message attrs
         end

data/spec/lib/draft_spec.rb

@@ -9,15 +9,9 @@ describe Chatbox::Draft do
         to: double('entity', chatbox_id: 2),
         body: 'Hi',
         store: store,
-        id_generator: -> { 'b00c7e15-668b-44b8-9336-e87e7b7d892e' },
       )
 
-      expect(store).to receive(:add_message).with(
-        'id' => 'b00c7e15-668b-44b8-9336-e87e7b7d892e',
-        'from_id' => 1,
-        'to_id' => 2,
-        'body' => 'Hi',
-      )
+      expect(store).to receive(:add_message).with from_id: 1, to_id: 2, body: 'Hi'
       draft.deliver!
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatbox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Austin Schneider