sorted 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fce640d4b8cfd9423a8aaaf498818a724d1fc008
-  data.tar.gz: eaabb0713590702c42d83c4f9ad6288b2955723a
+  metadata.gz: 38dd0916f6d792b758402c94839d2277b863dcf9
+  data.tar.gz: 669640e3a8adf55ad839b0218f0082319c4b8e24
 SHA512:
-  metadata.gz: 2cf3f307a7bdd63db2ba1b17c4c8c4f1c701b5ebd9f1f5393027483386da049c8c3cffa27f7ff8a5389d6f8a6bc77319c73b8ceeed93bf4986f0974909d302e5
-  data.tar.gz: b7e9e286b1b8802aad1e010f9358edebe4d9e0205ba83fa59a2d0e49abd48547da9e39df68b07320413a89ea3a0ec008e2ed3c3d9f0e8bffc87ed8f4885d883d
+  metadata.gz: 6f243889b5495aa2cf02a368da79aef5a98e1e3b7d7faef66ef7dabe09ca1b012535ade8f2db7674dae9ea37ad8bcb57f91510028197f48c0e0fa288118b90b0
+  data.tar.gz: 4d38c93addb9797e764f91a2d3bf47794f4f7117d214280d78cb5ff4a1db376a6928f33ebf833dfc78a85579c9accf67c555c1df42418e5f86bc172a17067e54

data/README.md

