voluntary 0.2.1 → 0.2.2

data/README.rdoc

@@ -65,24 +65,24 @@ Run this in your console:
   cd ..
   rails plugin new voluntary_product_name --database=postgresql --skip-javascript --skip-test-unit --dummy-path=dummy --full
   cd voluntary_product_name
-  # Add voluntary gem as a dependency to gemspec ('0.1.0.rc2').
+  # Add voluntary gem as a dependency to gemspec ('~> 0.2.1').
+  # Add development dependencies from the following gemspec to product's gemspec: https://github.com/volontariat/voluntary/blob/master/voluntary.gemspec
   # add "require 'voluntary'" to lib/voluntary_product_name.rb
-  # Still needed?: Add development dependencies to dummy Gemfile, see voluntary_text_creation.
   # bundle install
   cd dummy
+  # Add development dependencies to dummy Gemfile, see voluntary_text_creation. 
+  bundle install
   # change config/boot.rb to require bundler like here: https://github.com/volontariat/voluntary_scholarship/blob/master/dummy/config/boot.rb
   # change database names to #{product_name}_#{environment} and customize user credentials in config/database.yml
   # add gitignore file from voluntary: https://github.com/volontariat/voluntary/blob/master/.gitignore
-  rake db:create:all && rails g voluntary:product_dummy # confirm all overwrite questions
-  # Add "gemspec path: File.expand_path(File.dirname(__FILE__) + '/../')" to the top of the dummy's Gemfile
-  bundle install # if it hangs at Fetching source index stop it and deactivate gems until it works and add them back one by one
+  bundle exec rake db:create:all && bundle exec rails g voluntary:product_dummy # confirm all overwrite questions except of Gemfile
   cd ..
   rails g migration add_product_name_product
   # fill migration file with template: https://github.com/volontariat/voluntary_scholarship/blob/master/db/migrate/20140306201232_add_scholarship_product.rb
   cd dummy
-  rake railties:install:migrations
+  bundle exec rake railties:install:migrations
   # change database names to #{product_name}_#{environment} and customize user credentials in dummy/config/mongoid.yml
-  rake db:migrate && rake db:test:clone_structure
+  bundle exec rake db:migrate && bundle exec rake db:test:clone_structure
   # create a class for your new product under app/models/product/product_name.rb like: https://github.com/volontariat/voluntary_scholarship/blob/master/app/models/product/scholarship.rb
   bundle exec rails s
   

data/app/assets/javascripts/voluntary/base.js.coffee

@@ -9,9 +9,16 @@ $(document).ready ->
   $('.tabs').each (k, v) ->
     $(v).tabs
       autoHeight: false
-      
+      beforeActivate: (event, ui) ->
+        unless ui.newTab.find('a').attr('href').indexOf('#') == 0
+          ui.newTab.find('.ajax_spinner').show()
+          ui.newPanel.empty()
+          
       beforeLoad: (event, ui) ->
         ui.jqXHR.error ->
+          unless ui.tab.find('a').attr('href').indexOf('#') == 0
+            ui.tab.find('.ajax_spinner').hide()
+          
           json = null
           
           try
@@ -22,11 +29,17 @@ $(document).ready ->
           
           ui.panel.html error
     
+      load: (event, ui) ->
+        unless ui.tab.find('a').attr('href').indexOf('#') == 0
+          ui.tab.find('.ajax_spinner').hide()
+    
   $(document).on "click", ".ui-tabs-panel .pagination a", (event) ->
     event.preventDefault()
     
     $.get($(this).attr('href'), (data) ->
-      $($('.ui-tabs-panel[style*="display: block"]')[0]).html(data)
+      panel = $('.ui-tabs-panel[style*="display: block"]')[0]
+      panel = $('.ui-tabs-panel')[0] unless panel
+      $(panel).html(data)
     ).fail (jqXHR, textStatus, errorThrown) ->
       json = null
       
@@ -67,4 +80,26 @@ $(document).ready ->
     });
     
   $( ".datepicker" ).each (k, v) ->
