voluntary 0.3.0 → 0.4.0

data/app/models/ability.rb

@@ -19,7 +19,7 @@ class Ability
     alias_action :read, :assign_actions, to: :supervisor
     
     can :read, [
-      Area, Organization, Profession, Product, Project, Vacancy, Candidature, Story, Task, Result, Comment
+      Area, Organization, Profession, Product, Project, Story, Task, Result, Comment
     ]
     can [:read, :check_name, :check_url, :check_email, :check_email_unblocked], User
     can :show, Page
@@ -27,21 +27,17 @@ class Ability
     if user.present?
       can :destroy, User, id: user.id
       
-      can [:new, :create], [Area, Profession, Project, Vacancy, Candidature, Comment, Like]
+      can [:new, :create], [Area, Profession, Project, Comment, Like]
       can :assign, Task
       can [:update, :cancel, :review], [Task, Like], user_id: user.id
       
       { 
         user_id: [Product, Organization, Project, Comment, ProjectUser, Result], 
-        offeror_id: [Vacancy, Story, Task]
+        offeror_id: [Story, Task]
       }.each do |attribute, classes|
         can :restful_actions, classes, attribute => user.id   
       end
       
-      can :restful_actions, Candidature, resource_type: 'User', resource_id: user.id
-      
-      can Candidature::EVENTS, Candidature, offeror_id: user.id
-      can Vacancy::EVENTS, Vacancy, offeror_id: user.id
       can Story::EVENTS, Story, offeror_id: user.id
       can Task::EVENTS + [:update], Task, offeror_id: user.id
       

data/app/models/comment.rb

@@ -12,5 +12,5 @@ class Comment < ActiveRecord::Base
   
   attr_accessible :commentable_type, :commentable_id, :parent_id, :name, :text
   
-  COMMENTABLE_TYPES = ['project', 'vacancy', 'candidature']
+  COMMENTABLE_TYPES = ['project']
 end

data/app/models/product/music_metadata_enrichment.rb

@@ -0,0 +1,2 @@
+class Product::MusicMetadataEnrichment < ::Product
+end

data/app/models/product.rb

@@ -16,12 +16,9 @@ class Product
   validates :name, presence: true, uniqueness: true
   
   validate :english_name_available?
-  validate :existing_model_file?
   
   index({ name: 1 }, { unique: true })
   
-  before_validation :set_klass_name
-  
   # active record compatibility
   # just belongs_to reflections for cucumber's factory steps
   def self.reflections
@@ -77,28 +74,4 @@ class Product
       )
     end
   end
-  
-  def existing_model_file?
-    unless (get_klass_name.constantize rescue false)
-      errors[:name] << I18n.t(
-        'activerecord.errors.models.product.attributes.name.missing_model_file'
-      )
-    end
-  end
-
-  def get_klass_name
-    if klass_name.present?
-      klass_name
-    elsif name == 'Product'
-      'Product'
-    else
-      [
-        'Product', name.gsub(' - ', '_').gsub('-', '_').gsub(' ', '_').classify
-      ].join('::')
-    end
-  end
-  
-  def set_klass_name
-    self._type = get_klass_name
-  end
 end

data/app/models/project.rb

@@ -3,7 +3,6 @@ class Project < ActiveRecord::Base
   belongs_to :organization
   
   has_many :project_users, dependent: :destroy
-  has_many :vacancies, dependent: :destroy
   has_many :roles, through: :project_users
   has_many :comments, as: :commentable, dependent: :destroy
   

data/app/models/project_user.rb

@@ -2,12 +2,11 @@ class ProjectUser < ActiveRecord::Base#
   self.table_name = 'projects_users'
   
   belongs_to :project
-  belongs_to :vacancy
   belongs_to :user
   belongs_to :role
   
   validates :project_id, presence: true
-  validates :user_id, presence: true, uniqueness: { scope: [:project_id, :vacancy_id] }
+  validates :user_id, presence: true, uniqueness: { scope: [:project_id] }
   
