more_core_extensions 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 813c1118ca8bd1502d467502dbc10c1965cfccb8
-  data.tar.gz: 44f901136763832691e94be69e73cc90e82d3a16
+  metadata.gz: a1add9ba7e2ca9ea1cd89792999f0a40b1ae00a0
+  data.tar.gz: 21149cb02025e1c91ad29e50a68bc4df68746808
 SHA512:
-  metadata.gz: 82cbb225f4ba697fc29cc1b6b6ef0d1e00561de1fb6071d8078cae1981aa0209f983b843e787841706b4f584121b1a0c9d29078942ea1f606b682c58f79a4e65
-  data.tar.gz: 94645bbb55387932f89711371041e09bc4c00a7d7c43fe6224d52acf2d9ce00bb7f416ff2eb308ef3a3a8d8f26789657c178e8e095fa58e4d4294769708347e9
+  metadata.gz: 40638498bbcb894d6722018c78c9ce10eecb32eb7a64b60233735c6f442cc8a18d3685020348db60fb658a0c8b6f3bcc7cd4e6ead1cb407355ff9298c1758374
+  data.tar.gz: 8644345821bb5bef19fecd89e4e5575dd36ff6210146cfcbd029a2dd9310c607b7ad4ca1bf0e6776ff1fa2ddbfb402ce6c052b4d08978cba5a9ee7fee4bbbf82

data/README.md

@@ -59,6 +59,8 @@ MoreCoreExtensions are a set of core extensions beyond those provided by ActiveS
 
 #### Numeric
 
+* core_ext/numeric/clamp.rb
+  * `#clamp` - Clamp a number to a minimum and/or maximum value
 * core_ext/numeric/math.rb
   * `#square` - Returns the square of a Numeric
 * core_ext/numeric/rounding.rb
@@ -82,6 +84,8 @@ MoreCoreExtensions are a set of core extensions beyond those provided by ActiveS
   * `#guid?` - Returns whether or not the String is a valid GUID
 * core_ext/string/hex_dump.rb
   * `#hex_dump` - Dumps the string in a hex editor style format
+* core_ext/string/iec60027_2.rb
+  * `#iec_60027_2_to_i` - Convert strings with an IEC60027-2 suffix to an integer
 
 #### Shared
 

data/lib/more_core_extensions/core_ext/array/tableize.rb

@@ -31,59 +31,104 @@ module MoreCoreExtensions
     #    Value3 | Value4
     #
     def tableize(options = {})
-      case self.first
-      when Array; tableize_arrays(options)
-      when Hash;  tableize_hashes(options)
-      else raise "must be an Array of Arrays or Array of Hashes"
-      end
+      Tableizer.new(self, options).tableize
     end
 
-    private
+    # This class is a private implementation and not part of the public API.
+    class Tableizer
+      attr_accessor :target, :options
 
-    def tableize_arrays(options)
-      options[:header] = true unless options.has_key?(:header)
+      def initialize(target, options)
+        @target = target
+        @options = options
+      end
 
-      widths = []
-      justifications = []
-      self.each do |row|
-        row.each_with_index do |field, field_i|
-          widths[field_i] = [widths[field_i].to_i, field.to_s.length].max
-          widths[field_i] = [options[:max_width], widths[field_i].to_i].min if options[:max_width]
+      def tableize
+        case target.first
+        when Array then tableize_arrays
+        when Hash  then tableize_hashes
+        else raise "must be an Array of Arrays or Array of Hashes"
+        end
+      end
 
-          justifications[field_i] = field.kind_of?(Numeric) ? "" : "-"
+      private
+
+      def tableize_hashes
+        # Convert the target to an Array of Arrays
+        keys = options[:columns] || columns_from_hash_keys
+        self.target = target.collect { |h| h.values_at(*keys) }.unshift(keys)
+        options[:header] = true
+
+        tableize_arrays
+      end
+
+      def columns_from_hash_keys
+        target.first.keys.sort_by(&:to_s).tap do |keys|
+          apply_leading_columns!(keys)
+          apply_trailing_columns!(keys)
         end
       end
 
-      header_separator = widths.collect { |w| "-" * (w + 2) }.join("+")
+      def apply_leading_columns!(keys)
+        return unless options[:leading_columns]
+        options[:leading_columns].reverse_each { |h| keys.unshift(keys.delete(h)) }
+      end
+
+      def apply_trailing_columns!(keys)
+        return unless options[:trailing_columns]
+        options[:trailing_columns].each { |h| keys.push(keys.delete(h)) }
+      end
+
+      def tableize_arrays
+        options[:header] = true unless options.key?(:header)
 
