sorted 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47e5b8db73e27b5130e62753c00ec308e6c6886d
-  data.tar.gz: 4c8abeb0e9399f5d2558d202597199ed8d236bea
+  metadata.gz: b9b0ab137af7f8964eb8b6d8bee93e782fae7dce
+  data.tar.gz: 373d2c35b43cdddecb7d0eb1e0b60b6cd2ebcbb0
 SHA512:
-  metadata.gz: a1974de003bae9e48872f9652f209c5c374c0432d29635f1e169ef52ff3a0e626adff2bd2a8fa23ae583fe49cb98534e834ba82f36b1c285c456179f614ecb93
-  data.tar.gz: f9d8cba70836197f131ce03c3c36c35318284842d8a40aeb2ae3b4815d411c8e142949900257541b986be0c47f6ff97a06d3c0d5de7709aff3630ad15464f394
+  metadata.gz: 53e9a1614a66a52f42ec5b219c25927978c410ae43ce4eb12cd0facb1be64c2e64cb2dba457909043f4f12320a04e3313336e60d1be7be5d57e817caf5656c4d
+  data.tar.gz: 57eaad9eb987b624cebe8f320a786e541450d4f24424a31f41153f233d0e12f55f38c8d8eb73edb045117dc7faccb2f4192f64077857cc1b8eb62f2589377c8d

data/.gitignore

@@ -20,5 +20,6 @@ pkg
 .rvmrc
 Gemfile.lock
 .bundle
