binxtils 0.4.1 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07cf847075e14ba8eb238179122e2d07e65ea8b19d135dcbbfc857874854a3d6
-  data.tar.gz: 273252baab87508fa30c9ab4cbe5f3c0f385a9557099f798a62992f922636ea6
+  metadata.gz: e72c90471da7710071e132edf196d7599c104c825c57c763473dc7b2d76e013b
+  data.tar.gz: 8db5ae15b52cbf23d5a2e3a2ca5b5fb1b16a790e3c1c50b9a38f0f4519796c4c
 SHA512:
-  metadata.gz: 549515857ebf8373baeaf1bc8dbdebc60bf47edc00ee3b55a3c496963239cad5e349870904f54ccc996573b2531c92b7c7afa23be4636d0c754bc8c3bd67048b
-  data.tar.gz: 8e3cd4bec8bb233732398fe1d4e4a9a0034fd4d93258ab76a2cdb99de6cd498f1edf062c391271d401f04d0e5062a806532daadec2459715f2063686f3459d38
+  metadata.gz: 0fcf63a17b0886fcb73543e5ddbd363b95237eb257a159451d2a6af6b15ecf45354dcafd17cfd3e359b565459e28ce3ddad4b17d57d02562dc2b87b1ad9296d9
+  data.tar.gz: 2ffc0ce173f6d2431b831451f8c40f5668740c732ceb543ed90a584d3fba7f9c4e4c145281b92cee1d4a4b9842a7e2710483cf8eb84c073ce83f4f47122ac958

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

@@ -16,16 +16,15 @@ module Binxtils
       # Set time period
       @period ||= params[:period]
       if @period == "custom"
-        if params[:start_time].present?
-          @start_time = Binxtils::TimeParser.parse(params[:start_time], @timezone)
-          @end_time = Binxtils::TimeParser.parse(params[:end_time], @timezone) || latest_period_date
+        @start_time = Binxtils::TimeParser.parse(params[:start_time], @timezone, parse_error: :nil)
+        if @start_time.present?
+          @end_time = Binxtils::TimeParser.parse(params[:end_time], @timezone, parse_error: :nil) || latest_period_date
           @start_time, @end_time = @end_time, @start_time if @start_time > @end_time
         else
           set_time_range_from_period
         end
-      elsif params[:search_at].present?
+      elsif (@search_at = Binxtils::TimeParser.parse(params[:search_at], @timezone, parse_error: :nil))
         @period = "custom"
-        @search_at = Binxtils::TimeParser.parse(params[:search_at], @timezone)
         offset = params[:period].present? ? params[:period].to_i : 10.minutes.to_i
         @start_time = @search_at - offset
         @end_time = @search_at + offset

data/app/helpers/binxtils/sortable_helper.rb

@@ -31,16 +31,16 @@ module Binxtils
       render_sortable = html_options.key?(:render_sortable) ? html_options[:render_sortable] : !html_options[:skip_sortable]
       return title unless render_sortable
 
-      html_options[:class] = "#{html_options[:class]} sortable-link"
-      direction = (column == sort_column && sort_direction == "desc") ? "asc" : "desc"
+      active = column == sort_column
+      direction = (active && sort_direction == "desc") ? "asc" : "desc"
+      span_content = ((direction == "asc") ? "\u2193" : "\u2191") if active
 
-      if column == sort_column
-        html_options[:class] += " active"
-        span_content = (direction == "asc") ? "\u2193" : "\u2191"
-      end
+      link_options = html_options.except(:render_sortable, :skip_sortable)
+        .merge(class: [html_options[:class], "sortable-link", ("active" if active)].compact.join(" "))
 
-      link_to(sortable_url(column, direction), html_options) do
-        concat(block_given? ? capture(&block) : title.html_safe)
+      # Titles are escaped (not marked html_safe) - pass a block to render HTML
+      link_to(sortable_url(column, direction), link_options) do
+        concat(block_given? ? capture(&block) : title)
         concat(content_tag(:span, span_content, class: "sortable-direction"))
       end
     end

data/lib/binxtils/input_normalizer.rb

@@ -13,7 +13,7 @@ module Binxtils
     def string(val)
       return nil if val.blank?
 
-      val.strip.gsub(/\s+/, " ")
+      val.to_s.delete("\u0000").strip.gsub(/\s+/, " ")
     end
 
     def present_or_false?(val)

data/lib/binxtils/time_parser.rb

@@ -5,26 +5,48 @@ module Binxtils
     extend Functionable
 
     EARLIEST_YEAR = 1900
-    LATEST_YEAR = Time.current.year + 100
 
     def default_time_zone
       @default_time_zone ||= ActiveSupport::TimeZone[Rails.application.class.config.time_zone].freeze
     end
 
