tasuku 0.1.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91fd68be24466c75a16e67d93379f4005e00abf0
-  data.tar.gz: ce7bcd6b85315d1816ddbf646983224bd4b17c4e
+  metadata.gz: 955c630f90b4fe503c917430c9777d8c4c69e72f
+  data.tar.gz: f691fec1f524ca56689cdc798feef63fdbb739c7
 SHA512:
-  metadata.gz: bb8da418ba435900c235a11d654bfc0aa3b0787504981e68bb8fa386dbe6e17e013743c0562c6fceb8fa96e1e3a1f2ef76625e1301f8cd9f5ed03ec5a5c87b1e
-  data.tar.gz: 36ef622a0fb7890134e99def5df38b6e89a16da851b5d6bca744baf6ac1b03ef9590ce0cb79b90a895b41fd477a2218b05094f769ffaa57bbd1a9571f2a52faf
+  metadata.gz: f135ddf10bc15fd9f0f49c79e6e25ea1d1b6a55557916316e1d4862fec3d26e1298ca9a9348b7eb633cd5377060294e525eee0c83648ff21b949e3311b737cb1
+  data.tar.gz: 8b2c7b060126bb237659450230d91ff913da051098f9ec7c713065a78d660c264b9b4667a4c699e17cbd150a9301b259c2da33b287535262b5eac96752edb511

data/README.md

