refinerycms-jobs 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf6508cb6a3b48338b0b91fd97f3a156a90b447
-  data.tar.gz: 461a6ca77a920595754d42125dcd2dd247992bf6
+  metadata.gz: b2aa9ae56f6c89ca251060d91bbe58bb829d6bab
+  data.tar.gz: c8f3424a74df86f58cc5b4067a512ad2785dba42
 SHA512:
-  metadata.gz: dcac81632f3861b19b9c5fe7aae613a79c7623ee753acd6950de9e7d9f7a7dc5896094ac67f38f6c391ec1dc054ab04468967748bb1376f0196841879924b8a5
-  data.tar.gz: d69996dcb5eb87b3015ce1b20637b13399859584e0211c479d937a26b0ce7d055bf7bcecd98763f3d3e425cf1ca3f838c0ac659e5a27c25012c9580d8c79596a
+  metadata.gz: 69a1889f0a6108f945d6d35c1f69279a02f4665903d62b5e091936f8f9a5e63c71b0e93f7fe3d92e653c1fb3fecc56623c2109c338565deb3bdf6174085c1109
+  data.tar.gz: 19f07fe132997d8c6be4ba1949a5331de058402cbc25e7ff2845730108d7d09e5aee63d18c1ad55940e538d70a5d7dbd91c2d23557e040981194a43ff66738b3

data/.gitignore

@@ -1,29 +1,9 @@
-public/system/*
-public/themes/*
-log/*.log
-tmp/**/*
 .DS_Store
-doc/api
-doc/app
-doc/*
-config/database.yml
-config/amazon_s3.yml
-config/rackspace_cloudfiles.yml
-public/images/system/*
-nbproject
-index/**/*
-db/*.sqlite3
-*.tmproj
-*.autobackupbyrefinery.*
-refinerycms*.gem
-public/javascripts/cache
-public/stylesheets/cache
-config/database.yml.example
-.yardoc/
-refinerycms.gemspec
-.bundle
-vendor/cache
-*.lock
-callsite_hash.*
-**/*/slim_scrooge/ext/Makefile
-public/javascripts/messages.js
+Gemfile.lock
+spec/dummy
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile
+.gems
+.ruby-version
+.rbenv-gemsets

data/.teatro.yml

@@ -0,0 +1,15 @@
+stage:
+  before:
+    - bundle exec rake refinery:testing:dummy_app
+
+  run:
+    # workdir is sandbox
+    - bundle exec rails server
+
+  database:
+    - echo "skip database stage. rake sandbox already did everything"
+
+config:
+  database: postgresql
+  services:
+    - postgresql

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+cache: bundler
+bundler_args: --without development
+before_script: "bin/rake refinery:testing:dummy_app"
+env:
+  - DB=postgresql
+  - DB=mysql
+notifications:
+  webhooks:
+    - https://webhooks.gitter.im/e/2e2c6c0937f4fe221327
+rvm:
+  - 2.2
+  - 2.1
+  - 2.0.0
+sudo: false

data/Gemfile

@@ -1,5 +1,52 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.3'
+git 'https://github.com/refinery/refinerycms', branch: 'master' do
+  gem "refinerycms"
+
+  group :test do
+    gem 'refinerycms-testing'
+    gem 'poltergeist', github: 'teampoltergeist/poltergeist', branch: 'master'
+  end
+end
+
+# Database Configuration
+unless ENV["TRAVIS"]
+  gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+  gem "sqlite3", platform: :ruby
+end
+
+if !ENV["TRAVIS"] || ENV["DB"] == "mysql"
+  gem "activerecord-jdbcmysql-adapter", platform: :jruby
+  gem "jdbc-mysql", "= 5.1.13", platform: :jruby
+  gem "mysql2", platform: :ruby
+end
+
+if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"
+  gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
+  gem "pg", platform: :ruby
+end
+
+gem "jruby-openssl", platform: :jruby
+
+# Refinery/rails should pull in the proper versions of these
+group :assets do
+  gem "sass-rails"
+  gem "coffee-rails"
+  gem "uglifier"
+end
+
+group :development do
+  gem 'quiet_assets'
+end
+
+group :test do
+  gem "launchy"
+  gem "byebug"
+end
+
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path("../.gemfile", __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -6,15 +6,15 @@ rescue LoadError
 end
 
 ENGINE_PATH = File.dirname(__FILE__)
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path "../spec/dummy/Rakefile", __FILE__
 
-if File.exists?(APP_RAKEFILE)
+if File.exists? APP_RAKEFILE
   load 'rails/tasks/engine.rake'
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
-Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
+Refinery::Testing::Railtie.load_dummy_tasks ENGINE_PATH
 
-load File.expand_path('../tasks/testing.rake', __FILE__)
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/controllers/refinery/jobs/admin/job_applications_controller.rb

@@ -0,0 +1,30 @@
+module Refinery
+  module Jobs
+    module Admin
+      class JobApplicationsController < Refinery::AdminController
+        before_action :find_job, only: [:index, :destroy]
+
+        crudify :'refinery/jobs/job_application'
+
+
+        def index
+          if @job
+            @job_applications = @job.job_applications.paginate( page: params[:page] )
+          end
+        end
+
+        def destroy
+          Refinery::Jobs::JobApplication.find(params[:id]).destroy
+          redirect_to refinery.jobs_admin_job_job_applications_path(@job)
+        end
+
+
+        protected
+        
+        def find_job
+          @job = Refinery::Jobs::Job.find params[:job_id]
+        end
+      end
+    end
+  end
+end

data/app/controllers/refinery/jobs/admin/jobs_controller.rb

@@ -1,43 +1,23 @@
 module Refinery
   module Jobs
     module Admin
-      class JobsController < ::Refinery::AdminController
+      class JobsController < Refinery::AdminController
         crudify :'refinery/jobs/job',
-                :order => 'published_at DESC',
-                :include => [:translations]
-
-        def job_applications
-          find_job
-          @job_applications = @job.job_applications.paginate :page => params[:page]
-        end
+                order: 'position ASC',
+                include: [:translations, :job_applications]
 
         private
-          def job_params
-            params.require(:job).permit(
-              :title,
-              :description,
-              :employment_terms,
-              :hours,
-              :position,
-              :draft,
-              :published_at,
-              :fill,
-              :ref,
-              :education,
-              :experience,
-              :skills,
-              :languages,
-              :salary,
-              :length,
-              :employment_date,
-              :contact
-            )
-          end
 
-        protected
-          def find_job
-            @job = Refinery::Jobs::Job.find_by_slug_or_id(params[:id])
-          end
+        def job_params
+          params.require(:job).permit permitted_job_params
+        end
+
+        def permitted_job_params
+          [
+            :title, :description, :employment_terms, :hours, :position, :draft, :published_at, :fill,
+            :ref, :education, :experience, :skills, :languages, :salary, :length, :employment_date, :contact
+          ]
+        end
       end
     end
   end

data/app/controllers/refinery/jobs/admin/settings_controller.rb

@@ -3,15 +3,15 @@ module Refinery
     module Admin
       class SettingsController < Refinery::AdminController
 
-        before_filter :find_setting, :only => [:edit, :update]
-        after_filter :save_subject_for_confirmation,
-          :save_message_for_confirmation, :save_notification_recipients, :only => :update
+        before_action :find_setting, only: [:edit, :update]
+        after_action :save_subject_for_confirmation,
+          :save_message_for_confirmation, :save_notification_recipients, only: :update
 
         def edit
         end
 
         def update
-          flash[:notice] = t('refinery.crudify.updated', :what => @setting.name.gsub("job_", "").titleize)
+          flash[:notice] = t('refinery.crudify.updated', what: @setting.name.gsub("job_", "").titleize)
 
           unless request.xhr? or from_dialog?
             redirect_back_or_default(refinery.jobs_admin_jobs_path)

data/app/controllers/refinery/jobs/job_applications_controller.rb

@@ -1,25 +1,20 @@
 module Refinery
   module Jobs
     class JobApplicationsController < ::ApplicationController
-      include ControllerHelper
 
-      before_filter :find_page
-      before_filter :find_job, :only => [:new]
+      before_action :find_page
+      before_action :find_job, only: [:new, :create, :show]
 
       def new
         @job_application = Refinery::Jobs::JobApplication.new
-
         present(@page)
       end
 
       def create
         @job_application = Refinery::Jobs::JobApplication.new(job_application_params)
-        @job_id_integer  = Refinery::Jobs::Job.find_by_slug_or_id(params[:job_id])
-
-        if !@job_id_integer.nil?
-          @job_application.job_id = @job_id_integer.id
-          @job                    = @job_application.job
+        @job_application.job_id = @job.id
 
+        if !@job_application.job_id.nil?
           if @job_application.save
             if @job_application.ham? || Refinery::Jobs.send_notifications_for_job_applications_marked_as_spam
               begin
@@ -37,31 +32,36 @@ module Refinery
               end
             end
 
-            redirect_to refinery.jobs_job_job_application_url(@job, @job_application)
+            redirect_to refinery.jobs_job_job_application_path(params[:job_id], @job_application)
           else
-            render :action => 'new'
+            render action: 'new'
           end
         else
           error_404
         end
       end
 
-      def show
-        @job_application = Refinery::Jobs::JobApplication.find(params[:id])
-        @job             = @job_application.job
+      protected
 
-        present(@page)
+      def find_job
+        @job = Refinery::Jobs::Job.live.friendly.find(params[:job_id])
+      end
 
-        respond_to do |format|
-          format.html { render :action => 'show' }
-          format.xml  { render :xml => @future_student }
-        end
+      def find_page
+        @page = Refinery::Page.friendly.find_by(link_url: Refinery::Jobs.page_url)
+      end
+
+      def job_application_params
+        params.require(:job_application).permit(permitted_job_application_params)
       end
 
       private
-        def job_application_params
-          params.require(:job_application).permit!
-        end
+
+      def permitted_job_application_params
+        [
+          :job_id, :name, :email, :phone, :cover_letter, :resume
+        ]
+      end
     end
   end
 end

data/app/controllers/refinery/jobs/jobs_controller.rb

@@ -3,14 +3,17 @@ module Refinery
     class JobsController < ::ApplicationController
       include ControllerHelper
 
-      helper :'refinery/jobs/jobs'
-      before_filter :find_page
-      before_filter :find_all_jobs, :only => [:index]
-      before_filter :find_job, :only => [:show]
+      before_action :find_page
+      before_action :find_all_jobs, only: :index
+      before_action :find_job, only: :show
+
+      before_action :new_job_applicaton, only: [:index, :show]
 
       def show
-        find_job
-        @job_application = Refinery::Jobs::JobApplication.new
+        @breadcrumb = OpenStruct.new({
+          title: @job.title,
+          url: refinery.jobs_job_url(@job)
+        })
       end
     end
   end

data/app/helpers/refinery/jobs/controller_helper.rb

@@ -3,15 +3,19 @@ module Refinery
     module ControllerHelper
       protected
         def find_all_jobs
-          @jobs = Refinery::Jobs::Job.published.friendly.order("position ASC").page(params[:page])
+          @jobs = Refinery::Jobs::Job.live.friendly.page(params[:page]).order(:position)
         end
 
         def find_job
-          @job = Refinery::Jobs::Job.published.friendly.find(params[:id])
+          @job = Refinery::Jobs::Job.live.friendly.find(params[:id])
         end
 
         def find_page
-          @page = Refinery::Page.friendly.find_by(:link_url => '/jobs')
+          @page = Refinery::Page.friendly.find_by(link_url: Refinery::Jobs.page_url)
+        end
+
+        def new_job_applicaton
+          @job_application = Refinery::Jobs::JobApplication.new
         end
     end
   end

data/app/models/refinery/jobs/job.rb

@@ -1,3 +1,5 @@
+require 'acts_as_indexed'
+
 module Refinery
   module Jobs
     class Job < ActiveRecord::Base
@@ -6,16 +8,17 @@ module Refinery
 
       translates :title, :description, :slug, :education, :experience, :skills, :languages, :salary, :length, :contact
 
-      friendly_id :friendly_id_source, :use => [:slugged, :globalize]
+      friendly_id :friendly_id_source, use:[:slugged, :finders, :globalize]
 
-      acts_as_indexed :fields => [:title, :description, :employment_terms, :hours]
+      acts_as_indexed fields: [:title, :description, :employment_terms, :hours]
 
-      has_many :job_applications, :dependent => :destroy, :foreign_key => :job_id
+      has_many :job_applications, dependent: :destroy, foreign_key: :job_id
 
       validates_presence_of   :title, :description
       validates_uniqueness_of :title
 
-      scope :published, -> { where :draft => false }
+      validates_length_of :title, :employment_terms, :ref, :education, :experience,
+        :skills, :languages, :salary, :hours, :employment_terms, :length, :contact, maximum: 255
 
       def self.latest(number = 5)
         limit(number).order('created_at DESC')
@@ -31,6 +34,10 @@ module Refinery
         title
       end
 
+      def live?
+        !draft && published_at <= DateTime.now
+      end
+
       class << self
         # Wrap up the logic of finding the pages based on the translations table.
         def with_globalize(conditions = {})
@@ -53,7 +60,14 @@ module Refinery
             find(slug_or_id)
           end
         end
+
+        def published_before(date=DateTime.now)
+          where(arel_table[:published_at].lt(date))
+            .where(draft: false)
+            .with_globalize
+        end
+        alias_method :live, :published_before
       end
     end
   end
-end
+end

data/app/models/refinery/jobs/job_application.rb

@@ -1,4 +1,3 @@
-require 'dragonfly'
 require 'refinery/core/base_model'
 require 'filters_spam'
 
@@ -7,9 +6,9 @@ module Refinery
     class JobApplication < Refinery::Core::BaseModel
       self.table_name = 'refinery_job_applications'
 
-      dragonfly_accessor :resume, :app => :refinery_jobs
+      dragonfly_accessor :resume, app: :refinery_jobs
 
-      belongs_to :job, :class_name => "Refinery::Jobs::Job", :foreign_key => "job_id"
+      belongs_to :job, class_name: 'Refinery::Jobs::Job', foreign_key: 'job_id'
 
       filters_spam message_field:    :cover_letter,
                    email_field:      :email,
@@ -21,12 +20,9 @@ module Refinery
       validates :email, format: {
         with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i
       }, length: { maximum: 255 }
-      validates             :resume, :presence => true
+      validates             :resume, presence: true
       validates_with Refinery::Jobs::Validators::FileSizeValidator
 
-      def self.latest(number = 5)
-        limit(number).order('created_at DESC')
-      end
     end
   end
 end

data/app/views/refinery/jobs/admin/{jobs → job_applications}/_job_application.html.erb

@@ -1,3 +1,13 @@
+<% # setup params for various action links
+  delete_url = refinery.jobs_admin_job_job_application_path(@job, job_application)
+  delete_options = {
+     class: "cancel confirm-delete",
+            data: {
+              confirm: t('message',  scope: 'refinery.admin.delete', title: job_application.name)
+            }
+          }
+ %>
+
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(job_application) -%>">
   <span class='title'>
     <b><%= t('.created_at')%> :</b>
@@ -17,4 +27,6 @@
 
     <%= link_to t('.download_resume', name: job_application.name), job_application.resume.url %><span class="preview">&nbsp;</span><br>
   </span>
-</li>
+
+  <%= action_icon(:delete,  delete_url, t('delete', scope: 'refinery.admin.pages' ), delete_options ) %>
+</li>

data/app/views/refinery/jobs/admin/jobs/_job.html.erb

@@ -1,39 +1,49 @@
+<% # setup params for various action links
+  open_url = refinery.jobs_admin_job_job_applications_path(job)
+  preview_url = refinery.jobs_job_url(job)
+  edit_url = refinery.edit_jobs_admin_job_path(job)
+  delete_url = refinery.jobs_admin_job_path(job)
+  delete_options = {
+    class: "cancel confirm-delete",
+    data: {confirm: t('message',  scope: 'refinery.admin.delete', title: job.title)}
+  }
+%>
+
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(job) -%>">
   <span class='title'>
     <%= job.title.presence || job.translations.detect {|t| t.title.present?}.title %>
     <span class="preview">
-      <% job.translations.each do |translation| %>
-        <% if translation.title.present? %>
-          <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
-              refinery.edit_jobs_admin_job_path(job, :switch_locale => translation.locale),
-              :class => 'locale' %>
-          <% end %>
-      <% end %>
-
       <% if job.draft? %>
         <span class="label notice"><%= t('refinery.jobs.admin.jobs.job.draft') %></span>
       <% else %>
         <%= job.published_at.strftime('%b %d, %Y') %>
       <% end %>
+
+      <% if Refinery::I18n.frontend_locales.many? %>
+        <span class='locales'>
+          <% job.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+            <% if translation.title.present? %>
+              <%= link_to refinery.edit_jobs_admin_job_path(job, :switch_locale => translation.locale), :class => 'locale', title: translation.locale.upcase do %>
+
+                <div class="<%=translation.locale %> locale_marker">
+                  <%= locale_text_icon(translation.locale.upcase) %>
+                </div>
+              <% end %>
+            <% end %>
+          <% end %>
+        </span>
+      <% end %>
+
+      <%= t('.job_applications_count', count: job.job_applications.count ) %>
     </span>
   </span>
 
   <span class='actions'>
-    <% if !job.job_applications.blank? %>
-      <%= link_to refinery_icon_tag("folder_open.png"), refinery.job_applications_jobs_admin_job_path(job),
-           :title => t('.view_applications_for_this_job') %>
+    <% if job.job_applications.any? %>
+      <%= action_icon(:folder, open_url, t('.view_applications_for_this_job')) %>
     <% end %>
-    <%= link_to refinery_icon_tag("application_go.png"), refinery.jobs_job_url(job),
-        :title => t('.view_live_html'),
-        :target => "_blank" %>
-    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_jobs_admin_job_path(job),
-         :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), refinery.jobs_admin_job_path(job),
-        :class => "cancel confirm-delete",
-        :title => t('.delete'),
-        :method => :delete,
-        :data => {
-          :confirm => t('message', :scope => 'refinery.admin.delete', :title => job.title)
-        } %>
+    <%= action_icon(:preview, preview_url, t('.view_live_html')) %>
+    <%= action_icon(:edit, edit_url, t('.edit' ) ) %>
+    <%= action_icon(:delete, delete_url, t('.delete' ), delete_options ) %>
   </span>
 </li>

