chatty 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ca9a98ed8b49169259e0ca3a389af4abad3c52
-  data.tar.gz: 36c4b26cb9ba44b6d77f54edbc8cbd8810ee9628
+  metadata.gz: ccddaa579727156b1a72b0b4aba0808818d578e2
+  data.tar.gz: a957fdc99aa2cf4fd9de6759e0afd4e23596e49b
 SHA512:
-  metadata.gz: 9e05424786e767ef69a3095ca45ac2adc1798b22473f0db8bd0536d6f481363805ce97e6c11a0ee98168e0fd527cb67429f6fcb0407034bbc82b9ba5668d6ca4
-  data.tar.gz: 6ced35306e8623cdd13f9f3933afd4923fde8336b515b365950dd0c8bc49671eb9382fdf57966004143ab9821182c08a905f04f895bf724e1e041d5e4b9b1ff0
+  metadata.gz: 22ca590ace0f3f6e3c8e66d785a8d6958455682d720aed0d8937f92d2c490afc9be4da025c512568a7f163c92c0c90358db607589f03d99964a4f96118bcb696
+  data.tar.gz: 9ca27aef9394703ae5cf9bf62c0d916ef1905b756f9aed185a27f15497c86ccb90dae5f21df81c325643dd586fa611e1ee44453cb884e9b68162f34b6aeff396

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

@@ -2,7 +2,7 @@ $ ->
   # Adds the messages element and waits for the chat to be handled.
   chatty_init = (chat) ->
     chat.addClass("chatty_chat_" + chat.data("chat-id"))
-    
+
     messages = $("<div />", {
       "class": "chatty_messages",
       "text": chat.data("waiting-to-connect-message"),
@@ -11,7 +11,7 @@ $ ->
       }
     })
     chat.append(messages)
-    
+
     error = $("<div />", {
       "class": "chatty_not_allowed_to_add_messages",
       "text": chat.data("not-allowed-to-add-messages-message"),
@@ -20,7 +20,7 @@ $ ->
       }
     })
     chat.prepend(error)
-    
+
     error = $("<div />", {
       "class": "chatty_not_signed_in_error",
       "text": chat.data("need-to-be-signed-in-message"),
@@ -29,68 +29,68 @@ $ ->
       }
     })
     chat.prepend(error)
-    
+
     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) ->
         if data.chat.state != "handled"
           chatty_hide_form() unless chatty_form_hidden()
         else
           chatty_show_form() if chatty_form_hidden()
-        
+
         if data.chat.state == "closed"
           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)
-  
+
   chatty_show_not_allowed_to_add_messages = (chat) ->
     $(".chatty_not_allowed_to_add_messages", chat).slideDown("fast")
-  
+
   chatty_hide_not_allowed_to_add_messages = (chat) ->
     $(".chatty_not_allowed_to_add_messages", chat).slideUp("fast")
-  
+
   chatty_not_allowed_to_add_messages_hidden = (chat) ->
     $(".chatty_not_allowed_to_add_messages", chat).css("display") != "block"
-  
+
   chatty_hide_form = (chat) ->
     $(".chatty_form", chat).slideUp("fast") unless chatty_form_hidden()
-  
+
   chatty_form_hidden = (chat) ->
     $(".chatty_form", chat).css("display") != "block"
-  
+
   chatty_show_form = (chat) ->
     $(".chatty_form", chat).slideDown("fast") if chatty_form_hidden()
-  
+
   chatty_with_state = (chat, callback) ->
     $.ajax({type: "GET", url: "/chatty/chats/" + chat.data("chat-id"), cache: false, async: true, dataType: "json", success: (data) ->
       callback(data)
     })
-  
+
   # Waits for the chat to be handled, loads the messages and calls back.
   chatty_handled = (chat, callback) ->
     chatty_show_messages()
     messages = $(".chatty_messages", chat)
-    
+
     $.ajax({type: "GET", url: "/chatty/chats/" + chat.data("chat-id"), cache: false, async: true, dataType: "json", success: (data) ->
       chat.data("state", data.chat.state)
-      
+
       if data.chat.state == "new"
         messages.text(chat.data("waiting-to-be-handled-message"))
       else if data.chat.state == "closed"
         chatty_show_not_allowed_to_add_messages()
-      
+
       if data.chat.state == "handled" || data.chat.state == "closed"
         callback.call()
       else
@@ -98,7 +98,7 @@ $ ->
           chatty_handled(chat, callback)
         ), 500)
     })
-  
+
   # Inits all messages and begin new messages callback.
   chatty_init_messages = (chat, callback) ->
     chat.data("last-message-id", 0)
@@ -108,27 +108,27 @@ $ ->
       $.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)
     message_class = "chatty_message_" + msg_id
-    
+
     # Dont continue if message already exists!
     return if $("." + message_class, chat).length > 0
-    
+
     last_id = parseInt(chat.data("last-message-id"))
     chat.data("last-message-id", msg_id) if msg_id > last_id
     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 + " " + self_class,
       "data": {
@@ -139,45 +139,45 @@ $ ->
         "display": "none"
       }
     })
-    
+
     user_div = $("<div />", {
       "class": "chatty_message_user",
       "text": message.user_name
     })
     container.append(user_div)
-    
-    message_div = $("<div />", {
-      "class": "chatty_message_message",
-      "text": message.message
-    })
-    container.append(message_div)
-    
+
     created_at_div = $("<div />", {
       "class": "chatty_message_created_at",
       "text": message.created_at
     })
     container.append(created_at_div)
