typed_form 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e20316dde02ffffb4d493a7f20b90f96aea947
-  data.tar.gz: a420c807742102952a4b2a2af4e21105b69832d0
+  metadata.gz: ab5449edccd43bad3e14733d9b82bb90de304bf8
+  data.tar.gz: 6b073c538628ecc3c444c0f74831ebf8517dcff4
 SHA512:
-  metadata.gz: 5490138b490865e105087be1be998b2f6b0e2ba2e78532f921ed13e5658ff16912828ba841491f995e9f7187cffe2bfa2027c2563a7cbf0c3af2167291d0d2d2
-  data.tar.gz: '0659ee90598a0a52163129f1bfe606f656f6ad8fbc2ab999b5210ca869cca284058089063a7dc8fa7ba278693ae7d61ef1b59f3f2c97a775fe2db2bee5e47333'
+  metadata.gz: dd0c5d90fedf79764a064b5afd998cf7eea2560ac29eaff4bf83ab16791186bbf30269f60a4963ace0f2a9f7b6390ad477334e1bf80c976091b3ade1c91b0913
+  data.tar.gz: 0b51cd19c52a243fca662e09a24f822d037f82d0d4493231dae920f0b091c69cbb8425657447d9566314ef22b3d96bb6516e9d6d3598c335b8b408307b9ba18f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+### [0.1.4] - 2017-03-16
+
+Strips additional whitespace and isolates whitespace stripping behavior to a Util class, to allow for easier test coverage. Adds raw_json accessors to models where we normalize JSON input to allow for end-users to determine whether they want clean/normalized JSON or the original results from Typeform. This prevents mismatches in the regular expression => attribute matching in VirtualModel, which were running into issues when `" " != " "`, preventing the regular expressions from matching.
+
 ### [0.1.3] - 2017-03-16
 
 Adds support for typecasting Yes/No and Terms of Service fields in TypedForm::VirtualModel. Adds "original_answer" field to Questions to preserve original values, either for debugging purposes or for situations where typecasting is not desirable.  

data/lib/typed_form/form.rb

@@ -1,5 +1,8 @@
 module TypedForm
   # A representation of the Typeform Form Data for a single form response.
+  #
+  # @attr_reader [String] raw_json Unformatted JSON data from an incoming
+  #   Typeform Webhook.
   class Form
     extend Forwardable
 
@@ -11,6 +14,8 @@ module TypedForm
     # @see FormSubmission#questions
     def_delegators :submission, :questions
 
+    attr_reader :raw_json
+
     # Creates a new instance of a Form, to allow querying
     #
     # @params [String] json Typeform Data API JSON input for form.
@@ -18,10 +23,8 @@ module TypedForm
       @raw_json = json
     end
 
-    # Removes non-breaking spaces (character point 160) from TypeForm data
-    # before beginning processing.
     def json
-      @_json ||= @raw_json.gsub("\\u00a0", " ")
+      @_json ||= Util.normalize_spaces(@raw_json)
     end
 
     # Uses the Typeform API client to query/find the form based on the form_id

data/lib/typed_form/util.rb

@@ -0,0 +1,10 @@
+module TypedForm
+  # General utility functions used in multiple areas in the gem.
+  class Util
+    # Removes non-breaking spaces (character point 160) from TypeForm data
+    # before beginning processing.
+    def self.normalize_spaces(text)
+      text.gsub("\\u00a0", " ").gsub(/[[:space:]]/, " ")
+    end
+  end
+end

data/lib/typed_form/version.rb

@@ -1,4 +1,4 @@
 module TypedForm
   # Up-to-date version of gem.
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/typed_form/virtual_model.rb

@@ -54,7 +54,9 @@ module TypedForm
     private
 
     def find_answer_to(text)
-      question = form.questions.detect { |q| q.text.match Regexp.new(text) }
+      question = form.questions.detect do |q|
+        q.text.match Regexp.new Util.normalize_spaces(text)
+      end
       return unless question
       question.answer
     end

data/lib/typed_form/webhook.rb

@@ -4,7 +4,8 @@ module TypedForm
   #
   # @see https://www.typeform.com/help/webhooks/ Typeform Webhook Docs
   #
-  # @attr_reader [String] json JSON data from an incoming Typeform Webhook
+  # @attr_reader [String] raw_json Unformatted JSON data from an incoming
+  #   Typeform Webhook.
   class Webhook
     extend Forwardable
 
@@ -16,12 +17,17 @@ module TypedForm
     # @!method form_id
     #   @return [String] The form ID from the webhook submission.
     def_delegators :form_response, :form_id
-    attr_reader :json
+
+    attr_reader :raw_json
 
     # Creates a new webhook object from an incoming Typeform Data stream.
     # @param [String] json JSON Data from a Typeform Webhook
     def initialize(json:)
-      @json = json.freeze
+      @raw_json = json
+    end
+
+    def json
+      @_json ||= Util.normalize_spaces(@raw_json).freeze
     end
 
     # Retrieves the Token from the Webhook JSON data.

data/lib/typed_form.rb

@@ -3,6 +3,7 @@ require "forwardable"
 require "arendelle"
 require "date"
 require "typed_form/api/client"
+require "typed_form/util"
 require "typed_form/form_data/parsed_json"
 require "typed_form/form_data/question"
 require "typed_form/form_data/answers"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_form
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rob Cole
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -141,6 +141,7 @@ files:
 - lib/typed_form/form_data/form_submission.rb
 - lib/typed_form/form_data/parsed_json.rb
 - lib/typed_form/form_data/question.rb
+- lib/typed_form/util.rb
 - lib/typed_form/version.rb
 - lib/typed_form/virtual_model.rb
 - lib/typed_form/webhook.rb