fastapi 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914c5c91b0fd3b9f2b81b4da4d27554b05d254a5
-  data.tar.gz: ee22069497c8ba7c7704f60bbaf8a94af1df8ce2
+  metadata.gz: 91ec2057fc92dc867573e641cf9afbc4cf34908e
+  data.tar.gz: 3ebb509840114634d4279516fc2b939f08910f94
 SHA512:
-  metadata.gz: 267c4b35d3474ac545f24683baa22e7e4d1012de69c4cfb7d7dad20213d59a6a0816d2c951ed9db18f80d96da1c6e192a8168dbbaf1d4870c3f82fa702040083
-  data.tar.gz: 57fbf90fa9d58518b669aa95acec4f9b3904199e3c24609c8e0a9b0bd02e45d2fe87b10b88281302fec53e9035fc9cf9f205d009e8a9128ee81eeadc674cedb7
+  metadata.gz: 27e8290f2b34ac378c0b6fae534971199299c5277b49131728845ce6427e13df772ee47860515180edfc21b02eb8eefb7c2628d4e1030b4283e7ff960e93723b
+  data.tar.gz: 783b73a2ab2cd26af95cbededc10e887b45c0287a8992f6f65a1788f43d4286c28cdbcf6fe5a5288848be23d936799731c72c37c3cfa9c3464ffe0654e77ab71

data/lib/fastapi.rb

@@ -37,7 +37,7 @@ class FastAPI
 
   # Create and execute an optimized SQL query based on specified filters
   #
-  # @param fields [Array] an array containing fields to whitelist for the SQL query
+  # @param fields [Array] an array containing fields to whitelist for the SQL query. Can also pass in fields as arguments.
   # @return [FastAPI] the current instance
   def whitelist(fields = [])
 
@@ -312,11 +312,19 @@ class FastAPI
               currow[obj_name] = {}
             end
 
-            currow[obj_name][field.to_sym] = api_convert_type(val, model.columns_hash[field].type)
+            currow[obj_name][field.to_sym] = api_convert_type(
+              val,
+              model.columns_hash[field].type,
+              (model.columns_hash[field].respond_to?('array') and model.columns_hash[field].array)
+            )
 
           elsif @model.columns_hash[field]
 
-            currow[field.to_sym] = api_convert_type(val, @model.columns_hash[field].type)
+            currow[field.to_sym] = api_convert_type(
+              val,
+              @model.columns_hash[field].type,
+              (@model.columns_hash[field].respond_to?('array') and @model.columns_hash[field].array)
+            )
 
           end
 
@@ -340,6 +348,85 @@ class FastAPI
 
     end
 
+    # the two following methods are very similar, can reuse
+
+    def parse_postgres_array(str)
+
+      i = 0
+      len = str.length
+
+      values = []
+
+      i = str.index('{')
+
+      return values unless i
+
+      i = i + 1
+
+      while i < len
+
+        c = str[i]
+
+        if c == '}'
+
+          break
+
+        elsif c == '"'
+
+          i += 1
+          nextIndex = str.index('"', i)
+
+          while str[nextIndex - 1] == '\\'
+
+            j = 1
+            while str[nextIndex - j] == '\\'
+              j += 1
+            end
+
+            if j & 1 == 1
+              break
+            end
+
+            nextIndex = str.index('"', nextIndex + 1)
+
+          end
+
+          values.push str[i...nextIndex]
+
+          i = nextIndex + 1
+
+        else
+
+          if c == ','
+
+            values.push nil
+            i += 1
+            next
+
+          end
+
+          parensIndex = str.index('}', i)
+          nextIndex = str.index(',', i)
+
+          if nextIndex.nil? or nextIndex > parensIndex
+
+            values.push str[i...parensIndex]
+            break
+
+          end
+
+          values.push str[i...nexIndex]
+
+          i = nextIndex + 1
+
+        end
+
+      end
+
+      return values
+
+    end
+
     def parse_many(str, fields = [], types = [])
 
       rows = []
@@ -432,31 +519,37 @@ class FastAPI
     end
 
 
-    def api_comparison(comparator, value)
+    def api_comparison(comparator, value, field, type, is_array)
+
+      unless is_array
+        field_string = field
+      else
+        field_string = 'ANY(' + field + ')'
+      end
 
       if comparator == 'is'
 
-        ' = ' + ActiveRecord::Base.connection.quote(value.to_s)
+        ActiveRecord::Base.connection.quote(value.to_s) + ' = ' + field_string
 
       elsif comparator == 'not'
 
-        ' <> ' + ActiveRecord::Base.connection.quote(value.to_s)
+        ActiveRecord::Base.connection.quote(value.to_s) + ' <> ' + field_string
 
       elsif comparator == 'gt'
 
-        ' > ' + ActiveRecord::Base.connection.quote(value.to_s)
+        ActiveRecord::Base.connection.quote(value.to_s) + ' < ' + field_string
 
       elsif comparator == 'gte'
 
-        ' >= ' + ActiveRecord::Base.connection.quote(value.to_s)
+        ActiveRecord::Base.connection.quote(value.to_s) + ' <= ' + field_string
 
       elsif comparator == 'lt'
 
