fastapi 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37056922d778444be79f5020161722430529e5e4
-  data.tar.gz: 033dd3d2f7ea79de5839d6b8c9277ba008ede364
+  metadata.gz: 0af071723d04b7cb79104f53f4d800278380524a
+  data.tar.gz: 9841776f060fcdfa5f121f6f7cb162c0df45f557
 SHA512:
-  metadata.gz: b2a4fc990c58642ea548974913ab5ff81d41f677d0a403f7e2be491d46a784410ae1e071f9a4639185165683f4542611e287667e6db69052e27e568f96a5d54a
-  data.tar.gz: 366e4b9120db2ffc0edb029a7a7236981ab171f8d178728148a21b7cd219d3f5d64670fc4d5ba16e42d8ffd1ec5cc83a272de262f34dad4a143df42f1e5a6e7f
+  metadata.gz: 73a147f323c7ce14b43316cead922a31ff1bd1934c17749646201c71c94493f5ed926ce76571b628890d7d4405701add9d7957d46d7a4f0157a1e456dcfa6454
+  data.tar.gz: 2614da3a0b1d1537bc9d67460f42831b27fc1651d2dc25ef1a728d50e6e1c181492dc779a45709c27c81fa6f96f05fbaed7fab898b4aea96027a3225af35d84c

data/lib/fastapi.rb

@@ -556,30 +556,38 @@ class FastAPI
 
           if key == :__order
 
-            order = value.clone()
+            if model.nil? and (value.is_a? String or value.is_a? Symbol) and @model.fastapi_custom_order.has_key? value.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 = @model.fastapi_custom_order[value.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'
+
+              order = value.clone()
+
+              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 = order.join(' ')
+
+              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
+
             end
 
           else

data/lib/fastapi/active_record_extension.rb

@@ -38,6 +38,18 @@ module FastAPIExtension
       @fastapi_filters = filters
     end
 
+    # Define custom ORDER BY strings for specific keys
+    #
+    # @param keys [Hash] a hash containing the keys: strings for order filters
+    # @return [Hash] the same keys hash
+    def fastapi_define_order(keys)
+      @fastapi_custom_order = keys
+    end
+
+    def fastapi_custom_order
+      @fastapi_custom_order or {}
+    end
+
     def fastapi_fields
       @fastapi_fields or [:id]
     end

metadata

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