survey-gizmo-ruby 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49463d6fa875d93712a1da0951dac1e0053747ee
-  data.tar.gz: 339404fe4dae766bd04abc675cd7fbd34f244488
+  metadata.gz: 9e8d3c3ad7b01fbcd010738d2a5cf49376162df8
+  data.tar.gz: b7718a4435ea2b88abe17d460698b1104b2d6b02
 SHA512:
-  metadata.gz: 38c186f0d5e12964b5b559aeb0c674c2291d1ade6f0518c7ed681e806cb3a56cb05d791b5f9374655cc81fe491853406c74d5dab72ba126aa668195963d4ca08
-  data.tar.gz: ea37139f7d8fdad647d2b38db73cef15a065b6b6098a05efbbd911e8dda70404b8979bb42e6fad9f1b9eeaa41f1df49e8ddb8e0f7f34708569255f1823ebd388
+  metadata.gz: 3f9484c0436ffe3d78b5a0b68e0fe208ed3144480f7e0e7aefc3a4bb346e9f783b553d99dd542c5c9d6040ff263c9469472598137c40670f6c10925bf99aed05
+  data.tar.gz: 165082ee6af357726b193f86c6ef5c803a66fb7b77c21c43292254bcbc096403050c6b6ca7ec48611639664c7ee9fcbda570a2a3514f8ca634547c7520d64a35

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0

data/README.md

@@ -1,5 +1,7 @@
 # Survey Gizmo (ruby)
 
+[![Build Status](https://travis-ci.org/jarthod/survey-gizmo-ruby.svg?branch=master)](https://travis-ci.org/jarthod/survey-gizmo-ruby)
+
 Integrate with the [Survey Gizmo API](http://apisurveygizmo.helpgizmo.com/help) using an ActiveModel style interface.
 
 Currently supports SurveyGizmo API **v4** (default) and **v3**.

data/lib/survey_gizmo/api/page.rb

@@ -20,14 +20,17 @@ module SurveyGizmo; module API
     end
 
     def questions
-      # See note about broken subquestions in resource.rb
-      @questions.flat_map { |q| q.sub_question_skus }.each do |sku|
-        sku = sku[1] if sku.is_a?(Array)
-        next if @questions.find { |q| q.id == sku }
-        @questions << Question.first(children_params.merge(id: sku))
+      @questions.each { |q| q.attributes = children_params }
+      return @questions if @questions.all? { |q| q.sub_question_skus.all? { |sku| @questions.find { |q| q.id == sku } } }
+
+      # See note on broken subquestions in resource.rb.
+      with_subquestions = @questions
+      @questions.each do |q|
+        with_subquestions.reject! { |q| q.sub_question_skus.include?(q.id) }
+        with_subquestions += q.sub_questions
       end
 
-      @questions.each { |q| q.attributes = children_params }
+      @questions = with_subquestions.each { |q| q.attributes = children_params }
     end
   end
 end; end

data/lib/survey_gizmo/api/question.rb

@@ -43,12 +43,16 @@ module SurveyGizmo; module API
       @parent_question ||= Question.first(survey_id: survey_id, id: parent_question_id)
     end
 
+    def sub_question_skus
+      # As of 2015-12-23, the sub_question_skus attribute can either contain an array of integers if no shortname (alias)
+      # was set for any question, or an array of [String, Integer] with the String corresponding to the subquestion
+      # shortname and the integer corresponding to the subquestion id if at least one shortname was set.
+      @sub_question_skus.map { |sku| sku.is_a?(Array) ? sku[1] : sku }
+    end
+
     def sub_questions
       @sub_questions ||= sub_question_skus.map do |sku|
-        # As of 2015-12-23, the sub_question_skus attribute can either contain an array of integers if no shortname (alias)
-        # was set for any question, or an array of [String, Integer] with the String corresponding to the subquestion
-        # shortname and the integer corresponding to the subquestion id if at least one shortname was set.
-        sku = sku[1] if sku.is_a?(Array)
+        SurveyGizmo.configuration.logger.warn("Have to do individual load of sub question #{sku}...")
         subquestion = Question.first(survey_id: survey_id, id: sku)
         subquestion.parent_question_id = id
         subquestion

data/lib/survey_gizmo/configuration.rb

@@ -72,7 +72,7 @@ module SurveyGizmo
       @api_url = DEFAULT_REST_API_URL
       @api_version = DEFAULT_API_VERSION
       @results_per_page = DEFAULT_RESULTS_PER_PAGE
-      @logger = ::Logger.new(STDOUT)
+      @logger = SurveyGizmo::Logger.new(STDOUT)
       @api_debug = ENV['GIZMO_DEBUG'].to_s =~ /^(true|t|yes|y|1)$/i
     end
   end

data/lib/survey_gizmo/logger.rb

@@ -0,0 +1,9 @@
+require 'logger'
+
+module SurveyGizmo
+  class Logger < ::Logger
+    def format_message(severity, timestamp, progname, msg)
+      "#{timestamp.strftime('%Y-%m-%d %H:%M:%S')} #{severity} #{msg}\n"
+    end
+  end
+end

data/lib/survey_gizmo/version.rb

@@ -1,3 +1,3 @@
 module SurveyGizmo
-  VERSION = '5.0.2'
+  VERSION = '5.0.3'
 end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ RSpec.configure do |config|
     SurveyGizmo.configure do |config|
       config.user = 'test@test.com'
       config.password = 'password'
-      config.logger.level = Logger::WARN
+      config.logger.level = Logger::FATAL
     end
 
     Pester.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: survey-gizmo-ruby
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Kabari Hendrick
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -191,6 +191,7 @@ files:
 - ".document"
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -210,6 +211,7 @@ files:
 - lib/survey_gizmo/connection.rb
 - lib/survey_gizmo/faraday_middleware/parse_survey_gizmo.rb
 - lib/survey_gizmo/faraday_middleware/pester_survey_gizmo.rb
+- lib/survey_gizmo/logger.rb
 - lib/survey_gizmo/multilingual_title.rb
 - lib/survey_gizmo/resource.rb
 - lib/survey_gizmo/version.rb
@@ -259,4 +261,3 @@ test_files:
 - spec/test_json/page.json
 - spec/test_json/question.json
 - spec/test_json/survey.json
-has_rdoc: