elasticband 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFmN2E3YzkzYjMxY2Y0NjFlMGFiODRhZjM4MmFlMzE2NGE5ODNjZA==
+    YjdlOTdhMWJmYzYzNWJhY2E2MjMyNDAyNzg2YTkyYzVlMzFjYWMxYQ==
   data.tar.gz: !binary |-
-    NzcyMzlmZTg2YmU3ZmZjNTAxNDMxMTQ3OTFhZmY1ZDA5NWY4ODQwYQ==
+    Y2VmMzk3ZDAxYzE0OGIyYTcwNTFlMzdkMDRjYzU3MjVjYTJkMTMxMg==
 SHA512:
   metadata.gz: !binary |-
-    NGRmZDJlYzQ2NzliMzM0MWE0ZDY0MTgwY2NkYjEwYjAxNzk4YjVhNzA1ZTA3
-    YWMxYzAwZDJlZDRkMTgyOWQyOGQwNjdmNWQ2MWI4N2QyODgwZDI4MDhkYjI1
-    YWUyYTcyMmY1NjAzMTA3ZWI1NTU3ZjIxZGJjMGFlZDkzZTE2Yjk=
+    YTkzNjAwYTM4ZjcxZjZmMjdjOGJmYzdiMGFmODc2OWJlZDJjNzRlODhhZDdk
+    NTkxYmViY2NkM2Y5NDhiNzcxYmZkYWMyNDhkYTEwNTA3NWZhY2UyN2RkM2Mz
+    YmJjODdkZjMyNTJiYjhlYzkyNzdjZGEwMGNkNDgxNjNhYzg4NzE=
   data.tar.gz: !binary |-
-    OGQyOWY1OGIxOWU2ZWQ3NzgxNzdlOTYxYTM3ODRkYTE3ZmUzMGVjMDU0YTQx
-    ZjZhNGI2MThkMDFlODVhYTU0MWUwZjFiYzA1YWVjZWM3NTliMDVhZTE3NGNm
-    ZWJkZmNkZGI1ZDYwOThiMTQwNjc0ZjgyMzZjNTQyZDdiNTBkMTI=
+    ZmRhZWRhZDg2YzQwYmNmZGNhZjMxYzM3ZWQ3ODY2MmIyMGFiOTA4MjAzZjkx
+    MTM3ZjNjMGRkODFjMTE5ZGY3ZmEzOTc2ZjcyZjNkMTZhZGQwYjAyODZiNDJk
+    ODEyNzI1YzhmYjhlYThjYzczZmVmMGEyOWMxMWRhM2FjODNmZWE=

data/.gitignore

@@ -4,6 +4,7 @@
 
 /.bundle/
 /.yardoc
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/README.md

@@ -1,5 +1,10 @@
 # Elasticband
