questionable_surveys 0.1.6 → 0.2.0

data/README.rdoc

@@ -13,6 +13,10 @@ the questions and recording your users' answers.
 
 Add Questionable to your Gemfile:
 
+  gem 'questionable_surveys'
+
+or for the latest:
+
   gem 'questionable_surveys', :git => 'git://github.com/bespokepost/questionable.git'
 
 Then run:

data/app/controllers/questionable/answers_controller.rb

@@ -2,36 +2,7 @@ require_dependency "questionable/application_controller"
 
 module Questionable
   class AnswersController < ApplicationController
-    respond_to :html, :js
-
     def create
-      assignment = Assignment.find(params[:assignment_id])
-
-      a = Answer.new
-      a.assign_attributes({
-        assignment: assignment,
-        user: current_user, 
-        option_id: params[:answer][:option_id],
-        message:   (params[:answer][:message] || '')[0..255]
-      }, without_protection: true)
-
-      if a.save
-        respond_to do |format|
-          format.html { redirect_to :back }
-          format.js   { render :text => 'Ok' }
-        end
-      else
-        respond_to do |format|
-          format.html do 
-            flash[:info] = 'Error saving Answer'
-            redirect_to :back
-          end 
-          format.js { render :text => 'Error' }
-        end
-      end
-    end
-
-    def create_multiple
       answers = params[:answers] 
 
       if answers.is_a?(Hash)
@@ -49,7 +20,12 @@ module Questionable
             date = answers.first
             if date[:year].present? or date[:month].present? or date[:day].present?
               if date[:year].present? and date[:month].present? and date[:day].present?
-                assignment.answers.create(user_id: current_user.id, message: "#{date[:year]}-#{date[:month]}-#{date[:day]}")
+                answer = assignment.answers.build(user_id: current_user.id, message: "#{date[:year]}-#{date[:month]}-#{date[:day]}")
+                if answer.date_answer.nil?
+                  flash[:warn] = 'Could not save date. Invalid date.'
+                else
+                  answer.save
+                end
               else
                 flash[:warn] = 'Could not save date. You did not select all three fields.'
               end

data/app/models/questionable/answer.rb

@@ -7,20 +7,12 @@ module Questionable
     belongs_to :option
     has_one :question, :through => :assignment
 
-=begin
-    def self.build_answers_for_subject(user, subject)
-      if subject.kind_of?(Symbol) or subject.kind_of?(String)
-        assignments = Questionable::Assignment.where(:subject_type => subject)
-      else
-        assignments = Questionable::Assignment.where(:subject_type => subject.class.to_s, :subject_id => subject.id)
-      end
+    def date_answer
+      return nil if message.nil?
 
-      assignments = assignments.order(:position)
-      assignments.map { |as| as.answers_for_user(user) }
+      self.message.to_date
+    rescue ArgumentError
+      nil
     end
-=end
-
-    #  Questionable::Question.joins('INNER JOIN questionable_assignments ON questionable_assignments.question_id = questionable_questions.id').where(:questionable_assignments => { :subject_type => type }).order('questionable_assignments.position')
-
   end
 end

data/app/views/questionable/assignments/_form.html.haml

@@ -1,5 +1,5 @@
 
-= form_tag questionable.answers_create_multiple_path, method: :post, class: 'questions-form' do
+= form_tag questionable.answers_path, method: :post, class: 'questions-form' do
   - assignments.each do |a|
     .question-block{:id => "qa_#{a.id}", class: "question-#{a.question.id}"}
       - q = a.question
@@ -43,7 +43,7 @@
               =# select_date nil, field, order: [:month, :day, :year]
               =# date_select (Date.today - 20.years), field, order: [:month, :day, :year]
 
-              - date = selected_answers.first.try(:message).blank? ? nil : selected_answers.first.message.to_date
+              - date = selected_answers.first.try(:date_answer)
 
               .date-fields
                 = select_month date, {prompt: date.blank?}, name: "#{field}[month]", class: 'select-month'

data/config/routes.rb

@@ -1,7 +1,3 @@
 Questionable::Engine.routes.draw do
-  scope 'assignments/:assignment_id' do
-    resources :answers, :only => [:create]
-  end
-
-  post 'answers/create_multiple' => 'answers#create_multiple'
+  post 'answers' => 'answers#create'
 end

data/lib/questionable/version.rb

@@ -1,3 +1,3 @@
 module Questionable
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: questionable_surveys
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails engine that programatically generates surveys.