rapidfire 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf282cfdca2422d38ece7af4cb87094810907d87
-  data.tar.gz: e9270a2229db1cb26aa3e502446756e0975be8e2
+  metadata.gz: 98a860721e84efa9238468ab8d4de455acfc1004
+  data.tar.gz: d4a2bbade0997c99ac53d8344dc07a7f56e67b80
 SHA512:
-  metadata.gz: e06b07da985f333727aa9673f3551b1e06aa0cbfc34ab0c883d574462c22bdf6fbe13a5603c06ef685331039a410bfb7e9fed6e70d01b1e25679deda62cd565f
-  data.tar.gz: 55bad4a32186f3fca55958be7c5e8a7703f59d7064394cfe040c0aadc7b99961876a555cd66f361520979c4f5622c6e3d8004059eeabf7c222559318221a1703
+  metadata.gz: 859a4f282ae1505193d540ef46137d229a5efc4d2797d2640cc47fcea265151145071617b404a7fbcf4c48a2eec5e2acb1e02ed54127b546894406b48badf545
+  data.tar.gz: d8f1a0e3645f7ceb8e84e11e407d0d75dbb6763dfbb827e7c27965e9364745324e968f8ef1883a9339636b6929da4ee8c1381842b79b32f31d2d1ef84165c44a

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 Yuva Kumar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -185,6 +185,39 @@ The typical flow about how to use this gem is:
    creating questions fail.
 
 
+## Notes on upgrading
+##### Upgrading from 1.2.0 to 2.0.0
+
+The default delimiter which is used to store options for questions like select
+input, multiple answers for checkbox question is comma (,). This resulted in
+problems where gem is unable to parse options properly if answers also contain
+commas. For more information see [issue-19](https://github.com/code-mancers/rapidfire/issues/19).
+
+Starting from version `2.0.0` default delimiter is changed to `\r\n`, but a
+configuration is provided to change the delimiter. Please run this rake task
+to make existing questions or stored answers to use new delimiter.
+
+NOTE: Please take database backup before running this rake task.
+
+```ruby
+  bundle exec rake rapidfire:change_delimiter_from_comma_to_srsn
+```
+
+
+If you dont want to make this change rightaway, and would like to use comma
+as delimiter, then please use this initializer, but be warned that in future
+delimiter will be hardcoded to `\r\n`:
+
+
+```ruby
+# /<path-to-app>/config/initializers/rapidfire.rb
+
+Rapidfire.config do |config|
+  config.answers_delimiter = ','
+end
+```
+
+
 ## TODO
 1. Add ability to sort questions, so that order is preserved.
 2. Add multi tenant support.

data/app/helpers/rapidfire/application_helper.rb

@@ -6,7 +6,9 @@ module Rapidfire
     end
 
     def checkbox_checked?(answer, option)
-      answer.answer_text.to_s.split(",").include?(option)
+      answers_delimiter = Rapidfire.answers_delimiter
+      answers = answer.answer_text.to_s.split(answers_delimiter)
+      answers.include?(option)
     end
   end
 end

data/app/models/rapidfire/questions/checkbox.rb

@@ -4,14 +4,14 @@ module Rapidfire
       validates :answer_options, :presence => true
 
       def options
-        answer_options.split(/\r?\n/)
+        answer_options.split(Rapidfire.answers_delimiter)
       end
 
       def validate_answer(answer)
         super(answer)
 
         if rules[:presence] == "1" || answer.answer_text.present?
-          answer.answer_text.split(",").each do |value|
+          answer.answer_text.split(Rapidfire.answers_delimiter).each do |value|
             answer.errors.add(:answer_text, :invalid) unless options.include?(value)
           end
         end

data/app/models/rapidfire/questions/select.rb

@@ -4,7 +4,7 @@ module Rapidfire
       validates :answer_options, :presence => true
 
       def options
-        answer_options.split(/\r?\n/)
+        answer_options.split(Rapidfire.answers_delimiter)
       end
 
       def validate_answer(answer)

data/app/services/rapidfire/answer_group_builder.rb

@@ -15,8 +15,17 @@ module Rapidfire
       params.each do |question_id, answer_attributes|
         if answer = @answer_group.answers.find { |a| a.question_id.to_s == question_id.to_s }
           text = answer_attributes[:answer_text]
+
+          # in case of checkboxes, values are submitted as an array of
+          # strings. we will store answers as one big string separated
+          # by delimiter.
           answer.answer_text =
-            text.is_a?(Array) ? strip_checkbox_answers(text).join(',') : text
+            if text.is_a?(Array)
+              stripped_answers = strip_checkbox_answers(text)
+              stripped_answers.join(Rapidfire.answers_delimiter)
+            else
+              text
+            end
         end
       end
 
@@ -25,7 +34,7 @@ module Rapidfire
 
     def save(options = {})
       save!(options)
-    rescue Exception => e
+    rescue ActiveRecord::ActiveRecordError => e
       # repopulate answers here in case of failure as they are not getting updated
       @answers = @question_group.questions.collect do |question|
         @answer_group.answers.find { |a| a.question_id == question.id }

data/app/services/rapidfire/question_group_results.rb

@@ -14,9 +14,11 @@ module Rapidfire
           case question
           when Rapidfire::Questions::Select, Rapidfire::Questions::Radio,
             Rapidfire::Questions::Checkbox
-            answers = question.answers.map(&:answer_text).map { |text| text.split(',') }.flatten
-            answers.inject(Hash.new(0)) { |total, e| total[e] += 1; total }
+            answers = question.answers.map(&:answer_text).map do |text|
+              text.to_s.split(Rapidfire.answers_delimiter)
+            end.flatten
 
+            answers.inject(Hash.new(0)) { |total, e| total[e] += 1; total }
           when Rapidfire::Questions::Short, Rapidfire::Questions::Date,
             Rapidfire::Questions::Long, Rapidfire::Questions::Numeric
             question.answers.pluck(:answer_text)

data/lib/rapidfire.rb

@@ -3,4 +3,14 @@ require "rapidfire/engine"
 module Rapidfire
   class AccessDenied < StandardError
   end
+
+  # configuration which will be used as delimiter in case answers are bunch
+  # of collection values. This is the default delimiter which is used by
+  # all the browsers.
+  mattr_accessor :answers_delimiter
+  self.answers_delimiter = "\r\n"
+
+  def self.config
+    yield(self)
+  end
 end

data/lib/rapidfire/version.rb

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

data/lib/tasks/change_delimiter_to_srsn.rake

@@ -0,0 +1,16 @@
+desc 'Earlier delimiter used to be comma(,), but for #19, delimter is changed to \r\n'
+namespace :rapidfire do
+  task change_delimiter_from_comma_to_srsn: :environment do
+    Rapidfire::Question.transaction do
+      Rapidfire::Question.all.each do |question|
+        if question.is_a?(Rapidfire::Questions::Checkbox) ||
+            question.is_a?(Rapidfire::Questions::Select)
+
+          new_answer_options = question.answer_options.split(',')
+            .join(Rapidfire.answers_delimiter)
+          question.update_attributes!(answer_options: new_answer_options)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rapidfire
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yuva Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: quiet_assets
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   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'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   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'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   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'
 - !ruby/object:Gem::Dependency
@@ -140,28 +140,28 @@ dependencies:
   name: capybara-webkit
   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'
 - !ruby/object:Gem::Dependency
   name: launchy
   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!.
@@ -171,6 +171,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/rapidfire/application.js
 - app/assets/stylesheets/rapidfire/application.css
 - app/controllers/rapidfire/answer_groups_controller.rb
@@ -221,33 +224,33 @@ files:
 - db/migrate/20130502195415_create_rapidfire_answer_groups.rb
 - db/migrate/20130502195504_create_rapidfire_answers.rb
 - lib/generators/rapidfire/views_generator.rb
+- lib/rapidfire.rb
 - lib/rapidfire/engine.rb
 - lib/rapidfire/version.rb
-- lib/rapidfire.rb
+- lib/tasks/change_delimiter_to_srsn.rake
 - lib/tasks/rapidfire_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/code-mancers/rapidfire
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message: |
+  There is breaking delimiter change when upgrading to version 2.0.0.
+  Please see Readme for more information.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Surveys made easy.