voluntary 0.2.4 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmQ1ZjZjNDk5MjhjMGExMzNlYmI3NDM0ZGZjOWFkYzJkYWI4YzlkMA==
-  data.tar.gz: !binary |-
-    ZjNkMDA4MzU1N2RhZDBhNzMyMjc1ODVhN2M5MjFhZDk3NjY1NGNkNQ==
+SHA1:
+  metadata.gz: a771ddeec412e7d388b055acff871018533619c5
+  data.tar.gz: c76dc81a5782f89e7309a4391297aa1bced80d89
 SHA512:
-  metadata.gz: !binary |-
-    OWJiY2Y1ZGNkODFiMTIxMGJlMjMwY2E3OWNiOGNlOTI0OTI2NTIxODdjNGIw
-    ZDg4OTM3YWM0N2ZhZWZlYjQ4YTg5MjVmMDlkYzVlZjE0NWZhNGM0N2QwMDI1
-    ZmNlNzM0NTc2NTdkMWZjZTk4YjZkNWMyNmVmMTA4ZjY4M2U3NjE=
-  data.tar.gz: !binary |-
-    ZWJkYzg0ZmRjYTlmYjFmMWNmZDgxZmRkMzcwOTg2ODEwZmVkM2Q3ZDhjZmQ1
-    ZjE1YzE0ODUzZjVlNDYyZWMyOTQ0Mzk3Y2EwNmVlZjA4NWMyOWJlMDFiOWFl
-    ZDlhNDY3NTBhMWZlOWI4OTI5NTUyMDdmZDUxNWE5NmJhYWExZDY=
+  metadata.gz: 98f5ff05154ed1c5c22dad03918f3648f3935b2e46fbeb8eb877d86afe74196858cf4352460033c6499b42a49d988efb4538ed703b344c1bc4195dab1992b6ff
+  data.tar.gz: 996f49f84e99d8b219029c9fbeebd57733eceb89475a640964e98375dc27eb514a383bfcae6ed8b3209372b0d2b5cb8d07ffcd3ff51c23f08d87884a41a64795

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## unreleased ##
 
+## 0.3.0 (April 8, 2015) ##
+
+* #40 Rails 4.2.1 upgrade.
+* #46 Continuous integration server Travis setup.
+* #77 Workflow product and (user) product area page: consider areas with projects assigned to sub areas deeper than the direct child areas.
+* Removes rails-api gem (temporarily?).
+
 ## 0.2.4 (March 23, 2015) ##
 
 *  #73 Sticky Footer for Application Layout (Twitter Bootstrap).

data/{README.rdoc → README.md}

@@ -1,35 +1,43 @@
-= Voluntary
+# Voluntary [![Build Status](https://travis-ci.org/volontariat/voluntary.svg?branch=master)](https://travis-ci.org/volontariat/voluntary) [![Code Climate](https://codeclimate.com/github/volontariat/voluntary/badges/gpa.svg)](https://codeclimate.com/github/volontariat/voluntary) [![Test Coverage](https://codeclimate.com/github/volontariat/voluntary/badges/coverage.svg)](https://codeclimate.com/github/volontariat/voluntary)
 
 This is a gem which turns your rails application into a crowdsourcing platform to run on your intranet or on the internet.
 
 Then you can add existing voluntary products like text creation or create your own products.
 
-== Installation
+## Installation
 
-=== New Application
+### New Application
 
 Run this in your console:
 
+```bash
   rvm --create use 1.9.3@your_crowdsourcing_platform_name
   gem update bundler
   gem install rails -v 4.0.13 --no-rdoc --no-ri  
   rails new your_crowdsourcing_platform_name
   cd your_crowdsourcing_platform_name
+```
 
 Add this to your Gemfile:
 
+```ruby
   gem 'voluntary'
+```
   
 Add voluntary products to your Gemfile.  
   
 Run this in your console:
 
+```bash
   bundle install  
+```
   
 Run this in your console (confirm all overwrite questions):
 
+```bash
   rails g voluntary:install
   rake railties:install:migrations
+```
 
 Remove gem 'sqlite3' from your Gemfile.
 
