form_stalker 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b53d8d01b3c038a6691ea9d99be24f0053b575
-  data.tar.gz: 5bce75bc933758fd2f8b807e019f5f66432ed246
+  metadata.gz: 0d96318616918fc4c3cf5c6760c6f57f51584dc0
+  data.tar.gz: 81404c17b4881c0febe23dbcca08eb6f93350021
 SHA512:
-  metadata.gz: 681f0a9d056a3b80bfecce553e2b356005a7a6f945c3fd8291b381e0f9c989f84e2e22653546d18b414d669aaccaa02c4b09ef58ee3ac06c274b6eb8d9e6ead4
-  data.tar.gz: 43813697816d2fd2ec4ac68d3473d3855613cd6af788070ad6b9e3b27d6f20910497d5c6a9e480efe8f786daa34d8f3326e7e7b421c4f497fd408d26b7c51c32
+  metadata.gz: 84e8abd04e8648bd8f03b054d4d84b925c060bdbfa28846976700699b9457086da41824e1300fbe62a0f4948057428829d765709402b008030cc679592af42ec
+  data.tar.gz: 807927350b715b584440ed5be4ace08943191195ee4a76e9fb8e8dc420a9febaa65d8b70ab827eceaacfe54c803b876734e24ce2f0cdfeafbaa3012c6788cef0

data/lib/form_stalker/data/check_logic.rb

@@ -24,26 +24,23 @@ module FormStalker
       protected ####################### PROTECTED ##############################
 
       def js_to_json(js_object)
-        split(js_object).map(&:strip).map do |js_string|
-          escape_js_to_json(js_string)
-        end.join(', ')
+        json_converted_keys = convert_keys(js_object)
+
+        convert_values(json_converted_keys)
       end
 
       private ######################### PRIVATE ################################
 
-      def split(js_object)
-        js_object
-          .split(/(,)(?=(?:[^']|'[^']*')*$)/)
-          .reject { |string| string == ',' }
+      def convert_keys(js_object)
+        js_object.gsub(/([a-zA-Z]+):/, '"\1":')
       end
 
-      def escape_js_to_json(js_string)
-        string = js_string.tr('"', '\"')
-                          .tr("'", '"')
-                          .gsub('{', '{"')
-                          .gsub(':', '":')
+      def convert_values(js_object)
+        js_object.gsub(/'(.*?(?<!\\))'/) do |match|
+          value = match.gsub(/^'/, '').gsub(/'$/, '')
 
-        ['"', '{'].include?(string[0]) ? string : "\"#{string}"
+          "\"#{value}\""
+        end
       end
     end
   end

data/lib/form_stalker/version.rb

@@ -1,3 +1,3 @@
 module FormStalker
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: form_stalker
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - StreetBees Dev Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr