sort_n_params 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d7d660d21516f59a4a914359a26d53a20fdc3699793e0928957546baee823e
-  data.tar.gz: 928b68de9c0da24d7d454f445dbfe2b2cdfcd1a55762b9fd226edf86a85ec25f
+  metadata.gz: 1699472fa73140a298c054ba1cf30a75c1f08a38cfa991d2b0d738bed8b707a0
+  data.tar.gz: fa259494066c8118ce818a88169b771631550bd8b20dbf39c3966230abc24c54
 SHA512:
-  metadata.gz: '093b2206de1545750e2da682723fb6c725d6ca907156ccd7068edd827d87923f46ca100887d7a9f8d1f47923c1230214db6aca59a312a8da949291810637861a'
-  data.tar.gz: 431f0adadd6e5fc19f105afa7eac5a2ed3ea7d0471363473af5ba896e2b6c35f3d3ea4b2963cdb9f72955312c36cc8df1cfe59a01437ab005db6737f2e66ff32
+  metadata.gz: 4b7d0e7c550936f4f85a2312935b138490dcce4f252240465b28eac3e4c7268fa87a089607824af3165934abdb1a8e59fdb2f5412e8684c45e6b8980fc666814
+  data.tar.gz: 8f406482183c6f110e9eb13a30a0fbbfe85052c5c235b4e0d3366d879632de367c561b06b984184cef0ca01f737aa81a1f2288d2506663beb477d5e061b69eee

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.6.1
+before_install:
+   - gem update --system
+   - gem install bundler
+script:
+   - bundle install
+   - bundle exec rake spec

data/lib/sort_n_params/concerns/scopes.rb

@@ -4,15 +4,17 @@ module SortNParams
   module Scopes
     extend ActiveSupport::Concern
     class_methods do
-      def sorting_order(ordering_array)
+      def sorting_order(ordering_array, table_name = nil)
         return all if ordering_array.blank?
 
-        all.order(parse_array(ordering_array))
+        all.order(parse_array(ordering_array, table_name))
       end
 
-      def parse_array(ordering_array)
+      def parse_array(ordering_array, table_name = nil)
+        table = table_name || name.tableize
+
         ordering_array.each_slice(2).map do |order, direction|
-          "#{name.tableize}.#{order} #{direction}"
+          "#{table}.#{order} #{direction}"
         end.join(', ')
       end
     end

data/lib/sort_n_params/sortable.rb

@@ -9,7 +9,7 @@ class Sortable
   end
 
   def call
-    add_previous_order if @params[:order].present?
+    add_previous_order unless @params[:order].nil?
     @sort_params[:order].include?(@column) ? revert_order : add_order
     build_data
   end

data/sort_n_params.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'sort_n_params'
-  s.version     = '1.0.3'
+  s.version     = '1.0.4'
   s.date        = '2019-05-07'
   s.summary     = "Sort N Params"
   s.description = "Make your html <tables> sortables with N <th> parameters this gem."
@@ -8,14 +8,16 @@ Gem::Specification.new do |s|
   s.email       = 'juannferrari@gmail.com'
   s.require_paths = ["lib"]
   s.files       = [
+    ".travis.yml",
     "Gemfile",
-    "MIT-LICENSE",
+    "LICENSE",
     "Rakefile",
     "sort_n_params.gemspec",
     "lib/sort_n_params.rb",
     "lib/sort_n_params/sortable.rb",
     "lib/sort_n_params/sort_helpers.rb",
     "lib/sort_n_params/concerns/scopes.rb",
+    "spec/concerns/scopes_spec.rb",
     "spec/spec_helper.rb",
     "spec/sortable_spec.rb"
     ]
@@ -27,10 +29,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler"
   s.add_development_dependency "factory_bot", "~> 4.0"
   s.add_development_dependency "pry-byebug"
-  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake", ">= 12.3.3"
   s.add_development_dependency "rspec", "~> 3.0"
 
   s.add_dependency(%q<rails>.freeze, ["~> 5.0"])
   s.add_dependency(%q<nokogiri>.freeze, [">= 0"])
-  s.add_dependency(%q<rake>.freeze, ["~> 10.1"])
+  s.add_dependency(%q<rake>.freeze, [">= 12.3.3"])
 end

data/spec/concerns/scopes_spec.rb

@@ -0,0 +1,25 @@
+require 'sort_n_params/concerns/scopes'
+
+RSpec.describe SortNParams::Scopes do
+  let(:test_class) do
+    CustomTable = Struct.new(:custom_field) do
+      include SortNParams::Scopes
+    end
+  end
+
+  context 'when you pass only an ordering array' do
+    subject { test_class.parse_array(["test_field","asc"]) }
+
+    it "builds the array correctly without the table_name param passed" do
+      expect(subject).to eq("custom_tables.test_field asc")
+    end
+  end
+
+  context 'when you pass both ordering array and table name' do
+    subject { test_class.parse_array(["test_field","asc"], "another_table_name" ) }
+
+    it "builds the array correctly with the table_name param passed" do
+      expect(subject).to eq("another_table_name.test_field asc")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'factory_bot'
+require 'sort_n_params/sortable'
 
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sort_n_params
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Juan Francisco Ferrari
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,32 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 description: Make your html <tables> sortables with N <th> parameters this gem.
 email: juannferrari@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - Gemfile
-- MIT-LICENSE
+- LICENSE
 - Rakefile
 - lib/sort_n_params.rb
 - lib/sort_n_params/concerns/scopes.rb
 - lib/sort_n_params/sort_helpers.rb
 - lib/sort_n_params/sortable.rb
 - sort_n_params.gemspec
+- spec/concerns/scopes_spec.rb
 - spec/sortable_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/JuannFerrari/sort_n_params
@@ -157,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Sort N Params