data/app/views/refinery/jobs/job_applications/_form.html.erb

@@ -1,33 +1,45 @@
-<%= form_for [refinery, :jobs, @job, @job_application], :html => { :multipart => true } do |f| %>
+<%= form_for [refinery, :jobs, @job, @job_application], html: { multipart: true } do |f| %>
 
-  <%= render '/refinery/admin/error_messages', {:object => @job_application, :include_object_name => true} %>
+  <h2><%= t('.job_application_for_position', job_title: @job.title) %></h2>
 
-  <h2><%= t('.job_application_for_position') %></h2>
+  <%= render '/refinery/admin/error_messages', {object: @job_application, include_object_name: true} %>
 
   <div class='field'>
-    <%= f.label :name %>
-    <%= f.text_field :name %>
+    <%= f.label :name, class: 'required' %>
+    <%= f.text_field :name, class: 'text', required: 'required' %>
   </div>
 
   <div class='field'>
-    <%= f.label :email %>
-    <%= f.text_field :email %>
+    <%= f.label :email, class: 'required' %>
+    <%= f.email_field :email, class: 'text', required: 'required' %>
   </div>
 
   <div class='field'>
-    <%= f.label :phone %>
-    <%= f.text_field :phone %>
+    <%= f.label :phone, class: 'required' %>
+    <%= f.telephone_field :phone, class: 'text', required: 'required' %>
   </div>
 
+  <% if @jobs %>
+    <div class='field'>
+      <%= f.label :job_id %>
+      <%= f.select :job_id, @jobs.collect {|j| [ j.title, j.id ] }, { prompt: t('.select_a_job') }, required: true %>
+    </div>
+  <% end %>
+
   <div class='field'>
-    <%= f.label :cover_letter %>
-    <%= f.text_area :cover_letter %>
+    <%= f.label :cover_letter, class: 'required' %>
+    <%= f.text_area :cover_letter, class: 'text', required: 'required' %>
   </div>
 
-  <div class='field'>
-    <%= f.label :resume %>
-    <%= f.file_field :resume %>
+  <div class='field message_field'>
+    <%= f.label :resume, class: 'required' %>
+    <%= f.file_field :resume, class: 'text', required: 'required' %>
   </div>
 
-  <%= f.submit t('.apply') %>
-<% end %>
+  <div class="actions">
+    <p class="instruction">
+      <%= t('.mandatory_fields').html_safe %>
+    </p>
+    <%= f.submit t('.apply') %>
+  </div>
+<% end %>

data/bin/rails

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)