fastapi 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865a2af8b7cb9eaa5b07b197e8488d52b59b7301
-  data.tar.gz: 7837dbace0c099fb7a1b09e33702f0fdc53bacc0
+  metadata.gz: a6257aad18a7f5ccf31fd70bcb267a3976b83518
+  data.tar.gz: 81a7955417c82b41deafc611138a1fe606d20d4f
 SHA512:
-  metadata.gz: 0ca511a49d7786c24e8d8fa875dd1faac08f10409761da15e75dd18257e04818e0542316aa14ff7232a5667a1d9ab5c7265d366585c5111a9e61a9c0f07318e0
-  data.tar.gz: 2c56f860cfcdc05baaa1468d21064d3efa720999c5a051b98ef02fd0bd2b806fe76781d308525c4083b57a9c74a749edbd6e6881174e966c5dd143a13077390b
+  metadata.gz: db70059eb226331aa57f6964612d7fde14e64b47671950882c2408ec1c0730740fa7fc60540f832ec713a449547727446fc715d32662bfc98f895b3f1f09681c
+  data.tar.gz: d0a9bfffd1eed2b65288bcaad6eb01331e573df1932923e75d0b9d6d679c19b70ce5a065f852291c50b1fce4132259bab8e488a3aa921802ed635f54421a22d8

data/lib/fastapi.rb

@@ -492,6 +492,8 @@ class FastAPI
         elsif c == ','
 
           i = i + 1
+          cur_row[fields[entry_index]] = nil
+          entry_index = entry_index + 1
 
         else
 
@@ -802,85 +804,81 @@ class FastAPI
 
           end
 
-          if model.nil?
-
-            if self_obj.reflect_on_all_associations(:has_many).map(&:name).include? key
+          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)
-              # puts filter_result
-              filter_has_many[key] = filter_result[:main]
-              order_has_many[key] = filter_result[:main_order]
+            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]
 
-            elsif self_obj.reflect_on_all_associations(:belongs_to).map(&:name).include? key or
-              self_obj.reflect_on_all_associations(:has_one).map(&:name).include? key
+          elsif model.nil? and (self_obj.reflect_on_all_associations(:belongs_to).map(&:name).include? key or
+            self_obj.reflect_on_all_associations(:has_one).map(&:name).include? key)
 
-              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]
+            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
+          elsif self_obj.column_names.include? field
 
-              base_field = self_string_table + '.' + field
-              field_string = base_field
-              is_array = false
+            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
+            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
+              field_string = 'ANY(' + field_string + ')'
+              is_array = true
 
-              if self_obj.columns_hash[field].type == :boolean
+            end
 
-                if !!value != value
+            if self_obj.columns_hash[field].type == :boolean
 
-                  bool_lookup = {
-                    't' => true,
-                    'f' => false,
-                    'true' => true,
-                    'false' => false
-                  }
+              if !!value != value
 
-                  value = value.to_s.downcase
+                bool_lookup = {
+                  't' => true,
+                  'f' => false,
+                  'true' => true,
+                  'false' => false
+                }
 
-                  if bool_lookup.has_key? value
-                    value = bool_lookup[value]
-                  else
-                    value = true
-                  end
+                value = value.to_s.downcase
 
+                if bool_lookup.has_key? value
+                  value = bool_lookup[value]
+                else
+                  value = true
                 end
 
-                if !!value == value
-
-                  if comparator == 'is'
-                    filter_array << value.to_s.upcase + ' = ' + field_string
-                  elsif comparator == 'not'
-                    filter_array << 'NOT ' + value.to_s.upcase + ' = ' + field_string
-                  end
-
-                end
+              end
 
-              elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
+              if !!value == value
 
                 if comparator == 'is'
-                  filter_array << 'NULL = ' + field_string
+                  filter_array << value.to_s.upcase + ' = ' + field_string
                 elsif comparator == 'not'
-                  filter_array << 'NOT NULL = ' + field_string
+                  filter_array << 'NOT ' + value.to_s.upcase + ' = ' + field_string
                 end
 
-              elsif value.is_a? Range and comparator == 'is'
+              end
 
-                filter_array << ActiveRecord::Base.connection.quote(value.first.to_s) + ' <= ' + field_string
-                filter_array << ActiveRecord::Base.connection.quote(value.last.to_s) + ' >= ' + field_string
+            elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
 
-              else
+              if comparator == 'is'
+                filter_array << 'NULL = ' + field_string
+              elsif comparator == 'not'
+                filter_array << 'NOT NULL = ' + field_string
+              end
 
-                filter_array << api_comparison(comparator, value, base_field, self_obj.columns_hash[field].type, is_array)
+            elsif value.is_a? Range and comparator == 'is'
 
-              end
+              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 << api_comparison(comparator, value, base_field, self_obj.columns_hash[field].type, is_array)
 
             end
 
@@ -1032,7 +1030,7 @@ class FastAPI
           if not filters[:has_many_order][model_symbol].nil?
             has_many_order = 'ORDER BY ' + filters[:has_many_order][model_symbol]
           end
-          
+
         end
 
         field_list << [

metadata

@@ -1,15 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: fastapi
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Keith Horwood
+- Trevor Strieber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +54,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.9.9
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 description: Easily create robust, standardized API endpoints using lightning-fast
   database queries
 email: keithwhor@gmail.com
@@ -67,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easily create robust, standardized API endpoints using lightning-fast database