fastapi 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328f3a1e05457ead48ba2c6d01c09bfd7dcdfeb0
-  data.tar.gz: 40861b7243fede0344304840c81344e3c1a06db4
+  metadata.gz: f63fbcf57897ab8ecee8a900a93516b97acff713
+  data.tar.gz: 423602ac6ead2c5a13601358a5d6dc0cd908dc9f
 SHA512:
-  metadata.gz: 18773bd2adf7042592c600e7a00c4c0af2514d39796f20dfe195f6eb789396ed40facbf52e46b63fcebf81b7775b648773e7f0da82c9acdce2207f0e2587df9e
-  data.tar.gz: 7d21483a9259b0d76c78aac7d40afb0d499b4924855255b622fdd4998a20d306281956f72fa093eb57ac6beae9da76fc8a52342c23088e88a77643db4216d0ae
+  metadata.gz: 427a8df5aa5fb190764684dfbc50aca87c78fe430b860c0e94898f72d78c5c16791682fdb8f9f49e0b9fbcddd72090f4679370db924a295ea1d4cde2f02f1928
+  data.tar.gz: aceba336fc6a779b0e26e0a4f59aa5965bdcbf02446147b478ced92eac26bd6b0c23b5470ee281ec2506fc59f494a2b66d7e674a6296c29fdf18c81663d461ef

data/lib/fastapi.rb

@@ -236,7 +236,7 @@ class FastAPI
           types: model.fastapi_fields_sub.map { |field| (columns_hash.has_key? field.to_s) ? columns_hash[field.to_s].type : nil },
         }
       end
-      # model_lookup = model_lookup.map { |model| }
+
       error = nil
 
       begin
@@ -306,7 +306,7 @@ class FastAPI
 
       my_end = Time.now()
 
-      # logger.info dataset.size.to_s + '-length array parsed in ' + (my_end - start).to_s
+      # puts dataset.size.to_s + '-length array parsed in ' + (my_end - start).to_s
 
       {
         data: dataset,
@@ -337,31 +337,46 @@ class FastAPI
 
       while i < len
 
-        if str[i] == ')'
+        c = str[i]
+
+        if c == ')'
 
           rows << cur_row
           cur_row = {}
           entry_index = 0
           i = i + 3
 
-        elsif str[i] == '"'
+        elsif c == '"'
 
           i = i + 1
           nextIndex = str.index('"', i)
 
           while str[nextIndex - 1] == '\\'
+
+            j = 1
+            while str[nextIndex - j] == '\\'
+              j = j + 1
+            end
+
+            if j & 1 == 1
+              break
+            end
+
             nextIndex = str.index('"', nextIndex + 1)
+
           end
 
           cur_row[fields[entry_index]] = api_convert_type(str[i...nextIndex], types[entry_index])
           entry_index = entry_index + 1
 
           i = nextIndex + 1
+
         else
 
-          if str[i] == ','
+          if c == ','
             i = i + 1
           end
+
           parensIndex = str.index(')', i)
           nextIndex = str.index(',', i)
 
@@ -394,6 +409,7 @@ class FastAPI
 
     end
 
+
     def api_comparison(comparator, value)
 
       if comparator == 'is'
@@ -595,7 +611,7 @@ class FastAPI
             if model.nil? and self_obj.reflect_on_all_associations(:has_many).map(&:name).include? key
 
               filter_result = parse_filters(value, safe, field.singularize.classify.constantize)
-              # logger.info filter_result
+              # puts filter_result
               filter_has_many[key] = filter_result[:main]
               order_has_many[key] = filter_result[:main_order]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastapi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Keith Horwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj