trusty 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c17b62a8a0ccd79f67284a397b97f5537b55f9
-  data.tar.gz: 0a6eb00f7db619fe5b4aa9f7781778c7b5637107
+  metadata.gz: da402961c1200966ab167b95e1bc978534018ec5
+  data.tar.gz: bb8dfa60b4fae41ca354fb975ff7d1e7ba409c88
 SHA512:
-  metadata.gz: 50afc3a5dea7af42cd9c3aa2d5529f4e36dff23cd553199fe424617c4478baa45ebca1554db1390563b253b0102659dd473029f344e090e16c959473e5ec5161
-  data.tar.gz: 95ea11c6c51596d461cc56249e2298044c10fa78f2469747f22da9a6da3506531ed62add6e11fe4aa97c344e79a7f782151e6328c805b4dcd9ce90aab246b05e
+  metadata.gz: 554ac7e31363efa90cea9a2eef425036146d8ac35bf7c2ee1d6d574168ae58f70a8cc00051b8094deee5d3aa8603ac3973bd08df0887d13f7a109fa1abac581c
+  data.tar.gz: 7e7795d47f04e934856e64f683764264c05ff68ae21d71c3cf582e25f00817f110b50d8479dd29a92135f433b946ca0348a75f2eac197e531de1d6ae860e366b

data/lib/trusty/sorting/atom_sorter.rb

@@ -0,0 +1,102 @@
+require 'trusty/sorting/atoms/version'
+#
+# Based on https://makandracards.com/makandra/9185-ruby-natural-sort-strings-with-umlauts-and-other-funny-characters
+#
+module Trusty
+  module Sorting
+    class AtomSorter
+
+      LEFT_FIRST  = -1
+      RIGHT_FIRST =  1
+      BOTH_EQUAL  =  0
+
+      COMPARERS = {}
+
+      # /(?<=^|\s)[-][\d\.]+|[\d\.]+|.+?/
+      # /(?<=^|\s)[-][\d\.]+|[\d\.]+|[^\d\.\-]+|[^\d\.]+/
+      PATTERNS_RE = /\d+(?:\.\d+){2,}|(?:(?<=^|\s)[-])?\d+(?:\.\d+)?|.+?/
+      NUMERIC_RE  = /[-]?\d+(\.\d+)?/
+
+      attr_reader :value, :index
+
+      def initialize(value, index)
+        @value, @index = value, index
+      end
+
+      def <=>(other)
+        other.is_a?(self.class) || raise("#{self.class} can only compare with classes of the same kind")
+
+        self.class.compare_values(self.value, other.value)
+      end
+
+      class << self
+        def compare_values(left_value, right_value)
+          if left_value.class == right_value.class
+            left_value <=> right_value
+          elsif comparer = COMPARERS[comparer_key_for(left_value.class, right_value.class)]
+            comparer.call(left_value, right_value)
+          else
+            raise "No comparer defined for #{left_value.class} <=> #{right_value.class}"
+          end
+        end
+
+        # Loosely based on http://stackoverflow.com/a/4079031
+        def parse(string)
+          string.scan(PATTERNS_RE).each_with_index.map do |atom, index|
+            if    !atom.match(NUMERIC_RE) then  new(normalize_string(atom), index)
+            elsif !atom.include?('.')     then  new(atom.to_i, index)
+            elsif atom.include?('-')      then  new(atom.to_f, index)
+            else                                new(Atoms::Version.new(atom), index)
+            end
+          end
+        end
+
+        def sort(list)
+          list.sort_by{ |item| parse(item) }
+        end
+
+        def add_comparer(left_type, right_type, &comparer)
+          COMPARERS[comparer_key_for(left_type, right_type)] = comparer_builder(left_type, right_type, &comparer)
+        end
+
+      private
+
+        def normalize_string(string)
+          ActiveSupport::Inflector.transliterate(string).downcase
+        end
+
+        def comparer_builder(left_type, right_type, &comparer)
+          ->(left_value, right_value) do
+            if left_value.is_a?(left_type)
+              comparer.call(left_value, right_value)
+            else
+              -comparer.call(right_value, left_value)
+            end
+          end
+        end
+
+        def check_result(left_value, right_value, if_this, then_that)
+          result = left_value <=> right_value
+          if_this == result ? then_that : result
+        end
+
+        def comparer_key_for(*types)
+          types.map(&:to_s).sort
+        end
+      end
+
+      # Default comparers
+
+      add_comparer(Atoms::Version, Integer) do |left_value, right_value|
+        right_value.negative? ? RIGHT_FIRST : check_result(left_value, [right_value], BOTH_EQUAL, RIGHT_FIRST)
+      end
+      add_comparer(Atoms::Version, Float) do |left_value, right_value|
+        right_value.negative? ? RIGHT_FIRST : check_result(left_value, Atoms::Version.new(right_value), BOTH_EQUAL, LEFT_FIRST)
+      end
+      add_comparer(Atoms::Version, String){ |left_value, right_value| right_value[/^\s/] ? RIGHT_FIRST : LEFT_FIRST }
+      add_comparer(Integer, Float){ |left_value, right_value| check_result(left_value, right_value, BOTH_EQUAL, LEFT_FIRST) }
+      add_comparer(Integer, String){ |left_value, right_value| right_value[/^\s/] ? RIGHT_FIRST : LEFT_FIRST }
+      add_comparer(Float, String){ |left_value, right_value| right_value[/^\s/] ? RIGHT_FIRST : LEFT_FIRST }
+    end
+  end
+end

data/lib/trusty/sorting/atoms/version.rb

@@ -0,0 +1,20 @@
+module Trusty
+  module Sorting
+    module Atoms
+      class Version < Array
+        def initialize(version_string, *minor_and_patch)
+          case version_string
+          when Integer
+            super [version_string] + minor_and_patch
+          when Array
+            super
+          when String
+            super version_string.split('.').map(&:to_i)
+          else
+            raise "Invalid version specified"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/trusty/sorting.rb

@@ -0,0 +1 @@
+require 'trusty/sorting/atom_sorter'

data/lib/trusty/version.rb

@@ -1,3 +1,3 @@
 module Trusty
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/trusty.rb

@@ -1,5 +1,6 @@
 require "trusty/version"
 require "trusty/environment"
+require "trusty/sorting"
 require "trusty/utilities"
 
 # Optional features that need to be required manually when using this gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,9 @@ files:
 - lib/trusty/rails/controller_extensions.rb
 - lib/trusty/rails/engine.rb
 - lib/trusty/rake.rb
+- lib/trusty/sorting.rb
+- lib/trusty/sorting/atom_sorter.rb
+- lib/trusty/sorting/atoms/version.rb
 - lib/trusty/utilities.rb
 - lib/trusty/utilities/method_name.rb
 - lib/trusty/utilities/method_name_extensions.rb
@@ -206,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Trusty allows you to manage environment variables and other common configuration