-    def parse(time_str = nil, time_zone_str = nil, in_time_zone: false)
+    # parse_error: :raise raises unparseable input errors, :nil swallows them
+    def parse(time_str = nil, time_zone_str = nil, in_time_zone: false, parse_error: :raise)
+      parse!(time_str, time_zone_str, in_time_zone:)
+    rescue ArgumentError
+      raise unless parse_error == :nil
+      nil
+    end
+
+    def looks_like_timestamp?(time_str)
+      time_str.is_a?(Integer) || time_str.is_a?(Float) || time_str.to_s.strip.match(/^\d+\z/) # it's only numbers
+    end
+
+    # Accepts a time object, rounds to minutes
+    def round(time, unit = "minute")
+      if unit == "second"
+        time.change(usec: 0, sec: 0)
+      else # Default is minute, nothing is built to manage anything else
+        time.change(min: 0, usec: 0, sec: 0)
+      end
+    end
+
+    #
+    # private below here
+    #
+
+    def parse!(time_str = nil, time_zone_str = nil, in_time_zone: false)
       return nil unless time_str.present?
       return time_str if time_str.is_a?(Time)
 
       if looks_like_timestamp?(time_str)
-        return parse("#{time_str}-01-01") if time_str.to_s.length == 4 # Looks like year, valid 8601 format
+        return parse!("#{time_str}-01-01") if time_str.to_s.length == 4 # Looks like year, valid 8601 format
 
         # otherwise it's a timestamp
         time = Time.at(time_str.to_i)
       else
         time_zone = Binxtils::TimeZoneParser.parse(time_zone_str)
-        Time.zone = time_zone
-        time = Time.zone.parse(time_str.to_s) # Assign in time zone
-        Time.zone = default_time_zone
+        time = (time_zone || Time.zone).parse(time_str.to_s) # Assign in time zone
       end
       # Return in time_zone or not
       in_time_zone ? time_in_zone(time, time_str:, time_zone:, time_zone_str:) : time
@@ -32,8 +54,8 @@ module Binxtils
       # Try to parse some other, unexpected formats -
       paychex_formatted = %r{(?<month>\d+)/(?<day>\d+)/(?<year>\d+) (?<hour>\d\d):(?<minute>\d\d) (?<ampm>\w\w)}.match(time_str)
       ie11_formatted = %r{(?<month>\d+)/(?<day>\d+)/(?<year>\d+)}.match(time_str)
-      just_date = %r{(?<year>\d{4})[^\d|\w](?<month>\d\d?)}.match(time_str)
-      just_date_backward = %r{(?<month>\d\d?)[^\d|\w](?<year>\d{4})}.match(time_str)
+      just_date = %r{(?<year>\d{4})\D(?<month>\d\d?)}.match(time_str)
+      just_date_backward = %r{(?<month>\d\d?)\D(?<year>\d{4})}.match(time_str)
 
       # Get the successful matching regex group, and then reformat it in an expected way
       regex_match = [paychex_formatted, ie11_formatted, just_date, just_date_backward].compact.first
@@ -44,8 +66,10 @@ module Binxtils
         .compact
         .join("-")
 
-      # If we end up with an unreasonable year, throw an error
-      raise e unless new_str.split("-").first.to_i.between?(EARLIEST_YEAR, LATEST_YEAR)
+      # If we end up with an unreasonable year or month, throw an error
+      # (an invalid month would otherwise recurse forever, re-matching and re-appending the day)
+      raise e unless new_str.split("-").first.to_i.between?(EARLIEST_YEAR, Time.current.year + 100)
+      raise e unless regex_match["month"].to_i.between?(1, 12)
 
       # Add the day, if there isn't one
       new_str += "-01" unless regex_match.names.include?("day")
@@ -54,26 +78,9 @@ module Binxtils
         new_str += " #{regex_match["hour"]}:#{regex_match["minute"]}#{regex_match["ampm"]}"
       end
       # Run it through Binxtils::TimeParser again
-      parse(new_str, time_zone_str, in_time_zone:)
-    end
-
-    def looks_like_timestamp?(time_str)
-      time_str.is_a?(Integer) || time_str.is_a?(Float) || time_str.to_s.strip.match(/^\d+\z/) # it's only numbers
-    end
-
-    # Accepts a time object, rounds to minutes
-    def round(time, unit = "minute")
-      if unit == "second"
-        time.change(usec: 0, sec: 0)
-      else # Default is minute, nothing is built to manage anything else
-        time.change(min: 0, usec: 0, sec: 0)
-      end
+      parse!(new_str, time_zone_str, in_time_zone:)
     end
 
-    #
-    # private below here
-    #
-
     def time_in_zone(time, time_zone_str:, time_str: nil, time_zone: nil)
       time_zone ||= if time_zone_str.present?
         Binxtils::TimeZoneParser.parse(time_zone_str)
@@ -85,6 +92,6 @@ module Binxtils
       time.in_time_zone(time_zone || ActiveSupport::TimeZone["UTC"])
     end
 
-    conceal :time_in_zone
+    conceal :time_in_zone, :parse!
   end
 end

data/lib/binxtils/version.rb

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

metadata

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