-  attr_accessible :project_id, :vacancy_id, :user_id, :role_id
+  attr_accessible :project_id, :user_id, :role_id
 end

data/app/models/user.rb

@@ -13,9 +13,6 @@ class User < ActiveRecord::Base
   has_and_belongs_to_many :projects
   
   has_many :organizations, dependent: :destroy
-  has_many :offeror_vacancies, source: :offeror, class_name: 'Vacancy'
-  has_many :offeror_candidatures, source: :offeror, class_name: 'Candidature'
-  has_many :candidatures, as: :resource
   
   accepts_nested_attributes_for :areas, allow_destroy: true
   
@@ -49,6 +46,10 @@ class User < ActiveRecord::Base
                   
   PARENT_TYPES = ['area', 'project']
   
+  def self.by_slug_or_id(id)
+    id.to_i.to_s == id.to_s ? find(id) : friendly.find(id)
+  end
+  
   def self.languages(query = nil)
     options = []
     

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

@@ -11,10 +11,6 @@
 <body>
   <div id="bootstrap_modal" class="modal hide fade"></div>
   
-  <% if voluntary_application_repository_path.present? %>
-  <a href="https://github.com/<%= voluntary_application_repository_path %>"><img style="position: absolute; top: 41px; right: 0; border: 0; z-index: 100;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
-  <% end %>
-  
   <section id="dialog">
     <img alt="Ajax-loader-small" class="hide " id="dialog_body_spinner" src="<%=image_path('voluntary/spinner.gif')%>"/>
     <div id="dialog_body"/>

data/app/views/layouts/shared/_flash_messages.html.erb

@@ -1,7 +1,7 @@
 <div class="flash">
   <% flash.each do |type, message| -%>
-    <div class="message <%= type == :notice ? 'alert-info' : type %>">
-      <p><%= message %></p>
+    <div class="alert message <%= (type.to_sym == :notice ? 'alert-info' : 'alert-error') %>">
+      <%= message %><br/>
     </div>
   <% end -%>
 </div>

data/app/views/workflow/project_owner/index.html.erb

@@ -4,8 +4,9 @@
       <ul>
         <li><a href="#stories"><%= I18n.t('stories.index.title') %></a></li>
         <li><a href="#tasks"><%= I18n.t('workflow.project_owner.index.tasks') %></a></li>
-        <li><a href="#candidatures"><%= I18n.t('candidatures.index.title') %></a></li>
-        <li><a href="#vacancies"><%= I18n.t('vacancies.index.title') %></a></li>
+<% Workflow::ProjectOwnerController.extra_tabs.each do |tab| %>
+        <li><a href="#<%= tab %>"><%= I18n.t("#{tab}.index.title") %></a></li>
+<% end %>
       </ul>
       <div id="stories">
         <%= render 'stories' %>
@@ -13,12 +14,11 @@
       <div id="tasks">
         <%= render 'tasks' %>
       </div>
-      <div id="candidatures">
-        <%= render 'candidatures' %>
-      </div>
-      <div id="vacancies">
-        <%= render 'vacancies' %>
+<% Workflow::ProjectOwnerController.extra_tabs.each do |tab| %>
+      <div id="<%= tab %>">
+        <%= render "workflow/project_owner/#{tab}" %>
       </div>
+<% end %>
     </div>  
   </div>
 </div>

data/config/locales/en.yml

@@ -16,8 +16,7 @@ en:
   home:
     index:
       last_projects: Last projects
-      last_vacancies: Last vacancies
-      
+
   authentication:
     title: Authentication
     sign_in: Sign in

data/config/locales/general/en.yml

@@ -55,8 +55,7 @@ en:
     parent: Parent
     project_id: Project
     state: State
-    user_id: User
-    vacancy_id: Vacancy  
+    user_id: User 
     roles: Roles
     position: Position
     date: Date
@@ -65,7 +64,6 @@ en:
   activerecord:
     models:
       area: Area
