fastapi 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6ce23d8deee325849253771c6e3d086fc39198
-  data.tar.gz: 5f19315c1ae01f124a089c67878a31106e821b57
+  metadata.gz: af20b323da9210dc71e62a30ea44667d3376da1d
+  data.tar.gz: f3de2e210499133ad71a998657e28f0f7b817191
 SHA512:
-  metadata.gz: 76b3a8277e2973aacd8bcb43c025cdd5feb386b86f4c0b259fcc827d24111d8ae70d49f50ebd1c672f66e844c353e69679e4df69951072d57c4ceb566f03154b
-  data.tar.gz: b3374e4f49364f4d5878e9cc605be36d2510a7bd5f6f8c97b3b32a9bea232baf7de099b74623f8d822d0080d9c98b5b3b9e8b87bec0a97003c6cf9e97d330242
+  metadata.gz: 55fbc45d21255e8a7a6090f3eb86d6dae5299074ac91f352c1343567a99f95130c06e14020a8777c5306dd1b30496e01960990dddde483d332a8aba08f1b30a5
+  data.tar.gz: 208b4dc1fe024a49a84b20476faee6b1935302f4e54e36cf7da6f3dfa354cd89c9874fb098131da4b0694c882e83b53d66255a31df13566401189e601ac44a73

data/lib/fastapi.rb

@@ -27,7 +27,6 @@ class FastAPI
     @model = model
     @data = nil
     @metadata = nil
-    @has_results = false
     @result_type = 0
   end
 
@@ -41,9 +40,9 @@ class FastAPI
   # @param filters [Hash] a hash containing the intended filters
   # @param meta [Hash] a hash containing custom metadata
   # @return [FastAPI] the current instance
-  def filter(filters = {}, meta = {})
+  def filter(filters = {}, meta = {}, safe = false)
 
-    result = fastapi_query(filters)
+    result = fastapi_query(filters, safe)
 
     metadata = {}
 
@@ -73,23 +72,7 @@ class FastAPI
   # @return [FastAPI] the current instance
   def safe_filter(filters = {}, meta = {})
 
-    result = fastapi_query(filters, true)
-
-    metadata = {}
-
-    meta.each do |key, value|
-      metadata[key] = value
-    end
-
-    metadata[:total] = result[:total]
-    metadata[:offset] = result[:offset]
-    metadata[:count] = result[:count]
-    metadata[:error] = result[:error]
-
-    @metadata = metadata
-    @data = result[:data]
-
-    @result_type = @@result_types[:multiple]
+    filter(filters, meta, true)
 
     self
 
@@ -103,30 +86,12 @@ class FastAPI
   # @return [FastAPI] the current instance
   def fetch(id, meta = {})
 
-    result = fastapi_query({id: id})
-
-    metadata = {}
-
-    meta.each do |key, value|
-      metadata[key] = value
-    end
+    filter({id: id}, meta)
 
-    if result[:total] == 0
-      error = {message: @model.to_s + ' id does not exist'}
-    else
-      error = result[:error]
+    if @metadata[:total] == 0
+      @metadata[:error] = {message: @model.to_s + ' id does not exist'}
     end
 
-    metadata[:total] = result[:total]
-    metadata[:offset] = result[:offset]
-    metadata[:count] = result[:count]
-    metadata[:error] = error
-
-    @metadata = metadata
-    @data = result[:data]
-
-    @result_type = @@result_types[:multiple]
-
     self
 
   end
@@ -656,10 +621,6 @@ class FastAPI
 
             if model.nil?
 
-              puts 'What the Fuck'
-              puts key
-              puts self_obj
-
               if self_obj.reflect_on_all_associations(:has_many).map(&:name).include? key
 
                 filter_result = parse_filters(value, safe, field.singularize.classify.constantize)
@@ -764,19 +725,13 @@ class FastAPI
           class_name = @model.reflect_on_association(field).options[:class_name]
 
           if class_name.nil?
-
             model = field.to_s.classify.constantize
-            model_lookup[field] = model
-            belongs << {model: model, alias: field}
-
           else
-
             model = class_name.constantize
-            model_lookup[field] = model
-
-            belongs << {model: model, alias: field}
-
           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

metadata

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