@@ -1,4 +1,4 @@
-# sorted
+# Sorted
 
 [![Build Status](https://travis-ci.org/mynameisrufus/sorted.svg?branch=master)](https://travis-ci.org/mynameisrufus/sorted)
 

data/lib/sorted/parse.rb

@@ -7,8 +7,37 @@ module Sorted
       raw.to_s.split(delim).inject(Set.new, &block)
     end
 
-    def parse_match(m)
-      [(m[2].nil? ? m[1] : m[2]), (m[3].nil? ? 'asc' : m[3].downcase)]
+    def parse_match(raw)
+      return parse_sort_with_direction(raw) if raw[5].nil?
+
+      parse_sort_without_direction(raw)
+    end
+
+    def parse_sort_with_direction(raw)
+      parsed = []
+      parsed << parse_column(raw[1], raw[2])
+      parsed << parse_direction(raw[3])
+      parsed << parse_nulls(raw[4]) unless raw[4].nil?
+      parsed
+    end
+
+    def parse_sort_without_direction(raw)
+      parsed = []
+      parsed << parse_column(raw[1], raw[5])
+      parsed << parse_nulls(raw[6]) unless raw[6].nil?
+      parsed
+    end
+
+    def parse_column(raw_all_content, raw_column)
+      raw_column || raw_all_content
+    end
+
+    def parse_direction(raw_direction)
+      raw_direction.nil? ? 'asc' : raw_direction.downcase
+    end
+
+    def parse_nulls(raw_nulls)
+      raw_nulls.downcase
     end
   end
 end

data/lib/sorted/sql_query.rb

@@ -5,7 +5,11 @@ module Sorted
   class SQLQuery
     extend Parse
 
-    REGEXP = /(([a-z0-9._]+)\s([asc|desc]+)|[a-z0-9._]+)/i
+    REGEXP = %r{
+      (([a-z0-9._]+)\s([asc|desc]+)\s?(nulls\s[first|last]+)?|
+      ([a-z0-9._]+)\s(nulls\s[first|last]+)|
+      ([a-z0-9._]+))
+    }xi
 
     def self.parse(raw)
       split(raw, /,/) do |set, part|
@@ -16,8 +20,29 @@ module Sorted
     end
 
     def self.encode(set, quote_proc = ->(f) { f })
-      set.map { |a| "#{column(a[0], quote_proc)} #{a[1].upcase}" }.join(', ')
+      set.map do |a|
+        encoded = "#{column(a[0], quote_proc)}"
+
+        if sort_has_direction?(a)
+          encoded += " #{a[1].upcase}"
+          encoded += encode_nulls(a[2]) unless a[2].nil?
+        else
+          encoded += encode_nulls(a[1]) unless a[1].nil?
+        end
+
+        encoded
+      end.join(', ')
+    end
+
+    def self.sort_has_direction?(raw)
+      raw[1].match(/ASC|DESC/i) unless raw[1].nil?
+    end
+    private_class_method :sort_has_direction?
+
+    def self.encode_nulls(raw_nulls)
+      " #{raw_nulls.upcase.tr('_', ' ')}"
     end
+    private_class_method :encode_nulls
 
     def self.column(parts, quote_proc)
       parts.split('.').map { |frag| quote_proc.call(frag) }.join('.')

data/lib/sorted/uri_query.rb

@@ -5,7 +5,10 @@ module Sorted
   class URIQuery
     extend Parse
 
-    REGEXP = /(([a-z0-9._]+)_([asc|desc]+)|[a-z0-9._]+)/i
+    REGEXP = %r{
+      (([a-z0-9._]+)_([asc|desc]+)_?(nulls_first|nulls_last)?|
+      ([a-z0-9._]+)_(nulls_first|nulls_last))
+    }xi
 
     def self.parse(raw)
       split(raw, /!/) do |set, part|

data/lib/sorted/version.rb

@@ -1,3 +1,3 @@
 module Sorted
-  VERSION = '2.1.2'
+  VERSION = '2.2.0'
 end

data/spec/sql_query_spec.rb

@@ -34,6 +34,22 @@ describe Sorted::SQLQuery, 'decode' do
 
     expect(set).to eq(result)
   end
+
+  it 'should decode nulls first/last' do
+    sql = 'email ASC NULLS FIRST, phone ASC, name DESC NULLS LAST'
+    set = Sorted::SQLQuery.parse(sql)
+    result = Sorted::Set.new([['email', 'asc', 'nulls first'], ['phone', 'asc'], ['name', 'desc', 'nulls last']])
+
+    expect(set).to eq(result)
+  end
+
+  it 'should decode nulls first/last without asc/desc' do
+    sql = 'email NULLS FIRST, phone, name NULLS LAST'
+    set = Sorted::SQLQuery.parse(sql)
+    result = Sorted::Set.new([['email', 'nulls first'], ['phone', 'asc'], ['name', 'nulls last']])
+
+    expect(set).to eq(result)
+  end
 end
 
 describe Sorted::SQLQuery, 'encode' do
@@ -58,4 +74,18 @@ describe Sorted::SQLQuery, 'encode' do
 
     expect(Sorted::SQLQuery.encode(set, quoter)).to eq(result)
   end
+
+  it 'should encode nulls first/last' do
+    set = Sorted::Set.new([['email', 'desc', 'nulls_last'], ['name', 'desc'], ['phone', 'asc', 'nulls_first']])
+    result = '`email` DESC NULLS LAST, `name` DESC, `phone` ASC NULLS FIRST'
+
+    expect(Sorted::SQLQuery.encode(set, quoter)).to eq(result)
+  end
+
+  it 'should encode nulls first/last without asc/desc' do
+    set = Sorted::Set.new([['email', 'nulls_last'], ['name'], ['phone', 'nulls_first']])
+    result = '`email` NULLS LAST, `name`, `phone` NULLS FIRST'
+
+    expect(Sorted::SQLQuery.encode(set, quoter)).to eq(result)
+  end
 end

data/spec/uri_query_spec.rb

@@ -10,6 +10,22 @@ describe Sorted::URIQuery, 'decode' do
 
     expect(set).to eq(result)
   end
+
+  it 'should decode nulls first/last' do
+    uri = 'table_name.column_name_desc_nulls_last!table_name.column_name_5_asc_nulls_first'
+    set = Sorted::URIQuery.parse(uri)
+    result = [['table_name.column_name', 'desc', 'nulls_last'], ['table_name.column_name_5', 'asc', 'nulls_first']]
+
+    expect(set).to eq(result)
+  end
+
+  it 'should decode nulls first/last without asc/desc' do
+    uri = 'table_name.column_name_nulls_last!table_name.column_name_5_nulls_first'
+    set = Sorted::URIQuery.parse(uri)
+    result = [['table_name.column_name', 'nulls_last'], ['table_name.column_name_5', 'nulls_first']]
+
+    expect(set).to eq(result)
+  end
 end
 
 describe Sorted::URIQuery, 'encode' do
@@ -19,4 +35,18 @@ describe Sorted::URIQuery, 'encode' do
 
     expect(Sorted::URIQuery.encode(set)).to eq(result)
   end
+
+  it 'should encode nulls first/last' do
+    set = Sorted::Set.new([%w[column_name desc nulls_last], %w[column_name_5 asc nulls_first]])
+    result = 'column_name_desc_nulls_last!column_name_5_asc_nulls_first'
+
+    expect(Sorted::URIQuery.encode(set)).to eq(result)
+  end
+
+  it 'should encode nulls first/last' do
+    set = Sorted::Set.new([%w[column_name nulls_last], %w[column_name_5 nulls_first]])
+    result = 'column_name_nulls_last!column_name_5_nulls_first'
+
+    expect(Sorted::URIQuery.encode(set)).to eq(result)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorted
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Rufus Post
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: sorted
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Data sorting library