-        ' < ' + ActiveRecord::Base.connection.quote(value.to_s)
+        ActiveRecord::Base.connection.quote(value.to_s) + ' > ' + field_string
 
       elsif comparator == 'lte'
 
-        ' <= ' + ActiveRecord::Base.connection.quote(value.to_s)
+        ActiveRecord::Base.connection.quote(value.to_s) + ' >= ' + field_string
 
       elsif comparator == 'in' or comparator == 'not_in'
 
@@ -470,33 +563,61 @@ class FastAPI
 
         end
 
-        if comparator == 'in'
-          ' IN(' + (value.map { |val| ActiveRecord::Base.connection.quote(val.to_s) }).join(',') + ')'
+        if is_array
+
+          type_convert = {
+            boolean: '::boolean',
+            integer: '::integer',
+            float: '::float'
+          }[type]
+
+          type_convert = '::text' if type.nil?
+
+          if comparator == 'in'
+            'ARRAY[' + (value.map { |val| ActiveRecord::Base.connection.quote(val.to_s) }).join(',') + ']' + type_convert + '[] && ' + field
+          else
+            'NOT ARRAY[' + (value.map { |val| ActiveRecord::Base.connection.quote(val.to_s) }).join(',') + ']' + type_convert + '[] && ' + field
+          end
+
         else
-          ' NOT IN(' + (value.map { |val| ActiveRecord::Base.connection.quote(val.to_s) }).join(',') + ')'
+
+          if comparator == 'in'
+            field + ' IN(' + (value.map { |val| ActiveRecord::Base.connection.quote(val.to_s) }).join(',') + ')'
+          else
+            field + ' NOT IN(' + (value.map { |val| ActiveRecord::Base.connection.quote(val.to_s) }).join(',') + ')'
+          end
+
         end
 
       elsif comparator == 'contains'
 
-        ' LIKE \'%\' || ' + ActiveRecord::Base.connection.quote(value.to_s) + ' || \'%\''
+        '\'%\' || ' + ActiveRecord::Base.connection.quote(value.to_s) + ' || \'%\' LIKE ' + field_string
 
       elsif comparator == 'icontains'
 
-        ' ILIKE \'%\' || ' + ActiveRecord::Base.connection.quote(value.to_s) + ' || \'%\''
+        '\'%\' || ' + ActiveRecord::Base.connection.quote(value.to_s) + ' || \'%\' ILIKE ' + field_string
 
       elsif comparator == 'is_null'
 
-        ' IS NULL'
+        'NULL = ' + field_string
 
       elsif comparator == 'not_null'
 
-        ' IS NOT NULL'
+        'NOT NULL = ' + field_string
 
       end
 
     end
 
-    def api_convert_type(val, type)
+    def api_convert_type(val, type, is_array = false)
+
+      return api_convert_value(val, type) unless is_array
+
+      return parse_postgres_array(val).map { |inner_value| api_convert_value(inner_value, type) }
+
+    end
+
+    def api_convert_value(val, type)
 
       if not val.nil?
         if type == :integer
@@ -691,6 +812,17 @@ class FastAPI
 
             elsif self_obj.column_names.include? field
 
+              base_field = self_string_table + '.' + field
+              field_string = base_field
+              is_array = false
+
+              if self_obj.columns_hash[field].respond_to?('array') and self_obj.columns_hash[field].array == true
+
+                field_string = 'ANY(' + field_string + ')'
+                is_array = true
+
+              end
+
               if self_obj.columns_hash[field].type == :boolean
 
                 if !!value != value
@@ -715,9 +847,9 @@ class FastAPI
                 if !!value == value
 
                   if comparator == 'is'
-                    filter_array << self_string_table + '.' + field + ' IS ' + value.to_s.upcase
+                    filter_array << value.to_s.upcase + ' = ' + field_string
                   elsif comparator == 'not'
-                    filter_array << self_string_table + '.' + field + ' IS NOT ' + value.to_s.upcase
+                    filter_array << 'NOT ' + value.to_s.upcase + ' = ' + field_string
                   end
 
                 end
@@ -725,19 +857,19 @@ class FastAPI
               elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
 
                 if comparator == 'is'
-                  filter_array << self_string_table + '.' + field + ' IS NULL'
+                  filter_array << 'NULL = ' + field_string
                 elsif comparator == 'not'
-                  filter_array << self_string_table + '.' + field + ' IS NOT NULL'
+                  filter_array << 'NOT NULL = ' + field_string
                 end
 
               elsif value.is_a? Range and comparator == 'is'
 
-                filter_array << self_string_table + '.' + field + ' >= ' + ActiveRecord::Base.connection.quote(value.first.to_s)
-                filter_array << self_string_table + '.' + field + ' <= ' + ActiveRecord::Base.connection.quote(value.last.to_s)
+                filter_array << ActiveRecord::Base.connection.quote(value.first.to_s) + ' <= ' + field_string
+                filter_array << ActiveRecord::Base.connection.quote(value.last.to_s) + ' >= ' + field_string
 
               else
 
-                filter_array << self_string_table + '.' + field + api_comparison(comparator, value)
+                filter_array << api_comparison(comparator, value, base_field, self_obj.columns_hash[field].type, is_array)
 
               end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastapi
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Keith Horwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj