chatty 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccddaa579727156b1a72b0b4aba0808818d578e2
-  data.tar.gz: a957fdc99aa2cf4fd9de6759e0afd4e23596e49b
+  metadata.gz: 961dbbbebb41c20141c66e14f11dff3b969de2b0
+  data.tar.gz: 09c3da27eae898dccde5c8c87c135c5b4ee89b9e
 SHA512:
-  metadata.gz: 22ca590ace0f3f6e3c8e66d785a8d6958455682d720aed0d8937f92d2c490afc9be4da025c512568a7f163c92c0c90358db607589f03d99964a4f96118bcb696
-  data.tar.gz: 9ca27aef9394703ae5cf9bf62c0d916ef1905b756f9aed185a27f15497c86ccb90dae5f21df81c325643dd586fa611e1ee44453cb884e9b68162f34b6aeff396
+  metadata.gz: 27bb73080bfda31d93d21616a087867ec67bc0808d45645be5524a3beba987f00763e678fead71d1c2f73cfce3c504bcf8f25a1a45976331934b2bf265a54de4
+  data.tar.gz: 2f8956daa6857786fde400f5ab30410993e2d195a2fdba270cd5418e713d75272df44ac1132be3c037c1f352e704d46273aa193b5f07bd389708b8e686bcafb2

data/app/controllers/chatty/admin_chats_controller.rb

@@ -1,25 +1,24 @@
 class Chatty::AdminChatsController < Chatty::ApplicationController
-  before_filter :set_chat, :only => [:handle, :show]
-  
+  before_filter :set_chat, only: [:handle, :show]
+
   def index
     @ransack_params = params[:q] || {}
     @ransack = Chatty::Chat.ransack(@ransack_params)
     @chats = @ransack.result.order(:id).reverse_order
   end
-  
+
   def show
   end
-  
+
   def handle
-    @chat.handled = true
-    @chat.save!
-    @chat.create_activity :key => "chatty/chat.handled", :owner => current_user
-    
+    @chat.handle!
+    @chat.create_activity key: "chatty/chat.handled", owner: current_user
+
     redirect_to admin_chat_path(@chat)
   end
-  
+
 private
-  
+
   def set_chat
     @chat = Chatty::Chat.find(params[:id])
   end

data/app/controllers/chatty/chats_controller.rb

@@ -2,27 +2,27 @@ require_dependency "chatty/application_controller"
 
 class Chatty::ChatsController < Chatty::ApplicationController
   before_action :set_chat, only: [:show, :edit, :update, :destroy, :messages, :handle, :close]
-  
+
   def index
     @ransack_params = params[:q] || {}
     @ransack = Chatty::Chat.ransack(@ransack_params.clone)
     @chats = @ransack.result.order(:id).reverse_order
   end
-  
+
   def show
     respond_to do |format|
-      format.json { render(:json => {:chat => @chat.json}) }
+      format.json { render(json: {chat: @chat.json}) }
       format.html { render :show }
     end
   end
-  
+
   def new
     @chat = Chatty::Chat.new
   end
-  
+
   def edit
   end
-  
+
   def create
     @chat = Chatty::Chat.new(chat_params)
 
@@ -32,7 +32,7 @@ class Chatty::ChatsController < Chatty::ApplicationController
       render action: 'new'
     end
   end
-  
+
   def update
     if @chat.update(chat_params)
       redirect_to @chat, notice: 'Chat was successfully updated.'
@@ -40,36 +40,36 @@ class Chatty::ChatsController < Chatty::ApplicationController
       render action: 'edit'
     end
   end
-  
+
   def destroy
     @chat.destroy
     redirect_to chats_url, notice: 'Chat was successfully destroyed.'
   end
-  
+
   def messages
     @messages = @chat.messages
-    render :partial => "messages", :layout => false
+    render partial: "messages", layout: false
   end
-  
+
   def handle
     @chat.handle!
-    @chat.create_activity :key => "chatty/chat.handled", :owner => current_user
+    @chat.create_activity key: "chatty/chat.handled", owner: current_user
     redirect_to chat_path(@chat)
   end
-  
+
   def close
     @chat.close
-    @chat.create_activity :key => "chatty/chat.closed", :owner => current_user
+    @chat.create_activity key: "chatty/chat.closed", owner: current_user
     redirect_to chat_path(@chat)
   end
-  
+
 private
-  
+
   def set_chat
     @chat = Chatty::Chat.find(params[:id])
     authorize! action_name.to_sym, @chat
   end
-  
+
   def chat_params
     params.require(:chat).permit(:user_type, :user_id, :resource_type, :resource_id)
   end

data/config/routes.rb

@@ -1,9 +1,15 @@
 Chatty::Engine.routes.draw do
+  namespace :admin do
+    resources :chats
+  end
+
   resources :chats do
-    get :messages, :on => :member
-    post :handle, :on => :member
-    post :close, :on => :member
+    member do
+      get :messages
+      post :handle
+      post :close
+    end
   end
-  
+
   resources :messages
 end

data/lib/chatty.rb

@@ -2,4 +2,5 @@ require "chatty/engine"
 require "simple_form_ransack"
 
 module Chatty
+  autoload :ActiveAdminIntegrator, "#{File.dirname(__FILE__)}/chatty/active_admin_integrator"
 end

data/lib/chatty/active_admin_integrator.rb

@@ -0,0 +1,51 @@
+class Chatty::ActiveAdminIntegrator
+  def self.integrate!
+    ActiveAdmin.register Chatty::Chat do
+      index do
+        selectable_column
+        id_column
+        column :user
+        column :resource
+        column :state
+        column :created_at
+        actions
+      end
+
+      show do
+        attributes_table do
+          row :id
+          row :user
+          row :resource
+          row :state
+          row :created_at
+          row :updated_at
+        end
+
+        panel Chatty::Message.model_name.human(count: 2) do
+          table do
+            thead do
+              tr do
+                th Chatty::Message.human_attribute_name(:id)
+                th Chatty::Message.human_attribute_name(:user)
+                th Chatty::Message.human_attribute_name(:message)
+                th Chatty::Message.human_attribute_name(:created_at)
+              end
+            end
+            tbody do
+              resource.messages.each do |message|
+                tr do
+                  td message.id
+                  td message.user.name
+                  td message.message
+                  td message.created_at
+                end
+              end
+            end
+          end
+        end
+
+        active_admin_comments
+      end
+    end
+  end
+end

data/lib/chatty/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatty
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -277,10 +277,11 @@ files:
 - app/views/chatty/messages/_form.html.haml
 - app/views/chatty/messages/new.html.haml
 - config/routes.rb
-- db/plugin_migrate/20140520083027_create_chatty_messages.rb
-- db/plugin_migrate/20140520083510_create_chatty_chats.rb
-- db/plugin_migrate/20140521072854_create_activities.rb
+- db/migrate/20140520083027_create_chatty_messages.rb
+- db/migrate/20140520083510_create_chatty_chats.rb
+- db/migrate/20140521072854_create_activities.rb
 - lib/chatty.rb
+- lib/chatty/active_admin_integrator.rb
 - lib/chatty/engine.rb
 - lib/chatty/version.rb
 - lib/tasks/chatty_tasks.rake