fastapi 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eab51823b0d3829f997cadbacb612eb6702eaae
-  data.tar.gz: 39dff598e51d82b0f6636175022b64abeb61102a
+  metadata.gz: 37056922d778444be79f5020161722430529e5e4
+  data.tar.gz: 033dd3d2f7ea79de5839d6b8c9277ba008ede364
 SHA512:
-  metadata.gz: c323ec43ee5b54a50bd909bd0fde2460f92bfe9b467ecabe2e85eb529f54fa65d2797a3ab90081e8055be2fe470db3fb3650932e6411ef14948d32025a1adaa7
-  data.tar.gz: 0ba48b30c2e5c04a9cd54110b6aa4293fc6e27bf4abf76ed94b8e306dd60f9c5c56a8ba9cb19ab971b42202ae2a1f8aef233400979d61ffa1ea8a038513e506b
+  metadata.gz: b2a4fc990c58642ea548974913ab5ff81d41f677d0a403f7e2be491d46a784410ae1e071f9a4639185165683f4542611e287667e6db69052e27e568f96a5d54a
+  data.tar.gz: 366e4b9120db2ffc0edb029a7a7236981ab171f8d178728148a21b7cd219d3f5d64670fc4d5ba16e42d8ffd1ec5cc83a272de262f34dad4a143df42f1e5a6e7f

data/lib/fastapi.rb

@@ -498,6 +498,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()
       # if we're at the top level...
       if model.nil?
 
@@ -511,18 +512,7 @@ class FastAPI
           end
         end
 
-        all_filters = {}
-
-        @model.fastapi_filters.each do |key, value|
-          if value.is_a? Hash
-            copy = {}
-            value.each do |key, value|
-              copy[key] = value
-            end
-            value = copy
-          end
-          all_filters[key] = value
-        end
+        all_filters = @model.fastapi_filters.clone()
 
         filters.each do |field, value|
           all_filters[field.to_sym] = value
@@ -533,7 +523,7 @@ class FastAPI
       end
 
       if not filters.has_key? :__order
-        filters[:__order] = [:created_at, 'DESC']
+        filters[:__order] = [:created_at, :DESC]
       end
 
 
@@ -566,7 +556,7 @@ class FastAPI
 
           if key == :__order
 
-            order = value
+            order = value.clone()
 
             if order.is_a? String
               order = order.split(',')
@@ -574,6 +564,7 @@ class FastAPI
                 order << 'ASC'
               end
             elsif order.is_a? Array
+              order = order.map { |v| v.to_s }
               while order.size < 2
                 order << ''
               end
@@ -581,10 +572,10 @@ class FastAPI
               order = ['', '']
             end
 
-            if not self_obj.column_names.include? order[0].to_s
+            if not self_obj.column_names.include? order[0]
               order = nil
             else
-              order[0] = self_string_table + '.' + order[0].to_s
+              order[0] = self_string_table + '.' + order[0]
               if not ['ASC', 'DESC'].include? order[1]
                 order[1] = 'ASC'
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastapi
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Keith Horwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj