chatbox 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ad08c199c036d9537849e7dee035ff14a1084e
-  data.tar.gz: f0f6622961ca50cf53c19994a1e1cad8fbf25d09
+  metadata.gz: 5b66ba083f1d159cc4e17b4006dfc9890501b5a8
+  data.tar.gz: efdf4191ca17f8f92a5820efe735df7f39bbc888
 SHA512:
-  metadata.gz: 7fe1ae1ce10604d614694ec7d2ad6d78b5ccdb002e4afc333e719f6b0d121a62b96325280746beb715735854450717a8d6542613bccff59ad1a5a8abf7790ff6
-  data.tar.gz: 35caadb705b534d891aa817e97a9562f13cfb929bc0f12e897abf3e6d48df5cb6bd2dbb63354913080a8287f0450363919bf37da6e096e2cabcb682385bfe930
+  metadata.gz: 77bffe68cca61f58b1f0d177d3f5db898382c02030513a843f60f43cd5d3d8b854dca0d7140cfd34f13ed2f1ee7972f52f7e36af0c9b1aa1b1101f08a97e4997
+  data.tar.gz: 80f8b7d68f4c4bbcd38f29947440a805f59e46b68f2d47656e85f4a7b7b77d01d66f97fbee88e3cf27153d42fde073768b5e2f62654805aba1084f147f78a935

data/.rspec

@@ -1,3 +1,2 @@
 --color
---warnings
 --require spec_helper

data/.travis.yml

@@ -5,3 +5,5 @@ rvm:
 script: bundle exec rspec
 before_install:
   - gem install bundler
+notifications:
+  email: false

data/README.md