-      candidature: Candidature
       comment: Comment
       product: Product
       organization: Organization
@@ -74,14 +72,10 @@ en:
       story: Story
       task: Task
       user: User
-      vacancy: Vacancy
       
     attributes:
       comment:
         name: Subject
-      vacancy:
-        name: Name 
-        limit: Limit
       user:
         area_tokens: Areas
         country: Country 
@@ -89,7 +83,7 @@ en:
         foreign_language: Foreign language
         interface_language: Interface language
         language: Mother tongue
-        profession: Beruf
+        profession: Profession
      
     errors:
       models:

data/config/locales/workflow/en.yml

@@ -34,8 +34,4 @@ en:
       tasks:
         next:
           title: Next Task
-          unavailable: No further task available.
-             
-    controllers:
-      vacancies: 
-      candidatures:
+          unavailable: No further task available.

data/config/routes/workflow.rb

@@ -25,29 +25,4 @@ namespace 'workflow' do
       get 'tasks/:id/complete' => 'tasks#complete', as: :complete_task
     end
   end
-  
-  resources :vacancies, controller: 'vacancies', only: :index do
-    collection do
-      get '/' => 'vacancies#open', as: :open
-      
-      get :autocomplete
-      
-      get :open
-      get :recommended
-      get :denied
-      get :closed
-    end
-  end
-  
-  resources :candidatures, controller: 'candidatures', only: :index do
-    collection do
-      get '/' => 'candidatures#new', as: :new
-       
-      get :autocomplete 
-       
-      get :new
-      get :accepted
-      get :denied
-    end
-  end
 end

data/config/routes.rb

@@ -49,7 +49,6 @@ Rails.application.routes.draw do
   
   resources :projects do
     resources :users, only: :index
-    resources :vacancies, only: [:index, :new]
     resources :stories, only: [:index, :new]
     resources :comments, only: [:index, :new]
     
@@ -58,39 +57,6 @@ Rails.application.routes.draw do
       get :autocomplete
     end
   end
-      
-  resources :vacancies do
-    resources :candidatures, only: [:index, :new]
-    resources :comments, only: [:index, :new]
-    
-    collection do
-      put :update_multiple
-      get :autocomplete
-    end
-    
-    member do
-      put :recommend
-      put :accept_recommendation
-      put :deny_recommendation 
-      put :close
-      put :reopen
-    end
-  end
-  
-  resources :candidatures do
-    resources :comments, only: [:index, :new]
-    
-    collection do
-      put :update_multiple
-      get :autocomplete
-    end
-    
-    member do
-      get :accept
-      get :deny
-      get :quit
-    end
-  end
   
   resources :stories, only: [:create, :show, :edit, :update, :destroy] do
     resources :tasks, only: [:index, :new]
@@ -134,7 +100,6 @@ Rails.application.routes.draw do
   
   resources :users do
     resources :projects, only: [:index, :new]
-    resources :candidatures, only: :index
     
     collection do
       put :update_multiple

data/db/migrate/20131018143613_replace_user_by_polymorphic_resource_in_candidatures.rb

@@ -3,16 +3,16 @@ class ReplaceUserByPolymorphicResourceInCandidatures < ActiveRecord::Migration
     add_column :vacancies, :resource_type, :string
     add_column :vacancies, :resource_id, :integer
     
-    Vacancy.update_all(resource_type: "User")
-    Vacancy.update_all('resource_id = user_id')
+    Vacancy.where('user_id IS NOT NULL').update_all(resource_type: "User")
+    Vacancy.where('user_id IS NOT NULL').update_all('resource_id = user_id')
     
     remove_column :vacancies, :user_id
     
     add_column :candidatures, :resource_type, :string
     add_column :candidatures, :resource_id, :integer
     
