standardapi 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3ef0a277d0306f9afa031a1bbbd80e7a36595b5
-  data.tar.gz: 89adcb13d289d2ef7b4b7027d9385c50f3555e9c
+  metadata.gz: 7f3dd80946f83f6fd0512ec5a1b18053006c30ee
+  data.tar.gz: c0942e8eda944f221b15ba0fc39d897701128256
 SHA512:
-  metadata.gz: b51fb68bea85b47d19549f567f5a3461de9d662633b973c93461f692ce660945d16cb6604dcf11b89db04bc1566c9a92269e477b494906c3f2ac96a6b42af1e9
-  data.tar.gz: 554e724a84890ca9dc5d0d0c21e481c217e4b9384cc67ef624bed671e984baf2fc89d24fa9b5079ba18aeaf66b7474ffdc94b3270259ec8deec05f67129f60f8
+  metadata.gz: 3e268419011bfa400dee7027e2ac961069f8f4beefc28a90e5b441577914552f2c01d992d6ec95cb0e22057cef29de9997b76a07a69310c737f77825b538c4f8
+  data.tar.gz: a851e18f2e1491d0df72e8b5352da579ae59a4fd340617940e6609cac2a46fcaea75cdba7930b37328a1ecf4bc2f5bbfb3abc6be53d44b2d6c67b9d2ab624951

data/lib/standard_api/orders.rb

@@ -13,42 +13,43 @@ module StandardAPI
     # # ['listings.size', 'property.id']    => [{:listings => [:size]}, {:property => [:id]}]
     # # { 'size' => :asc, 'property.id' => :desc } => [{:size => :asc}, {:property => [{:id => :desc}]}]
     # # { :size => {:asc => :nulls_first}, 'property.id' => {:desc => :null_last} } => [{:size => {:asc => :nulls_first}}, {:property => [{:id => {:desc => :nulls_first}}]}]
-    # def self.normalize(orderings)
-    #   return nil if orderings.nil?
-    #   orderings = orderings.is_a?(Array) ? orderings : [orderings]
-    #
-    #   orderings.map! do |order|
-    #     case order
-    #     when Hash
-    #       normalized = ActiveSupport::HashWithIndifferentAccess.new
-    #       order.each do |key, value|
-    #         key = key.to_s
-    #         if key.index(".")
-    #           relation, column = key.split('.').map(&:to_sym)
-    #           normalized[relation] ||= []
-    #           normalized[relation] << { column => value }
-    #         elsif value.is_a?(Hash) && value.keys.first.to_s != 'desc' && value.keys.first.to_s != 'asc'
-    #           normalized[key.to_sym] ||= []
-    #           normalized[key.to_sym] << value
-    #         else
-    #           normalized[key.to_sym] = value
-    #         end
-    #       end
-    #       normalized
-    #     else
-    #       order = order.to_s
-    #       if order.index(".")
-    #         relation, column = order.split('.').map(&:to_sym)
-    #         { relation => [column] }
-    #       else
-    #         order.to_sym
-    #       end
-    #     end
-    #   end
-    # end
+    def self.normalize(orderings)
+      return nil if orderings.nil?
+      orderings = orderings.is_a?(Array) ? orderings : [orderings]
+
+      orderings.map! do |order|
+        case order
+        when Hash
+          normalized = ActiveSupport::HashWithIndifferentAccess.new
+          order.each do |key, value|
+            key = key.to_s
+            if key.index(".")
+              relation, column = key.split('.').map(&:to_sym)
+              normalized[relation] ||= []
+              normalized[relation] << { column => value }
+            elsif value.is_a?(Hash) && value.keys.first.to_s != 'desc' && value.keys.first.to_s != 'asc'
+              normalized[key.to_sym] ||= []
+              normalized[key.to_sym] << value
+            else
+              normalized[key.to_sym] = value
+            end
+          end
+          normalized
+        else
+          order = order.to_s
+          if order.index(".")
+            relation, column = order.split('.').map(&:to_sym)
+            { relation => [column] }
+          else
+            order.to_sym
+          end
+        end
+      end
+    end
 
     def self.sanitize(orders, permit, normalized=false)
       return nil if orders.nil?
+      orders = StandardAPI::Orders.normalize(orders) if !normalized
 
       permit = [permit] if !permit.is_a?(Array)
       permit = permit.flatten.map { |x| x.is_a?(Hash) ? x.with_indifferent_access : x.to_s }
@@ -73,6 +74,8 @@ module StandardAPI
       else
         if permit.include?(orders.to_s)
           permitted = orders
+        # elsif permit.split('.').size == 2
+        #   sanitize({permit.split('.')[0] => permit.split('.')[1]}, permit)
         else
           raise(ActionDispatch::ParamsParser::ParseError.new("Invalid Ordering #{orders.inspect}", nil))
         end
@@ -82,4 +85,4 @@ module StandardAPI
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-sort