@@ -1,3 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/chatbox.svg)](http://badge.fury.io/rb/chatbox)
+[![Build Status](https://travis-ci.org/austinthecoder/chatbox.svg?branch=master)](https://travis-ci.org/austinthecoder/chatbox)
+[![Code Climate](https://codeclimate.com/github/austinthecoder/chatbox/badges/gpa.svg)](https://codeclimate.com/github/austinthecoder/chatbox)
+
 # Chatbox
 
 Simple messaging system.

data/chatbox.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'dalli', '~> 2.7'
 
   spec.add_dependency 'activesupport', '>= 3'
 end

data/lib/chatbox/draft.rb

@@ -1,24 +1,29 @@
+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))
-      @from_id = from.chatbox_id
-      @to_id = to.chatbox_id
+    def initialize(from: req(:from), to: req(:to), body: req(:body), store: req(:store), id_generator: -> { SecureRandom.uuid })
+      @from = from
+      @to = to
       @body = body
       @store = store
+      @id_generator = id_generator
     end
 
-    attr_reader :to_id, :from_id, :body
-
     def deliver!
-      store.add_message self
+      store.add_message(
+        'id' => id_generator.(),
+        'from_id' => from.chatbox_id,
+        'to_id' => to.chatbox_id,
+        'body' => body,
+      )
     end
 
     private
 
-    attr_reader :store
+    attr_reader :from, :to, :body, :store, :id_generator
   end
 end

data/lib/chatbox/inbox.rb

@@ -1,4 +1,5 @@
 require 'chatbox/fake_missing_keywords'
+require 'chatbox/message'
 
 module Chatbox
   class Inbox
@@ -28,7 +29,10 @@ module Chatbox
     private
 
     def messages
-      @messages ||= store.find_all_messages_by_to_id id
+      @messages ||= begin
+        records = store.find_all_messages_by_to_id id
+        records.map { |record| Message.new record: record, store: store }
+      end
     end
   end
 end

data/lib/chatbox/memcached_store.rb

@@ -0,0 +1,93 @@
+require 'dalli'
+require 'json'
+
+module Chatbox
+  class MemcachedStore
+    def initialize(namespace: nil)
+      @dalli = Dalli::Client.new nil, namespace: namespace
+    end
+
+    delegate :flush, to: :dalli
+
+    def add_message(attrs)
+      @dalli.set "messages/#{attrs['id']}", JSON.generate(
+        'from_id' => attrs['from_id'],
+        'to_id' => attrs['to_id'],
+        'body' => attrs['body'],
+      )
+
+      from_list = JSON.parse(@dalli.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)
+
+      to_list = JSON.parse(@dalli.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)
+    end
+
+    ##########
+
+    def mark_message_read!(id)
+      attrs = JSON.parse @dalli.get("messages/#{id}")
+      attrs['read'] = true
+      @dalli.set "messages/#{id}", JSON.generate(attrs)
+    end
+
+    def mark_message_unread!(id)
+      attrs = JSON.parse @dalli.get("messages/#{id}")
+      attrs['read'] = false
+      @dalli.set "messages/#{id}", JSON.generate(attrs)
+    end
+
+    ##########
+
+    def find_message(id)
+      if json = @dalli.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}")
+        JSON.parse(json).map do |attrs|
+          find_message attrs['message_id']
+        end
+      else
+        []
+      end
+    end
+
+    def find_all_messages_by_from_id(id)
+      if json = @dalli.get("from/#{id}")
+        JSON.parse(json).map do |attrs|
+          find_message attrs['message_id']
+        end
+      else
+        []
+      end
+    end
+
+    private
+
+    attr_reader :dalli
+
+    class Record
+      def initialize(id, attrs)
+        @id = id
+        @attrs = attrs
+      end
+
+      attr_reader :id
+
+      %w[from_id to_id body read].each do |name|
+        define_method name do
+          attrs[name]
+        end
+      end
+
+      private
+
+      attr_reader :attrs
+    end
+  end
+end

data/lib/chatbox/memory_store.rb

@@ -1,21 +1,53 @@
 module Chatbox
   class MemoryStore
-    def add_message(message)
-      messages << message
+    def add_message(attrs)
+      attrs_list << attrs
     end
 
-    def find_all_messages_by_to_id(to_id)
-      messages.select { |message| message.to_id == to_id }
+    def mark_message_read!(id)
+      attrs_list.detect { |attrs| attrs['id'] == id }.merge! 'read' => true
     end
 
-    def find_all_messages_by_from_id(from_id)
-      messages.select { |message| message.from_id == from_id }
+    def mark_message_unread!(id)
+      attrs_list.detect { |attrs| attrs['id'] == id }.merge! 'read' => false
+    end
+
+    ##########
+
+    def find_message(id)
+      if attrs = attrs_list.detect { |attrs| attrs['id'] == id }
+        Record.new attrs
+      end
+    end
+
+    def find_all_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)
+      attrs_list.select { |attrs| attrs['from_id'] == id }.map { |attrs| Record.new attrs }
     end
 
     private
 
-    def messages
-      @messages ||= []
+    def attrs_list
+      @attrs_list ||= []
+    end
+
+    class Record
+      def initialize(attrs)
+        @attrs = attrs
+      end
+
+      %w[id from_id to_id body read].each do |name|
+        define_method name do
+          attrs[name]
+        end
+      end
+
+      private
+
+      attr_reader :attrs
     end
   end
 end

data/lib/chatbox/message.rb

@@ -0,0 +1,36 @@
+require 'chatbox/fake_missing_keywords'
+
+module Chatbox
+  class Message
+    include FakeMissingKeywords
+
+    def initialize(record: req(:record), store: req(:store))
+      @record = record
+      @store = store
+    end
+
+    delegate :id, :from_id, :to_id, :body, to: :record
+
+    def read?
+      record.read
+    end
+
+    def mark_as_read!
+      store.mark_message_read! id
+      @record = store.find_message id
+    end
+
+    def mark_as_unread!
+      store.mark_message_unread! id
+      @record = store.find_message id
+    end
+
+    def ==(other)
+      other.is_a?(self.class) && record == other.record && store == other.store
+    end
+
+    private
+
+    attr_reader :record, :store
+  end
+end

data/lib/chatbox/outbox.rb

@@ -1,10 +1,11 @@
 require 'chatbox/fake_missing_keywords'
+require 'chatbox/message'
 
 module Chatbox
   class Outbox
     include FakeMissingKeywords
 
-    def initialize(entity:  req(:entity), store:  req(:store))
+    def initialize(entity: req(:entity), store: req(:store))
       @id = entity.chatbox_id
       @store = store
     end
@@ -28,7 +29,10 @@ module Chatbox
     private
 
     def messages
-      @messages ||= store.find_all_messages_by_from_id id
+      @messages ||= begin
+        records = store.find_all_messages_by_from_id(id)
+        records.map { |record| Message.new record: record, store: store }
+      end
     end
   end
 end

data/lib/chatbox/version.rb

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

data/spec/chatbox_spec.rb

@@ -1,32 +1,8 @@
-require 'chatbox'
-
 describe Chatbox do
-  before { Chatbox.reset_config! }
-
-  context 'integration' do
-    it 'sending and receiving a message' do
-      austin = double 'entity', chatbox_id: 1
-      rachel = double 'entity', chatbox_id: 2
-
-      Chatbox.deliver_message! from: austin, to: rachel, body: 'Hello! How are you?'
-
-      rachels_inbox = Chatbox.fetch_inbox_for rachel
-      expect(rachels_inbox.size).to eq 1
-      message = rachels_inbox[0]
-      expect(message.from_id).to eq 1
-      expect(message.body).to eq 'Hello! How are you?'
-
-      austins_outbox = Chatbox.fetch_outbox_for austin
-      expect(austins_outbox.size).to eq 1
-      expect(message.to_id).to eq 2
-      expect(message.body).to eq 'Hello! How are you?'
-    end
-  end
-
   describe '.deliver_message!' do
     before do
-      @from = double 'entity'
-      @to = double 'entity'
+      @from = double 'entity', chatbox_id: 1
+      @to = double 'entity', chatbox_id: 2
       @draft = double 'draft', deliver!: nil
       allow(Chatbox::Draft).to receive(:new).and_return @draft
     end

data/spec/integration_spec.rb

@@ -0,0 +1,73 @@
+require 'chatbox/memcached_store'
+
+describe 'chatbox' do
+  before do
+    @austin = double 'entity', chatbox_id: 1
+    @rachel = double 'entity', chatbox_id: 2
+  end
+
+  [:memcached, :memory].each do |store_type|
+    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 }
+        end
+      end
+
+      it 'sending a message' do
+        Chatbox.deliver_message! from: @austin, to: @rachel, body: 'Hello! How are you?'
+
+        austins_outbox = Chatbox.fetch_outbox_for @austin
+        expect(austins_outbox.size).to eq 1
+
+        message = austins_outbox[0]
+        expect(message.to_id).to eq 2
+        expect(message.body).to eq 'Hello! How are you?'
+      end
+
+      it 'receiving a message' do
+        Chatbox.deliver_message! from: @austin, to: @rachel, body: 'Hello! How are you?'
+
+        rachels_inbox = Chatbox.fetch_inbox_for @rachel
+        expect(rachels_inbox.size).to eq 1
+
+        message = rachels_inbox[0]
+        expect(message.from_id).to eq 1
+        expect(message.body).to eq 'Hello! How are you?'
+      end
+
+      it 'marking messages as read' do
+        Chatbox.deliver_message! from: @austin, to: @rachel, body: 'Hello! How are you?'
+
+        rachels_inbox = Chatbox.fetch_inbox_for @rachel
+
+        message = rachels_inbox[0]
+        expect(message).to_not be_read
+
+        message.mark_as_read!
+        expect(message).to be_read
+
+        expect(Chatbox.fetch_inbox_for(@rachel)[0]).to be_read
+      end
+
+      it 'marking messages as unread' do
+        Chatbox.deliver_message! from: @austin, to: @rachel, body: 'Hello! How are you?'
+
+        rachels_inbox = Chatbox.fetch_inbox_for @rachel
+
+        message = rachels_inbox[0]
+        expect(message).to_not be_read
+
+        message.mark_as_read!
+        message.mark_as_unread!
+
+        message = rachels_inbox[0]
+        expect(message).to_not be_read
+
+        expect(Chatbox.fetch_inbox_for(@rachel)[0]).to_not be_read
+      end
+    end
+  end
+end

data/spec/lib/draft_spec.rb

@@ -9,8 +9,15 @@ 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 draft
       draft.deliver!
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
+require 'chatbox'
+
 RSpec.configure do |config|
+  config.before do
+    Chatbox.reset_config!
+  end
+
   # More verbose output when running an individual spec file.
   if config.files_to_run.one?
     # Use the documentation formatter for detailed output,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Austin Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -86,10 +100,13 @@ files:
 - lib/chatbox/draft.rb
 - lib/chatbox/fake_missing_keywords.rb
 - lib/chatbox/inbox.rb
+- lib/chatbox/memcached_store.rb
 - lib/chatbox/memory_store.rb
+- lib/chatbox/message.rb
 - lib/chatbox/outbox.rb
 - lib/chatbox/version.rb
 - spec/chatbox_spec.rb
+- spec/integration_spec.rb
 - spec/lib/draft_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -118,5 +135,6 @@ specification_version: 4
 summary: Simple messaging system.
 test_files:
 - spec/chatbox_spec.rb
+- spec/integration_spec.rb
 - spec/lib/draft_spec.rb
 - spec/spec_helper.rb