@@ -37,9 +45,11 @@ Copy the content of config/database.example.yml into config/database.yml
 
 Add this to your application.rb:
 
+```ruby
   config.generators do |g|
     g.orm :active_record
   end
+```
 
 Remove public/index.html
 
@@ -49,14 +59,17 @@ Add a Capfile to your Rails root.
 
 Run this in your console:
 
+```bash
   bundle install
   rake db:create
   rake db:migrate
   rake db:seed
   rails s
+```
 
-=== New Product
-  
+### New Product
+
+```bash  
   git clone https://github.com/user/voluntary_product_name.git
   cd voluntary_product_name
   rvm --create use --rvmrc 1.9.3@voluntary_product_name # if you use RVM
@@ -85,7 +98,8 @@ Run this in your console:
   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
+```
   
-= License 
+## License 
 
 This project uses MIT-LICENSE.

data/app/controllers/candidatures_controller.rb

@@ -16,7 +16,7 @@ class CandidaturesController < ApplicationController
     @candidatures = if @vacancy
       @vacancy.candidatures.includes(:vacancy, :resource)
     else 
-      Candidature.includes(:vacancy, :resource).where(resource_type: 'User').all
+      Candidature.includes(:vacancy, :resource).where(resource_type: 'User')
     end
   end
   

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

@@ -5,13 +5,6 @@ module Voluntary
         #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
-        
-        after_filter :set_access_control_headers
-        
-        def set_access_control_headers
-          headers['Access-Control-Allow-Origin'] = '*'
-          headers['Access-Control-Request-Method'] = '*'
-        end
       end
     end
   end

data/app/helpers/voluntary/application_helper.rb

@@ -79,5 +79,22 @@ module Voluntary
     def name_with_apostrophe(value)
       value =~ /s$/i ? "#{value}'" : "#{value}'s"
     end
+    
+    def event_links_for_resource(current_resource, type)
+      return [] unless current_resource.respond_to? :state_events
+      
+      links = []
+      
+      current_resource.state_events.select{|event| can? event, current_resource }.each do |event|
+        path = "#{event}_#{type.singularize}_path"
+        
+        next unless respond_to? path
+        
+        path = eval("#{path}(current_resource)")
+        links << link_to(t("#{type}.show.events.#{event}"), path, method: :put)
+      end
+      
+      links
+    end
   end
 end

data/app/models/area.rb

@@ -6,6 +6,17 @@ class Area < ActiveRecord::Base
   has_and_belongs_to_many :users
   has_and_belongs_to_many :projects
   
+  scope :with_projects_for_product, ->(product_id) do
+    select('DISTINCT(areas.id), areas.*').joins(%Q{
+      LEFT JOIN areas areas2 ON areas2.id = areas.id OR areas2.ancestry like CONCAT(areas.id, '/', '%') 
+        OR areas2.ancestry like CONCAT('%', '/', areas.id) 
+        OR areas2.ancestry like CONCAT('%', '/', areas.id, '/', '%')  
+        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)
+  end
+  
   validates :name, presence: true, uniqueness: true
   
   attr_accessible :name, :parent_id
@@ -15,11 +26,13 @@ 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.joins(:projects).merge(Project.for_product_id(product_id))
+    roots.with_projects_for_product(product_id)
   end
   
   def children_for_product_id(product_id)
-    children.joins(:projects).merge(Project.for_product_id(product_id))
+    #children.joins(:projects).merge(Project.for_product_id(product_id))
+    children.with_projects_for_product(product_id)
   end
     
   def products

data/app/models/concerns/likeable.rb

@@ -10,7 +10,10 @@ module Likeable
     has_many :dislikers, class_name: 'User', through: :dislikes, source: :user
     
     scope :liked_by, ->(user_id) do
-      positive_likes_string = if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) 
+      positive_likes_string = if (
+        defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) &&
+        ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) 
+      )
         "likes.positive = 't'"
       else
         'likes.positive = 1'

data/app/models/product.rb