+doc/*
 
 ## PROJECT::SPECIFIC

data/.rubocop.yml

@@ -1,7 +1,4 @@
 inherit_from: .rubocop_todo.yml
 
-Style/Blocks:
-  Enabled: false
-
 Style/WordArray:
   MinSize: 2

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-03-01 13:05:10 +1100 using RuboCop version 0.28.0.
+# on 2015-09-23 09:55:31 +1000 using RuboCop version 0.28.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,9 +12,9 @@ Metrics/AbcSize:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 103
+  Max: 130
 
-# Offense count: 12
+# Offense count: 18
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 131
@@ -24,7 +24,7 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 13
 
-# Offense count: 8
+# Offense count: 9
 Style/Documentation:
   Enabled: false
 
@@ -37,3 +37,7 @@ Style/For:
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Enabled: false
+
+# Offense count: 3
+Style/OpMethod:
+  Enabled: false

data/README.md

@@ -10,6 +10,8 @@ attributes in weird and wonderful ways.
 The secret sauce is the `Sorted::Set` object, in this example we 'toggle' email:
 
 ```ruby
+require 'sorted/set'
+
 a = Sorted::Set.new([['email', 'asc'], ['name', 'asc']])
 b = Sorted::Set.new([['email', 'asc'], ['phone', 'asc']])
 
@@ -26,6 +28,8 @@ when you sort by various columns, `Sorted::Set` pretty much just does that.
 Parsers return a `Sorted::Set` that can then be used by an encoder:
 
 ```ruby
+require 'sorted/uri_query'
+
 set = Sorted::URIQuery.parse('name_asc!email_asc')
 Sorted::SQLQuery.encode(set) #=> 'name ASC email ASC'
 ```

data/lib/sorted.rb

@@ -1,274 +1,2 @@
 module Sorted
-  class Set
-    include Enumerable
-    include Comparable
-
-    def initialize(set = [])
-      @set = set
-    end
-
-    def each(&block)
-      @set.each(&block)
-    end
-
-    ##
-    # Gets the keys from the array pairs
-    #
-    #   set = [["email", "name"], ["desc", "desc"]]
-    #   set.transpose #=> [["email", "name"], ["desc", "desc"]]
-    #   set.transpose.first #=> ["email", "name"]
-
-    def keys
-      @set.transpose.first || []
-    end
-
-    ##
-    # Returns a resulting set with specific keys flipped
-    #
-    #   a = Sorted::Set.new([['email', 'asc'], ['name', 'asc']])
-    #   b = Sorted::Set.new([['email', 'asc'], ['phone', 'asc']])
-    #   s = a.direction_intersect(b)
-    #   s.to_a #=> [['email', 'desc'], ['phone', 'asc'], ['name', 'asc']]
-
-    def direction_intersect(other)
-      self.class.new.tap do |memo|
-        unless other.keys.empty?
-          a(memo, other)
-          b(memo, other)
-        end
-        c(memo)
-        d(memo, other)
-      end
-    end
-
-    def -(other)
-      self.class.new.tap do |memo|
-        each do |a|
-          b = other.assoc(a.first)
-          next if b
-          memo << a
-        end
-      end
-    end
-
-    def +(other)
-      self.class.new(@set + other.to_a)
-    end
-
-    def <<(other)
-      self.class.new(@set << other.to_a)
-    end
-
-    def select(&block)
-      self.class.new(@set.select(&block))
-    end
-
-    def reject(&block)
-      self.class.new(@set.reject(&block))
-    end
-
-    def <=>(other)
-      @set <=> other.to_a
-    end
-
-    def uniq
-      self.class.new(@set.uniq)
-    end
-
-    def assoc(o)
-      @set.assoc(o)
-    end
-
-    def at(i)
-      @set.at(i)
-    end
-
-    def to_a
-      @set
-    end
-
-    def to_hash
-      @set.inject({}) { |a, e| a.merge(Hash[e[0], e[1]]) }
-    end
-
-    private
-
-    # If the order of keys match upto the size of the set then flip them
-    def a(memo, other)
-      if keys == other.keys.take(keys.size)
-        keys.each do |order|
-          if other.keys.include?(order)
-            memo << [order, flip_direction(other.assoc(order).last)]
-          end
-        end
-      else
-        keys.each do |order|
-          if other.keys.include?(order)
-            memo << other.assoc(order)
-          end
-        end
-      end
-    end
-
-    # Add items from other that are common and not already added
-    def b(memo, other)
-      other.keys.each do |sort|
-        if keys.include?(sort) && !memo.keys.include?(sort)
-          memo << other.assoc(sort)
-        end
-      end
-    end
-
-    # Add items not in memo
-    def c(memo)
-      each do |order|
-        unless memo.keys.include?(order[0])
-          memo << order
-        end
-      end
-    end
-
-    # Add items from other not in memo
-    def d(memo, other)
-      other.each do |sort|
-        unless memo.keys.include?(sort[0])
-          memo << sort
-        end
-      end
-    end
-
-    def flip_direction(direction)
-      case direction
-      when 'asc' then 'desc'
-      when 'desc'then  'asc'
-      end
-    end
-  end
-
-  module Parse
-    def split(raw, delim, &block)
-      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-z0-9._]+)_([asc|desc]+)|[a-z0-9._]+)/i
-
-    def self.parse(raw)
-      split(raw, /!/) 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('_') }.join('!')
-    end
-  end
-
-  class SQLQuery
-    extend Parse
-
-    REGEXP = /(([a-z0-9._]+)\s([asc|desc]+)|[a-z0-9._]+)/i
-
-    def self.parse(raw)
-      split(raw, /,/) do |set, part|
-        m = part.match(REGEXP)
-        next unless m
-        set << parse_match(m)
-      end
-    end
-
-    def self.encode(set, quote_proc = ->(f) { f })
-      set.map { |a| "#{column(a[0], quote_proc)} #{a[1].upcase}" }.join(', ')
-    end
-
-    def self.column(parts, quote_proc)
-      parts.split('.').map { |frag| quote_proc.call(frag) }.join('.')
-    end
-    private_class_method :column
-  end
-
-  class JSONQuery
-    extend Parse
-
-    JSON_TO_SORTED = { 1 => 'asc', -1 => 'desc' }
-    SORTED_TO_JSON = { 'asc' => 1, 'desc' => -1 }
-
-    def self.parse(raw)
-      Set.new(raw.map { |key, val| [key, JSON_TO_SORTED[val]] })
-    end
-
-    def self.encode(set)
-      set.inject({}) { |a, e| a.merge(Hash[e[0], SORTED_TO_JSON[e[1]]]) }
-    end
-  end
-
-  ##
-  # Parses an Elasticsearch type set of order
-  #
-  # Parsing:
-  #
-  #   params = [{ 'email' => {'order' => 'desc'}}]
-  #   set = Sorted::ElasticsearchQuery.parse(params)
-  #   set.to_a #=> [['email', 'desc']]
-  #
-  # Encoding:
-  #
-  #   Sorted::ParamsQuery.encode(set) #=> [{ 'email' => {'order' => 'desc'}}]
-  #
-
-  class ElasticsearchQuery
-    extend Parse
-
-    def self.parse(raw)
-      Set.new(raw.each_with_object([]) { |hash, a| a << [hash.first.first, hash.first.last['order']] })
-    end
-
-    def self.encode(set)
-      set.to_a.each_with_object([]) { |f, a| a << { f.first => { 'order' => f.last } } }
-    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/elasticsearch_query.rb

@@ -0,0 +1,27 @@
+require 'sorted/set'
+
+module Sorted
+  ##
+  # Parses an Elasticsearch type set of order
+  #
+  # Parsing:
+  #
+  #   params = [{ 'email' => {'order' => 'desc'}}]
+  #   set = Sorted::ElasticsearchQuery.parse(params)
+  #   set.to_a #=> [['email', 'desc']]
+  #
+  # Encoding:
+  #
+  #   Sorted::ParamsQuery.encode(set) #=> [{ 'email' => {'order' => 'desc'}}]
+  #
+
+  class ElasticsearchQuery
+    def self.parse(raw)
+      Set.new(raw.each_with_object([]) { |hash, a| a << [hash.first.first, hash.first.last['order']] })
+    end
+
+    def self.encode(set)
+      set.to_a.each_with_object([]) { |f, a| a << { f.first => { 'order' => f.last } } }
+    end
+  end
+end

data/lib/sorted/json_query.rb

@@ -0,0 +1,16 @@
+require 'sorted/set'
+
+module Sorted
+  class JSONQuery
+    JSON_TO_SORTED = { 1 => 'asc', -1 => 'desc' }
+    SORTED_TO_JSON = { 'asc' => 1, 'desc' => -1 }
+
+    def self.parse(raw)
+      Set.new(raw.map { |key, val| [key, JSON_TO_SORTED[val]] })
+    end
+
+    def self.encode(set)
+      set.inject({}) { |a, e| a.merge(Hash[e[0], SORTED_TO_JSON[e[1]]]) }
+    end
+  end
+end

data/lib/sorted/params_query.rb

@@ -0,0 +1,38 @@
+require 'sorted/set'
+require 'sorted/parse'
+
+module Sorted
+  ##
+  # 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/parse.rb

@@ -0,0 +1,14 @@
+require 'sorted/set'
+
+module Sorted
+  module Parse
+    def split(raw, delim, &block)
+      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
+end

data/lib/sorted/set.rb

@@ -0,0 +1,238 @@
+module Sorted
+  class Set
+    include Enumerable
+    include Comparable
+
+    def initialize(ary = [])
+      @ary = ary
+    end
+
+    ##
+    # Calls the given block once for each element in self, passing that element
+    # as a parameter.
+    #
+    # An Enumerator is returned if no block is given.
+
+    def each
+      return to_enum(:each) unless block_given?
+      @ary.each { |item| yield item }
+    end
+
+    ##
+    # Returns the keys form the array pairs.
+    #
+    #   set = Sorted::Set.new([["email", "desc"], ["name", "desc"]])
+    #   set.keys #=> ["email", "name"]
+
+    def keys
+      @ary.transpose.first || []
+    end
+
+    ##
+    # Returns a new array containing elements common to the two arrays,
+    # excluding any duplicates.
+    #
+    # Any matching keys at matching indexes with the same order will have the
+    # order reversed.
+    #
+    #   a = Sorted::Set.new([['email', 'asc'], ['name', 'asc']])
+    #   b = Sorted::Set.new([['email', 'asc'], ['phone', 'asc']])
+    #   s = a.direction_intersect(b)
+    #   s.to_a #=> [['email', 'desc'], ['phone', 'asc'], ['name', 'asc']]
+
+    def direction_intersect(other_set)
+      self.class.new.tap do |memo|
+        unless other_set.keys.empty?
+          a(memo, other_set)
+          b(memo, other_set)
+        end
+        c(memo)
+        d(memo, other_set)
+      end
+    end
+
+    ##
+    # Array Difference - Returns a new set that is a copy of the original set,
+    # removing any items that also appear in +other_set+. The order is preserved
+    # from the original set.
+    #
+    #   set = Sorted::Set.new(['email', 'desc'])
+    #   other_set = Sorted::Set.new(['phone', 'asc'])
+    #   set - other_set #=> #<Sorted::Set:0x007fafde1ead80>
+
+    def -(other_set)
+      self.class.new.tap do |memo|
+        each do |a|
+          b = other_set.assoc(a.first)
+          next if b
+          memo << a
+        end
+      end
+    end
+
+    ##
+    # Concatenation - Returns a new set built by concatenating the two sets
+    # together to produce a third set.
+    #
+    #   set = Sorted::Set.new(['email', 'desc'])
+    #   other_set = Sorted::Set.new(['phone', 'asc'])
+    #   set + other_set #=> #<Sorted::Set:0x007fafde1ead80>
+
+    def +(other_set)
+      self.class.new(@ary + other_set.to_a)
+    end
+
+    ##
+    # Append - Pushes the given order array on to the end of this set. This
+    # expression returns the set itself, so several appends may be chained
+    # together.
+    #
+    #   set = Sorted::Set.new(['name', 'asc'])
+    #   set << ['email', 'desc'] << ['phone', 'asc']
+    #   set.to_a #=> [['name', 'asc'], ['email', 'desc'], ['phone', 'asc']]
+
+    def <<(ary)
+      @ary << ary
+      self
+    end
+
+    ##
+    # Returns a new set containing all elements of self for which the given
+    # block returns a true value.
+    #
+    # If no block is given, an Enumerator is returned instead.
+
+    def select
+      return to_enum(:select) unless block_given?
+      self.class.new(@ary.select { |item| yield item })
+    end
+
+    ##
+    # Returns a new set containing the items in self for which the given block
+    # is not true.
+    #
+    # If no block is given, an Enumerator is returned instead.
+
+    def reject
+      return to_enum(:reject) unless block_given?
+      self.class.new(@ary.reject { |item| yield item })
+    end
+
+    ##
+    # Comparison - Returns an integer (-1, 0, or +1) if this array is less than,
+    # equal to, or greater than +other_set+.
+
+    def <=>(other_set)
+      @ary <=> other_set.to_a
+    end
+
+    ##
+    # Returns a new set by removing duplicate values in self.
+    #
+    # If a block is given, it will use the return value of the block for comparison.
+
+    def uniq
+      return self.class.new(@ary.uniq) unless block_given?
+      self.class.new(@ary.uniq { |item| yield item })
+    end
+
+    ##
+    # Searches through an array whose elements are also arrays comparing +item+
+    # with the first element of each contained array using +item+.==.
+    #
+    # Returns the first contained array that matches (that is, the first
+    # associated array), or nil if no match is found.
+
+    def assoc(item)
+      @ary.assoc(item)
+    end
+
+    ##
+    # Returns key, order array pair at index +index+
+
+    def at(index)
+      @ary.at(index)
+    end
+
+    ##
+    # Returns the underlying array for the set object.
+    #
+    #   set = Sorted::Set.new(['name', 'asc'])
+    #   set.to_a #=> [['name', 'asc']]
+
+    def to_a
+      @ary
+    end
+
+    ##
+    # Returns the result of interpreting ary as an array of [key, value] pairs.
+    #
+    #   set = Sorted::Set.new([['email', 'asc']])
+    #   set.to_h #=> { 'email' => 'asc' }
+
+    def to_h
+      @ary.inject({}) { |a, e| a.merge(Hash[e[0], e[1]]) }
+    end
+
+    ##
+    # Returns the number of elements in self. May be zero.
+
+    def length
+      @ary.length
+    end
+    alias_method :size, :length
+
+    private
+
+    # If the order of keys match upto the size of the set then flip them
+    def a(memo, other)
+      if keys == other.keys.take(keys.size)
+        keys.each do |order|
+          if other.keys.include?(order)
+            memo << [order, flip_direction(other.assoc(order).last)]
+          end
+        end
+      else
+        keys.each do |order|
+          if other.keys.include?(order)
+            memo << other.assoc(order)
+          end
+        end
+      end
+    end
+
+    # Add items from other that are common and not already added
+    def b(memo, other)
+      other.keys.each do |sort|
+        if keys.include?(sort) && !memo.keys.include?(sort)
+          memo << other.assoc(sort)
+        end
+      end
+    end
+
+    # Add items not in memo
+    def c(memo)
+      each do |order|
+        unless memo.keys.include?(order[0])
+          memo << order
+        end
+      end
+    end
+
+    # Add items from other not in memo
+    def d(memo, other)
+      other.each do |sort|
+        unless memo.keys.include?(sort[0])
+          memo << sort
+        end
+      end
+    end
+
+    def flip_direction(direction)
+      case direction
+      when 'asc' then 'desc'
+      when 'desc' then 'asc'
+      end
+    end
+  end
+end

data/lib/sorted/sql_query.rb

@@ -0,0 +1,26 @@
+require 'sorted/set'
+
+module Sorted
+  class SQLQuery
+    extend Parse
+
+    REGEXP = /(([a-z0-9._]+)\s([asc|desc]+)|[a-z0-9._]+)/i
+
+    def self.parse(raw)
+      split(raw, /,/) do |set, part|
+        m = part.match(REGEXP)
+        next unless m
+        set << parse_match(m)
+      end
+    end
+
+    def self.encode(set, quote_proc = ->(f) { f })
+      set.map { |a| "#{column(a[0], quote_proc)} #{a[1].upcase}" }.join(', ')
+    end
+
+    def self.column(parts, quote_proc)
+      parts.split('.').map { |frag| quote_proc.call(frag) }.join('.')
+    end
+    private_class_method :column
+  end
+end

data/lib/sorted/uri_query.rb

@@ -0,0 +1,22 @@
+require 'sorted/set'
+require 'sorted/parse'
+
+module Sorted
+  class URIQuery
+    extend Parse
+
+    REGEXP = /(([a-z0-9._]+)_([asc|desc]+)|[a-z0-9._]+)/i
+
+    def self.parse(raw)
+      split(raw, /!/) 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('_') }.join('!')
+    end
+  end
+end

data/lib/sorted/version.rb

@@ -1,3 +1,3 @@
 module Sorted
-  VERSION = '2.0.3'
+  VERSION = '2.1.1'
 end

data/sorted.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop', '>= 0.28'
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map { |f| f =~ /^bin\/(.*)/ ? Regexp.last_match[1] : nil }.compact
+  s.executables  = `git ls-files`.split("\n").map { |f| f =~ %r{/^bin\/(.*)/} ? Regexp.last_match[1] : nil }.compact
   s.require_path = 'lib'
 end

data/spec/elasticsearch_query_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'sorted/elasticsearch_query'
+
 describe Sorted::ElasticsearchQuery, 'decode' do
   it 'should decode elasticsearch order hash to into set' do
     json = [{ 'email' => { 'order' => 'desc' } }, { 'phone' => { 'order' => 'asc' } }, { 'name' => { 'order' => 'desc' } }]

data/spec/json_query_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'sorted/json_query'
+
 describe Sorted::JSONQuery, 'decode' do
   it 'should return a nice array from the order sql' do
     json = { 'email' => 1, 'phone' => 1, 'name' => -1 }

data/spec/params_query_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'sorted/params_query'
+
 describe Sorted::ParamsQuery, 'decode' do
   it 'should return a set from an array of params' do
     params = %w(email_asc phone_asc name_desc)

data/spec/set_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'sorted/set'
+
 describe Sorted::Set do
   it 'should bring phone to first order importance but not toggle ascendance' do
     orders = Sorted::Set.new([['email', 'asc'], ['phone', 'asc']])
@@ -69,7 +71,7 @@ describe Sorted::Set do
     set = Sorted::Set.new([['email', 'asc']])
     result = { 'email' => 'asc' }
 
-    expect(set.to_hash).to eq(result)
+    expect(set.to_h).to eq(result)
   end
 
   it 'should return set when selecting items' do
@@ -83,4 +85,18 @@ describe Sorted::Set do
 
     expect(set.reject { true }.class).to eq(Sorted::Set)
   end
+
+  it 'should append value to set' do
+    set = Sorted::Set.new([['email', 'asc']])
+    set << ['name', 'asc'] << ['phone', 'asc']
+
+    expect(set.length).to eq(3)
+    expect(set.size).to eq(3)
+  end
+
+  it 'should return a unique set' do
+    set = Sorted::Set.new([['email', 'asc'], ['email', 'asc']])
+
+    expect(set.uniq.to_a).to eq([['email', 'asc']])
+  end
 end

data/spec/spec_helper.rb

@@ -2,4 +2,3 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rspec'
-require 'sorted'

data/spec/sql_query_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'sorted/sql_query'
+
 describe Sorted::SQLQuery, 'decode' do
   it 'should return a nice array from the order sql' do
     sql = 'email ASC, phone ASC, name DESC'
@@ -41,9 +43,7 @@ describe Sorted::SQLQuery, 'encode' do
     end
   end
 
-  let(:quoter) {
-    ->(frag) { FakeConnection.quote_column_name(frag) }
-  }
+  let(:quoter) { ->(frag) { FakeConnection.quote_column_name(frag) } }
 
   it 'should properly escape sql column names' do
     set = Sorted::Set.new([['users.name', 'desc']])

data/spec/uri_query_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'sorted/uri_query'
+
 describe Sorted::URIQuery, 'decode' do
   it 'should allow numbers, underscores and full stops in sort params' do
     uri = 'assessmentsTable.name_desc!users_300.name_5_desc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorted
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Rufus Post
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,13 @@ files:
 - README.md
 - Rakefile
 - lib/sorted.rb
+- lib/sorted/elasticsearch_query.rb
+- lib/sorted/json_query.rb
+- lib/sorted/params_query.rb
+- lib/sorted/parse.rb
+- lib/sorted/set.rb
+- lib/sorted/sql_query.rb
+- lib/sorted/uri_query.rb
 - lib/sorted/version.rb
 - sorted.gemspec
 - spec/elasticsearch_query_spec.rb