voluntary 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84618c24e02dcb9f224841b3bb6526e93f1bda6f
-  data.tar.gz: 1b6fe36335714062ee0fd318c3dd156caed931bd
+  metadata.gz: 419c8a84e348727daf69aa18cf56c4c9a6b719ff
+  data.tar.gz: 0539d0b9cf7e06254e7a892b050de1c246082ae3
 SHA512:
-  metadata.gz: 9867508b65ab5394f5ffa28c656820efab9f9d42aca93d4adbba19d02fc46f7029fdf3e7dd82ab1c1144b73eeff3a1c2a03c3085004b97788efaac0b97c5c6aa
-  data.tar.gz: 0b468d36ac2ac429aa34db0a4eaa87de902510f794fadfd32dcdfbe3d00ef1bc6209edd7c1a112d70ac559ea6fa1612ece31f2bedb9c1992053fe73696e0d0a9
+  metadata.gz: 82e81ddb6f66fd0accbdae7561fd49b31a80534c884166b142e73e37a9a52cdc0189008fe56d6b4876c6cc44daf36773a3a9caf117bbc677af00b39143f415bf
+  data.tar.gz: 30be2205e906c800a754507e5391e74e2fdc0827bca932e68bc04cb1e8b38a7045af9ec98497140e9514055af877118c56b6894e0758078df87f8b973f379b9e

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 ## unreleased ##
 