@@ -99,6 +99,6 @@ class Product
   end
   
   def set_klass_name
-    update_attribute(:_type, get_klass_name)
+    self._type = get_klass_name
   end
 end

data/app/models/product/project_management.rb

@@ -8,7 +8,7 @@ module Product::ProjectManagement
   module ClassMethods
     def stories(id, user)
       collection = if id == 'no-name'
-        Story.exists(_type: false)
+        Story.where(_type: 'Story')
       else
         product = Product.find(id)
         

data/app/models/role.rb

@@ -2,7 +2,7 @@ class Role < ActiveRecord::Base
   has_many :users, through: :user_roles
   has_many :projects, through: :project_users
   
-  scope :public, -> { where(public: true) }
+  scope :is_public, -> { where(public: true) }
   
   attr_accessible :name, :public
 end

data/app/models/state_machines/candidature.rb

@@ -8,6 +8,8 @@ module StateMachines::Candidature
       const_set 'STATES', [:new, :accepted, :denied]
       const_set 'EVENTS', [:accept, :deny, :quit]
       
+      after_initialize :set_initial_state
+      
       state_machine :state, initial: :new do
         event :accept do
           transition [:new, :denied] => :accepted
@@ -50,6 +52,10 @@ module StateMachines::Candidature
           errors[:state] << I18n.t('activerecord.errors.models.vacancy.attributes.limit.reached')
         end
       end
+      
+      def set_initial_state
+        self.state ||= :new
+      end
     end
   end
   

data/app/models/state_machines/page.rb

@@ -8,8 +8,16 @@ module StateMachines::Page
       const_set 'STATES', [:active]
       const_set 'EVENTS', []
       
+      after_initialize :set_initial_state
+      
       state_machine :state, initial: :active do
       end
+      
+      private
+      
+      def set_initial_state
+        self.state ||= :active
+      end
     end
   end
   

data/app/models/state_machines/story.rb

@@ -10,6 +10,8 @@ module StateMachines::Story
       const_set 'STATES', [:new, :tasks_defined, :active, :completed, :closed]
       const_set 'EVENTS', [:initialization, :setup_tasks, :activate, :complete]
       
+      after_initialize :set_initial_state
+      
       state_machine :state, initial: :new do
         event :initialization do
           transition :new => :initialized
@@ -44,6 +46,10 @@ module StateMachines::Story
       
       private
       
+      def set_initial_state
+        self.state ||= :new
+      end
+      
       def presence_of_tasks
         self.tasks.delete_if{|t| t.name.blank? && t.text.blank? }
         

data/app/models/state_machines/task.rb

@@ -10,6 +10,8 @@ module StateMachines::Task
       const_set 'STATES', [:new, :assigned, :under_supervision, :completed]
       const_set 'EVENTS', [:assign, :cancel, :review, :follow_up, :complete]
       
+      after_initialize :set_initial_state
+      
       state_machine :state, initial: :new do
         event :assign do
           transition :new => :assigned
@@ -74,6 +76,12 @@ module StateMachines::Task
           end
         end
       end
+      
+      private
+      
+      def set_initial_state
+        self.state ||= :new
+      end
     end
   end
 end

data/app/models/state_machines/vacancy.rb

@@ -8,6 +8,8 @@ module StateMachines::Vacancy
       const_set 'STATES', [:open, :recommended, :denied, :closed]
       const_set 'EVENTS', [:accept_recommendation, :deny_recommendation, :close, :reopen]
       
+      after_initialize :set_initial_state
+      
       state_machine :state, initial: :new do
         event :recommend do
           transition :new => :recommended 
@@ -33,6 +35,12 @@ module StateMachines::Vacancy
           transition [:denied, :closed] => :open
         end
       end
+      
+      private
+      
+      def set_initial_state
+        self.state ||= :new
+      end
     end
   end
   

data/app/models/story.rb

@@ -15,6 +15,8 @@ class Story
   
   accepts_nested_attributes_for :tasks, allow_destroy: true, reject_if: ->(t) { t['name'].blank? && t['text'].blank? }
   