-    
+
+    message_div = $("<div />", {
+      "class": "chatty_message_message",
+      "text": message.message
+    })
+    container.append(message_div)
+
     messages_container.prepend(container)
     container.slideDown("fast")
-  
+
   chatty_refresh_messages = (chat, callback) ->
     last_message_id = chat.data("last-message-id")
-    
+
     $.ajax({type: "GET", url: "/chatty/messages/?q[id_gt]=" + chat.data("last-message-id") + "&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)
     })
-  
+
   chatty_show_not_signed_in_error = (chat) ->
     $(".chatty_not_signed_in_error", chat).slideDown("fast")
-  
+
   chatty_show_cant_add_messages_error = (chat) ->
     $(".chatty_not_allowed_to_add_messages", chat).slideDown("fast")
-  
+
   chatty_show_messages = (chat) ->
     $(".chatty_messages", chat).slideDown("fast")
-  
+
   chatty_init_form = (chat, callback) ->
     if !chat.data("signed-in")
       chatty_show_not_signed_in_error()
@@ -196,25 +196,29 @@ $ ->
             "display": "none"
           }
         })
+
+        send_button = $(".chatty_send_msg", form_container)
+        send_button.val(chat.data("send-msg-text")) if chat.data("send-msg-text")
+
         chat.prepend(form_container)
         form_container.slideDown("fast")
-        
+
         $("form", form_container).bind("ajax:complete", (env, xhr, status) ->
           textfield = $("textarea, input[type=text]", chat)
           chatty_refresh_messages(chat)
           res = $.parseJSON(xhr.responseText)
-          
+
           if !res.success
             alert(res.errors)
           else
             textfield.val("")
-          
+
           textfield.focus()
         )
-        
+
         callback.call()
       })
-  
+
   $(".chatty_chat").each ->
     chat = $(this)
     chatty_init(chat)

data/app/helpers/chatty/chats_helper.rb

@@ -1,17 +1,26 @@
 module Chatty::ChatsHelper
-  def chatty_chat(chat)
+  CHATTY_CHAT_ALLOWED_KEYS = [:data]
+  def chatty_chat chat, args = {}
+    args.each do |key, val|
+      raise ArgumentError, "Invalid key: #{key}" unless CHATTY_CHAT_ALLOWED_KEYS.include?(key)
+    end
+
+    data = {
+      chat_id: chat.id,
+      signed_in: signed_in?,
+      can_add_messages: can?(:new, Chatty::Message),
+      need_to_be_signed_in_message: _("You need to be signed in to write messages."),
+      not_allowed_to_add_messages_message: _("You are not allowed to write messages."),
+      waiting_to_connect_message: _("Waiting to connect..."),
+      waiting_to_be_handled_message: _("Waiting to be handled..."),
+      chat_is_closed_message: _("This chat is closed.")
+    }
+
+    data = data.merge(args[:data]) if args[:data]
+
     content_tag(:div, nil, {
-      :class => "chatty_chat",
-      :data => {
-        :chat_id => chat.id,
-        :signed_in => signed_in?,
-        :can_add_messages => can?(:new, Chatty::Message),
-        :need_to_be_signed_in_message => _("You need to be signed in to write messages."),
-        :not_allowed_to_add_messages_message => _("You are not allowed to write messages."),
-        :waiting_to_connect_message => _("Waiting to connect..."),
-        :waiting_to_be_handled_message => _("Waiting to be handled..."),
-        :chat_is_closed_message => _("This chat is closed.")
-      }
+      class: "chatty_chat",
+      data: data
     })
   end
 end

data/app/views/chatty/messages/_form.html.haml

@@ -1,4 +1,4 @@
 = simple_form_for @message, :remote => true do |f|
   = f.input :chat_id, :as => :hidden
   = f.input :message, :as => :string
-  = f.submit
+  = f.submit class: "chatty_send_msg"

data/lib/chatty/version.rb

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

metadata

@@ -1,251 +1,251 @@
 --- !ruby/object:Gem::Specification
 name: chatty
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form_ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: public_activity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: plugin_migrator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: gettext_simple_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: forgery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Making it easy to set it up a live chat on your website.
@@ -255,35 +255,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/models/chatty/message.rb
-- app/models/chatty/chat.rb
-- app/assets/stylesheets/scaffold.css
+- MIT-LICENSE
+- Rakefile
+- app/assets/javascripts/chatty.js.coffee
+- app/assets/javascripts/chatty/application.js
+- app/assets/javascripts/chatty/chats.js
+- app/assets/stylesheets/chatty.css.scss
 - app/assets/stylesheets/chatty/application.css
 - app/assets/stylesheets/chatty/chats.css
-- app/assets/stylesheets/chatty.css.scss
-- app/assets/javascripts/chatty/chats.js
-- 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/assets/stylesheets/scaffold.css
+- app/controllers/chatty/admin_chats_controller.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/helpers/chatty/application_helper.rb
+- app/helpers/chatty/chats_helper.rb
+- app/models/chatty/chat.rb
+- app/models/chatty/message.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/20140521072854_create_activities.rb
 - db/plugin_migrate/20140520083027_create_chatty_messages.rb
 - db/plugin_migrate/20140520083510_create_chatty_chats.rb
+- db/plugin_migrate/20140521072854_create_activities.rb
+- lib/chatty.rb
 - lib/chatty/engine.rb
 - lib/chatty/version.rb
-- lib/chatty.rb
 - lib/tasks/chatty_tasks.rake
-- MIT-LICENSE
-- Rakefile
 homepage: https://www.github.com/kaspernj/chatty
 licenses: []
 metadata: {}
@@ -293,17 +293,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Chatty is a chat extention for Rails