chatty 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c0e4fba05a323b0b54c5e2c094e961048cc7cf
-  data.tar.gz: 3cea5a15dc30dc14eb841080dd31535529590a9f
+  metadata.gz: 87ca9a98ed8b49169259e0ca3a389af4abad3c52
+  data.tar.gz: 36c4b26cb9ba44b6d77f54edbc8cbd8810ee9628
 SHA512:
-  metadata.gz: a842d79f49e4ec07c1209dd8be1a3a5d6b75628b8ae0d1bc39cf677617ca84aca510d87edc40ed3d0f1da92078d4b1bcb4ab8d556c1bb6a77a536b89baa7d48e
-  data.tar.gz: cad89e6ad27ae91910c7caa6d99f84a6ab99c64a921178e667b8cad512c46427f87b31d3c90a3c41a0025ad05885e14892a1d3bf24c0dd89b3ef0924dff7538c
+  metadata.gz: 9e05424786e767ef69a3095ca45ac2adc1798b22473f0db8bd0536d6f481363805ce97e6c11a0ee98168e0fd527cb67429f6fcb0407034bbc82b9ba5668d6ca4
+  data.tar.gz: 6ced35306e8623cdd13f9f3933afd4923fde8336b515b365950dd0c8bc49671eb9382fdf57966004143ab9821182c08a905f04f895bf724e1e041d5e4b9b1ff0

data/app/assets/javascripts/chatty.js.coffee

@@ -30,21 +30,18 @@ $ ->
     })
     chat.prepend(error)
     
-    chatty_handled(chat, ->
-      chatty_init_messages(chat, ->
-        chatty_init_form(chat, ->
+    chatty_handled chat, ->
+      chatty_init_messages chat, ->
+        chatty_init_form chat, ->
           chatty_refresh_messages(chat)
           chatty_check_new_messages(chat)
-        )
-      )
-    )
   
   chatty_check_new_messages = (chat) ->
     setTimeout((->
       chatty_refresh_messages(chat)
       
       # Handle changed chat state.
-      chatty_with_state(chat, (data) ->
+      chatty_with_state chat, (data) ->
         if data.chat.state != "handled"
           chatty_hide_form() unless chatty_form_hidden()
         else
@@ -54,7 +51,6 @@ $ ->
           chatty_show_not_allowed_to_add_messages() if chatty_not_allowed_to_add_messages_hidden()
         else
           chatty_hide_not_allowed_to_add_messages() unless chatty_not_allowed_to_add_messages_hidden()
-      )
       
       chatty_check_new_messages(chat)
     ), 1000)
@@ -108,14 +104,13 @@ $ ->
     chat.data("last-message-id", 0)
     messages_container = $(".chatty_messages", chat)
     messages_container.html("")
-    messages_container.slideDown("fast", ->
+    messages_container.slideDown "fast", ->
       $.ajax({type: "GET", url: "/chatty/messages/?q[chat_id_eq]=" + chat.data("chat-id"), cache: false, async: true, dataType: "json", success: (data) ->
         for message in data.messages
           chatty_add_message(chat, message)
         
         callback.call()
       })
-    )
   
   chatty_add_message = (chat, message) ->
     msg_id = parseInt(message.id)
@@ -129,21 +124,27 @@ $ ->
     messages_container = $(".chatty_messages", chat)
     message_class = "chatty_message_" + msg_id
     
+    if message.self
+      self_class = "chatty_message_self"
+    else
+      self_class = "chatty_message_other"
+    
     container = $("<div />", {
-      "class": "chatty_message " + message_class,
+      "class": "chatty_message " + message_class + " " + self_class,
       "data": {
-        "message_id": message.id
+        "message_id": message.id,
+        "self": message.self
       },
       "css": {
         "display": "none"
       }
     })
     
