rapidfire 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a860721e84efa9238468ab8d4de455acfc1004
-  data.tar.gz: d4a2bbade0997c99ac53d8344dc07a7f56e67b80
+  metadata.gz: c5931093a48962d9159db2f33f779444a64ebec1
+  data.tar.gz: 91f3a91079f2e3588373f6c6056fcf79275b8e57
 SHA512:
-  metadata.gz: 859a4f282ae1505193d540ef46137d229a5efc4d2797d2640cc47fcea265151145071617b404a7fbcf4c48a2eec5e2acb1e02ed54127b546894406b48badf545
-  data.tar.gz: d8f1a0e3645f7ceb8e84e11e407d0d75dbb6763dfbb827e7c27965e9364745324e968f8ef1883a9339636b6929da4ee8c1381842b79b32f31d2d1ef84165c44a
+  metadata.gz: 58aa967e0dd9018371d7acdc8158457aecc6941f9489e80a9fd04e198dad2db050d5cd25d2aba0bfedd94bdf9f43ce60f0e29ff4b3bf068309070f2b96eaee37
+  data.tar.gz: b5d67e8d5c7a7bf06286641f188cc3e7543e2fd88ccb7a14c0cfa46cac090b72e3c982c9d785aed4e2d8beea2803de5837069660d1f994888d2a35909b671376

data/app/controllers/rapidfire/question_groups_controller.rb

@@ -1,31 +1,38 @@
 module Rapidfire
   class QuestionGroupsController < Rapidfire::ApplicationController
     before_filter :authenticate_administrator!, except: :index
-    respond_to :html, :js
-    respond_to :json, only: :results
 
     def index
       @question_groups = QuestionGroup.all
-      respond_with(@question_groups)
     end
 
     def new
       @question_group = QuestionGroup.new
-      respond_with(@question_group)
     end
 
     def create
       @question_group = QuestionGroup.new(question_group_params)
-      @question_group.save
-
-      respond_with(@question_group, location: rapidfire.question_groups_url)
+      if @question_group.save
+        respond_to do |format|
+          format.html { redirect_to question_groups_path }
+          format.js
+        end
+      else
+        respond_to do |format|
+          format.html { render :new }
+          format.js
+        end
+      end
     end
 
     def destroy
       @question_group = QuestionGroup.find(params[:id])
       @question_group.destroy
 
-      respond_with(@question_group)
+      respond_to do |format|
+        format.html { redirect_to question_groups_path }
+        format.js
+      end
     end
 
     def results
@@ -33,7 +40,11 @@ module Rapidfire
       @question_group_results =
         QuestionGroupResults.new(question_group: @question_group).extract
 
-      respond_with(@question_group_results, root: false)
+      respond_to do |format|
+        format.json { render json: @question_group_results, root: false }
+        format.html
+        format.js
+      end
     end
 
     private

data/app/controllers/rapidfire/questions_controller.rb

@@ -1,48 +1,68 @@
 module Rapidfire
   class QuestionsController < Rapidfire::ApplicationController
     before_filter :authenticate_administrator!
-    respond_to :html, :js
 
     before_filter :find_question_group!
     before_filter :find_question!, :only => [:edit, :update, :destroy]
 
     def index
       @questions = @question_group.questions
-      respond_with(@questions)
     end
 
     def new
-      @question = QuestionForm.new(:question_group => @question_group)
-      respond_with(@question)
+      @question_form = QuestionForm.new(:question_group => @question_group)
     end
 
     def create
       form_params = params[:question].merge(:question_group => @question_group)
-      @question = QuestionForm.new(form_params)
-      @question.save
+      @question_form = QuestionForm.new(form_params)
+      @question_form.save
 
-      respond_with(@question, location: index_location)
+      if @question_form.errors.empty?
+        respond_to do |format|
+          format.html { redirect_to index_location }
+          format.js
+        end
+      else
+        respond_to do |format|
+          format.html { render :new }
+          format.js
+        end
+      end
     end
 
     def edit
-      @question = QuestionForm.new(:question => @question)
-      respond_with(@question)
+      @question_form = QuestionForm.new(:question => @question)
     end
 
     def update
       form_params = params[:question].merge(:question => @question)
-      @question = QuestionForm.new(form_params)
-      @question.save
+      @question_form = QuestionForm.new(form_params)
+      @question_form.save
 
-      respond_with(@question, location: index_location)
+      if @question_form.errors.empty?
+        respond_to do |format|
+          format.html { redirect_to index_location }
+          format.js
+        end
+      else
+        respond_to do |format|
+          format.html { render :edit }
+          format.js
+        end
+      end
     end
 
     def destroy
       @question.destroy
-      respond_with(@question, location: index_location)
+      respond_to do |format|
+        format.html { redirect_to index_location }
+        format.js
+      end
     end
 
     private
+
     def find_question_group!
       @question_group = QuestionGroup.find(params[:question_group_id])
     end

data/app/services/rapidfire/question_form.rb

@@ -22,11 +22,7 @@ module Rapidfire
       :answer_minimum_length, :answer_maximum_length,
       :answer_greater_than_or_equal_to, :answer_less_than_or_equal_to
 
-    delegate :valid?, :errors, :id, :to => :question
-
-    def to_model
-      question
-    end
+    delegate :valid?, :errors, :to => :question
 
     def initialize(params = {})
       from_question_to_attributes(params[:question]) if params[:question]

data/app/views/rapidfire/questions/_form.html.erb

@@ -1,9 +1,9 @@
 <h3>Question</h3>
 
-<%= form_for [@question_group, question] do |f| %>
-  <%- unless question.errors.empty? %>
+<%= form_for form, as: :question, url: url, method: method do |f| %>
+  <%- unless form.errors.empty? %>
     <ul>
-      <%- question.errors.full_messages.each do |message| %>
+      <%- form.errors.full_messages.each do |message| %>
         <li><%= message %></li>
       <% end %>
     </ul>
@@ -36,5 +36,5 @@
   <%= f.label :answer_less_than_or_equal_to %>
   <%= f.text_field :answer_less_than_or_equal_to %>
 
-  <%= f.submit %>
+  <%= f.submit submit_text %>
 <% end %>

data/app/views/rapidfire/questions/edit.html.erb

@@ -1 +1 @@
-<%= render partial: 'form', locals: {question: @question} %>
+<%= render partial: 'form', locals: { form: @question_form, url: question_group_question_path(@question_group, @question), method: :put, submit_text: 'Update Question' } %>

data/app/views/rapidfire/questions/new.html.erb

@@ -1 +1 @@
-<%= render partial: 'form', locals: {question: @question} %>
+<%= render partial: 'form', locals: { form: @question_form, url: question_group_questions_path(@question_group), method: :post, submit_text: 'Create Question' } %>

data/lib/rapidfire/version.rb

@@ -1,3 +1,3 @@
 module Rapidfire
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapidfire
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Yuva Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,16 +70,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: One stop solution for all survey related requirements! Its tad easy!.
 email:
 - yuva@codemancers.com
@@ -250,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Surveys made easy.