fastapi 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e54711b6986d78e68f91500ea931e04bd497027
-  data.tar.gz: 5e321a89fc6fc363d2389e799a8249a418ca254f
+  metadata.gz: 0a6ce23d8deee325849253771c6e3d086fc39198
+  data.tar.gz: 5f19315c1ae01f124a089c67878a31106e821b57
 SHA512:
-  metadata.gz: 09af462c7bb56a4298afbd50f65d59dc07ad92f5fc3030f05bcd62dcb5015df5f0f81ca8dc475ca965590f0ef6fd56106170b4196ae927bc330490d5368fdd67
-  data.tar.gz: 6b5c624fb605fd6dc1916a8ea0c8a8c436bb0e4f286779a21346429f52e3ed5b20bf6bddbd146a705346a61cb3b9ebfc6158b72800c12b0da15c6d63dd1599bc
+  metadata.gz: 76b3a8277e2973aacd8bcb43c025cdd5feb386b86f4c0b259fcc827d24111d8ae70d49f50ebd1c672f66e844c353e69679e4df69951072d57c4ceb566f03154b
+  data.tar.gz: b3374e4f49364f4d5878e9cc605be36d2510a7bd5f6f8c97b3b32a9bea232baf7de099b74623f8d822d0080d9c98b5b3b9e8b87bec0a97003c6cf9e97d330242

data/lib/fastapi.rb

@@ -543,7 +543,7 @@ class FastAPI
       self_obj = model.nil? ? @model : model
       self_string_table = model.nil? ? @model.to_s.tableize : '__' + model.to_s.tableize
 
-      filters = filters.clone()
+      filters = filters.clone().symbolize_keys
       # if we're at the top level...
       if model.nil?
 
@@ -579,9 +579,9 @@ class FastAPI
         found_index = key.to_s.rindex('__')
         key_root = found_index.nil? ? key : key.to_s[0...found_index].to_sym
         if not self_obj.column_names.include? key_root.to_s
-          if not model.nil? or (
-            not @model.reflect_on_all_associations(:has_many).map(&:name).include? key_root and
-            not @model.reflect_on_all_associations(:belongs_to).map(&:name).include? key_root
+          if not model.nil? or not (
+            @model.reflect_on_all_associations(:has_many).map(&:name).include? key_root or
+            @model.reflect_on_all_associations(:belongs_to).map(&:name).include? key_root
           )
             raise 'Filter "' + key.to_s + '" not supported'
           end
@@ -591,9 +591,11 @@ class FastAPI
 
       filter_array = []
       filter_has_many = {}
+      filter_belongs_to = {}
 
       order = nil
       order_has_many = {}
+      order_belongs_to = {}
 
       if filters.size > 0
 
@@ -652,52 +654,77 @@ class FastAPI
 
             end
 
-            if model.nil? and self_obj.reflect_on_all_associations(:has_many).map(&:name).include? key
+            if model.nil?
 
-              filter_result = parse_filters(value, safe, field.singularize.classify.constantize)
-              # puts filter_result
-              filter_has_many[key] = filter_result[:main]
-              order_has_many[key] = filter_result[:main_order]
+              puts 'What the Fuck'
+              puts key
+              puts self_obj
 
-            elsif self_obj.column_names.include? field
+              if self_obj.reflect_on_all_associations(:has_many).map(&:name).include? key
 
-              if self_obj.columns_hash[field].type == :boolean
+                filter_result = parse_filters(value, safe, field.singularize.classify.constantize)
+                # puts filter_result
+                filter_has_many[key] = filter_result[:main]
+                order_has_many[key] = filter_result[:main_order]
 
-                if !!value != value
-                  value = ({
-                    't' => true,
-                    'f' => false,
-                    'true' => true,
-                    'false' => false
-                  }[value] or true)
-                end
+              elsif self_obj.reflect_on_all_associations(:belongs_to).map(&:name).include? key
 
-                if !!value == value
+                filter_result = parse_filters(value, safe, field.singularize.classify.constantize)
+                # puts filter_result
+                filter_belongs_to[key] = filter_result[:main]
+                order_belongs_to[key] = filter_result[:main_order]
+
+              elsif self_obj.column_names.include? field
+
+                if self_obj.columns_hash[field].type == :boolean
+
+                  if !!value != value
+
+                    bool_lookup = {
+                      't' => true,
+                      'f' => false,
+                      'true' => true,
+                      'false' => false
+                    }
+
+                    value = value.to_s.downcase
+
+                    if bool_lookup.has_key? value
+                      value = bool_lookup[value]
+                    else
+                      value = true
+                    end
 
-                  if comparator == 'is'
-                    filter_array << self_string_table + '.' + field + ' IS ' + value.to_s.upcase
-                  elsif comparator == 'not'
-                    filter_array << self_string_table + '.' + field + ' IS NOT ' + value.to_s.upcase
                   end
 
-                end
+                  if !!value == value
 
-              elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
+                    if comparator == 'is'
+                      filter_array << self_string_table + '.' + field + ' IS ' + value.to_s.upcase
+                    elsif comparator == 'not'
+                      filter_array << self_string_table + '.' + field + ' IS NOT ' + value.to_s.upcase
+                    end
 
-                if comparator == 'is'
-                  filter_array << self_string_table + '.' + field + ' IS NULL'
-                elsif comparator == 'not'
-                  filter_array << self_string_table + '.' + field + ' IS NOT NULL'
-                end
+                  end
+
+                elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
+
+                  if comparator == 'is'
+                    filter_array << self_string_table + '.' + field + ' IS NULL'
+                  elsif comparator == 'not'
+                    filter_array << self_string_table + '.' + field + ' IS NOT NULL'
+                  end
 
-              elsif value.is_a? Range and comparator == 'is'
+                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 << 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)
 
-              else
+                else
 
-                filter_array << self_string_table + '.' + field + api_comparison(comparator, value)
+                  filter_array << self_string_table + '.' + field + api_comparison(comparator, value)
+
+                end
 
               end
 
@@ -713,7 +740,9 @@ class FastAPI
         main: filter_array,
         main_order: order,
         has_many: filter_has_many,
-        has_many_order: order_has_many
+        has_many_order: order_has_many,
+        belongs_to: filter_belongs_to,
+        belongs_to_order: order_belongs_to
       }
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastapi
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Keith Horwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj