voluntary 0.4.0 → 0.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voluntary
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Mathias Gawlista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.5
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -403,61 +417,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.1
 - !ruby/object:Gem::Dependency
-  name: mongoid_slug
+  name: bitmask_attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: has_scope
+  name: mongoid_slug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: has_scope
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: wicked
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: versionist
   requirement: !ruby/object:Gem::Requirement
@@ -506,14 +520,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: country_select
   requirement: !ruby/object:Gem::Requirement
@@ -562,14 +576,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2.1
+        version: 3.1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2.1
+        version: 3.1.0.0
 - !ruby/object:Gem::Dependency
   name: auto_html
   requirement: !ruby/object:Gem::Requirement
@@ -724,20 +738,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
-- !ruby/object:Gem::Dependency
-  name: acts_as_api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: i18n-inflector-rails
   requirement: !ruby/object:Gem::Requirement
@@ -814,14 +814,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -884,42 +884,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: cucumber-rails-training-wheels
   requirement: !ruby/object:Gem::Requirement
@@ -1004,48 +1004,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0rc2
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: guard-spork
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.1
-- !ruby/object:Gem::Dependency
-  name: guard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -1158,7 +1116,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
-description: "#Crowdsourcing management system for #RubyOnRails: http://bit.ly/voluntary-0-4-0"
+description: "#Crowdsourcing management system for #RubyOnRails: http://bit.ly/voluntary-0-5-0"
 email:
 - gawlista@gmail.com
 executables: []
@@ -1198,6 +1156,7 @@ files:
 - app/controllers/tasks_controller.rb
 - app/controllers/users_controller.rb
 - app/controllers/voluntary/api/v1/base_controller.rb
+- app/controllers/voluntary/api/v1/tasks_controller.rb
 - app/controllers/voluntary/application_controller.rb
 - app/controllers/workflow/products_controller.rb
 - app/controllers/workflow/project_owner_controller.rb
@@ -1241,11 +1200,6 @@ files:
 - app/models/project.rb
 - app/models/project_user.rb
 - app/models/result.rb
-- app/models/role.rb
-- app/models/role/admin.rb
-- app/models/role/master.rb
-- app/models/role/project_owner.rb
-- app/models/role/user.rb
 - app/models/state_machines/page.rb
 - app/models/state_machines/story.rb
 - app/models/state_machines/task.rb
@@ -1253,7 +1207,7 @@ files:
 - app/models/task.rb
 - app/models/thing.rb
 - app/models/user.rb
-- app/models/user_role.rb
+- app/models/wikidata.rb
 - app/presenters/layout/application_presenter.rb
 - app/presenters/layout_presenter.rb
 - app/presenters/presenter.rb
@@ -1330,6 +1284,7 @@ files:
 - app/views/stories/steps/_setup_tasks.html.erb
 - app/views/stories/tasks.html.erb
 - app/views/tasks/_collection.html.erb
+- app/views/tasks/show.html.erb
 - app/views/users/_form.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/index.html.erb
@@ -1362,6 +1317,7 @@ files:
 - config/initializers/locale_settings.rb
 - config/initializers/mongoid-history.rb
 - config/initializers/simple_form.rb
+- config/initializers/simple_form_bootstrap.rb
 - config/initializers/simple_navigation.rb
 - config/initializers/state_machine_patch_for_rails_4_1_support.rb
 - config/initializers/vendor_extensions.rb
@@ -1379,6 +1335,7 @@ files:
 - config/locales/resources/result/en.yml
 - config/locales/resources/story/en.yml
 - config/locales/resources/task/en.yml
+- config/locales/resources/thing/en.yml
 - config/locales/resources/user/en.yml
 - config/locales/simple_form.en.yml
 - config/locales/workflow/en.yml
@@ -1404,7 +1361,8 @@ files:
 - db/migrate/20150119171210_add_lastfm_user_name_to_users.rb
 - db/migrate/20150126185249_create_likes.rb
 - db/migrate/20150802141840_drop_recruiting_unless_recruiting_plugin_present.rb
-- db/seeds.rb
+- db/migrate/20150808155719_add_api_key_to_users.rb
+- db/migrate/20150809120211_remove_roles_model.rb
 - lib/api_constraints.rb
 - lib/applicat/mvc/controller.rb
 - lib/applicat/mvc/controller/error_handling.rb
@@ -1415,7 +1373,6 @@ files:
 - lib/applicat/mvc/model/tree.rb
 - lib/concerns/model/base_list_item.rb
 - lib/concerns/model/base_thing.rb
-- lib/db_seed.rb
 - lib/environment_configuration.rb
 - lib/generators/voluntary/install/install_generator.rb
 - lib/generators/voluntary/install/templates/app/controllers/application_controller.rb
@@ -1433,7 +1390,6 @@ files:
 - lib/generators/voluntary/install/templates/config/nginx.conf
 - lib/generators/voluntary/install/templates/config/unicorn.rb
 - lib/generators/voluntary/install/templates/config/unicorn_init.sh
-- lib/generators/voluntary/install/templates/db/seeds.rb
 - lib/generators/voluntary/install/templates/features/step_definitions/email_steps.rb
 - lib/generators/voluntary/install/templates/features/step_definitions/factory_steps.rb
 - lib/generators/voluntary/install/templates/features/step_definitions/javascript_steps.rb
@@ -1450,7 +1406,6 @@ files:
 - lib/generators/voluntary/install/templates/features/support/selectors.rb
 - lib/generators/voluntary/install/templates/features/support/spork_env
 - lib/generators/voluntary/install/templates/features/support/user_cuke_helpers.rb
-- lib/generators/voluntary/install/templates/lib/volontariat_seed.rb
 - lib/generators/voluntary/install/templates/spec/factories.rb
 - lib/generators/voluntary/install/templates/spec/spec_helper.rb
 - lib/generators/voluntary/install/templates/spec/support/deferred_garbage_collector.rb
@@ -1520,7 +1475,6 @@ files:
 - lib/tasks/voluntary_tasks.rake
 - lib/vendors/simple_navigation/renderer/breadcrumbs_without_method_links.rb
 - lib/vendors/simple_navigation/renderer/twitter_sidenav.rb
-- lib/volontariat_seed.rb
 - lib/voluntary.rb
 - lib/voluntary/engine.rb
 - lib/voluntary/navigation.rb

data/app/models/role/admin.rb

@@ -1,2 +0,0 @@
-class Role::Admin < Role
-end

data/app/models/role/master.rb

@@ -1,2 +0,0 @@
-class Role::Master < Role
-end

data/app/models/role/project_owner.rb

@@ -1,2 +0,0 @@
-class Role::ProjectOwner < Role
-end

data/app/models/role/user.rb

@@ -1,2 +0,0 @@
-class Role::User < Role
-end

data/app/models/role.rb

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

data/app/models/user_role.rb

@@ -1,6 +0,0 @@
-class UserRole < ActiveRecord::Base
-  self.table_name = 'users_roles'
-  
-  belongs_to :user
-  belongs_to :role
-end

data/db/seeds.rb

@@ -1,14 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)
-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

data/lib/db_seed.rb