-      table = []
-      self.each_with_index do |row, row_i|
-        r = []
-        row.each_with_index do |field, field_i|
-          r << sprintf("%0#{justifications[field_i]}#{widths[field_i]}s", field.to_s.gsub(/\n|\r/, '').slice(0, widths[field_i]))
+        widths, justifications = widths_and_justifications
+        table = target.collect { |row| format_row(row, widths, justifications) }
+        format_table(table, widths)
+      end
+
+      def widths_and_justifications
+        widths = []
+        justifications = []
+
+        target.each do |row|
+          row.each.with_index do |field, field_i|
+            apply_width!(widths, field, field_i)
+            apply_justification!(justifications, field, field_i)
+          end
         end
-        r = " #{r.join(' | ')} ".rstrip
 
-        table << r
-        table << header_separator if row_i == 0 && options[:header]
+        return widths, justifications
+      end
+
+      def apply_width!(widths, field, field_i)
+        widths[field_i] = [widths[field_i].to_i, field.to_s.length].max
+        widths[field_i] = [options[:max_width], widths[field_i].to_i].min if options[:max_width]
+      end
+
+      def apply_justification!(justifications, field, field_i)
+        justifications[field_i] = field.kind_of?(Numeric) ? "" : "-"
+      end
+
+      def format_row(row, widths, justifications)
+        formatted_fields = row.collect.with_index do |field, field_i|
+          format_field(field, widths[field_i], justifications[field_i])
+        end
+        " #{formatted_fields.join(' | ')} ".rstrip
       end
-      table.join("\n") << "\n"
-    end
 
-    def tableize_hashes(options)
-      if options[:columns]
-        keys = options[:columns]
-      elsif options[:leading_columns] || options[:trailing_columns]
-        keys = self.first.keys.sort_by(&:to_s)
-        options[:leading_columns].reverse.each { |h| keys.unshift(keys.delete(h)) } if options[:leading_columns]
-        options[:trailing_columns].each { |h| keys.push(keys.delete(h)) } if options[:trailing_columns]
-      else
-        keys = self.first.keys.sort_by(&:to_s)
+      def format_field(field, width, justification)
+        field = field.to_s.gsub(/\n|\r/, '').slice(0, width)
+        "%0#{justification}#{width}s" % field
       end
 
-      options = options.dup
-      options[:header] = true
-      self.collect { |h| h.values_at(*keys) }.unshift(keys).tableize(options)
+      def format_table(table, widths)
+        if options[:header] && table.size > 1
+          header_separator = widths.collect { |w| "-" * (w + 2) }.join("+")
+          table.insert(1, header_separator)
+        end
+        table.join("\n") << "\n"
+      end
     end
   end
 end

data/lib/more_core_extensions/core_ext/numeric.rb

@@ -1,2 +1,3 @@
+require 'more_core_extensions/core_ext/numeric/clamp'
 require 'more_core_extensions/core_ext/numeric/math'
 require 'more_core_extensions/core_ext/numeric/rounding'

data/lib/more_core_extensions/core_ext/numeric/clamp.rb

@@ -0,0 +1,18 @@
+module MoreCoreExtensions
+  module NumericClamp
+    #
+    # Clamp a number to a minimum and/or maximum value.
+    #
+    #   8.clamp(nil, nil) #=> 8
+    #   8.clamp(9, nil)   #=> 9
+    #   8.clamp(nil, 6)   #=> 6
+    def clamp(min, max)
+      value = self
+      value = [value, min].max if min
+      value = [value, max].min if max
+      value
+    end
+  end
+end
+
+Numeric.send(:prepend, MoreCoreExtensions::NumericClamp)

data/lib/more_core_extensions/core_ext/string.rb

@@ -1,2 +1,3 @@
 require 'more_core_extensions/core_ext/string/formats'
 require 'more_core_extensions/core_ext/string/hex_dump'
+require 'more_core_extensions/core_ext/string/iec60027_2'

data/lib/more_core_extensions/core_ext/string/formats.rb

@@ -1,7 +1,7 @@
 module MoreCoreExtensions
   module StringFormats
     # From: http://www.regular-expressions.info/email.html
