voluntary 0.4.0 → 0.5.0

data/config/initializers/simple_form_bootstrap.rb

@@ -0,0 +1,136 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.error_notification_class = 'alert alert-danger'
+  config.button_class = 'btn btn-default'
+  config.boolean_label_class = nil
+
+  config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'checkbox' do |ba|
+      ba.use :label_input
+    end
+
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr|
+      wr.wrapper tag: 'div', class: 'checkbox' do |ba|
+        ba.use :label_input, class: 'col-sm-9'
+      end
+
+      wr.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      wr.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'sr-only'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  # Wrappers for forms and inputs using the Bootstrap toolkit.
+  # Check the Bootstrap docs (http://getbootstrap.com)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :vertical_form
+  config.wrapper_mappings = {
+    check_boxes: :vertical_radio_and_checkboxes,
+    radio_buttons: :vertical_radio_and_checkboxes,
+    file: :vertical_file_input,
+    boolean: :vertical_boolean,
+  }
+end

data/config/locales/general/en.yml

@@ -49,7 +49,8 @@ en:
         sticky_footer: Sticky footer style from
       license: Code licensed under %{link}
       
-  attributes:  
+  attributes: 
+    id: ID 
     name: Name 
     text: Text
     parent: Parent
@@ -76,15 +77,7 @@ en:
     attributes:
       comment:
         name: Subject
-      user:
-        area_tokens: Areas
-        country: Country 
-        employment_relationship: Employment relationship
-        foreign_language: Foreign language
-        interface_language: Interface language
-        language: Mother tongue
-        profession: Profession
-     
+      
     errors:
       models:
         general:

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

@@ -21,12 +21,17 @@ en:
         title: Criteria
       setup_tasks:
         title: Setup Tasks
+        import: Import Tasks
         add_task: Add Task
         update: Update Tasks
       activate:
         title: Activate
         
   activerecord:
+    attributes:
+      story:
+        tasks_file: Tasks file
+        
     errors:
       models:
         story:

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

@@ -0,0 +1,8 @@
+en:
+  activerecord:
+    errors:
+      models:
+        thing:
+          attributes:
+            name:
+              unwanted_special_characters_included: Name must not include slash.

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

@@ -11,4 +11,16 @@ en:
     edit:
       title: Settings 
     preferences:
-      title: Preferences
+      title: Preferences
+      
+  activerecord:
+    attributes:
+      user:
+        area_tokens: Areas
+        country: Country 
+        employment_relationship: Employment relationship
+        foreign_language: Foreign language
+        interface_language: Interface language
+        language: Mother tongue
+        profession: Profession
+        api_key: API Key

data/config/routes/api.rb

@@ -1,6 +1,7 @@
-scope :voluntary do
-  namespace :api, defaults: {format: 'json'} do
-    namespace :v1 do
+namespace :voluntary, path: 'api', module: 'voluntary/api', defaults: {format: 'json'} do
+  namespace :v1 do
+    resources :stories, only: [] do
+      resources :tasks, only: [:index, :create]
     end
   end
 end

data/db/migrate/20120907144853_create_schema.rb

@@ -213,8 +213,6 @@ class CreateSchema < ActiveRecord::Migration
     add_index :friendly_id_slugs, :sluggable_id
     add_index :friendly_id_slugs, [:slug, :sluggable_type], :unique => true
     add_index :friendly_id_slugs, :sluggable_type
-    
-    VolontariatSeed.new.create_fixtures
   end
   
   def down

data/db/migrate/20131018143613_replace_user_by_polymorphic_resource_in_candidatures.rb

@@ -3,16 +3,20 @@ class ReplaceUserByPolymorphicResourceInCandidatures < ActiveRecord::Migration
     add_column :vacancies, :resource_type, :string
     add_column :vacancies, :resource_id, :integer
     
-    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')
+    if (Product::Recruiting rescue nil)
+      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')
+    end
     
     remove_column :vacancies, :user_id
     
     add_column :candidatures, :resource_type, :string
     add_column :candidatures, :resource_id, :integer
     
-    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')
+    if (Product::Recruiting rescue nil)
+      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')
+    end
     
     remove_column :candidatures, :user_id
     
@@ -27,8 +31,10 @@ class ReplaceUserByPolymorphicResourceInCandidatures < ActiveRecord::Migration
   def down
     add_column :vacancies, :user_id, :integer
     
