standardapi 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3dd80946f83f6fd0512ec5a1b18053006c30ee
-  data.tar.gz: c0942e8eda944f221b15ba0fc39d897701128256
+  metadata.gz: aba7eb96fbb3c8dba47890e2871e70648bdda2e4
+  data.tar.gz: 0bf9b3de2a4122a8c091e8b34a177dd6911d0cd7
 SHA512:
-  metadata.gz: 3e268419011bfa400dee7027e2ac961069f8f4beefc28a90e5b441577914552f2c01d992d6ec95cb0e22057cef29de9997b76a07a69310c737f77825b538c4f8
-  data.tar.gz: a851e18f2e1491d0df72e8b5352da579ae59a4fd340617940e6609cac2a46fcaea75cdba7930b37328a1ecf4bc2f5bbfb3abc6be53d44b2d6c67b9d2ab624951
+  metadata.gz: fbd2ce6353c85738279cb7ceb455c462e1df71fe47b51d445500c6b2f278cd9a739731dce3f00e004c0a74baf9759f2eaf34702579d64e3ad0fde9c88ab8ac06
+  data.tar.gz: 455c0199f0ad92ed61581397ab53623c06b814f3c0b2ae5cdd07fe774df5aac00dec561765c3e712e16669ffe2e2e09d3c3bf3852df04536f53835f6ff339370

data/lib/standard_api/orders.rb

@@ -1,55 +1,8 @@
 module StandardAPI
   module Orders
 
-    # # :size                               => [:size]
-    # # { :size => :asc }                   => [{:size => :asc}]
-    # # { :size => :desc }                  => [{:size => :desc}]
-    # # {:size => {:desc => :nulls_first}}  => [{:size => {:desc => :nulls_first}}]
-    # # [:size, :id]                        => [:size, :id]
-    # # { :size => :asc, :id => :desc }     => [{ :size => :asc, :id => :desc }]
-    # # 'listings.size'                     => [{:listings => [:size]}]
-    # # { 'listings.size' => :asc }         => [{:listings => [{:size => :asc}]}]
-    # # { 'listings.size' => :desc }        => [{:listings => [{:size => :desc}]}]
-    # # ['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.sanitize(orders, permit, normalized=false)
+    def self.sanitize(orders, permit)
       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 }
@@ -63,19 +16,21 @@ module StandardAPI
             permitted = { key.to_sym => value }
           elsif permit.find { |x| x.is_a?(Hash) && x.has_key?(key.to_s) }
             subpermit = permit.find { |x| x.is_a?(Hash) && x.has_key?(key.to_s) }[key.to_s]
-            sanitized_value = sanitize(value, subpermit, true)
+            sanitized_value = sanitize(value, subpermit)
             permitted = { key.to_sym => sanitized_value }
           else
             raise(ActionDispatch::ParamsParser::ParseError.new("Invalid Ordering #{orders.inspect}", nil))
           end
         end
       when Array
-        orders.each { |order| permitted << sanitize(order, permit, true); }
+        orders.each { |order| permitted << sanitize(order, permit); }
       else
-        if permit.include?(orders.to_s)
+
+        if orders.to_s.count('.') == 1
+          key, value = *orders.to_s.split('.')
+          permitted = sanitize({key.to_sym => value.to_sym}, permit)
+        elsif 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - James Bracy