+## 0.5.0 (August 17, 2015) ##
+
+* [#87](https://github.com/volontariat/voluntary/issues/87) WikiData.org integration for things suggestion
+* [#39](https://github.com/volontariat/voluntary/issues/39) Bootstrap 3 upgrade 
+* [#49](https://github.com/volontariat/voluntary/issues/49) Task import from CSV or Excel file
+* [#85](https://github.com/volontariat/voluntary/issues/85) Task show page
+* [#50](https://github.com/volontariat/voluntary/issues/50) [REFACTORING] Replace roles by new bitmap user attribute roles and remove seeds
+* [#84](https://github.com/volontariat/voluntary/issues/84) Task import API
+* [#42](https://github.com/volontariat/voluntary/issues/42) Secure API
+* [#35](https://github.com/volontariat/voluntary/issues/35) API for exporting task results
+* [#83](https://github.com/volontariat/voluntary/issues/83) [BUGFIX] Query about areas with projects without a product return nothing even if there are projects
+
 ## 0.4.0 (August 3, 2015) ##
 
+WARNING: this release drops recruiting data tables if you don't have installed voluntary_recruiting gem.
+
 * #47 Refactoring: outsource recruiting to voluntary_recruiting gemRefactoring: outsource recruiting to voluntary_recruiting gem.
 * #81 Removes fork me on GitHub links.
 * #80 Fixes twitter bootstrap style of flash messages.
@@ -106,4 +120,4 @@
 
 ## 0.0.1 (November 11, 2012) ##
 
-*   Initial version.
+*   Initial version.

data/README.md

@@ -63,7 +63,6 @@ Run this in your console:
   bundle install
   rake db:create
   rake db:migrate
-  rake db:seed
   rails s
 ```
 

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

@@ -70,19 +70,20 @@ $(document).ready ->
       
     target.before($(this).data('fields').replace(regexp, time))
     event.preventDefault()
-  
-  $('input[data-autocomplete]').each (k, v) ->
-    $(v).autocomplete({
-      source: $(this).attr('data-autocomplete'),
-      select: (event, ui) ->
-        $(this).val(ui.item.value)
-        
-        if ($(this).attr('id_element'))
-          $($(this).attr('id_element')).val(ui.item.id)
-        
-        return false;
-    });
     
+  document.body.addEventListener 'DOMNodeInserted', ((event) ->
+    $('input[data-autocomplete]').each (k, v) ->
+      $(v).autocomplete
+        source: $(this).data('autocomplete')
+        select: (event, ui) ->
+          $(this).val(ui.item.value)
+          
+          if ($(this).attr('id_element'))
+            $($(this).attr('id_element')).val(ui.item.id)
+          
+          false
+  )
+  
   $( ".datepicker" ).each (k, v) ->
     $(v).datepicker({ dateFormat: "yy-mm-dd", changeYear: true, yearRange: "c-100:c+10" });
     

data/app/assets/stylesheets/voluntary/application.css

@@ -11,7 +11,7 @@
  *= require_self
  *= require font-awesome
  *= require token-input-facebook
- *= require twitter/bootstrap
+ *= require bootstrap
  *= require voluntary/sticky_footer
  *= require jquery-ui-bootstrap
  *= require selectize

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

@@ -1,10 +1,10 @@
 #plattform_brand
-  padding: 10px 0px 10px 0px
   margin-left: 0px
-
+  padding: 15px 0px 0px 5px
+  
 #product_brand
   margin-left: 0px
-  padding: 10px 15px 10px 5px
+  padding: 15px 0px 0px 5px
   
 pre
   background-color: white

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

@@ -1,4 +1,3 @@
-@import "twitter/bootstrap/responsive"
 @import 'bootstrap-datetimepicker'
 
 .list-striped 

data/app/assets/stylesheets/voluntary/sticky_footer.css

@@ -40,6 +40,6 @@ body {
   text-align:center;
 }
 
-#wrap > .container-fluid {
+#wrap > .container-fluid, #wrap .container-fluid {
   padding-top: 60px;
 }

data/app/controllers/products_controller.rb

@@ -24,7 +24,7 @@ class ProductsController < ApplicationController
     @product.user_id = current_user.id
     
     if @product.save
-      redirect_to @product, notice: t('general.form.successfully_created')
+      redirect_to product_path(@product), notice: t('general.form.successfully_created')
     else
       render :new
     end
@@ -38,7 +38,7 @@ class ProductsController < ApplicationController
     @product = Product.find(params[:id])
     
     if @product.update_attributes(params[:product])
-      redirect_to @product, notice: t('general.form.successfully_updated')
+      redirect_to product_path(@product), notice: t('general.form.successfully_updated')
     else
       render :edit
     end

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

@@ -1,10 +1,30 @@
 module Voluntary
   module Api
     module V1
-      class BaseController < ActionController::Base #ActionController::Metal
-        #include ActionController::Rendering        # enables rendering
-        #include ActionController::MimeResponds     # enables serving different content types like :xml or :json
-        #include AbstractController::Callbacks      # callbacks for your authentication logic
+      class BaseController < ActionController::Base
+        rescue_from CanCan::AccessDenied, with: :access_denied
+        rescue_from ActiveRecord::RecordNotFound, with: :not_found
+        rescue_from Mongoid::Errors::DocumentNotFound, with: :not_found
+        
+        def require_api_key
+          render status: 401, json: { error: 'You need to pass your API key for this request!' } if current_user.nil?
+        end 
+        
+        protected
+        
+        def current_user
+          @current_user ||= User.where(api_key: params[:api_key]).first
+        end
+        
+        private
+        
+        def access_denied
+          render status: 401, json: { error: 'You are not authorized for this request!' }
+        end
+        
+        def not_found
+          render status: 403, json: { error: 'Record not found! ' + [current_user.id, Story.first].inspect }
+        end
       end
     end
   end

data/app/controllers/voluntary/api/v1/tasks_controller.rb

@@ -0,0 +1,50 @@
+module Voluntary
+  module Api
+    module V1
+      class TasksController < Voluntary::Api::V1::BaseController
+        before_action :require_api_key, only: [:create]
+        
+        respond_to :json
+        
+        def index
+          params[:page] = nil if params[:page] == ''
+          params[:per_page] = nil if params[:per_page] == ''
+          collection = Task.where(story_id: params[:story_id])
+          collection = collection.where(state: params[:state]) if params[:state].present?
+          collection = collection.paginate(per_page: params[:per_page] || 50, page: params[:page] || 1)
+          
+          respond_to do |format|
+            format.json {
+              render json: {
+                current_page: collection.current_page, per_page: collection.per_page, 
+                total_entries: collection.total_entries, total_pages: collection.total_pages,
+                entries: collection.map(&:to_json),
+              }.to_json
+            }
+          end
+        end
+        
+        def create
+          tasks = current_user.stories.find(params[:story_id]).tasks
+          json = []
+          
+          params[:tasks].each do |attributes|
+            task = tasks.create(attributes)
+            
+            json << if task.valid?
+              task.to_json
+            else  
+              hash = { errors: {}}
+              task.errors.each {|key, value| hash[:errors][key] = value }
+              hash
+            end
+          end
+          
+          respond_to do |format|
+            format.json { render json: json }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/voluntary/application_controller.rb

@@ -15,10 +15,6 @@ class Voluntary::ApplicationController < ActionController::Base
   def after_sign_in_path_for(resource_or_scope)
     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
     else
       workflow_path
     end

data/app/helpers/voluntary/show_helper.rb

@@ -57,7 +57,8 @@ module Voluntary
       result  = content_tag :dt, raw('&nbsp')
       result += content_tag :dd, render(
         partial: 'shared/resource/actions', locals: { 
-          type: root_model_class_name(resource).tableize, resource: resource, namespace: options[:namespace] 
+          type: root_model_class_name(resource).tableize, resource: resource, namespace: options[:namespace],
+          after_namespace: options[:after_namespace] 
         }
       )
        

data/app/models/area.rb

@@ -14,7 +14,7 @@ class Area < ActiveRecord::Base
         OR areas2.ancestry = CONCAT(areas.id, '') 
       LEFT JOIN areas_projects ON areas_projects.area_id = areas2.id 
       LEFT JOIN projects ON projects.id = areas_projects.project_id
-    }).where('areas2.id IS NOT NULL AND projects.product_id = ?', product_id)
+    }).where('areas2.id IS NOT NULL AND projects.product_id = ?', product_id == 'no-name' ? '' : product_id)
   end
   
   validates :name, presence: true, uniqueness: true
@@ -26,7 +26,6 @@ class Area < ActiveRecord::Base
   friendly_id :name, :use => :slugged
   
   def self.find_by_product_id(product_id)
-    #roots.joins(:projects).merge(Project.for_product_id(product_id))
     roots.with_projects_for_product(product_id)
   end
   

data/app/models/product.rb

@@ -64,6 +64,7 @@ class Product
   
   # has_many (SQL)
   def areas; Area.where(id: area_ids); end
+  def projects; Project.where(product_id: id); end
   
   private
   

data/app/models/project.rb

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

data/app/models/project_user.rb

@@ -3,10 +3,9 @@ class ProjectUser < ActiveRecord::Base#
   
   belongs_to :project
   belongs_to :user
-  belongs_to :role
   
   validates :project_id, presence: true
   validates :user_id, presence: true, uniqueness: { scope: [:project_id] }
   
-  attr_accessible :project_id, :user_id, :role_id
+  attr_accessible :project_id, :user_id
 end

data/app/models/result.rb

@@ -39,6 +39,10 @@ class Result
   
   def user; user_id ? User.find(user_id) : nil; end
   def user=(value); self.user_id = value.id; end
+
+  def to_json
+    { id: id.to_s, name: name, text: text, user_id: user_id, state: state }
+  end
   
   private
   

data/app/models/story.rb

@@ -26,7 +26,9 @@ class Story
   
   slug :name
   
-  attr_accessible :project_id, :name, :text, :tasks_attributes
+  attr_accessible :project_id, :name, :text, :tasks_file, :tasks_attributes
+  
+  attr_accessor :tasks_file
   
   scope :active, -> { where(state: 'active') }
   
@@ -37,7 +39,8 @@ class Story
   
   after_initialize :cache_associations
   before_validation :cache_associations 
-
+  after_save :import_tasks_from_file, if: 'tasks_file.present?'
+  
   PARENT_TYPES = ['project']
   
   def self.for_user(user)
@@ -76,6 +79,22 @@ class Story
   
   private
   
+  def import_tasks_from_file
+    csv = CSV.read(tasks_file.path)
+    column_to_index = {}
+
+    csv.first.first.split(';').each_with_index do |column, index|
+      column_to_index[column.downcase.to_sym] = index
+    end
+    
+    csv.each_with_index do |task, index|
+      next if index == 0
+      
+      task = task.first.split(';')
+      tasks.create name: task[column_to_index[:name]], text: task[column_to_index[:text]]
+    end
+  end
+  
   def cache_associations
     self.offeror_id = project.user_id if project_id.present? && (project rescue nil)
   end

data/app/models/task.rb

@@ -10,7 +10,7 @@ class Task
   include StateMachines::Task
   
   belongs_to :story
-  belongs_to :result, dependent: :destroy
+  belongs_to :result
   
   accepts_nested_attributes_for :result, allow_destroy: true
   
@@ -39,6 +39,7 @@ class Task
   
   after_initialize :cache_associations
   before_validation :cache_associations  
+  after_destroy :destroy_result
     
   #track_history on: [:user_id, :name, :text, :state]
     
@@ -97,6 +98,14 @@ class Task
     end
   end
   
+  def to_json
+    record = {
+      id: id.to_s, offeror_id: offeror_id, user_id: user_id, author_id: author_id, name: name, text: text, state: state
+    }
+    record[:result] = result.to_json if result.present?
+    record
+  end
+  
   protected
   
   # validates :name, presence: true, uniqueness: { scope: :story_id }
@@ -114,6 +123,10 @@ class Task
   
   private
   
+  def destroy_result
+    result.try(:destroy)
+  end
+  
   def cache_associations
     self.offeror_id = story.offeror_id if story_id.present? && (story rescue nil)
   end

data/app/models/thing.rb

@@ -1,3 +1,14 @@
 class Thing < ActiveRecord::Base
   include Concerns::Model::BaseThing
+  
+  def self.suggest(term)
+    known_things = Thing.order(:name).where("name LIKE ?", "%#{term}%").limit(10).map do |t| 
+      { id: t.id, name: t.name }
+    end
+    
+    (known_things + Wikidata.search(term, known_things)).map do |item|
+      item[:value] = item[:name]
+      item
+    end
+  end
 end

data/app/models/user.rb

@@ -5,14 +5,13 @@ class User < ActiveRecord::Base
   include User::Omniauthable
   include User::Liking
   
-  belongs_to :main_role, class_name: 'Role'
   belongs_to :profession
   
-  has_and_belongs_to_many :roles, join_table: 'users_roles'
   has_and_belongs_to_many :areas
   has_and_belongs_to_many :projects
   
   has_many :organizations, dependent: :destroy
+  def stories; Story.where(offeror_id: id); end
   
   accepts_nested_attributes_for :areas, allow_destroy: true
   
@@ -29,8 +28,6 @@ class User < ActiveRecord::Base
                   :salutation, :marital_status, :family_status, :date_of_birth, :place_of_birth, :citizenship, 
                   :email, :country, :language, :interface_language, :foreign_language_tokens, :profession_id, 
                   :employment_relationship, :area_tokens, :remember_me
-                  # preferences
-                  :main_role_id
        
   # :timeoutable, :token_authenticatable, :lockable,
   # :lock_strategy => :none, :unlock_strategy => :nones
@@ -42,7 +39,9 @@ class User < ActiveRecord::Base
   
   friendly_id :name, use: :slugged     
   
-  after_create :set_main_role
+  bitmask :roles, as: [:master]
+  
+  before_create :create_api_key
                   
   PARENT_TYPES = ['area', 'project']
   
@@ -67,7 +66,7 @@ class User < ActiveRecord::Base
   end
   
   def is_master?
-    roles.where(name: 'Master').any?
+    roles.include? :master
   end
   
   def languages
@@ -108,7 +107,9 @@ class User < ActiveRecord::Base
   
   private
   
-  def set_main_role
-    self.update_attribute :main_role_id, Role.find_or_create_by(name: 'User').id if self.respond_to? :main_role_id
+  def create_api_key
+    begin
+      self.api_key = SecureRandom.uuid.tr('-', '')
+    end while User.where(api_key: api_key).any?
   end
 end

data/app/models/wikidata.rb

@@ -0,0 +1,20 @@
+class Wikidata
+  def self.search(term, known_things)
+    JSON.parse(
+      HTTParty.get(
+        "https://www.wikidata.org/w/api.php?action=wbsearchentities&search=" +
+        "#{URI.encode(term, /\W/)}&format=json&language=en&type=item&continue=0",
+        verify: false
+      ).body
+    )['search'].map do |item|
+      description = if item['description'].to_s.present? && 
+                       item['description'] != 'Wikimedia disambiguation page'
+        " (#{item['description']})"
+      else
+        ''
+      end
+      
+      "#{item['label']}#{description}"
+    end.uniq.select{|i| known_things.select{|t| t[:name] == i }.none? }.map{|item| { name: item } }
+  end
+end

data/app/views/areas/_form.html.erb

@@ -1,12 +1,13 @@
-<%= simple_form_for(@area, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@area, html: {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @area } %>
   
   <%= f.hidden_field :parent_id %>
-  <div class="form-inputs">
-    <%= f.input :name %>
-  </div>
   
-  <div class="actions">
-    <%= f.button :submit %>
+  <%= f.input :name %>
+  
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>

data/app/views/comments/_form.html.erb

@@ -1,16 +1,16 @@
-<%= simple_form_for(resource, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(resource, html: {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: resource } %>
   
   <%= f.hidden_field :parent_id %>
   <%= f.hidden_field :commentable_type %>
   <%= f.hidden_field :commentable_id %>
   
-  <div class="form-inputs">
-    <%= f.input :name %>  
-    <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
-  </div>
+  <%= f.input :name %>  
+  <%= f.input :text, input_html: {style: 'width: 500px; height:300px;'} %>
   
-  <div class="form-actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>

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

@@ -21,26 +21,26 @@
     
     <div class="container-fluid">
 <% unless flash.empty? %>
-      <div class="row-fluid">
-        <div class="span12">
+      <div class="row">
+        <div class="col-md-12">
           <%= render 'layouts/shared/flash_messages' %>
         </div>
       </div>
 <% end %>    
-      <div class="row-fluid">
+      <div class="row">
 <% if sidenav(@sidenav_links_count).present? || content_for?(:search) || content_for?(:sidebar) %>
-        <div class="span9">
+        <div class="col-md-9">
   <% if content_for?(:breadcrumbs) %>
-          <div class="nav">
+          <div class="nav" style="padding-bottom:15px;">
             <%= yield :breadcrumbs %>
           </div>
   <% else %>
-          <%= breadcrumbs %>
+          <%= raw breadcrumbs.gsub('<div class="nav">', '<div class="nav" style="padding-bottom:15px;">') %>
   <% end %>
         
           <%= yield %>
         </div>      
-        <div class="span3">
+        <div class="col-md-3">
           <%= yield :search %>
           
           <%= sidenav(@sidenav_links_count) %>
@@ -48,13 +48,13 @@
           <%= yield :sidebar %>
         </div>
 <% else %>
-        <div class="span12">
+        <div class="col-md-12">
           <% if content_for?(:breadcrumbs) %>
-            <div class="nav">
+            <div class="nav" style="padding-bottom:15px;">
               <%= yield :breadcrumbs %>
             </div>
           <% else %>
-            <%= breadcrumbs %>
+            <%= raw breadcrumbs.gsub('<div class="nav">', '<div class="nav" style="padding-bottom:15px;">') %>
           <% end %>
           
           <%= yield %>

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

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

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

@@ -1,10 +1,8 @@
-<div class="navbar navbar-inverse navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-      <a id="plattform_brand" class="brand" href="/">Volontari.at /</a>
-      <a id="product_brand" class="brand" href="<%= navigation_product_path %>"><%= navigation_product_name %></a>
-      
-      <%= render_navigation context: application_navigation, expand_all: false, renderer: :bootstrap %>
-    </div>
+<nav class="navbar navbar-inverse navbar-fixed-top">
+  <div class="container">
+    <a id="plattform_brand" class="navbar-brand" href="/">Volontari.at /</a>
+    <a id="product_brand" class="navbar-brand" href="<%= navigation_product_path %>"><%= navigation_product_name %></a>
+    
+    <%= raw render_navigation(context: application_navigation, expand_all: false, renderer: :bootstrap).gsub('<ul class="nav">', '<ul class="nav navbar-nav">') %>
   </div>
-</div>
+</nav>

data/app/views/organizations/_form.html.erb

@@ -1,11 +1,11 @@
-<%= simple_form_for(@organization, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@organization, html: {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @organization } %>
   
-  <div class="form-inputs">
-    <%= f.input :name %>
-  </div>
+  <%= f.input :name %>
   
-  <div class="actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>

data/app/views/pages/_form.html.erb

@@ -1,12 +1,12 @@
-<%= simple_form_for(@page, html: {class: 'form-horizontal'}) do |f| %>
+<%= simple_form_for(@page, html: {class: 'form-horizontal'}, wrapper: :horizontal_form) do |f| %>
   <%= render partial: 'shared/form/error_messages', locals: { resource: @page } %>
   
-  <div class="form-inputs">
-    <%= f.input :name %>
-    <%= f.input :text, as: :text, input_html: {style: 'width: 100%; height:300px;'} %>
-  </div>
+  <%= f.input :name %>
+  <%= f.input :text, as: :text, input_html: {style: 'width: 100%; height:300px;'} %>
   
-  <div class="actions">
-    <%= f.button :submit %>
+  <div class="form-group">
+    <div class="col-sm-offset-3 col-sm-9">
+      <%= f.button :submit %>
+    </div>
   </div>
 <% end %>