-    RE_EMAIL =  %r{\A[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\z}
+    RE_EMAIL =  %r{\A[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\z}i
 
     def email?
       !!(self =~ RE_EMAIL)

data/lib/more_core_extensions/core_ext/string/hex_dump.rb

@@ -9,47 +9,59 @@ module MoreCoreExtensions
     #        instead of returning as a string.
     # :meth:: Used in conjunction with _:obj_ to send each line to an object
     #        instead of returning as a string.
-    def hex_dump(*opts)
-      opts = opts[0] if opts.empty? || (opts.length == 1 && opts[0].kind_of?(Hash))
-      raise ArgumentError, "opts must be a Hash" unless opts.nil? || opts.kind_of?(Hash)
+    def hex_dump(options = {})
+      HexDumper.new(self, options).dump
+    end
+
+    # This class is a private implementation and not part of the public API.
+    class HexDumper
+      attr_reader :target, :options
 
-      opts = {:grouping => 16, :newline => true, :start_pos => 0}.merge!(opts || {})
-      obj, meth, grouping, newline, pos = opts.values_at(:obj, :meth, :grouping, :newline, :start_pos)
-      raise ArgumentError, "obj and meth must both be set, or both not set" if (obj.nil? && !meth.nil?) || (!obj.nil? && meth.nil?)
+      DEFAULT_OPTIONS = {
+        :grouping  => 16,
+        :newline   => true,
+        :start_pos => 0
+      }.freeze
 
-      row_format = "0x%08x  #{"%02x " * grouping} "
+      def initialize(target, options)
+        @target  = target
+        @options = DEFAULT_OPTIONS.merge(options)
 
-      i = 0
-      last_i = self.length - 1
+        if !!options[:obj] ^ !!options[:meth] # rubocop:disable Style/DoubleNegation
+          raise ArgumentError, "obj and meth must both be set, or both not set"
+        end
+      end
 
-      ret = ''
-      row_vals = []
-      row_chars = ''
+      def dump
+        obj, meth, grouping, pos = options.values_at(:obj, :meth, :grouping, :start_pos)
 
-      self.each_byte do |c|
-        row_vals << c
-        row_chars << (c < 0x20 || (c >= 0x7F && c < 0xA0) ? '.' : c.chr)
+        ret = ""
 
-        if (i + 1) % grouping == 0 || i == last_i
-          row_format = "0x%08x  #{"%02x " * row_vals.length}#{"   " * (grouping - row_vals.length)} " if i == last_i
+        target.each_byte.each_slice(grouping) do |bytes|
+          row = format_row(pos, bytes)
+          ret << row
 
-          row_vals.unshift(pos)
-          ret << (row_format % row_vals) << row_chars
-          ret << "\n" if newline
           if obj
-            obj.send(meth, ret)
-            ret.replace('')
+            obj.send(meth, row)
+            ret = ""
           end
 
           pos += grouping
-          row_vals.clear
-          row_chars = ''
         end
 
-        i += 1
+        ret
       end
 
-      return ret
+      def format_row(pos, bytes)
+        padding    = "   " * (options[:grouping] - bytes.size)
+        byte_chars = bytes.collect { |byte| row_char(byte) }.join
+        newline    = "\n" if options[:newline]
+        "0x%08x  #{"%02x " * bytes.size}#{padding} " % [pos, *bytes] << "#{byte_chars}#{newline}"
+      end
+
+      def row_char(byte)
+        byte < 0x20 || (byte >= 0x7F && byte < 0xA0) ? '.' : byte.chr
+      end
     end
   end
 end

data/lib/more_core_extensions/core_ext/string/iec60027_2.rb

@@ -0,0 +1,19 @@
+module MoreCoreExtensions
+  module IEC60027_2
+    # Support converting strings with an IEC60027-2 suffix to an integer
+    # http://physics.nist.gov/cuu/Units/binary.html
+    # Example: "1 Ki".iec_60027_2_to_i => 1024
+
+    IEC_60027_2_SIZE_SUFFIXES = %w(Ki Mi Gi Ti Pi Ei Zi Yi).freeze
+    def iec_60027_2_to_i
+      suffix_index = IEC_60027_2_SIZE_SUFFIXES.index(self[-2..-1])
+      if suffix_index.nil?
+        Integer(self)
+      else
+        Integer(self[0..-3]) * (2**10)**(suffix_index + 1)
+      end
+    end
+  end
+end
+
+String.send(:prepend, MoreCoreExtensions::IEC60027_2)

data/lib/more_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module MoreCoreExtensions
-  VERSION = "3.1.1".freeze
+  VERSION = "3.2.0".freeze
 end

data/spec/core_ext/numeric/clamp_spec.rb

@@ -0,0 +1,17 @@
+describe Numeric do
+  it "#clamp" do
+    expect(8.clamp(nil, nil)).to eq(8)
+    expect(8.clamp(3, nil)).to eq(8)
+    expect(8.clamp(13, nil)).to eq(13)
+    expect(8.clamp(nil, 6)).to eq(6)
+    expect(8.clamp(13, 16)).to eq(13)
+    expect(20.clamp(13, 16)).to eq(16)
+
+    expect(8.0.clamp(nil, nil)).to eq(8.0)
+    expect(8.0.clamp(3.0, nil)).to eq(8.0)
+    expect(8.0.clamp(13.0, nil)).to eq(13.0)
+    expect(8.0.clamp(nil, 6.0)).to eq(6.0)
+    expect(8.0.clamp(13.0, 16.0)).to eq(13.0)
+    expect(20.0.clamp(13.0, 16.0)).to eq(16.0)
+  end
+end

data/spec/core_ext/string/formats_spec.rb

@@ -4,6 +4,8 @@ describe String do
     expect("john.doe@example.com").to be_email
     expect("john.doe@my-company.prestidigitation").to be_email
     expect("john.o'doe@example.com").to be_email
+    expect("john.doe@EXAMPLE.COM").to be_email
+    expect("John.Doe@example.com").to be_email
 
     expect("john\ndoe@example.com").not_to be_email
     expect("").not_to be_email

data/spec/core_ext/string/iec60027_2_spec.rb

@@ -0,0 +1,13 @@
+describe String do
+  it '#iec60027_2' do
+    expect("1   ".iec_60027_2_to_i).to eq(1)
+    expect("1 Ki".iec_60027_2_to_i).to eq(1_024)
+    expect("1 Mi".iec_60027_2_to_i).to eq(1_048_576)
+    expect("1 Gi".iec_60027_2_to_i).to eq(1_073_741_824)
+    expect("1 Ti".iec_60027_2_to_i).to eq(1_099_511_627_776)
+    expect("1 Pi".iec_60027_2_to_i).to eq(1_125_899_906_842_624)
+    expect("1 Ei".iec_60027_2_to_i).to eq(1_152_921_504_606_846_976)
+    expect("1 Zi".iec_60027_2_to_i).to eq(1_180_591_620_717_411_303_424)
+    expect("1 Yi".iec_60027_2_to_i).to eq(1_208_925_819_614_629_174_706_176)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: more_core_extensions
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Jason Frey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,6 +111,7 @@ files:
 - lib/more_core_extensions/core_ext/module.rb
 - lib/more_core_extensions/core_ext/module/namespace.rb
 - lib/more_core_extensions/core_ext/numeric.rb
+- lib/more_core_extensions/core_ext/numeric/clamp.rb
 - lib/more_core_extensions/core_ext/numeric/math.rb
 - lib/more_core_extensions/core_ext/numeric/rounding.rb
 - lib/more_core_extensions/core_ext/object.rb
@@ -119,6 +120,7 @@ files:
 - lib/more_core_extensions/core_ext/string.rb
 - lib/more_core_extensions/core_ext/string/formats.rb
 - lib/more_core_extensions/core_ext/string/hex_dump.rb
+- lib/more_core_extensions/core_ext/string/iec60027_2.rb
 - lib/more_core_extensions/version.rb
 - spec/core_ext/array/deletes_spec.rb
 - spec/core_ext/array/duplicates_spec.rb
@@ -131,11 +133,13 @@ files:
 - spec/core_ext/array/tableize_spec.rb
 - spec/core_ext/hash/deletes_spec.rb
 - spec/core_ext/hash/nested_spec.rb
+- spec/core_ext/numeric/clamp_spec.rb
 - spec/core_ext/numeric/math_spec.rb
 - spec/core_ext/numeric/rounding_spec.rb
 - spec/core_ext/object/namespace_spec.rb
 - spec/core_ext/string/formats_spec.rb
 - spec/core_ext/string/hex_dump_spec.rb
+- spec/core_ext/string/iec60027_2_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/ManageIQ/more_core_extensions
 licenses:
@@ -174,10 +178,12 @@ test_files:
 - spec/core_ext/array/tableize_spec.rb
 - spec/core_ext/hash/deletes_spec.rb
 - spec/core_ext/hash/nested_spec.rb
+- spec/core_ext/numeric/clamp_spec.rb
 - spec/core_ext/numeric/math_spec.rb
 - spec/core_ext/numeric/rounding_spec.rb
 - spec/core_ext/object/namespace_spec.rb
 - spec/core_ext/string/formats_spec.rb
 - spec/core_ext/string/hex_dump_spec.rb
+- spec/core_ext/string/iec60027_2_spec.rb
 - spec/spec_helper.rb
 - ".rspec"