-[![Build Status](https://travis-ci.org/LoveMondays/elasticband.svg)](https://travis-ci.org/LoveMondays/elasticband) [![Code Climate](https://codeclimate.com/github/LoveMondays/elasticband/badges/gpa.svg)](https://codeclimate.com/github/LoveMondays/elasticband) [![Test Coverage](https://codeclimate.com/github/LoveMondays/elasticband/badges/coverage.svg)](https://codeclimate.com/github/LoveMondays/elasticband/coverage)
+
+[![Build Status](https://travis-ci.org/LoveMondays/elasticband.svg)](https://travis-ci.org/LoveMondays/elasticband)
+[![Code Climate](https://codeclimate.com/github/LoveMondays/elasticband/badges/gpa.svg)](https://codeclimate.com/github/LoveMondays/elasticband)
+[![Test Coverage](https://codeclimate.com/github/LoveMondays/elasticband/badges/coverage.svg)](https://codeclimate.com/github/LoveMondays/elasticband/coverage)
+[![Gem Version](https://badge.fury.io/rb/elasticband.svg)](http://badge.fury.io/rb/elasticband)
+[![Dependency Status](https://gemnasium.com/LoveMondays/elasticband.svg)](https://gemnasium.com/LoveMondays/elasticband)
 
 Query builder for [elasticsearch-rails gem](https://github.com/elastic/elasticsearch-rails)
 

data/lib/elasticband/aggregation.rb

@@ -12,7 +12,7 @@ module Elasticband
     attr_accessor :name
 
     def initialize(name)
-      self.name = name.to_s.gsub(/\W/, '_').to_sym
+      self.name = name.to_s.gsub(/\W/, '_'.freeze).to_sym
     end
 
     def to_h(aggregation_hash = {})

data/lib/elasticband/sort.rb

@@ -9,32 +9,51 @@ module Elasticband
       #
       # #### Examples
       # ```
-      # Sort.parse(sort: [{ name: :desc }])
+      # Sort.parse(sort: { name: :desc })
       # => { sort: [{ name: :desc }] }
       #
-      # Sort.parse(sort: [{ name: :asc }])
-      # => { sort: [{ name: :asc }] }
+      # Sort.parse(sort: [{ name: :desc }, { created_at: :asc }])
+      # => { sort: [{ name: :desc }, { created_at: :asc }] }
       #
-      # Sort.parse(sort: ['+name'])
-      # => { sort: [{ name: :asc }] }
+      # Sort.parse(sort: '-name,+created_at,id')
+      # => { sort: [{ name: :desc }, { created_at: :asc }, { id: :asc }] }
       #
-      # Sort.parse(sort: ['-name'])
-      # => { sort: [{ name: :desc }] }
+      # Sort.parse(sort: ['-name', '+created_at', 'id'])
+      # => { sort: [{ name: :desc }, { created_at: :asc }, { id: :asc }] }
       # ```
       def parse(options)
-        options[:sort].map { |param| parse_param(param) }
+        new(options[:sort]).parse
       end
+    end
+
+    attr_reader :sort_by
 
-      private
+    def initialize(sort_by)
+      @sort_by = sort_by
+    end
 
-      def parse_param(param)
-        return param unless param.is_a?(String)
+    def parse
+      return if sort_by.blank?
+      return [sort_by] if sort_by.is_a?(Hash)
 
-        direction = param.start_with?('-') ? :desc : :asc
-        field = param.start_with?('-') || param.start_with?('+') ? param[1..-1] : param
+      @sort_by = sort_by.split(','.freeze) if sort_by.is_a?(String)
+      sort_by.map { |param| parse_param(param) }
+    end
 
-        { field.to_sym => direction }
-      end
+    private
+
+    def parse_param(param)
+      return param if param.is_a?(Hash)
+
+      { field(param).to_sym => direction(param) }
+    end
+
+    def field(param)
+      param.start_with?('-'.freeze) || param.start_with?('+'.freeze) ? param[1..-1] : param
+    end
+
+    def direction(param)
+      param.start_with?('-'.freeze) ? :desc : :asc
     end
   end
 end

data/lib/elasticband/version.rb

@@ -1,3 +1,3 @@
 module Elasticband
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/sort_spec.rb

@@ -4,28 +4,34 @@ RSpec.describe Elasticband::Sort do
   describe '.parse' do
     subject { described_class.parse(sort: sort_params) }
 
-    context 'with name desc' do
-      let(:sort_params) { [{ name: :desc }] }
+    context 'when sort param nil' do
+      let(:sort_params) { nil }
+
+      it { is_expected.to be nil }
+    end
+
+    context 'when sort is a hash' do
+      let(:sort_params) { { name: :desc } }
 
       it { is_expected.to eq([{ name: :desc }]) }
     end
 
-    context 'with name asc short way' do
-      let(:sort_params) { ['+name'] }
+    context 'when sort is an array of hashes' do
+      let(:sort_params) { [{ name: :desc }, { created_at: :asc }] }
 
-      it { is_expected.to eq([{ name: :asc }]) }
+      it { is_expected.to eq([{ name: :desc }, { created_at: :asc }]) }
     end
 
-    context 'with name desc short way' do
-      let(:sort_params) { ['-name'] }
+    context 'when sort is a string' do
+      let(:sort_params) { '-name,+created_at,id' }
 
-      it { is_expected.to eq([{ name: :desc }]) }
+      it { is_expected.to eq([{ name: :desc }, { created_at: :asc }, { id: :asc }]) }
     end
 
-    context 'with name as string' do
-      let(:sort_params) { ['name'] }
+    context 'when sort is array of strings' do
+      let(:sort_params) { ['-name', '+created_at', 'id'] }
 
-      it { is_expected.to eq([{ name: :asc }]) }
+      it { is_expected.to eq([{ name: :desc }, { created_at: :asc }, { id: :asc }]) }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticband
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Glauber Campinho
@@ -109,7 +109,6 @@ files:
 - .travis.yml
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,73 +0,0 @@
-PATH
-  remote: .
-  specs:
-    elasticband (0.1.5)
-      activesupport
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.4)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    dotenv (2.0.2)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.0)
-    parser (2.2.2.6)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.32.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  codeclimate-test-reporter
-  dotenv
-  elasticband!
-  rake
-  rspec (~> 3.3.0)
-  rubocop
-
-BUNDLED WITH
-   1.10.6