+  # see https://github.com/mongoid/mongoid/issues/2222
+  field(:_type, default: ->{ self.class.name }, type: String)
   field :project_id, type: Integer
   field :offeror_id, type: Integer
   field :name, type: String

data/app/views/products/index.html.erb

@@ -37,10 +37,11 @@
 				  <% if can? :edit, product %>    
 				    <li><%= link_to t('general.edit'), eval("edit_product_path(product)") %></li>
 				  <% end %>
-				  <% if product.respond_to? :state_events %>
-				  <li class="divider"></li>
-				  <% end %>
-				  <%= render 'shared/resource/event_elements', resource: product, type: 'products' %>
+				  <% links = event_links_for_resource(product, 'products') %>
+          <% if links.any? %>
+            <li class="divider"></li>
+            <%= render 'shared/resource/event_elements', links: links %>
+          <% end %>
 				  </ul>
 				</div>
 				<% end %>

data/app/views/shared/resource/_actions.html.erb

@@ -21,10 +21,11 @@
   <% if can? :edit, resource %>    
     <li><%= link_to t('general.edit'), eval("edit_#{(namespace.present? ? namespace.to_s + '_' : '')}#{type.gsub('/', '_').singularize}_path(resource)") %></li>
   <% end %>
-  <% if resource.respond_to? :state_events %>
-  <li class="divider"></li>
+  <% links = event_links_for_resource(resource, type) %>
+  <% if links.any? %>
+    <li class="divider"></li>
+    <%= render 'shared/resource/event_elements', links: links %>
   <% end %>
-  <%= render 'shared/resource/event_elements', resource: resource, type: type %>
   </ul>
 </div>
 <% end %>

data/app/views/shared/resource/_event_elements.html.erb

@@ -1,7 +1,5 @@
-<% if resource.respond_to? :state_events %>
-  <% resource.state_events.select{|event| can? event, resource }.each do |event| %>
+<% links.each do |link| %>
 <li>
-  <%= link_to t("#{type}.show.events.#{event}"), eval("#{event}_#{type.singularize}_path(resource)"), method: :put %> 
+  <%= raw link %> 
 </li>
-  <% end %>
 <% end %>

data/app/views/users/preferences.html.erb

@@ -2,7 +2,7 @@
 
 <%= simple_form_for(current_user, url: preferences_user_path(current_user), html: { class: 'form-horizontal block-form' }) do |f| %>
   <div class="form-inputs">
-    <%= f.input :main_role_id, collection: Role.public %>
+    <%= f.input :main_role_id, collection: Role.is_public %>
   </div>
   
   <div class="form-actions">

data/app/views/workflow/user/product/areas/show.html.erb

@@ -1,4 +1,21 @@
-<h3><%= params[:product_id] == 'no-name' ? 'No Name' : @product.name %></h3>
+<% content_for :breadcrumbs do %>
+  <% product_key = nil %>
+  <% Voluntary::Navigation::Base.products.each{|s,k| product_key = k if s == params[:product_id] } %>
+  <%= raw(
+    (
+      [
+        link_to(t('workflow.index.title'), workflow_path),
+        link_to(t('workflow.user.index.title'), workflow_user_index_path),
+        link_to(t(product_key), product_workflow_user_index_path(params[:product_id]))
+      ] + 
+      (@area.ancestors + [@area]).map do |a| 
+        link_to(a.name, product_area_workflow_user_index_path(params[:product_id], a))
+      end
+    ).join(' > ')
+  ) %> 
+<% end %>
+
+<h3><%= @area.name %></h3>
 
 <%= render 'shared/collection/table',
   type: 'areas', collection: @areas, columns: {

data/config/initializers/cookies_serializer.rb

@@ -0,0 +1 @@
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/config/initializers/state_machine_patch_for_rails_4_1_support.rb

@@ -0,0 +1,8 @@
+# from https://github.com/pluginaweek/state_machine/issues/251#issuecomment-31598775
+module StateMachine
+  module Integrations
+     module ActiveModel
+        public :around_validation
+     end
+  end
+end