-    Vacancy.where('resource_type = "User"').update_all('user_id = resource_id')
-    Vacancy.where('resource_type <> "User"').destroy_all
+    if (Product::Recruiting rescue nil)
+      Vacancy.where('resource_type = "User"').update_all('user_id = resource_id')
+      Vacancy.where('resource_type <> "User"').destroy_all
+    end
     
     remove_column :vacancies, :resource_type
     remove_column :vacancies, :resource_id
@@ -37,8 +43,10 @@ class ReplaceUserByPolymorphicResourceInCandidatures < ActiveRecord::Migration
     
     add_index :candidatures, [:user_id, :vacancy_id]
     
-    Candidature.where('resource_type = "User"').update_all('user_id = resource_id')
-    Candidature.where('resource_type <> "User"').destroy_all
+    if (Product::Recruiting rescue nil)
+      Candidature.where('resource_type = "User"').update_all('user_id = resource_id')
+      Candidature.where('resource_type <> "User"').destroy_all
+    end
     
     remove_column :candidatures, :resource_type
     remove_column :candidatures, :resource_id

data/db/migrate/20150802141840_drop_recruiting_unless_recruiting_plugin_present.rb

@@ -3,8 +3,8 @@ class DropRecruitingUnlessRecruitingPluginPresent < ActiveRecord::Migration
     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
+      remove_index 'projects_users', name: 'index_projects_users_on_project_id_and_user_id_and_vacancy_id'
+      remove_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
@@ -53,6 +53,7 @@ class DropRecruitingUnlessRecruitingPluginPresent < ActiveRecord::Migration
       add_index 'candidatures', ['vacancy_id'], name: 'index_candidatures_on_vacancy_id', using: :btree
       
       add_column 'projects_users', 'vacancy_id', :integer
+      remove_index 'projects_users', name: 'index_projects_users_on_project_id_and_user_id'
       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

data/db/migrate/20150808155719_add_api_key_to_users.rb

@@ -0,0 +1,13 @@
+class AddApiKeyToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :api_key, :string, limit: 32
+    
+    User.where('api_key IS NULL').find_each do |user|
+      begin
+        user.api_key = SecureRandom.uuid.tr('-', '')
+      end while User.where(api_key: user.api_key).any?
+      
+      user.save!
+    end
+  end
+end

data/db/migrate/20150809120211_remove_roles_model.rb

@@ -0,0 +1,63 @@
+class Role < ActiveRecord::Base
+  attr_accessible :name
+end
+
+class Role::Master < Role
+end
+
+class UserRole < ActiveRecord::Base
+  self.table_name = 'users_roles'
+  
+  belongs_to :user
+  
+  attr_accessible :user_id, :role_id
+end
+
+class RemoveRolesModel < ActiveRecord::Migration
+  def up
+    add_column :users, :roles, :integer, limit: 8, null: false, default: 0
+    
+    if role = Role.where(name: 'Master').first
+      UserRole.where(role_id: role.id).find_each do |user_role|
+        if user_role.role_id == role.id
+          ActiveRecord::Base.connection.execute "UPDATE users SET roles = 1 WHERE id = #{user_role.user_id}"
+        end
+      end
+    end
+    
+    drop_table :roles
+    drop_table :users_roles
+    remove_column :projects_users, :role_id
+    remove_column :users, :main_role_id
+  end
+  
+  def down
+    create_table "roles", force: :cascade do |t|
+      t.string   "name",       limit: 255
+      t.string   "state",      limit: 255
+      t.datetime "created_at",                             null: false
+      t.datetime "updated_at",                             null: false
+      t.boolean  "public",                 default: false
+      t.string   "type",       limit: 255
+    end
+    
+    create_table "users_roles", force: :cascade do |t|
+      t.integer "role_id", limit: 4
+      t.integer "user_id", limit: 4
+      t.string  "state",   limit: 255
+    end
+  
+    role = Role::Master.create(name: 'Master')
+    
+    User.with_roles(:master).each {|user| UserRole.create(user_id: user.id, role_id: role.id) }
+    
+    remove_column :users, :roles
+  
+    add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id", unique: true, using: :btree
+
+    add_column :projects_users, :role_id, :integer, limit: 4
+    add_index "projects_users", ["role_id"], name: "index_projects_users_on_role_id", using: :btree
+    
+    add_column :users, :main_role_id, :integer, limit: 4
+  end
+end

