binxtils 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d72b64353d985a2d1473b717fe1adff0e04c89af0d62ef6b5a1a1af9d274509
-  data.tar.gz: dc3707cc25fd903d65bddca88af6eeea7ea1e05abad11ae17f9f53b2afacc880
+  metadata.gz: ae08f86d8d31882ed56c248ad820a66823606b09a5f5b429b35ea76eb5530cb7
+  data.tar.gz: 0e96c6e1230b26127f1ce6906df7b08db3d83a2b8c0bdc12d6824074ae39ac1d
 SHA512:
-  metadata.gz: 965dbfb38c5dc90180f92ebd1ca5a1403d39cc4688183c42ee474d859efc396387453eec0647ec04a67b57df64a10b05bf29b99294a5d72c2f6f4e80b35f1a9f
-  data.tar.gz: b3a516d70a73ae33f9d4486f23c292f6f644c4a341e591c07d83d67737813e1cda77b6f3649a268887bd6902e611cbabe83f0ae76c291ab339f825c790e365d4
+  metadata.gz: 8e0d408e004acbc45439477d6ea3e79e94f2975a3a1f4cb9a37bef1a6cbfcabf4935a884061e38e90b79fedcfe6e72f07e4aefd119c7b4a298e060d015b72924
+  data.tar.gz: 7ead69ca11aa5335956f0222b8892a29fc356067952d02c09840154bae0f41ccb530a1e70e586869363d70dc9734099b99fe9ae103b4a192ebbad1ed061f9b88

data/README.md

@@ -59,6 +59,14 @@ class BikesController < ApplicationController
 end
 ```
 
+Order with `sortable_order`, which applies `sort_direction` and puts nils last in both directions. It takes `sort_column` by default, or an Arel node or SQL string:
+
+```ruby
+Bike.order(sortable_order)
+Bike.order(sortable_order(Bike.arel_table[sort_column].lower))
+Bike.order(sortable_order("COALESCE((data -> 'bike_count')::integer, 0)"))
+```
+
 ## npm package
 
 This repo also publishes `@bikeindex/time-localizer`, an npm package for localizing time elements in the browser. It ships two builds of the same source:

data/app/controllers/concerns/binxtils/sortable_table.rb

@@ -18,6 +18,12 @@ module Binxtils
       %w[asc desc].include?(params[:direction]) ? params[:direction] : default_direction
     end
 
+    # Desc puts nils last, matching asc
+    def sortable_order(expression = sort_column)
+      node = expression.respond_to?(:asc) ? expression : Arel.sql(expression)
+      node.public_send(sort_direction).nulls_last
+    end
+
     def permitted_time_range_columns
       %w[created_at updated_at].freeze
     end

data/lib/binxtils/input_normalizer.rb

@@ -20,6 +20,11 @@ module Binxtils
       val.to_s.present?
     end
 
+    def regex_escape(val)
+      # Lazy hack, good enough for current purposes. Improve if required!
+      string(val)&.gsub(/\W/, ".")
+    end
+
     def sanitize(str = nil)
       Rails::Html::Sanitizer.full_sanitizer.new.sanitize(str.to_s, encode_special_chars: true)
         .strip
@@ -27,9 +32,14 @@ module Binxtils
         .gsub(/\s+/, " ") # remove extra whitespace
     end
 
-    def regex_escape(val)
-      # Lazy hack, good enough for current purposes. Improve if required!
-      string(val)&.gsub(/\W/, ".")
+    # Plain text, so unlike sanitize: every entity is decoded and angle brackets stay literal
+    def plain_text(value = nil)
+      normalize_whitespace(CGI.unescapeHTML(Rails::Html::Sanitizer.full_sanitizer.new.sanitize(value.to_s)))
+    end
+
+    # An HTML email's "blank" lines are often a  , which String#strip doesn't count as whitespace
+    def normalize_whitespace(value = nil)
+      value.to_s.tr(" ", " ").lines.map(&:strip).join("\n").gsub(/\n{3,}/, "\n\n").strip
     end
   end
 end

data/lib/binxtils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Binxtils
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binxtils
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Bike Index