-    $(v).datepicker({ dateFormat: "yy-mm-dd", changeYear: true, yearRange: "c-100:c+10" });
+    $(v).datepicker({ dateFormat: "yy-mm-dd", changeYear: true, yearRange: "c-100:c+10" });
+    
+  $(document.body).on "click", ".remote_links", (event) ->
+    $this = $(this)
+    
+    $.ajax(url: $this.attr('href'), type: "GET", dataType: "html").success (data) ->
+      $($this.data("replace")).html(data)
+      
+    event.preventDefault()
+    
+  $(document.body).on "click", ".remote_modal_link", (event) ->
+    $this = $(this)
+    
+    $.ajax(url: $this.attr('href'), type: "GET", dataType: "html").success (data) ->
+      $('#bootstrap_modal').html(data)
+      $('#bootstrap_modal').modal('show')
+      
+    event.preventDefault()
+    
+  $(document.body).on "click", "#close_bootstrap_modal_button", (event) ->
+    $('#bootstrap_modal').modal('hide')
+    event.preventDefault()
+    

data/app/assets/javascripts/voluntary/likes/list.js.coffee

@@ -0,0 +1,71 @@
+window.Likes or= {}
+
+window.Likes.List = class List
+  constructor: ->
+    $(document.body).on "click", ".like_link", (event) ->
+      event.preventDefault()
+      table = $(this).closest('table')
+      
+      $.post("/like/" + table.data('target_type') + "/" + table.data('target_id')).done(=>
+        $(this).hide()
+        $(this).closest('table').find('.undo_like_link').show()
+        likes_count = parseInt($(this).closest('table').find('.likes_counter_column').text()) + 1
+        $(this).closest('table').find('.likes_counter_column').html(likes_count)
+        $(this).closest('table').find('.dislike_link').data('liked', true)
+        
+        if $(this).data('disliked')
+          $(this).closest('table').find('.undo_dislike_link').hide()
+          $(this).closest('table').find('.dislike_link').show()
+          dislikes_count = parseInt($(this).closest('table').find('.dislikes_counter_column').text()) - 1
+          $(this).closest('table').find('.dislikes_counter_column').html(dislikes_count)
+          $(this).data('disliked', false)
+      ) 
+    $(document.body).on "click", ".undo_like_link", (event) ->
+      event.preventDefault()
+      table = $(this).closest('table')
+      
+      $.post("/unlike/" + table.data('target_type') + "/" + table.data('target_id')).done(=>
+        $(this).hide()
+        $(this).closest('table').find('.like_link').show()
+        $(this).closest('table').find('.dislike_link').data('liked', false)
+        likes_count = parseInt($(this).closest('table').find('.likes_counter_column').text()) - 1
+        $(this).closest('table').find('.likes_counter_column').html(likes_count)
+      ).fail(->
+        alert "Undoing like failed!"
+      )
+      
+    $(document.body).on "click", ".dislike_link", (event) ->
+      event.preventDefault()
+      table = $(this).closest('table')
+      
+      $.post("/dislike/" + table.data('target_type') + "/" + table.data('target_id')).done(=>
+        event.preventDefault()
+        $(this).hide()
+        $(this).closest('table').find('.undo_dislike_link').show()
+        dislikes_count = parseInt($(this).closest('table').find('.dislikes_counter_column').text()) + 1
+        $(this).closest('table').find('.dislikes_counter_column').html(dislikes_count)
+        $(this).closest('table').find('.like_link').data('disliked', true)
+        
+        if $(this).data('liked')
+          $(this).closest('table').find('.undo_like_link').hide()
+          $(this).closest('table').find('.like_link').show()
+          likes_count = parseInt($(this).closest('table').find('.likes_counter_column').text()) - 1
+          $(this).closest('table').find('.likes_counter_column').html(likes_count)
+          $(this).data('liked', false)
+      ).fail(->
+        alert "Disliking failed!"
+      )
+        
+    $(document.body).on "click", ".undo_dislike_link", (event) ->
+      event.preventDefault()
+      table = $(this).closest('table')
+      
+      $.post("/unlike/" + table.data('target_type') + "/" + table.data('target_id')).done(=>
+        $(this).hide()
+        $(this).closest('table').find('.dislike_link').show()
+        $(this).closest('table').find('.like_link').data('disliked', false)
+        dislikes_count = parseInt($(this).closest('table').find('.dislikes_counter_column').text()) - 1
+        $(this).closest('table').find('.dislikes_counter_column').html(dislikes_count)      
+      ).fail(->
+        alert "Undoing dislike failed!"
+      )