@@ -1,166 +0,0 @@
-require 'faker'
-
-class DbSeed
-  USER_ROLES = {
-    master: {},
-    admin: {},
-    project_owner: {},
-    user: {}
-  }
-  
-  attr_accessor :logger, :user_roles
-  
-  def initialize(options = {logger: nil})
-    self.logger = options[:logger]
-  end
-  
-  def create_fixtures
-    create_roles
-    create_users
-    create_user_roles
-  end
-  
-  protected
-  
-  def users
-    return @users if @users
-    
-    @users = {}
-    
-    self.class::USER_ROLES.each do |role,attributes|
-      name = role.to_s.humanize 
-      name += ' user' unless name == 'User'
-      
-      @users[role] = attributes
-      @users[role][:id] = User.find_by_name(name).id
-    end
-    
-    @users
-  end
-  
-  # roles 
-  # TODO: define methods through USER_ROLES
-  def user
-    @user ||= User.find(user_id)
-  end
-  
-  def user_id
-    @user_id ||= users[:user][:id]
-  end
-  
-  def tenant
-    @tenant ||= User.find(tenant_id)
-  end
-  
-  def tenant_id
-    @tenant_id ||= users[:tenant][:id]
-  end
-  
-  def log(message, type = :info)
-    if logger 
-      logger.send(type, message)
-    else
-      puts message
-    end
-  end
-  
-  def create_roles
-    Role.import([:name], self.class::USER_ROLES.keys.map{|role| [role.to_s.humanize]})
-    
-    self.class::USER_ROLES.keys.each do |role|
-      attributes = { name: role.to_s.humanize }
-      
-      attributes[:public] = [:project_owner, :user].include?(role) if Role.new.respond_to? :public
-      
-      "Role::#{role.to_s.classify}".constantize.create(attributes)
-    end
-  end
-  
-  def create_users
-    self.class::USER_ROLES.each do |role, settings|
-      name = role.to_s.humanize 
-      name += ' user' unless name == 'User'
-      
-      attributes = {
-        name: name, first_name: 'Mister', last_name: role.to_s.humanize, email: "#{role}@volontari.at",
-        password: "#{role}2012", language: 'en', country: 'Germany', interface_language: 'en'
-      }
-      
-      attributes.reject!{|key,value| !User.new.respond_to? key }
-      attributes[:password_confirmation] = attributes[:password]
-      
-      create_record(User, attributes) # events: ['skip_confirmation!']
-    end
-  end
-  
-  def create_user_roles
-    UserRole.import(
-      [:role_id, :user_id], users.keys.map{|r| [Role.find_by_name(r.to_s.humanize).id, users[r][:id]]}
-    )
-  end
-  
-  private
-  
-  def create_record(klass, attributes, options = {})
-    options.assert_valid_keys(:events)
-    
-    klass = klass.constantize if klass.is_a?(String)
-    events = options[:events] || []
-    
-    record = klass.new
-    
-    (attributes || {}).each {|attribute,value| record.send("#{attribute}=", value) }
-    
-    send_events(record, events) if events.any?
-    
-    record.save!(validate: false) if record.new_record?
-    
-    record
-  end
-  
-  def send_events(object, events = [])
-    events.each {|event| send_event(object, event) }
-  end
-  
-  def send_event(object, event)
-    object_was = object
-    event_condition_class = "::DbSeed::EventConditions::#{object.class.table_name.classify}".constantize rescue nil
-    arguments = nil
-      
-    if event.is_a?(Array)
-      arguments = event
-      event = arguments.shift
-      
-      if event == 'assignment'
-        # TODO: YAGNI?
-        object_was = object
-        object = object.send(event)
-        event = arguments.shift
-        arguments = nil if arguments.none?
-      end
-    elsif event.is_a?(Proc)
-      event.call(object)
-      
-      return
-    end
-    
-    if event_condition_class && event_condition_class.respond_to?("before_#{event.gsub('!', '')}")
-      conditions_arguments = arguments.is_a?(Array) ? [object] + arguments : [object]
-      event_condition_class.send("before_#{event.gsub('!', '')}", *conditions_arguments)
-    end
-
-    if event_condition_class && event_condition_class.respond_to?(event.gsub('!', ''))
-      # override event method through event condition class
-      event_condition_class.send(event.gsub('!', ''), object)      
-    else
-      arguments ? object.send(event, *arguments) : object.send(event)
-    end
-    
-    if event_condition_class && event_condition_class.respond_to?("after_#{event.gsub('!', '')}")
-      conditions_arguments = arguments.is_a?(Array) ? [object] + arguments : [object]
-      event_condition_class.send("after_#{event.gsub('!', '')}", *conditions_arguments)
-    end
-    
-    object = object_was
-  end
-end

data/lib/generators/voluntary/install/templates/db/seeds.rb

@@ -1,14 +0,0 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
-#   Mayor.create(name: 'Emanuel', city: cities.first)
-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

data/lib/generators/voluntary/install/templates/lib/volontariat_seed.rb

@@ -1,36 +0,0 @@
-class VolontariatSeed < DbSeed
-  USER_ROLES = {
-    master: {},
-    admin: {},
-    project_owner: {},
-    user: {}
-  }
-  
-  def create_fixtures
-    super
-    
-    create_areas
-    create_products
-    
-    # should send notifications to stream and email
-  end
-  
-  private
-  
-  def create_areas
-    Area.create!(
-      [ 
-        { name: 'General' },
-        { name: 'Software Engineering' }
-      ]
-    )
-  end
-  
-  def create_products
-    product = Product.new(
-      name: 'Text Creation', text: 'Dummy', area_ids: [Area.where(name: 'General').first.id]
-    )
-    product.user_id = User.where(name: 'Master').first.id
-    product.save!
-  end
-end

data/lib/volontariat_seed.rb

@@ -1,27 +0,0 @@
-class VolontariatSeed < DbSeed
-  USER_ROLES = {
-    master: {},
-    admin: {},
-    project_owner: {},
-    user: {}
-  }
-  
-  def create_fixtures
-    super
-    
-    create_areas
-    
-    # should send notifications to stream and email
-  end
-  
-  private
-  
-  def create_areas
-    Area.create!(
-      [ 
-        { name: 'General' },
-        { name: 'Software Engineering' }
-      ]
-    )
-  end
-end