data/lib/applicat/mvc/model/resource/base.rb

@@ -5,8 +5,6 @@ module Applicat
         module Base
           def self.included(base)
             base.class_eval do
-              #has_many :role_assignments, :class_name => 'Role', :as => :authorizable
-              
               cattr_reader :per_page
               @@per_page = 20
   
@@ -43,12 +41,6 @@ module Applicat
                 end
               end
               
-              #def role_for?(role_name, user)
-              #  return true if new_record?
-              # 
-              #  role_assignments.joins(:users).where('roles.name = ? AND users.id = ?', role_name, user.id).any?
-              #end
-      
               def to_s
                 self.name rescue self.class.name.humanize
               end

data/lib/concerns/model/base_thing.rb

@@ -16,6 +16,7 @@ module Concerns
         attr_accessible :name
         
         validates :name, presence: true, uniqueness: true
+        validate :special_characters_excluded
         
         #pusherable "#{Rails.env}_channel"
       end
@@ -45,6 +46,14 @@ module Concerns
       
       # custom associations
       def lists; List.where(thing_type: self.to_s); end
+      
+      def special_characters_excluded
+        if name.match(/\//)
+          errors[:name] << I18n.t(
+            'activerecord.errors.models.thing.attributes.name.unwanted_special_characters_included'
+          )
+        end
+      end
     end
   end
 end

data/lib/generators/voluntary/install/install_generator.rb

@@ -82,21 +82,6 @@ module Voluntary
           gem 'rack-piwik', '~> 0.1.3', require: 'rack/piwik', require: false
         end
       end
-      
-      def append_load_seed_data
-        create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
-        append_file 'db/seeds.rb', :verbose => true do
-          <<-EOH
-delivery_method_was = ActionMailer::Base.delivery_method
-ActionMailer::Base.delivery_method = :test
-
-db_seed = VolontariatSeed.new
-db_seed.create_fixtures
-
-ActionMailer::Base.delivery_method = delivery_method_was
-          EOH
-        end
-      end
     end
   end
 end

data/lib/generators/voluntary/product_dummy/product_dummy_generator.rb

@@ -93,21 +93,6 @@ gemspec path: File.expand_path(File.dirname(__FILE__) + "/../")
           gem 'rack-piwik', '~> 0.1.3', require: 'rack/piwik', require: false
         end
       end
-      
-      def append_load_seed_data
-        create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
-        append_file 'db/seeds.rb', :verbose => true do
-          <<-EOH
-delivery_method_was = ActionMailer::Base.delivery_method
-ActionMailer::Base.delivery_method = :test
-
-db_seed = VolontariatSeed.new
-db_seed.create_fixtures
-
-ActionMailer::Base.delivery_method = delivery_method_was
-          EOH
-        end
-      end
     end
   end
 end

data/lib/voluntary/test/rspec_helpers/factories.rb

@@ -14,17 +14,6 @@ module Voluntary
               interface_language 'en'
               password 'password'
               password_confirmation { |u| u.password }
-              
-              #after_create do |user|
-              #  User.confirm_by_token(user.confirmation_token)
-              #end
-              
-              factory :master_user do
-                after_create do |user|
-                  role = Role.find_or_create_by(name: 'Master')
-                  user.roles << role
-                end
-              end
             end
             
             factory_girl.factory :area do

data/lib/voluntary/version.rb

@@ -1,3 +1,3 @@
 module Voluntary
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/voluntary.rb

@@ -25,7 +25,6 @@ require 'mongoid/history'
 require 'mongoid_slug'
 require 'has_scope'
 require 'friendly_id'
-require 'wicked'
 require 'simple-navigation'  
 require 'facebox-rails'
 require 'simple_form'
@@ -35,7 +34,6 @@ require 'will_paginate'
 require 'will_paginate_mongoid'
 require 'gon'
 require 'json'
-require 'acts_as_api'
 require 'i18n-inflector-rails'
 require 'rails-i18n'
 require 'slim'
@@ -59,12 +57,12 @@ require 'coffee-script'
 require 'font-awesome-rails'
 require 'thor'
 require 'selectize-rails'
+require 'bitmask_attributes'
+require 'csv'
+require 'httparty'
 
 require 'voluntary/navigation'
 
-require 'db_seed'
-require 'volontariat_seed'
-
 if Rails.env == 'test'
   require 'voluntary/test/rspec_helpers/factories'
 end