Merge bac1165 into 77015ee

Gemfile

@@ -49,8 +49,6 @@ gem 'cancancan'
 gem 'gravtastic'
 # for markdown rendering
 gem 'redcarpet'
-# for view presenters/decorators
-gem 'draper'
 # for token input
 gem 'selectize-rails'
 # as state machine

Gemfile.lock

@@ -97,11 +97,6 @@ GEM
       devise (>= 2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    draper (2.1.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      request_store (~> 1.0)
     erubis (2.7.0)
     execjs (2.4.0)
     factory_girl (4.5.0)
@@ -224,7 +219,6 @@ GEM
     rainbow (2.0.0)
     rake (10.4.2)
     redcarpet (3.2.2)
-    request_store (1.1.0)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     rest-client (1.7.3)
@@ -331,7 +325,6 @@ DEPENDENCIES
   database_cleaner
   devise
   devise_ichain_authenticatable
-  draper
   factory_girl_rails
   faker
   figaro

app/views/projects/_list.html.haml

@@ -1,7 +1,7 @@
 -if projects
   %table.table
     %thead
-    - ProjectDecorator.decorate_collection(projects).each_with_index do |project, index|
+    - projects.each_with_index do |project, index|
       %tr
         %td{:class => "#{project.aasm_state}"}
-          = render :partial => "projects/list_item", :locals => {:project => project, :index => index }
+          = render :partial => "projects/list_item", :locals => {:project => project, :index => index }

app/views/projects/_list_item.html.haml

@@ -5,11 +5,11 @@
 
 %p{:style=>"margin-top: -10px"}
   %small
-    = project.state_name
+    = render :partial => "projects/state_name", :locals => {:project => project }
     by
     = link_to(user_path(project.originator.id)) do
       #{project.originator.name}
-      = project.like_button
+      = render :partial => "projects/like_button", :locals => {:project => project }
 :markdown
   #{truncate(project.description, length: 140)}
 - unless project.users.empty?
@@ -19,6 +19,4 @@
         = image_tag(user.gravatar_url(:size => "24"), :class => "img-thumbnail", :title => "#{user.name}", :alt => user.name)
 %span.help-block
   %small
-    = project.updated_at
-    = project.kudos
-    = project.grab_it_link
+    = render :partial => "projects/info", :locals => {:project => project }

app/views/projects/index.html.haml

@@ -41,7 +41,7 @@
             .col-sm-12
               %table.table#project_table
                 %thead
-                - ProjectDecorator.decorate_collection(@projects).each_with_index do |project, index|
+                - @projects.each_with_index do |project, index|
                   %tr
                     %td{:class => "#{project.aasm_state}"}
                       = render :partial => "projects/list_item", :locals => {:project => project, :index => index }

app/views/search/result.html.haml

@@ -18,7 +18,7 @@
         - unless @projects.empty?
           %table.table#project_table
             %thead
-            - ProjectDecorator.decorate_collection(@projects).each_with_index do |project, index|
+            - @projects.each_with_index do |project, index|
               %tr
                 %td{:class => "#{project.aasm_state}"}
                   = render :partial => "projects/list_item", :locals => {:project => project, :index => index }