-    Candidature.update_all(resource_type: "User")
-    Candidature.update_all('resource_id = user_id')
+    Candidature.where('user_id IS NOT NULL').update_all(resource_type: "User")
+    Candidature.where('user_id IS NOT NULL').update_all('resource_id = user_id')
     
     remove_column :candidatures, :user_id
     

data/db/migrate/20150802141840_drop_recruiting_unless_recruiting_plugin_present.rb

@@ -0,0 +1,59 @@
+class DropRecruitingUnlessRecruitingPluginPresent < ActiveRecord::Migration
+  def up
+    unless (Product::Recruiting rescue nil)
+      drop_table :vacancies
+      drop_table :candidatures
+      remove_index name: 'index_projects_users_on_project_id_and_user_id_and_vacancy_id'
+      drop_column :projects_users, :vacancy_id
+      add_index 'projects_users', ['project_id', 'user_id'], name: 'index_projects_users_on_project_id_and_user_id', unique: true, using: :btree
+    end
+  end
+  
+  def down
+    unless (Product::Recruiting rescue nil)
+      create_table 'vacancies', force: true do |t|
+        t.string   'type'
+        t.integer  'project_id'
+        t.integer  'offeror_id'
+        t.integer  'author_id'
+        t.integer  'project_user_id'
+        t.string   'name'
+        t.string   'slug'
+        t.text     'text'
+        t.integer  'limit',           default: 1
+        t.string   'state'
+        t.datetime 'created_at',                  null: false
+        t.datetime 'updated_at',                  null: false
+        t.string   'resource_type'
+        t.integer  'resource_id'
+      end
+    
+      add_index 'vacancies', ['offeror_id'], name: 'index_vacancies_on_offeror_id', using: :btree
+      add_index 'vacancies', ['project_id', 'name'], name: 'index_vacancies_on_project_id_and_name', unique: true, using: :btree
+      add_index 'vacancies', ['project_id'], name: 'index_vacancies_on_project_id', using: :btree
+      add_index 'vacancies', ['project_user_id'], name: 'index_vacancies_on_project_user_id', using: :btree
+      add_index 'vacancies', ['slug'], name: 'index_vacancies_on_slug', unique: true, using: :btree
+      
+      create_table 'candidatures', force: true do |t|
+        t.integer  'vacancy_id'
+        t.integer  'offeror_id'
+        t.string   'name'
+        t.string   'slug'
+        t.text     'text'
+        t.string   'state'
+        t.datetime 'created_at',    null: false
+        t.datetime 'updated_at',    null: false
+        t.string   'resource_type'
+        t.integer  'resource_id'
+      end
+    
+      add_index 'candidatures', ['resource_id', 'resource_type', 'vacancy_id'], name: 'index_candidatures_on_resource_and_vacancy', unique: true, using: :btree
+      add_index 'candidatures', ['slug'], name: 'index_candidatures_on_slug', unique: true, using: :btree
+      add_index 'candidatures', ['vacancy_id', 'name'], name: 'index_candidatures_on_vacancy_id_and_name', unique: true, using: :btree
+      add_index 'candidatures', ['vacancy_id'], name: 'index_candidatures_on_vacancy_id', using: :btree
+      
+      add_column 'projects_users', 'vacancy_id', :integer
+      add_index 'projects_users', ['project_id', 'user_id', 'vacancy_id'], name: 'index_projects_users_on_project_id_and_user_id_and_vacancy_id', unique: true, using: :btree
+    end
+  end
+end

data/lib/generators/voluntary/install/templates/features/support/paths.rb

@@ -43,20 +43,6 @@ module NavigationHelpers
       
     when /the edit project page/
       edit_project_path(@project)
-    
-    # vacancies
-    when /the vacancy page/
-      vacancy_path(@vacancy)
-      
-    when /the edit vacancy page/
-      edit_vacancy_path(@vacancy)
-    
-    # candidatures
-    when /the candidature page/
-      candidature_path(@candidature)
-      
-    when /the edit candidature page/
-      edit_candidature_path(@candidature)
       
     # stories
     when /the new project story page/