fastapi 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af20b323da9210dc71e62a30ea44667d3376da1d
-  data.tar.gz: f3de2e210499133ad71a998657e28f0f7b817191
+  metadata.gz: 832572badad40969dcb8f6d057c0027d1715475d
+  data.tar.gz: 5ee51023d5100554b269cb038ba86083abca8667
 SHA512:
-  metadata.gz: 55fbc45d21255e8a7a6090f3eb86d6dae5299074ac91f352c1343567a99f95130c06e14020a8777c5306dd1b30496e01960990dddde483d332a8aba08f1b30a5
-  data.tar.gz: 208b4dc1fe024a49a84b20476faee6b1935302f4e54e36cf7da6f3dfa354cd89c9874fb098131da4b0694c882e83b53d66255a31df13566401189e601ac44a73
+  metadata.gz: 99cb06224e1c33548b2feb9c788d30f528f66dfe3c314dcc6f0930475eff980afd7213a3d9a08b5d6813bcee6be82c8758f8e50d182569e2f28640a4c5e163ca
+  data.tar.gz: 7cd11d4be9b02ba8f1d261b35411e76ed129f924838f791c92af706b85b00249760bbde389a2fb7516937a6d37eccd5673c0fdb97f46bedfc83bd5faaae7175a

data/lib/fastapi.rb

@@ -536,21 +536,36 @@ class FastAPI
         filters[:__order] = [:created_at, :DESC]
       end
 
+      params = []
+
+      if filters.has_key? :__params
+        params = filters[:__params]
+        filters.delete :__params
+      end
+
+      if not params.is_a? Array and not params.is_a? Hash
+        params = [params]
+      end
 
       filters.each do |key, value|
-        if [:__order, :__offset, :__count].include? key
+
+        if [:__order, :__offset, :__count, :__params].include? key
           next
         end
+
         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 or
-            @model.reflect_on_all_associations(:belongs_to).map(&:name).include? key_root
+            @model.reflect_on_all_associations(:belongs_to).map(&:name).include? key_root or
+            @model.reflect_on_all_associations(:has_one).map(&:name).include? key_root
           )
             raise 'Filter "' + key.to_s + '" not supported'
           end
         end
+
       end
 
 
@@ -562,130 +577,155 @@ class FastAPI
       order_has_many = {}
       order_belongs_to = {}
 
-      if filters.size > 0
+      # get the order first
 
-        filters.each do |key, value|
+      if filters.has_key? :__order
 
-          if key == :__order
+        value = filters[:__order]
 
-            if model.nil? and (value.is_a? String or value.is_a? Symbol) and @model.fastapi_custom_order.has_key? value.to_sym
+        order = value.clone()
 
-              order = @model.fastapi_custom_order[value.to_sym].gsub('self.', self_string_table + '.')
+        if order.is_a? String
+          order = order.split(',')
+          if order.size < 2
+            order << 'ASC'
+          end
+        elsif order.is_a? Array
+          order = order.map { |v| v.to_s }
+          while order.size < 2
+            order << ''
+          end
+        else
+          order = ['', '']
+        end
 
-            else
+        if not ['ASC', 'DESC'].include? order[1]
+          order[1] = 'ASC'
+        end
 
-              order = value.clone()
+        if model.nil? and @model.fastapi_custom_order.has_key? order[0].to_sym
 
-              if order.is_a? String
-                order = order.split(',')
-                if order.size < 2
-                  order << 'ASC'
-                end
-              elsif order.is_a? Array
-                order = order.map { |v| v.to_s }
-                while order.size < 2
-                  order << ''
-                end
-              else
-                order = ['', '']
-              end
+          order[0] = @model.fastapi_custom_order[order[0].to_sym].gsub('self.', self_string_table + '.')
 
-              if not self_obj.column_names.include? order[0]
-                order = nil
-              else
-                order[0] = self_string_table + '.' + order[0]
-                if not ['ASC', 'DESC'].include? order[1]
-                  order[1] = 'ASC'
-                end
-                order = order.join(' ')
-              end
+          if params.is_a? Array
 
-            end
+            order[0] = order[0].gsub(/\$params\[([\w\d_-]+)\]/) { ActiveRecord::Base.connection.quote(params[Regexp.last_match[1].to_i].to_s) }
 
           else
 
-            field = key.to_s
+            order[0] = order[0].gsub(/\$params\[([\w\d_-]+)\]/) { ActiveRecord::Base.connection.quote(params[Regexp.last_match[1]].to_s) }
 
-            if field.rindex('__').nil?
-              comparator = 'is'
-            else
+          end
 
-              comparator = field[(field.rindex('__') + 2)..-1]
-              field = field[0...field.rindex('__')]
+          order[0] = '(' + order[0] + ')'
+          order = order.join(' ')
 
-              if not @@api_comparator_list.include? comparator
-                next # skip dis bro
-              end
+        else
 
-            end
+          if not self_obj.column_names.include? order[0]
+
+            order = nil
+
+          else
+
+            order[0] = self_string_table + '.' + order[0]
+            order = order.join(' ')
 
-            if model.nil?
+          end
 
-              if self_obj.reflect_on_all_associations(:has_many).map(&:name).include? key
+        end
 
-                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]
+        filters.delete :__order
 
-              elsif self_obj.reflect_on_all_associations(:belongs_to).map(&:name).include? key
+      end
 
-                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]
+      if filters.size > 0
 
-              elsif self_obj.column_names.include? field
+        filters.each do |key, value|
 
-                if self_obj.columns_hash[field].type == :boolean
+          field = key.to_s
 
-                  if !!value != value
+          if field.rindex('__').nil?
 
-                    bool_lookup = {
-                      't' => true,
-                      'f' => false,
-                      'true' => true,
-                      'false' => false
-                    }
+            comparator = 'is'
 
-                    value = value.to_s.downcase
+          else
 
-                    if bool_lookup.has_key? value
-                      value = bool_lookup[value]
-                    else
-                      value = true
-                    end
+            comparator = field[(field.rindex('__') + 2)..-1]
+            field = field[0...field.rindex('__')]
 
-                  end
+            if not @@api_comparator_list.include? comparator
+              next # skip dis bro
+            end
+
+          end
+
+          if model.nil?
+
+            if 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]
+
+            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
+
+              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 !!value == value
+              if self_obj.columns_hash[field].type == :boolean
 
-                    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 !!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
 
-                elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
+                end
+
+                if !!value == value
 
                   if comparator == 'is'
-                    filter_array << self_string_table + '.' + field + ' IS NULL'
+                    filter_array << self_string_table + '.' + field + ' IS ' + value.to_s.upcase
                   elsif comparator == 'not'
-                    filter_array << self_string_table + '.' + field + ' IS NOT NULL'
+                    filter_array << self_string_table + '.' + field + ' IS NOT ' + value.to_s.upcase
                   end
 
-                elsif value.is_a? Range and comparator == 'is'
+                end
 
-                  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)
+              elsif value == nil and comparator != 'is_null' and comparator != 'not_null'
 
-                else
+                if comparator == 'is'
+                  filter_array << self_string_table + '.' + field + ' IS NULL'
+                elsif comparator == 'not'
+                  filter_array << self_string_table + '.' + field + ' IS NOT NULL'
+                end
 
-                  filter_array << self_string_table + '.' + field + api_comparison(comparator, value)
+              elsif value.is_a? Range and comparator == 'is'
 
-                end
+                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
+
+                filter_array << self_string_table + '.' + field + api_comparison(comparator, value)
 
               end
 
@@ -720,7 +760,8 @@ class FastAPI
 
       @model.fastapi_fields.each do |field|
 
-        if @model.reflect_on_all_associations(:belongs_to).map(&:name).include? field
+        if (@model.reflect_on_all_associations(:belongs_to).map(&:name).include? field or
+          @model.reflect_on_all_associations(:has_one).map(&:name).include? field)
 
           class_name = @model.reflect_on_association(field).options[:class_name]
 
@@ -729,16 +770,20 @@ class FastAPI
           else
             model = class_name.constantize
           end
-            
+
           model_lookup[field] = model
           belongs << {model: model, alias: field}
 
         elsif @model.reflect_on_all_associations(:has_many).map(&:name).include? field
+
           model = field.to_s.singularize.classify.constantize
           model_lookup[field] = model
           has_many << model
+
         elsif @model.column_names.include? field.to_s
+
           fields << field
+
         end
 
       end

metadata

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