awesome_sort 0.3.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9485b53990fb0439d32188a7f376efbd0cf7dc735f4ef01d369495e9af602667
-  data.tar.gz: dfc66e05ea62d66225dec8aed090edef4b01e60563a85d0b3a2260abfe031b2e
+  metadata.gz: f16f10faaf8520c88bfde7de255d7cc672b817a46a0063121b17ae499dcceab9
+  data.tar.gz: c75a91203b168d52c8f9a79057913ee6f27ffbe08d0bf6c64c0fb7cabfa583bf
 SHA512:
-  metadata.gz: 4cbdb4084601236beb0897e4b5b4c7a8d54a95e3cca3d8a48708656c01539822d981e834ebda1adcc8cd661e45c1756d71a67d4e36d52d691993e17b39353c87
-  data.tar.gz: cd2fe41617d2502a8909ce375d3b0ef883626caa875a393bacb88728bbd31ba081a1b4594da39fb14b277dec4a0ebf82a1e5684a3dd85e29060b705c23730659
+  metadata.gz: 370930407f65a4f177c3904d30ec42435539581862eb91db817032064e978f493402ebac1374b2a981ce145bfff915b19d604b0003e1b21a6259e825bd78ae37
+  data.tar.gz: 10e113696d830db57611c007c9b7f034bd330c52d1a7c66bc912233a4190861ff68c7ce6f6d3fe33ff7a94a4e03c414023fd0536c6a251662f7e6ffdcc57e326

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock

data/README.md

@@ -40,6 +40,21 @@ AwesomeSort.configure do |config|
 end
 ```
 
+In the view, when creating columns for the table, use the following syntax:
+```ruby
+  <%= column_sort(
+    column_name: "title",
+    width: "10%",
+    link_name: "Title",
+    controller_name: "contact_index",
+    extra: { search: @search }) %>
+```
+where: <br />
+  "column_name" will be the name of your db column <br />
+  "width" will be your column width <br />
+  "link_name" will be the name of the column displayed as a link <br />
+  "controller_name" will be the controller name for logic <br />
+  "extra" pass in there extra parameters <br />
 
 ## Development
 

data/app/assets/javascripts/awesome_sort.js

@@ -20,11 +20,27 @@ function orderable() {
   }
 
   $(".orderable").each(function() {
-    if ($(this).hasClass('order-asc')) {
-      var link = window.location.pathname + '?sort_by=' + $(this).data('order-term') + '&sort_order=desc' + window.location.hash
-    } else {
-      var link = window.location.pathname + '?sort_by=' + $(this).data('order-term') + '&sort_order=asc' + window.location.hash
-    }
-    $(this).wrapInner($('<a/>').attr('href', link));
+    var url = new URL(window.location)
+    url.searchParams.append('sort_by', $(this).data('order-term'))
+    url.searchParams.append('sort_order', $(this).hasClass('order-asc') ? 'desc' : 'asc')
+
+    var element = $(this).has('> a').length ? $(this).children('a') : $(this).wrapInner($('<a/>'))
+    element.attr('href', url.toString());
   });
 };
+
+function fireEvent(event) {
+  var e = new Event(event)
+  window.dispatchEvent(e)
+}
+
+// Have to manually fire event when history is updated (url changes)
+var _pushState = history.pushState;
+history.pushState = function() {
+  _pushState.apply(history, arguments);
+  fireEvent('pushState');
+};
+
+window.addEventListener('pushState', function() {
+  orderable()
+})

data/app/helpers/awesome_sort/awesome_sort_helper.rb

@@ -1,5 +1,14 @@
 module AwesomeSort
   module AwesomeSortHelper
+    ALLOWED_SORT_ORDERS = [
+      'asc',
+      'desc',
+      'ASC',
+      'DESC',
+      :asc,
+      :desc,
+    ]
+
     def column_sort(args = {})
       args[:extra] ||= {}
       # Should pass it column_name, link_name, controller_name and
@@ -19,7 +28,7 @@ module AwesomeSort
         else
           "asc"
         end
-      content_tag(:th, width: args[:width], class: klass) do
+      content_tag(:th, width: args[:width], class: klass, data: { order_term: args[:column_name] }) do
         link_to(
           args[:link_name],
           public_send(c_method, { sort_order: sort_order, sort_by: args[:column_name] }.merge(args[:extra])),
@@ -30,6 +39,7 @@ module AwesomeSort
 
     def sort(scope, sort_by, sort_order)
       klass = scope.model.name.tableize.to_sym
+      sort_order = (ALLOWED_SORT_ORDERS & [sort_order]).first || 'asc'
 
       if sort_by
         if sorter = AwesomeSort.sorters[klass][sort_by.to_sym]

data/awesome_sort.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "awesome_sort/version"
@@ -11,9 +10,12 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Responsive sortable table}
   spec.description   = %q{This gem should make the creation of responsive sortable tables much easier.}
-  spec.homepage      = "https://cpoms.co.uk"
+  spec.homepage      = "https://www.cpoms.co.uk"
   spec.license       = "MIT"
-  spec.metadata      = {"source_code_url" => "https://github.com/meritec/awesome_sort"}
+  spec.metadata      = {
+    "source_code_uri"   => "https://github.com/cpoms/awesome_sort",
+    "documentation_uri" => "https://github.com/cpoms/awesome_sort"
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -24,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "railties", ">= 3.2", "< 6.1"
-  spec.add_runtime_dependency "activesupport", ">= 3.2", "< 6.1"
+  spec.add_runtime_dependency "railties", ">= 3.2", "< 6.2"
+  spec.add_runtime_dependency "activesupport", ">= 3.2", "< 6.2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/awesome_sort/version.rb

@@ -1,3 +1,3 @@
 module AwesomeSort
-  VERSION = "0.3.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_sort
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrei Diaconu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,6 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -118,12 +117,13 @@ files:
 - lib/awesome_sort.rb
 - lib/awesome_sort/engine.rb
 - lib/awesome_sort/version.rb
-homepage: https://cpoms.co.uk
+homepage: https://www.cpoms.co.uk
 licenses:
 - MIT
 metadata:
-  source_code_url: https://github.com/meritec/awesome_sort
-post_install_message: 
+  source_code_uri: https://github.com/cpoms/awesome_sort
+  documentation_uri: https://github.com/cpoms/awesome_sort
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Responsive sortable table
 test_files: []

data/Gemfile.lock

@@ -1,73 +0,0 @@
-PATH
-  remote: .
-  specs:
-    awesome_sort (0.2.0)
-      activesupport (>= 3.2, < 6.1)
-      railties (>= 3.2, < 6.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  awesome_sort!
-  bundler
-  minitest (~> 5.0)
-  rake (~> 10.0)
-
-BUNDLED WITH
-   2.0.1