Merge branch 'master' of https://github.com/kandanapp/kandan

Author: gabceb

Gemfile

@@ -21,7 +21,7 @@ gem 'aws-sdk'
 gem 'paperclip'
 gem 'remotipart'
 gem 'jquery-rails'
-gem 'rb-readline'
+
 # Making the world a better, more stable place
 gem 'airbrake'
 
@@ -30,7 +30,7 @@ gem 'airbrake'
 group :assets do
   gem 'sass-rails'
   gem 'coffee-rails'
-  gem 'bourbon'
+  gem 'bourbon', '~> 1.4.0'
   gem 'execjs'   
   gem 'eco'
   gem 'uglifier'

Gemfile.lock

@@ -38,29 +38,29 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
-    airbrake (3.0.9)
+    airbrake (3.1.8)
       activesupport
       builder
+      json
     arel (3.0.2)
     awesome_print (1.1.0)
-    aws-sdk (1.3.8)
-      httparty (~> 0.7)
+    aws-sdk (1.8.1.2)
       json (~> 1.4)
-      nokogiri (<= 1.5.0)
+      nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
     bcrypt-ruby (3.0.1)
-    better_errors (0.3.2)
+    better_errors (0.5.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.7.0)
+      erubis (>= 2.6.6)
     binding_of_caller (0.6.8)
     bourbon (1.4.0)
       sass (>= 3.1)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.4)
-    childprocess (0.3.7)
-      ffi (~> 1.0, >= 1.0.6)
-    cloudfuji (0.0.39)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    cloudfuji (0.0.46)
       highline (>= 1.6.1)
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
@@ -73,9 +73,9 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
+    coffee-script-source (1.4.0)
     cookiejar (0.3.0)
-    daemons (1.1.8)
+    daemons (1.1.9)
     database_cleaner (0.9.1)
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
@@ -90,36 +90,38 @@ GEM
       eco-source
       execjs
     eco-source (1.1.0.rc.1)
-    em-http-request (0.3.0)
-      addressable (>= 2.0.0)
-      escape_utils
-      eventmachine (>= 0.12.9)
+    em-http-request (1.0.3)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
+    em-socksify (0.2.1)
+      eventmachine (>= 1.0.0.beta.4)
     erubis (2.7.0)
-    escape_utils (0.2.4)
-    eventmachine (0.12.10)
-    execjs (1.3.0)
+    eventmachine (1.0.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (3.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.1.0)
-      factory_girl (~> 3.1.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     faker (1.1.2)
       i18n (~> 0.5)
     ffi (1.3.1)
-    guard (1.6.1)
+    guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
+      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (2.3.3)
+    guard-rspec (2.4.0)
       guard (>= 1.1)
       rspec (~> 2.11)
-    highline (1.6.11)
+    highline (1.6.15)
     hike (1.2.1)
-    httparty (0.8.1)
-      multi_json
-      multi_xml
+    http_parser.rb (0.5.3)
     i18n (0.6.1)
     jasmine (1.3.1)
       jasmine-core (~> 1.3.1)
@@ -128,49 +130,47 @@ GEM
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.3.1)
     journey (1.0.4)
-    jquery-rails (2.0.1)
-      railties (>= 3.2.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.6)
-    kaminari (0.13.0)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
+    kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
-    listen (0.7.1)
+    listen (0.7.2)
     lumberjack (1.0.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (1.19)
+    mime-types (1.21)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
-    multi_xml (0.4.2)
-    nokogiri (1.5.0)
-    orm_adapter (0.0.6)
+    multi_json (1.5.1)
+    nokogiri (1.5.6)
+    orm_adapter (0.0.7)
     paperclip (3.4.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.4.0)
       mime-types
-    pg (0.12.2)
+    pg (0.14.1)
     polyglot (0.3.3)
-    pry (0.9.10)
+    pry (0.9.11.4)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
+      slop (~> 3.4)
     pry-rails (0.2.2)
       pry (>= 0.9.10)
     quiet_assets (1.0.1)
       railties (~> 3.1)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -190,10 +190,9 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rb-readline (0.4.2)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
-    remotipart (1.0.2)
+    remotipart (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.12.0)
@@ -203,19 +202,19 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.1)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
       rspec-mocks (~> 2.12.0)
-    rubycas-client (2.3.8)
+    rubycas-client (2.3.9)
       activesupport
     rubyzip (0.9.9)
     sass (3.2.5)
-    sass-rails (3.2.4)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
@@ -231,30 +230,31 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.3.3)
+    slop (3.4.3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thin (1.3.1)
+    sqlite3 (1.3.7)
+    terminal-table (1.4.5)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
-    uglifier (1.2.3)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    uuidtools (2.1.2)
-    warden (1.1.1)
+      multi_json (~> 1.0, >= 1.0.2)
+    uuidtools (2.1.3)
+    warden (1.2.1)
       rack (>= 1.0)
-    websocket (1.0.6)
+    websocket (1.0.7)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -267,7 +267,7 @@ DEPENDENCIES
   aws-sdk
   better_errors
   binding_of_caller
-  bourbon
+  bourbon (~> 1.4.0)
   cloudfuji
   coffee-rails
   database_cleaner
@@ -287,7 +287,6 @@ DEPENDENCIES
   pry-rails
   quiet_assets
   rails (= 3.2.11)
-  rb-readline
   remotipart
   rspec-rails
   sass-rails

app/assets/javascripts/backbone/views/chatbox.js.coffee

@@ -37,7 +37,7 @@ class Kandan.Views.Chatbox extends Backbone.View
       )
 
       $("#activity-c#{model.cid}").attr("id", "activity-#{model.get('id')}")
-      $scrollbox = $(event.target).parent().find(".paginated-activities")
+      $scrollbox = $('.channels-pane')
       $scrollbox.prop("scrollTop", $scrollbox.prop('scrollHeight'))
     })
 

app/controllers/activities_controller.rb

@@ -34,12 +34,11 @@ def index
   def create
     @activity = Channel.find(params[:channel_id]).activities.build(params[:activity])
     @activity.user_id = current_user.id if @activity.action == "message"
-    if @activity.save
-      respond_to do |format|
+
+    respond_to do |format|
+      if @activity.save
         format.json { render :json => @activity, :status => :created }
-      end
-    else
-      respond_to do |format|
+      else
         format.json { render :json => @activity.errors, :status => :unprocessable_entity }
       end
     end

app/controllers/channels_controller.rb

@@ -26,12 +26,10 @@ def index
 
   def create
     @channel = Channel.new(params[:channel])
-    if @channel.save
-      respond_to do |format|
+    respond_to do |format|
+      if @channel.save
         format.json { render :json => @channel, :status => :created }
-      end
-    else
-      respond_to do |format|
+      else
         format.json { render :json => @channel.errors, :status => :unprocessable_entity }
       end
     end
@@ -46,12 +44,10 @@ def show
 
   def update
     @channel = Channel.find(params[:id])
-    if @channel.update_attributes(params[:channel])
-      respond_to do |format|
+    respond_to do |format|
+      if @channel.update_attributes(params[:channel])
         format.json { render :json => @channel, :status => :ok }
-      end
-    else
-      respond_to do |format|
+      else
         format.json { render :json => @channel.errors, :status => :unprocessable_entity }
       end
     end