data/app/assets/stylesheets/voluntary/base.css.sass

@@ -41,11 +41,11 @@ code
 
 html, body, div
   font-family: Arial
-  font-size: 10px
+  font-size: 12px
 
 .nav a
   font-family: Arial
-  font-size: 10px
+  font-size: 12px
 
 .nested_comments
   margin-left: 30px
@@ -59,4 +59,8 @@ html, body, div
 .floating_form fieldset .control-group
   float: left 
   margin-right: 10px
-  margin-bottom: 0px
+  margin-bottom: 0px
+  
+.likes_and_dislikes_table td
+  background-color: transparent !important
+  border-top: 0px !important

data/app/assets/stylesheets/voluntary/bootstrap_and_overrides.css.sass

@@ -1,4 +1,14 @@
 @import "twitter/bootstrap/responsive"
 
+.list-striped 
+  li:nth-child(odd)
+    background-color: #F9F9F9
+
 .nav a
-  font-size: 14px !important
+  font-size: 14px !important
+  
+.modal-body
+  overflow-y: visible
+  
+.scrollable-modal-body
+  overflow-y: auto

data/app/controllers/concerns/voluntary/v1/base_controller.rb

@@ -8,9 +8,17 @@ module Voluntary
         rescue_from ActiveRecord::RecordNotFound, with: :not_found
         rescue_from Mongoid::Errors::DocumentNotFound, with: :not_found
         
-        helper_method :parent, :application_navigation, :navigation_product_path, :navigation_product_name
+        helper_method :parent, :application_navigation, :navigation_product_path, :navigation_product_name, :voluntary_application_stylesheets, :voluntary_application_javascripts
       end
       
+      def voluntary_application_stylesheets
+        ['voluntary/application', 'application'] 
+      end
+    
+      def voluntary_application_javascripts
+        ['voluntary/application', 'application'] 
+      end
+          
       def parent
         @parent
       end

data/app/controllers/likes_controller.rb

@@ -0,0 +1,23 @@
+class LikesController < ApplicationController
+  def create
+    positive = request.original_url.match('/like/') ? true : false
+    like_or_dislike = current_user.likes_or_dislikes.where(target_type: params[:target_type], target_id: params[:target_id]).first
+    
+    if like_or_dislike
+      like_or_dislike.update_attribute(:positive, positive)
+    else
+      current_user.likes_or_dislikes.create!(positive: positive, target_type: params[:target_type], target_id: params[:target_id])
+    end
+    
+    render nothing: true
+  end
+  
+  def destroy
+    like_or_dislike = current_user.likes_or_dislikes.where(target_type: params[:target_type], target_id: params[:target_id]).first
+    
+    raise ActiveRecord::RecordNotFound unless like_or_dislike
+    
+    like_or_dislike.destroy!
+    render nothing: true
+  end
+end

data/app/controllers/omniauth_callbacks_controller.rb

@@ -0,0 +1,22 @@
+class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def all
+    user = User.from_omniauth(request.env['omniauth.auth'])
+
+    if user.persisted?
+      kind = case request.env['omniauth.auth']['provider']
+      when 'google_oauth2' then 'Google'
+      else request.env['omniauth.auth']['provider'].titleize
+      end
+      
+      flash[:notice] = I18n.t 'devise.omniauth_callbacks.success', kind: kind
+      sign_in_and_redirect user, event: :authentication
+    else
+      session['devise.user_attributes'] = user.attributes
+      redirect_to new_user_registration_url
+    end
+  end
+  
+  alias_method :facebook, :all
+  alias_method :google_oauth2, :all
+  alias_method :lastfm, :all
+end

data/app/controllers/voluntary/application_controller.rb

@@ -13,7 +13,9 @@ class Voluntary::ApplicationController < ActionController::Base
   protected
 
   def after_sign_in_path_for(resource_or_scope)
-    if resource_or_scope.main_role.is_a? Role::ProjectOwner
+    if resource_or_scope.provider == 'lastfm'
+      music_path
+    elsif resource_or_scope.main_role.is_a? Role::ProjectOwner
       workflow_project_owner_index_path
     elsif resource_or_scope.main_role.is_a? Role::User
       workflow_user_index_path

data/app/helpers/voluntary/application_helper.rb

@@ -75,5 +75,9 @@ module Voluntary
       klass = ::Voluntary::ApplicationHelper.root_model_class_name_helper(record)
       eval("#{klass.tableize.singularize}_path(record)")
     end
+    
+    def name_with_apostrophe(value)
+      value =~ /s$/i ? "#{value}'" : "#{value}'s"
+    end
   end
 end

data/app/models/ability.rb

@@ -27,9 +27,9 @@ class Ability
     if user.present?
       can :destroy, User, id: user.id
       
-      can [:new, :create], [Area, Profession, Project, Vacancy, Candidature, Comment]
+      can [:new, :create], [Area, Profession, Project, Vacancy, Candidature, Comment, Like]
       can :assign, Task
-      can [:update, :cancel, :review], Task, user_id: user.id
+      can [:update, :cancel, :review], [Task, Like], user_id: user.id
       
       { 
         user_id: [Product, Organization, Project, Comment, ProjectUser, Result], 

data/app/models/concerns/likeable.rb

@@ -0,0 +1,16 @@
+module Likeable
+  extend ActiveSupport::Concern
+          
+  included do
+    belongs_to :target, polymorphic: true
+    
+    has_many :likes, -> { where(positive: true) }, dependent: :delete_all, as: :target
+    has_many :likers, class_name: 'User', through: :likes, source: :user
+    has_many :dislikes, -> { where(positive: false) }, class_name: 'Like', dependent: :delete_all, as: :target
+    has_many :dislikers, class_name: 'User', through: :dislikes, source: :user
+  end
+  
+  def update_likes_counter
+    self.class.where(id: self.id).update_all likes_count: self.likes.count, dislikes_count: self.dislikes.count
+  end
+end

data/app/models/concerns/user/liking.rb

@@ -0,0 +1,11 @@
+class User
+  module Liking
+    extend ActiveSupport::Concern
+            
+    included do
+      has_many :likes_or_dislikes, class_name: 'Like', dependent: :destroy
+      has_many :likes, -> { where(positive: true) }, dependent: :destroy
+      has_many :dislikes, -> { where(positive: false) }, class_name: 'Like', dependent: :destroy
+    end
+  end
+end

data/app/models/concerns/user/omniauthable.rb

@@ -0,0 +1,51 @@
+class User
+  module Omniauthable
+    extend ActiveSupport::Concern
+    
+    module ClassMethods
+      def from_omniauth(auth)
+        user = User.where(provider: auth.provider, uid: auth.uid).first
+        
+        unless user
+          user = User.new
+          user.provider = auth.provider
+          user.uid = auth.uid
+          user.first_name = auth.info.first_name
+          user.last_name = auth.info.last_name 
+          user.email = auth.info.email
+          user.lastfm_user_name = auth.info.nickname if user.provider == 'lastfm'
+          user.save
+        end
+        
+        user
+      end
+      
+      def new_with_session(params, session)
+        if session["devise.user_attributes"]
+          new(session["devise.user_attributes"], without_protection: true) do |user|
+            user.attributes = params
+            user.valid?
+          end
+        else
+          super
+        end
+      end
+    end
+  end
+    
+  def password_required?
+    super && provider.blank?
+  end
+
+  def email_required?
+    super && provider.blank?
+  end
+  
+  def update_with_password(params, *options)
+    if encrypted_password.blank?
+      update_attributes(params, *options)
+    else
+      super
+    end
+  end
+end

data/app/models/like.rb

@@ -0,0 +1,22 @@
+class Like < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :target, polymorphic: true
+  
+  scope :for_targets, ->(type, ids) do
+    where('target_type = :type AND target_id IN(:ids)', type: type, ids: ids)
+  end
+  
+  validates :target_id, presence: true, uniqueness: { scope: [:target_type, :user_id] }
+  validates :target_type, presence: true
+  validates :user_id, presence: true
+  
+  attr_accessible :positive, :target_id, :target_type
+  
+  after_save do
+    self.target.update_likes_counter
+  end
+
+  after_destroy do
+    self.target.update_likes_counter
+  end
+end

data/app/models/user.rb

@@ -2,6 +2,8 @@ class User < ActiveRecord::Base
   include ::Applicat::Mvc::Model::Resource::Base
   include User::Listable
   include User::Extensions
+  include User::Omniauthable
+  include User::Liking
   
   belongs_to :main_role, class_name: 'Role'
   belongs_to :profession
@@ -19,12 +21,12 @@ class User < ActiveRecord::Base
   
   serialize :foreign_languages
   
-  validates :name, presence: true, uniqueness: true
-  validates :first_name, presence: true
-  validates :last_name, presence: true
-  validates :language, presence: true
-  validates :country, presence: true
-  validates :interface_language, presence: true
+  validates :name, presence: true, uniqueness: true, if: 'provider.blank?'
+  validates :first_name, presence: true, if: 'provider.blank?'
+  validates :last_name, presence: true, if: 'provider.blank?'
+  validates :language, presence: true, if: 'provider.blank?'
+  validates :country, presence: true, if: 'provider.blank?'
+  validates :interface_language, presence: true, if: 'provider.blank?'
         
   attr_accessible :name, :password, :password_confirmation, :remember_me, :text, :language, :first_name, :last_name, 
                   :salutation, :marital_status, :family_status, :date_of_birth, :place_of_birth, :citizenship, 
@@ -36,7 +38,8 @@ class User < ActiveRecord::Base
   # :timeoutable, :token_authenticatable, :lockable,
   # :lock_strategy => :none, :unlock_strategy => :nones
   devise :database_authenticatable, :registerable,# :confirmable,
-         :recoverable, :rememberable, :trackable, :validatable 
+         :recoverable, :rememberable, :trackable, :validatable
+  devise :omniauthable, omniauth_providers: [:facebook, :google_oauth2, :lastfm]
   
   extend FriendlyId
   

data/app/presenters/resources/user/form_presenter.rb

@@ -4,7 +4,7 @@ class Resources::User::FormPresenter < ResourcePresenter
       :name, :first_name, :last_name, :email, 
     ]
     
-    list += [:password, :password_confirmation] if resource.new_record?
+    list += [:password, :password_confirmation] if resource.new_record? && resource.provider.blank?
     
     list += [
       :country, :language, :interface_language, :foreign_language_tokens, :profession, 

data/app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", user_omniauth_authorize_path(provider) %><br />
+  <% end -%>
+<% end -%>

data/app/views/layouts/application.html.erb

@@ -1,15 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= t('layout.title') %></title>
+  <title><%= (yield(:title).blank? ? '' : yield(:title) + ' - ') + t('layout.title') %></title>
   <meta charset='utf-8'>
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <%= stylesheet_link_tag 'voluntary/application', media: 'all' %>
-  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= stylesheet_link_tag *voluntary_application_stylesheets, media: 'all' %>
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
+  <div id="bootstrap_modal" class="modal hide fade"></div>
+  
   <%= render 'layouts/shared/navigation' %>
   
   <section id="dialog">
@@ -26,18 +27,32 @@
     </div>
 <% end %>    
     <div class="row-fluid">
-<% if sidenav(@sidenav_links_count).present? %>
+<% if sidenav(@sidenav_links_count).present? || content_for?(:search) %>
       <div class="span9">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
       <div class="span3">
+        <%= yield :search %>
+        
         <%= sidenav(@sidenav_links_count) %>
       </div>
 <% else %>
       <div class="span12">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
@@ -51,8 +66,7 @@
       </div>
     </div>
   </div>
-  <%= javascript_include_tag 'voluntary/application' %>
-  <%= javascript_include_tag 'application' %>
+  <%= javascript_include_tag *voluntary_application_javascripts %>
   <%= yield :javascript_includes %>
   <%= csrf_meta_tags %>
   <%= javascript_tag do %>

data/app/views/shared/_likes_and_dislikes.html.erb

@@ -0,0 +1,50 @@
+<table class="likes_and_dislikes_table" data-target_type="<%= target.class.name %>" data-target_id="<%= target.id %>">
+  <tr>
+<% if user_signed_in? %>
+    <td style="padding-right: 5px">
+      <a 
+        href="#" class="like_link" 
+        data-disliked="<%= (likes[target.id].present? && !likes[target.id].positive?).inspect %>" 
+        style="<%= likes[target.id].present? && likes[target.id].positive? ? 'display:none;' : '' %>"
+      >
+        <%= t('likes.actions.like') %>
+      </a>
+      <a 
+        href="#" class="undo_like_link" 
+        style="<%= likes[target.id].present? && likes[target.id].positive? ? '' : 'display:none;' %>"
+      >
+        <%= t('likes.actions.undo_like') %>
+      </a>
+    </td>
+<% end %>    
+    <td>
+      <i class="icon-thumbs-up"></i>
+    </td>
+    <td class="likes_counter_column" style="padding-right: 5px">
+      <%= target.likes_count %>
+    </td>
+<% if user_signed_in? %>    
+    <td style="padding-right: 5px">
+      <a 
+        href="#" class="dislike_link" 
+        data-liked="<%= (likes[target.id].present? && likes[target.id].positive?).inspect %>" 
+        style="<%= likes[target.id].present? && !likes[target.id].positive? ? 'display:none;' : '' %>"
+      >
+        <%= t('likes.actions.dislike') %>
+      </a>
+      <a 
+        href="#" class="undo_dislike_link" 
+        style="<%= likes[target.id].present? && !likes[target.id].positive? ? '' : 'display:none;' %>"
+      >
+        <%= t('likes.actions.undo_dislike') %>
+      </a>      
+    </td> 
+<% end %>    
+    <td>
+      <i class="icon-thumbs-down"></i>
+    </td>
+    <td class="dislikes_counter_column">
+      <%= target.dislikes_count %>
+    </td> 
+  </tr>
+</table>

data/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile << /(^[^_\/]|\/[^_])[^\/]*$/

data/config/locales/en.yml

@@ -11,7 +11,7 @@ en:
       title: About Us    
        
   layout:
-    title: Volontari.at - Creative Open Crowdsource Platform
+    title: Volontari.at (Open Source Crowdsourcing Platform)
    
   home:
     index:

data/config/locales/general/en.yml

@@ -2,17 +2,20 @@ en:
   general:
     index:
       title: Home
+    search: Search
     new: New
     denied: Denied
     accepted: Accepted
     edit: Edit
     destroy: Destroy
     remove: Remove
+    close: Close
     not_available: n/a
     steps: Steps
     error: Error
     list_action: Back to the overview
     details: Details
+    export: Export
     form:
       errors_count: '%{count} prohibited this object from being saved:'
       successfully_created: Creation successful
@@ -39,6 +42,7 @@ en:
     user_id: User
     vacancy_id: Vacancy  
     roles: Roles
+    position: Position
     
   activerecord:
     models:

data/config/locales/resources/like/en.yml

@@ -0,0 +1,7 @@
+en:
+  likes:
+    actions:
+      like: Like
+      dislike: Dislike
+      undo_like: Unlike
+      undo_dislike: Undo Dislike

data/config/routes.rb

@@ -9,6 +9,7 @@ end
 Rails.application.routes.draw do
   devise_for :users, controllers: {
     registrations: 'devise_extensions/registrations',
+    omniauth_callbacks: 'omniauth_callbacks'
   }
 
   resources :areas do
@@ -132,7 +133,7 @@ Rails.application.routes.draw do
   resources :comments, only: [:new, :edit, :create, :update, :destroy]
   
   resources :users do
-    resources :projects, only: :index
+    resources :projects, only: [:index, :new]
     resources :candidatures, only: :index
     
     collection do
@@ -154,4 +155,8 @@ Rails.application.routes.draw do
       get :autocomplete
     end
   end
+  
+  post 'like/:target_type/:target_id' => 'likes#create'
+  post 'dislike/:target_type/:target_id' => 'likes#create'
+  post 'unlike/:target_type/:target_id' => 'likes#destroy'
 end

data/db/migrate/20150119151714_add_provider_to_users.rb

@@ -0,0 +1,6 @@
+class AddProviderToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :provider, :string
+    add_column :users, :uid, :string
+  end
+end

data/db/migrate/20150119171210_add_lastfm_user_name_to_users.rb

@@ -0,0 +1,13 @@
+class AddLastfmUserNameToUsers < ActiveRecord::Migration
+    def up
+    add_column :users, :lastfm_user_name, :string
+    
+    change_column :users, :email, :string, null: true
+  end
+  
+  def down
+    remove_column :users, :lastfm_user_name
+    
+    change_column :users, :email, :string, null: false
+  end
+end

data/db/migrate/20150126185249_create_likes.rb

@@ -0,0 +1,13 @@
+class CreateLikes < ActiveRecord::Migration
+  def change
+    create_table :likes do |t|
+      t.boolean  :positive, default: true
+      t.integer  :target_id
+      t.string   :target_type, limit: 60, null: false
+      t.integer  :user_id
+      t.timestamps
+    end
+    
+    add_index :likes, [:target_id, :user_id, :target_type], unique: true
+  end
+end

data/lib/generators/voluntary/install/templates/app/views/layouts/application.html.erb

@@ -1,15 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= t('layout.title') %></title>
+  <title><%= (yield(:title).blank? ? '' : yield(:title) + ' - ') + t('layout.title') %></title>
   <meta charset='utf-8'>
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <%= stylesheet_link_tag 'voluntary/application', media: 'all' %>
-  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <%= stylesheet_link_tag *voluntary_application_stylesheets, media: 'all' %>
   <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
+  <div id="bootstrap_modal" class="modal hide fade"></div>
+  
   <%= render 'layouts/shared/navigation' %>
   
   <section id="dialog">
@@ -26,18 +27,32 @@
     </div>
 <% end %>    
     <div class="row-fluid">
-<% if sidenav(@sidenav_links_count).present? %>
+<% if sidenav(@sidenav_links_count).present? || content_for?(:search) %>
       <div class="span9">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
       <div class="span3">
+        <%= yield :search %>
+        
         <%= sidenav(@sidenav_links_count) %>
       </div>
 <% else %>
       <div class="span12">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
@@ -51,8 +66,7 @@
       </div>
     </div>
   </div>
-  <%= javascript_include_tag 'voluntary/application' %>
-  <%= javascript_include_tag 'application' %>
+  <%= javascript_include_tag *voluntary_application_javascripts %>
   <%= yield :javascript_includes %>
   <%= csrf_meta_tags %>
   <%= javascript_tag do %>

data/lib/generators/voluntary/product_dummy/templates/app/views/layouts/application.html.erb

@@ -1,15 +1,23 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title><%= t('layout.title') %></title>
+  <title><%= (yield(:title).blank? ? '' : yield(:title) + ' - ') + t('layout.title') %></title>
   <meta charset='utf-8'>
   <meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
-  <%= stylesheet_link_tag 'voluntary/application', media: 'all' %>
-  <%= stylesheet_link_tag 'application', media: 'all' %>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <%= stylesheet_link_tag *voluntary_application_stylesheets, media: 'all' %>
+  <link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet"/>
 </head>
 <body>
+  <div id="bootstrap_modal" class="modal hide fade"></div>
+  
   <%= render 'layouts/shared/navigation' %>
   
+  <section id="dialog">
+    <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>
+    <div id="dialog_body"/>
+  </section>
+  
   <div class="container-fluid">
 <% unless flash.empty? %>
     <div class="row-fluid">
@@ -19,14 +27,36 @@
     </div>
 <% end %>    
     <div class="row-fluid">
+<% if sidenav(@sidenav_links_count).present? || content_for?(:search) %>
       <div class="span9">
-        <%= breadcrumbs %>
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
         
         <%= yield %>
       </div>      
       <div class="span3">
-        <%= sidenav %>
+        <%= yield :search %>
+        
+        <%= sidenav(@sidenav_links_count) %>
       </div>
+<% else %>
+      <div class="span12">
+        <% if content_for?(:breadcrumbs) %>
+          <div class="nav">
+            <%= yield :breadcrumbs %>
+          </div>
+        <% else %>
+          <%= breadcrumbs %>
+        <% end %>
+        
+        <%= yield %>
+      </div>      
+<% end %>
     </div>
   </div>
   <div class="container-fluid">
@@ -36,8 +66,8 @@
       </div>
     </div>
   </div>
-  <%= javascript_include_tag 'voluntary/application' %>
-  <%= javascript_include_tag 'application' %>
+  <%= javascript_include_tag *voluntary_application_javascripts %>
+  <%= yield :javascript_includes %>
   <%= csrf_meta_tags %>
   <%= javascript_tag do %>
     <%= yield :top_javascript %>

data/lib/voluntary/version.rb

@@ -1,3 +1,3 @@
 module Voluntary
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/lib/voluntary.rb

@@ -11,7 +11,8 @@ require 'messagebus_ruby_api'
 require 'devise'
 require 'omniauth'
 require 'omniauth-facebook'
-require 'omniauth-tumblr'
+require 'omniauth-google-oauth2'
+require 'omniauth-lastfm'
 require 'cancan'
 require 'foreigner'
 require 'ancestry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voluntary
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,7 +242,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,15 +266,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: omniauth-tumblr
+  name: omniauth-google-oauth2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -282,7 +282,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 0.2.6
+- !ruby/object:Gem::Dependency
+  name: omniauth-lastfm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: foreigner
   requirement: !ruby/object:Gem::Requirement
@@ -907,22 +923,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: auto_html
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -976,17 +976,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1035,22 +1035,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.2.1
-- !ruby/object:Gem::Dependency
-  name: auto_html
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: simple-navigation-bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -1479,6 +1463,7 @@ files:
 - app/assets/javascripts/voluntary/application.js
 - app/assets/javascripts/voluntary/base.js.coffee
 - app/assets/javascripts/voluntary/functions.js
+- app/assets/javascripts/voluntary/likes/list.js.coffee
 - app/assets/javascripts/voluntary/users.js.coffee
 - app/assets/stylesheets/voluntary/application.css
 - app/assets/stylesheets/voluntary/base.css.sass
@@ -1489,6 +1474,8 @@ files:
 - app/controllers/concerns/voluntary/v1/base_controller.rb
 - app/controllers/devise_extensions/registrations_controller.rb
 - app/controllers/home_controller.rb
+- app/controllers/likes_controller.rb
+- app/controllers/omniauth_callbacks_controller.rb
 - app/controllers/organizations_controller.rb
 - app/controllers/pages_controller.rb
 - app/controllers/products_controller.rb
@@ -1526,9 +1513,13 @@ files:
 - app/models/candidature.rb
 - app/models/column.rb
 - app/models/comment.rb
+- app/models/concerns/likeable.rb
 - app/models/concerns/user/extensions.rb
+- app/models/concerns/user/liking.rb
 - app/models/concerns/user/listable.rb
+- app/models/concerns/user/omniauthable.rb
 - app/models/history_tracker.rb
+- app/models/like.rb
 - app/models/list.rb
 - app/models/list_item.rb
 - app/models/mongo_db_document.rb
@@ -1584,6 +1575,7 @@ files:
 - app/views/comments/new.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/registrations/new.html.erb
+- app/views/devise/shared/_links.erb
 - app/views/general/wizard.html.erb
 - app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
@@ -1617,6 +1609,7 @@ files:
 - app/views/projects/new.html.erb
 - app/views/projects/show.html.erb
 - app/views/shared/_comments.html.erb
+- app/views/shared/_likes_and_dislikes.html.erb
 - app/views/shared/collection/_list.html.erb
 - app/views/shared/collection/_table.html.erb
 - app/views/shared/form/_error_messages.html.erb
@@ -1663,6 +1656,7 @@ files:
 - app/views/workflow/user/product/areas/show.html.erb
 - app/views/workflow/user/projects/show.html.erb
 - config/initializers/1_initialize_app_config.rb
+- config/initializers/assets.rb
 - config/initializers/devise.rb
 - config/initializers/filter_parameters_logging.rb
 - config/initializers/friendly_id.rb
@@ -1678,6 +1672,7 @@ files:
 - config/locales/resources/area/en.yml
 - config/locales/resources/candidature/en.yml
 - config/locales/resources/comment/en.yml
+- config/locales/resources/like/en.yml
 - config/locales/resources/organization/en.yml
 - config/locales/resources/page/en.yml
 - config/locales/resources/product/en.yml
@@ -1706,6 +1701,9 @@ files:
 - db/migrate/20130817090734_create_lists.rb
 - db/migrate/20131018143613_replace_user_by_polymorphic_resource_in_candidatures.rb
 - db/migrate/20140307113214_add_user_id_to_organizations.rb
+- db/migrate/20150119151714_add_provider_to_users.rb
+- db/migrate/20150119171210_add_lastfm_user_name_to_users.rb
+- db/migrate/20150126185249_create_likes.rb
 - db/seeds.rb
 - lib/api_constraints.rb
 - lib/applicat/mvc/controller/error_handling.rb
@@ -1852,7 +1850,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1000069296358120593
+      hash: 1073244219484482667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1861,7 +1859,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1000069296358120593
+      hash: 1073244219484482667
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23