sorted 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24619b1bb18184b31fed12d6dc314cea988201f7
-  data.tar.gz: 5b31c5ef8375ca83aa0853e2fe219477fa40afe5
+  metadata.gz: 2f0ad49531eb40c3d51bc2a4950f86b72ae83ea7
+  data.tar.gz: 2e51b786f0cd6517b6ad3ae2f0fe51a7eb77d257
 SHA512:
-  metadata.gz: 2a285ff4a99085d9ca9740a6e4c5187a594b14a6698750b03ec2e8846473d6f93145aedff4f1c98bfdd4aa4b32c28d395d3908ed428bbf4b62818f52f9461ff2
-  data.tar.gz: f77377cd895a964111ff98edf7fe62e16193a8ee5f397b9613fa1db66f7a6631f861f1a0cab2fbcb622fec21cec8ec833b25b2a3b1dad528b5d3de50418b9c2e
+  metadata.gz: 0c1ac0dfd1f9364671961822558ab89f5363e8d5c39e6b3bdaf638eb2ad0d14dcd98205ebc7935650633e66955f582945fe08708d4085619bb9d7d775395b2bc
+  data.tar.gz: f74792f358763f1b61df176cf900b4581659f53fd838adf98c60c2b0606f426581e2db94311665d33ef2d9484d153295e97a225ced3d1f21bf507581e5a9a1d4

data/README.md

@@ -35,6 +35,7 @@ Currently implemented:
 * `Sorted::SQLQuery`
 * `Sorted::URIQuery`
 * `Sorted::JSONQuery`
+* `Sorted::ParamsQuery`
 
 ## Projects
 

data/lib/sorted.rb

@@ -142,18 +142,22 @@ module Sorted
       return Set.new if raw.nil?
       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)]
+    end
   end
 
   class URIQuery
     extend Parse
 
-    REGEXP = /([a-zA-Z0-9._]+)_(asc|desc)$/
+    REGEXP = /(([a-z0-9._]+)_([asc|desc]+)|[a-z0-9._]+)/i
 
     def self.parse(raw)
       split(raw, /!/) do |set, part|
         m = part.match(REGEXP)
-        return set unless m
-        set << [m[1], m[2].downcase]
+        next unless m
+        set << parse_match(m)
       end
     end
 
@@ -170,8 +174,8 @@ module Sorted
     def self.parse(raw)
       split(raw, /,/) do |set, part|
         m = part.match(REGEXP)
-        return set unless m
-        set << [(m[2].nil? ? m[1] : m[2]), (m[3].nil? ? 'asc' : m[3].downcase)]
+        next unless m
+        set << parse_match(m)
       end
     end
 
@@ -199,4 +203,38 @@ module Sorted
       set.inject({}) { |a, e| a.merge(Hash[e[0], SORTED_TO_JSON[e[1]]]) }
     end
   end
+
+  ##
+  # Parses an array of decoded query params
+  #
+  # This parser/encoder uses an already decoded array of sort strings parsed by
+  # a URI library.
+  #
+  # Parsing:
+  #
+  #   params = ['phone_desc', 'name_asc']
+  #   set = Sorted::ParamsQuery.parse(params)
+  #   set.to_a #=> [['phone', 'desc'], ['name', asc']]
+  #
+  # Encoding:
+  #
+  #   Sorted::ParamsQuery.encode(set) #=> ['phone_desc', 'name_asc']
+
+  class ParamsQuery
+    extend Parse
+
+    REGEXP = /(([a-z0-9._]+)_([asc|desc]+)|[a-z0-9._]+)/i
+
+    def self.parse(params)
+      params.inject(Set.new) do |set, part|
+        m = part.match(REGEXP)
+        next unless m
+        set << parse_match(m)
+      end
+    end
+
+    def self.encode(set)
+      set.map { |a| a.join('_') }
+    end
+  end
 end

data/lib/sorted/version.rb

@@ -1,3 +1,3 @@
 module Sorted
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/params_query_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Sorted::ParamsQuery, 'decode' do
+  it 'should return a set from an array of params' do
+    params = %w(email_asc phone_asc name_desc)
+    set = Sorted::ParamsQuery.parse(params)
+    result = Sorted::Set.new([['email', 'asc'], ['phone', 'asc'], ['name', 'desc']])
+
+    expect(set).to eq(result)
+  end
+
+  it 'should defalut to asc if missing direction' do
+    params = %w(email)
+    set = Sorted::ParamsQuery.parse(params)
+    result = Sorted::Set.new([['email', 'asc']])
+
+    expect(set).to eq(result)
+  end
+end
+
+describe Sorted::ParamsQuery, 'encode' do
+  it 'should return an array of params to be used with a URL library' do
+    set = Sorted::Set.new([['email', 'desc'], ['name', 'desc'], ['phone', 'asc']])
+    result = %w(email_desc name_desc phone_asc)
+
+    expect(Sorted::ParamsQuery.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.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Rufus Post
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,6 +86,7 @@ files:
 - lib/sorted/version.rb
 - sorted.gemspec
 - spec/json_query_spec.rb
+- spec/params_query_spec.rb
 - spec/set_spec.rb
 - spec/spec_helper.rb
 - spec/sql_query_spec.rb