-    author_div = $("<div />", {
-      "class": "chatty_message_author",
-      "text": message.author_name
+    user_div = $("<div />", {
+      "class": "chatty_message_user",
+      "text": message.user_name
     })
-    container.append(author_div)
+    container.append(user_div)
     
     message_div = $("<div />", {
       "class": "chatty_message_message",

data/app/controllers/chatty/messages_controller.rb

@@ -25,7 +25,7 @@ class Chatty::MessagesController < Chatty::ApplicationController
     @messages = @ransack.result.order(:created_at, :id)
     
     respond_to do |format|
-      format.json { render(:json => {:messages => @messages.map{ |message| message.json } }) }
+      format.json { render(:json => {:messages => messages_json(@messages)}) }
     end
   end
   
@@ -45,4 +45,18 @@ private
   def message_params
     params.require(:message).permit(:chat_id, :message)
   end
+  
+  def messages_json messages
+    @messages.map do |message|
+      message_json = message.json
+      
+      if message.user == current_user
+        message_json[:self] = true
+      else
+        message_json[:self] = false
+      end
+      
+      message_json
+    end
+  end
 end

data/app/models/chatty/message.rb

@@ -9,7 +9,8 @@ class Chatty::Message < ActiveRecord::Base
     return {
       :id => id,
       :message => message,
-      :author_name => (user[:name].presence || user[:email].presence || user.id),
+      :user_id => user.id,
+      :user_name => (user[:name].presence || user[:email].presence || user.id),
       :created_at => created_at.strftime("%Y-%m-%d %H:%M:%S")
     }
   end

data/lib/chatty/version.rb

@@ -1,3 +1,3 @@
 module Chatty
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatty
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -255,36 +255,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/chatty/admin_chats_controller.rb
-- app/controllers/chatty/messages_controller.rb
-- app/controllers/chatty/application_controller.rb
-- app/controllers/chatty/chats_controller.rb
-- app/views/chatty/messages/_form.html.haml
-- app/views/chatty/messages/new.html.haml
-- app/views/chatty/chats/show.html.haml
-- app/views/chatty/chats/index.html.haml
-- app/helpers/chatty/chats_helper.rb
-- app/helpers/chatty/application_helper.rb
+- app/models/chatty/message.rb
+- app/models/chatty/chat.rb
 - app/assets/stylesheets/scaffold.css
-- app/assets/stylesheets/chatty/chats.css
 - app/assets/stylesheets/chatty/application.css
+- app/assets/stylesheets/chatty/chats.css
 - app/assets/stylesheets/chatty.css.scss
-- app/assets/javascripts/chatty.js.coffee
-- app/assets/javascripts/chatty/application.js
 - app/assets/javascripts/chatty/chats.js
-- app/models/chatty/message.rb
-- app/models/chatty/chat.rb
+- app/assets/javascripts/chatty/application.js
+- app/assets/javascripts/chatty.js.coffee
+- app/helpers/chatty/application_helper.rb
+- app/helpers/chatty/chats_helper.rb
+- app/controllers/chatty/application_controller.rb
+- app/controllers/chatty/chats_controller.rb
+- app/controllers/chatty/messages_controller.rb
+- app/controllers/chatty/admin_chats_controller.rb
+- app/views/chatty/chats/index.html.haml
+- app/views/chatty/chats/show.html.haml
+- app/views/chatty/messages/_form.html.haml
+- app/views/chatty/messages/new.html.haml
 - config/routes.rb
-- db/plugin_migrate/20140520083510_create_chatty_chats.rb
-- db/plugin_migrate/20140520083027_create_chatty_messages.rb
 - db/plugin_migrate/20140521072854_create_activities.rb
-- lib/chatty.rb
+- db/plugin_migrate/20140520083027_create_chatty_messages.rb
+- db/plugin_migrate/20140520083510_create_chatty_chats.rb
 - lib/chatty/engine.rb
 - lib/chatty/version.rb
+- lib/chatty.rb
 - lib/tasks/chatty_tasks.rake
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
 homepage: https://www.github.com/kaspernj/chatty
 licenses: []
 metadata: {}

data/README.rdoc

@@ -1,3 +0,0 @@
-= Chatty
-
-This project rocks and uses MIT-LICENSE.