Merge branch 'master' of github.com:fredwu/angel_nest

Author: gitfly

Gemfile

@@ -6,7 +6,6 @@ gem 'mysql2'
 # core function gems
 gem 'devise',              '~> 1.4.2'
 gem 'omniauth',            '~> 0.2.0'
-gem 'cancan',              '~> 1.6.0'
 gem 'inherited_resources', '~> 1.2.0'
 gem 'simple_form',         '~> 1.4.0'
 gem 'squeel',              '~> 0.8.0'
@@ -30,7 +29,7 @@ gem 'mini_magick'
 gem 'carrierwave'
 gem 'client_side_validations', '~> 3.1.0'
 
-#production environment
+# asset compilation
 gem 'execjs'
 gem 'therubyracer'
 

Gemfile.lock

@@ -44,7 +44,6 @@ GEM
     arel (2.1.3)
     bcrypt-ruby (2.1.4)
     builder (3.0.0)
-    cancan (1.6.5)
     capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -53,7 +52,7 @@ GEM
       selenium-webdriver (~> 0.2.0)
       xpath (~> 0.1.4)
     carmen (0.2.8)
-    carrierwave (0.5.4)
+    carrierwave (0.5.5)
       activesupport (~> 3.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
@@ -64,10 +63,10 @@ GEM
       execjs
     coffee-script-source (1.1.1)
     configuration (1.3.1)
-    cucumber (1.0.0)
+    cucumber (1.0.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      gherkin (~> 2.4.5)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     cucumber-rails (1.0.2)
@@ -95,7 +94,7 @@ GEM
     ffaker (1.8.0)
     ffi (1.0.9)
     geo_location (0.4.2)
-    gherkin (2.4.1)
+    gherkin (2.4.5)
       json (>= 1.4.6)
     has_scope (0.5.0)
     hike (1.1.0)
@@ -224,7 +223,7 @@ GEM
       ruby-openid (>= 2.1.7)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
-    sass (3.1.3)
+    sass (3.1.4)
     selenium-webdriver (0.2.2)
       childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
@@ -242,7 +241,7 @@ GEM
       hike (~> 1.0)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
-    squeel (0.8.4)
+    squeel (0.8.5)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
     subexec (0.1.0)
@@ -269,7 +268,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cancan (~> 1.6.0)
   capybara (~> 1.0.0)
   carmen
   carrierwave

app/assets/javascripts/angels.js.coffee

@@ -29,4 +29,23 @@ jQuery ->
       parent.next().fadeIn()
 
     e.preventDefault()
-  )
+  )
+
+  # AutoSuggest
+  $('.multi_add input').autoSuggest(
+    '/' + $('.multi_add').data('target'),
+    asHtmlID: $('.multi_add').data('target')
+    startText: $('.multi_add').data('start_text')
+    selectionLimit: ($('.multi_add').data('selection_limit') || false)
+    limitText: window.label.no_more_selections_allowed
+    selectedValuesProp: 'id'
+    selectedItemProp: 'name'
+    searchObjProps: 'name'
+    preFill: $('.multi_add input').data('source')
+  )
+  $('.multi_add').parents('form').submit(->
+    $('.multi_add input').attr('value', $('input#as-values-' + $('.multi_add').data('target')).attr('value')[1..-2])
+  )
+
+  # read only forms
+  $('.read_only form :input:not([type=submit])').attr('disabled', 'disabled')

app/assets/javascripts/comments.js.coffee

@@ -107,6 +107,10 @@ a {
   &:hover   { color: $link_colour_h; text-decoration: underline; }
 }
 
+li a.current {
+  font-weight: bold;
+}
+
 .first {
   margin-left: 0 !important;
 }
@@ -118,7 +122,8 @@ a {
 .new {
   color: $error_colour;
 
-  &:hover {
+  &:hover,
+  &:visited {
     color: darken($error_colour, 20%);
   }
 }
@@ -170,6 +175,10 @@ div.message {
   margin-left: $input_margin;
 }
 
+#new_private_message .as-results {
+  margin-left: 0;
+}
+
 /* ------------------------------
   form
 ------------------------------ */
@@ -581,7 +590,7 @@ nav.pagination {
       }
 
       ul {
-        li.location {
+        li.secondary {
           color: $secondary_colour_h;
           font-size: $font_size_tiny;
         }

app/assets/javascripts/concerns/form.js.coffee

@@ -7,6 +7,9 @@ class MessagesController < ApplicationController
 
   has_scope :p, :default => 1
 
+  before_filter :hide_sidebar, :only => [:show_private_message]
+  before_filter :ensure_ownership, :only => [:show_private_message, :reply_private_message]
+
   def create
     resource = parent.add_comment(current_user, params[:message][:content])
 
@@ -15,4 +18,27 @@ def create
       format.html { redirect_to :back }
     end
   end
+
+  def send_private_message
+    result = current_user.send_private_message(User.find(params[:users]), params[:message][:content])
+
+    respond_to do |format|
+      format.json { render :json => result }
+      format.html { redirect_to :back }
+    end
+  end
+
+  def show_private_message
+    @topic = Message.topics.find(params[:id])
+  end
+
+  def reply_private_message
+    @topic = Message.topics.find(params[:id])
+    result = current_user.reply_private_message(@topic, params[:message][:content])
+
+    respond_to do |format|
+      format.json { render :json => result }
+      format.html { redirect_to :back }
+    end
+  end
 end

app/assets/javascripts/proposals.js.coffee

@@ -4,7 +4,7 @@ class ProposalsController < ApplicationController
   belongs_to :startup
 
   def create
-    parent.submit_proposal(investors, params[:proposal], proposal_stage)
+    parent.create_proposal(investors, params[:proposal], proposal_stage)
     show_flash_message
     redirect_to parent_path
   end
@@ -17,12 +17,6 @@ def update
     redirect_to parent_path
   end
 
-  def edit
-    @investors = resource.investors.for_auto_suggest.to_json
-
-    edit!
-  end
-
   private
 
   def investors

app/assets/javascripts/startups.js.coffee

@@ -3,15 +3,34 @@ class UsersController < ApplicationController
 
   has_scope :page, :default => 1
 
+  before_filter :hide_sidebar, :only => [:show, :message_inboxes]
+
+  def index
+    respond_to do |format|
+      format.json { render :json => collection.for_auto_suggest }
+      format.html { render 'users/_index', :locals => { :meta => {} } }
+    end
+  end
+
   def home
     @micro_posts = resource.followed_micro_posts.page(params[:p])
   end
 
   def show
-    hide_sidebar
     @micro_posts = resource.micro_posts.page(params[:p])
   end
 
+  def message_inboxes
+    @messages = case params[:type].try(:to_sym)
+      when :sent_messages      then current_user.sent_messages
+      when :archived_messages  then current_user.archived_messages
+      when :inbox_proposals    then current_user.inbox_proposals
+      when :sent_proposals     then current_user.sent_proposals
+      when :archived_proposals then current_user.archived_proposals
+      else                          current_user.inbox_messages
+    end
+  end
+
   def add_micro_post
     result = current_user.add_micro_post(params[:message][:content])
 
@@ -41,6 +60,10 @@ def unfollow_target
 
   private
 
+  def collection
+    User.page(params[:page])
+  end
+
   def resource
     if params.key?(:username)
       User.find_by_username(params[:username])