@@ -6,6 +6,10 @@
 [![Code Climate](https://img.shields.io/codeclimate/github/hyperoslo/tasuku.svg)](https://codeclimate.com/github/hyperoslo/tasuku)
 [![Coverage Status](https://img.shields.io/coveralls/hyperoslo/tasuku.svg)](https://coveralls.io/r/hyperoslo/tasuku)
 
+Tasuku is a framework for building tasks in Ruby on Rails. It ships with an array of tasks
+ranging from reading articles to sharing photos. You can make your own tasks, too,
+and we'd love for you to contribute if you do.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,10 +20,6 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install tasuku
-
 Install the gem:
 
     $ rails generate tasuku:install

data/app/controllers/tasuku/taskables/code/responses_controller.rb

@@ -0,0 +1,32 @@
+require_dependency 'tasuku/application_controller'
+
+module Tasuku
+  class Taskables::Code::ResponsesController < ApplicationController
+    include Concerns::Redirectable
+
+    before_action :set_request
+
+    def create
+      response = @request.responses.new response_params
+      response.author = send Tasks.config.author
+
+      respond_to do |format|
+        if response.save
+          format.html { redirect_to redirect_path_for(response) }
+        else
+          format.html { redirect_to :back, alert: response.errors.full_messages.to_sentence }
+        end
+      end
+    end
+
+    private
+
+    def response_params
+      params.require(:taskables_code_response).permit(:code)
+    end
+
+    def set_request
+      @request = Taskables::Code::Request.find params[:request_id]
+    end
+  end
+end

data/app/controllers/tasuku/taskables/questions/answers_controller.rb

@@ -7,6 +7,7 @@ module Tasuku
     before_action :set_question
 
     def create
+      return redirect_to :back, alert: I18n.t('tasuku.taskables.questions.answers.no_answers') unless params[:taskables_question_answer]
       answer = Taskables::Question::Answer.new
 
       answer_params[:option_ids].each do |num|

data/app/helpers/tasuku/url_helper.rb

@@ -0,0 +1,11 @@
+module Tasuku
+  module UrlHelper
+    def url_for(options)
+      begin
+        super options
+      rescue ActionController::UrlGenerationError
+        main_app.url_for options
+      end
+    end
+  end
+end

data/app/models/tasuku/task.rb

@@ -1,5 +1,6 @@
 module Tasuku
   class Task < ActiveRecord::Base
     include Concerns::Models::Task
+    include Concerns::Models::Requirables::Requirable
   end
 end

data/app/models/tasuku/task_requirement.rb

@@ -0,0 +1,5 @@
+module Tasuku
+  class TaskRequirement < ActiveRecord::Base
+    include Concerns::Models::Requirables::InverseRequirable
+  end
+end

data/app/models/tasuku/taskables/code/request.rb

@@ -0,0 +1,7 @@
+module Tasuku
+  module Taskables
+    class Code::Request < ActiveRecord::Base
+      include Concerns::Models::Taskables::Code::Request
+    end
+  end
+end

data/app/models/tasuku/taskables/code/response.rb

@@ -0,0 +1,22 @@
+module Tasuku
+  module Taskables
+    class Code::Response < ActiveRecord::Base
+      include Taskable::Submission
+
+      belongs_to :request
+      belongs_to :author, polymorphic: true
+
+      validates :author_id, :author_type, presence: true
+      validates :code, presence: true
+      validate :code_is_valid
+
+      request is: :request
+
+      private
+
+      def code_is_valid
+        errors.add :code, I18n.t('tasuku.taskables.codes.responses.invalid') unless code == request.code
+      end
+    end
+  end
+end

data/app/models/tasuku/taskables/code.rb

@@ -0,0 +1,7 @@
+module Tasuku
+  module Taskables::Code
+    def self.table_name_prefix
+      'tasuku_taskables_code_'
+    end
+  end
+end

data/app/models/tasuku/taskables/question/option.rb

@@ -7,3 +7,4 @@ module Tasuku
     validates_presence_of :text
   end
 end
+

data/app/views/tasuku/taskables/_illustration.html.erb

@@ -0,0 +1,7 @@
+<% if request.image? %>
+  <div class="image"><%= image_tag request.image %></div>
+<% end %>
+
+<% if request.video? %>
+  <div class="video"><%= embed_video(request, '100%', '100%') %></div>
+<% end %>

data/app/views/tasuku/taskables/code/requests/_request.html.erb

@@ -0,0 +1,9 @@
+<div class="text"><%= request.text %></div>
+
+<% if request.completed_by? current_author %>
+  <%= t 'tasks.taskables.codes.responses.already_submitted' %>
+<% else %>
+  <div class="form">
+    <%= render partial: 'tasuku/taskables/code/responses/form', locals: { request: request } %>
+  </div>
+<% end %>

data/app/views/tasuku/taskables/code/responses/_form.html.erb

@@ -0,0 +1,5 @@
+<%= form_for request.responses.build, url: tasuku.code_request_responses_path(request_id: request.id), method: :post, html: { multipart: true } do |form| %>
+  <%= form.text_field :code %>
+
+  <%= form.submit t('tasuku.taskables.codes.responses.submit') %>
+<% end %>

data/app/views/tasuku/taskables/image/requests/_request.html.erb

@@ -1,6 +1,4 @@
-<% if request.image? %>
-  <div class="image"><%= image_tag request.image %></div>
-<% end %>
+<%= render 'tasuku/taskables/illustration', request: request %>
 
 <div class="text"><%= request.text %></div>
 <div class="description"><%= request.description %></div>

data/app/views/tasuku/taskables/questions/_question.html.erb

@@ -1,6 +1,4 @@
-<% if question.image? %>
-  <div class="image"><%= image_tag question.image %></div>
-<% end %>
+<%= render 'tasuku/taskables/illustration', request: question %>
 
 <div class="text"><%= question.text %></div>
 <div class="description"><%= question.description %></div>
@@ -12,6 +10,7 @@
       <ul>
 	  	<% answer.votes.each do |vote| %>
         <%= vote.option.text %>
+        <span class="reply"><%= vote.option.reply %></span>
       <% end %>
       </ul>
     <% end %>

data/app/views/tasuku/taskables/questions/answers/_form.html.erb

@@ -12,5 +12,7 @@
     </div>
   <% end %>
 
-  <%= form.submit t('tasuku.taskables.questions.answers.submit') %>
+  <%= form.submit t('tasuku.taskables.questions.answers.submit'), data: {
+    disable_with: t('tasuku.taskables.questions.answers.submitting')
+  } %>
 <% end %>

data/app/views/tasuku/taskables/text/requests/_request.html.erb

@@ -1,6 +1,4 @@
-<% if request.image? %>
-  <div class="image"><%= image_tag request.image %></div>
-<% end %>
+<%= render 'tasuku/taskables/illustration', request: request %>
 
 <div class="text"><%= request.text %></div>
 <div class="description"><%= request.description %></div>

data/app/views/tasuku/taskables/url/requests/_request.html.erb

@@ -1,6 +1,4 @@
-<% if request.image? %>
-  <div class="image"><%= image_tag request.image %></div>
-<% end %>
+<%= render 'tasuku/taskables/illustration', request: request %>
 
 <div class="text"><%= request.text %></div>
 <div class="description"><%= request.description %></div>

data/config/locales/en.yml

@@ -1,24 +1,168 @@
 en:
+  activerecord:
+    models:
+      tasuku/task:
+        one: Task
+        other: Tasks
+
+      tasuku/taskables/question:
+        one: Question
+        other: Questions
+
+      tasuku/taskables/question/option:
+        one: Option
+        other: Options
+
+      tasuku/taskables/question/vote:
+        one: Vote
+        other: Votes
+
+      tasuku/taskables/question/answer:
+        one: Answer
+        other: Answer
+
+      tasuku/taskables/verification:
+        one: Verification
+        other: Verifications
+
+      tasuku/taskables/verification/confirmation:
+        one: Verification confirmation
+        other: Verification confirmations
+
+      tasuku/taskables/image/request:
+        one: Image request
+        other: Image requests
+
+      tasuku/taskables/image/response:
+        one: Image response
+        other: Image responses
+
+      tasuku/taskables/text/request:
+        one: Text request
+        other: Text requests
+
+      tasuku/taskables/text/response:
+        one: Text response
+        other: Text responses
+
+      tasuku/taskables/url/request:
+        one: URL request
+        other: URL requests
+
+      tasuku/taskables/url/response:
+        one: URL response
+        other: URL responses
+
+      tasuku/taskables/code/request:
+        one: Code request
+        other: Code requests
+
+      tasuku/taskables/code/response:
+        one: Code response
+        other: Code responses
+
+      tasuku/task_requirement:
+        one: Task requirement
+        other: Task requirements
+
+    attributes:
+      defaults: &DEFAULT_ATTRS
+        created_at: Created at
+        updated_at: Updated at
+        text: Text
+        verification: Verification
+        task: Task
+        request: Request
+        responses: Response
+        votes: Votes
+        description: Description
+
+      tasuku/task:
+        <<: *DEFAULT_ATTRS
+        taskable_type: Taskable type
+        taskable: Taskable
+
+      tasuku/taskables/question:
+        <<: *DEFAULT_ATTRS
+        multiple: Multiple choice
+        show_statistics: Show statistics
+        options: Options
+
+      tasuku/taskables/question/option:
+        <<: *DEFAULT_ATTRS
+        question: Question
+        correct: Correct answer
+        answers: Answers
+
+      tasuku/taskables/question/vote:
+        <<: *DEFAULT_ATTRS
+        option: Option
+        answer: Answer
+
+      tasuku/taskables/question/answer:
+        <<: *DEFAULT_ATTRS
+        option: Option
+        author: Author
+        option_id: Option
+
+      tasuku/taskables/verification:
+        <<: *DEFAULT_ATTRS
+        verifiable: Verifiable
+        confirmations: Confirmations
+
+      tasuku/taskables/verification/confirmation:
+        <<: *DEFAULT_ATTRS
+
+      tasuku/taskables/image/request:
+        <<: *DEFAULT_ATTRS
+
+      tasuku/taskables/image/response:
+        <<: *DEFAULT_ATTRS
+        image: Image
+
+      tasuku/taskables/text/request:
+        <<: *DEFAULT_ATTRS
+
+      tasuku/taskables/text/response:
+        <<: *DEFAULT_ATTRS
+        text: Text
+
+      tasuku/taskables/url/request:
+        <<: *DEFAULT_ATTRS
+
+      tasuku/taskables/url/response:
+        <<: *DEFAULT_ATTRS
+
   tasuku:
     taskables:
       verifications:
         confirmations:
-          confirm: 'Confirm'
+          confirm: Confirm
+          confirming: Confirming...
       questions:
         answers:
-          submit: 'Submit'
-          already_answered: 'You have already answered this question'
-          can_only_vote_once: 'You may only select one alternative'
+          already_answered: You have already answered this question
+          can_only_vote_once: You may only select one alternative
+          submit: Submit
+          submitting: Submitting...
+          no_answers: No answer chosen
       images:
         responses:
-          already_uploaded: 'You have already uploaded an image'
-          upload: 'Upload'
-          uploading: 'Uploading...'
+          already_uploaded: You have already uploaded an image
+          upload: Upload
+          uploading: Uploading...
       texts:
         responses:
-          already_responded: 'You have already submitted a text'
-          respond: 'Submit'
+          already_responded: You have already submitted a text
+          respond: Submit
+          responding: Responding...
       urls:
         responses:
-          already_answered: 'You have already answered'
-          answer: 'Answer'
+          already_answered: You have already answered
+          answer: Answer
+          answering: Answering...
+      codes:
+        responses:
+          invalid: Invalid code
+          already_submitted: You have already submitted a code
+          submit: Submit code

data/config/locales/nb.yml

@@ -31,13 +31,13 @@ nb:
       tasuku/taskables/text/response:
         one: Svar på tekstforespørsler
         other: Svar på tekstforespørsler
-      tasks/taskables/verification/confirmation:
+      tasuku/taskables/verification/confirmation:
         one: Bekreftelse
         other: Bekreftelser
-      tasks/taskables/url/request:
+      tasuku/taskables/url/request:
         one: URL-forespørsel
         other: URL-forespørsler
-      tasks/taskables/url/response:
+      tasuku/taskables/url/response:
         one: Svar på URL-forespørsel
         other: Svar på URL-forespørsler
     attributes:
@@ -100,11 +100,14 @@ nb:
       verifications:
         confirmations:
           confirm: 'Bekreft'
+          confirming: 'Bekrefter...'
       questions:
         answers:
-          submit: 'Svar'
           already_answered: 'Du har allerede svart på spørsmålet'
           can_only_vote_once: 'Du kan kun avgi ett svar'
+          submit: 'Svar'
+          submitting: 'Sender inn...'
+          no_answers: 'Du valgte ingen svar'
       images:
         responses:
           already_uploaded: 'Du har allerede lastet opp et bilde'
@@ -115,7 +118,14 @@ nb:
           already_responded: 'Du har allerede sendt inn svartekst'
           response: 'Svar'
           respond: 'Svar'
+          responding: 'Sender inn...'
       urls:
         responses:
           already_answered: 'Du har allerede oppgitt en addresse'
           answer: 'Svar'
+          answering: 'Sender inn...'
+      codes:
+        responses:
+          invalid: 'Ugyldig kode'
+          already_submitted: 'Du har allerede oppgitt koden'
+          submit: 'Oppgi kode'

data/config/routes.rb

@@ -31,5 +31,11 @@ Tasuku::Engine.routes.draw do
         resources :responses, only: [:create]
       end
     end
+
+    namespace :code do
+      resources :requests, only: [] do
+        resources :responses, only: [:create]
+      end
+    end
   end
 end

data/db/migrate/20140611084458_add_video_urls.rb

@@ -0,0 +1,8 @@
+class AddVideoUrls < ActiveRecord::Migration
+  def change
+    add_column :tasuku_taskables_questions, :video_url, :string
+    add_column :tasuku_taskables_image_requests, :video_url, :string
+    add_column :tasuku_taskables_url_requests, :video_url, :string
+    add_column :tasuku_taskables_text_requests, :video_url, :string
+  end
+end

data/db/migrate/20140813073552_create_tasuku_taskables_code_requests.rb

@@ -0,0 +1,10 @@
+class CreateTasukuTaskablesCodeRequests < ActiveRecord::Migration
+  def change
+    create_table :tasuku_taskables_code_requests do |t|
+      t.string :text
+      t.string :code
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140813075643_create_tasuku_taskables_code_responses.rb

@@ -0,0 +1,11 @@
+class CreateTasukuTaskablesCodeResponses < ActiveRecord::Migration
+  def change
+    create_table :tasuku_taskables_code_responses do |t|
+      t.string :code
+      t.references :request
+      t.references :author, polymorphic: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140813080116_add_reply_to_option.rb

@@ -0,0 +1,5 @@
+class AddReplyToOption < ActiveRecord::Migration
+  def change
+    add_column :tasuku_taskables_question_options, :reply, :text
+  end
+end

data/db/migrate/20140910112050_create_tasuku_task_requirements.rb

@@ -0,0 +1,10 @@
+class CreateTasukuTaskRequirements < ActiveRecord::Migration
+  def change
+    create_table :tasuku_task_requirements do |t|
+      t.integer :task_id, index: true
+      t.integer :requirement_id, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140926105940_add_description_to_code_requests.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToCodeRequests < ActiveRecord::Migration
+  def change
+    add_column :tasuku_taskables_code_requests, :description, :text
+  end
+end

data/lib/tasuku/concerns/illustratable.rb

@@ -3,7 +3,10 @@ module Tasuku
     extend ActiveSupport::Concern
 
     included do
+      include Embeddable
+
       mount_uploader :image, ImageUploader
+      embeddable :video, from: :video_url
     end
   end
 end

data/lib/tasuku/concerns/models/requirables/inverse_requirable.rb

@@ -0,0 +1,12 @@
+module Tasuku
+  module Concerns::Models::Requirables::InverseRequirable
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :task
+      belongs_to :requirement, class_name: "Task"
+
+      validates :task, :requirement, presence: true
+    end
+  end
+end

data/lib/tasuku/concerns/models/requirables/requirable.rb

@@ -0,0 +1,35 @@
+module Tasuku
+  module Concerns::Models::Requirables::Requirable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :task_requirements
+      has_many :requirements, through: :task_requirements
+      has_many :inverse_tasks, class_name: "TaskRequirement", foreign_key: :requirement_id
+      has_many :required_for, through: :inverse_tasks, source: :task
+
+      accepts_nested_attributes_for :requirements, allow_destroy: true
+
+      def locked? author
+        required_task_ids = self.task_requirements.pluck :requirement_id
+        return false if required_task_ids.empty?
+
+        completed_task_ids = Tasuku::Task.completed_by(author).
+          where('tasuku_taskables_taskable_responses.task_id IN (?)', required_task_ids)
+
+        completed_task_ids.length.eql?(required_task_ids.length) ? false : true
+      end
+
+      def locked_by_tasks author
+        completed_task_ids = Tasuku::Task.completed_by(author).pluck(:id) || []
+
+        scope = self.requirements
+        scope = scope.where(
+          'tasuku_task_requirements.requirement_id NOT IN (?)', completed_task_ids
+        ) unless completed_task_ids.empty?
+
+        scope
+      end
+    end
+  end
+end

data/lib/tasuku/concerns/models/requirables.rb

@@ -0,0 +1,4 @@
+module Tasuku::Concerns::Models::Requirables
+  require 'tasuku/concerns/models/requirables/requirable'
+  require 'tasuku/concerns/models/requirables/inverse_requirable'
+end

data/lib/tasuku/concerns/models/taskables/code/request.rb

@@ -0,0 +1,19 @@
+module Tasuku
+  module Concerns::Models::Taskables::Code::Request
+    extend ActiveSupport::Concern
+
+    included do
+      include ::Tasks::Taskables::Taskable
+
+      has_many :responses
+
+      validates :text, :code, presence: true
+
+      responses are: :responses
+
+      def to_s
+        text
+      end
+    end
+  end
+end

data/lib/tasuku/concerns/models/taskables/code.rb

@@ -0,0 +1,3 @@
+module Tasuku::Concerns::Models::Taskables::Code
+  require "tasuku/concerns/models/taskables/code/request"
+end

data/lib/tasuku/concerns/models/taskables.rb

@@ -4,4 +4,5 @@ module Tasuku::Concerns::Models::Taskables
   require 'tasuku/concerns/models/taskables/text'
   require 'tasuku/concerns/models/taskables/url'
   require 'tasuku/concerns/models/taskables/verification'
+  require 'tasuku/concerns/models/taskables/code'
 end

data/lib/tasuku/concerns/models.rb

@@ -1,4 +1,5 @@
 module Tasuku::Concerns::Models
   require 'tasuku/concerns/models/task'
   require 'tasuku/concerns/models/taskables'
+  require 'tasuku/concerns/models/requirables'
 end

data/lib/tasuku/seeds.rb

@@ -7,6 +7,9 @@ task          = Tasks::Task.create! taskable: url_request
 text_request  = Tasks::Taskables::Text::Request.create! text: 'Write something'
 task          = Tasks::Task.create! taskable: text_request
 
+code_request  = Tasks::Taskables::Code::Request.create! text: 'Enter the code', code: '1337'
+task          = Tasks::Task.create! taskable: code_request
+
 question      = Tasks::Taskables::Question.create! text: 'Choose something'
 option        = Tasks::Taskables::Question::Option.create! question: question, text: 'One option'
 option        = Tasks::Taskables::Question::Option.create! question: question, text: 'Another option'

data/lib/tasuku/version.rb

@@ -1,3 +1,3 @@
 module Tasuku
-  VERSION = '0.1.1'
+  VERSION = '1.0.1'
 end