active_object 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b093e29d0378623498441f8037c523eb3e67f558bb83e9964c57bf5625db6def
-  data.tar.gz: 8107c37f3ea2508749dbb370d72a11bacc1123f2ac404970633eb85211e455b1
+  metadata.gz: 39c6fc484928254173ce44e6b9f7c4a7ff73a0711f9890f9976f394bc8db1e85
+  data.tar.gz: 2e99c34f428b114a6d776f7426af8399643f0401994b69b4619ca577a601a402
 SHA512:
-  metadata.gz: 51356f34a64e12f619b233280a804bd01b28a7470ef735f5ecb2d22c95ea104d1a85dab1ff203f514e4aab16af2f2d6c0773f00bf8a32f8817b64b8d9e56a1f5
-  data.tar.gz: ba913963613f3a6b7cd60b9f1286ff87ae44de19b88ed76782dd4d39e6c4fb2eab8b36a3595afd3b04b470bf46f637efdb6b4909e40fb1fd9f579a999480b4a8
+  metadata.gz: 2c5e925327ee1aaa043b56dd0c082bbb28bcfe63f8e2dc12ba7c06156744e134723fdb329f1d6e0425ec33688c764f7e3cd8d43aae8bdca25080f307bbe9a629
+  data.tar.gz: c370ee668f6d8edbe3677648bd182666618289b75a0a78ea587e7d914c3d36fec6dbf214c4ca4a23f6b9844f52ebe3538f9715bb6aef4fec9cb1825cea467ddd

data/lib/active_object/array.rb

@@ -32,9 +32,7 @@ module ActiveObject
     end
 
     def delete_values(*args)
-      result = []
-      args.each { |val| result << delete(val) }
-      result
+      args.each_with_object([]) { |val, results| results << delete(val) }
     end
 
     def demote(value)
@@ -120,7 +118,6 @@ module ActiveObject
       end
 
       sliced_collection = collection.each_slice(number)
-
       block_given? ? sliced_collection { |val| yield(val) } : sliced_collection.to_a
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -146,7 +143,9 @@ module ActiveObject
 
     def position(value)
       idx = index(value)
-      (idx + 1) unless idx.nil?
+      return if idx.nil?
+
+      idx + 1
     end
 
     def positions(value)
@@ -180,7 +179,9 @@ module ActiveObject
 
     def rposition(value)
       idx = rindex(value)
-      (idx + 1) unless idx.nil?
+      return if idx.nil?
+
+      idx + 1
     end
 
     def sample!
@@ -226,12 +227,11 @@ module ActiveObject
 
     # rubocop:disable Metrics/MethodLength
     def to_sentence(options = {})
-      default_connectors = {
+      options = {
         words_connector: ', ',
         two_words_connector: ' and ',
         last_word_connector: ', and '
-      }
-      options = default_connectors.merge!(options)
+      }.merge!(options)
 
       case length
       when 0

data/lib/active_object/date.rb

@@ -152,10 +152,7 @@ module ActiveObject
     def format(string)
       delimiters = string.scan(/\W+/)
       formatters = string.scan(/[a-z0-9_]+/i)
-
-      string = formatters.map do |unit|
-        "%#{STRING_UNITS.fetch(unit.to_sym)}#{delimiters.shift || ''}"
-      end
+      string = formatters.map { |unit| "%#{STRING_UNITS.fetch(unit.to_sym)}#{delimiters.shift}" }
 
       strftime(string.join)
     end

data/lib/active_object/enumerable.rb

@@ -55,12 +55,10 @@ if ActiveObject.configuration.autoload_enumerable
 
     # rubocop:disable Lint/UnusedMethodArgument
     def cluster(&block)
-      result = []
-      each do |ele|
-        last_res = result.last
-        last_res && (yield(ele) == yield(last_res.last)) ? last_res << ele : result << [ele]
+      each_with_object([]) do |ele, results|
+        last_res = results.last
+        last_res && (yield(ele) == yield(last_res.last)) ? last_res << ele : results << [ele]
       end
-      result
     end
     # rubocop:enable Lint/UnusedMethodArgument
 
@@ -101,23 +99,23 @@ if ActiveObject.configuration.autoload_enumerable
     end
 
     def drop_last_if
-      return(to_enum(:drop_last_if)) unless block_given?
+      return to_enum(:drop_last_if) unless block_given?
 
-      result = []
       dropping = true
-      reverse_each do |val|
-        result.unshift(val) unless dropping &&= yield(val)
-      end
+      result = []
+      reverse_each { |val| result.unshift(val) unless dropping &&= yield(val) }
       result
     end
 
     def exactly?(num)
       found_count = 0
+
       if block_given?
         each { |*opt| found_count += 1 if yield(*opt) }
       else
         each { |opt| found_count += 1 if opt }
       end
+
       found_count > num ? false : num == found_count
     end
 
@@ -171,6 +169,7 @@ if ActiveObject.configuration.autoload_enumerable
 
     def many?
       found_count = 0
+
       if block_given?
         any? do |val|
           found_count += 1 if yield val
@@ -193,7 +192,6 @@ if ActiveObject.configuration.autoload_enumerable
     def median(identity = 0)
       collection_length = length.to_f
       collection_sorted = sort
-
       return(identity) unless collection_length > 0.0
 
       half_collection = collection_length / 2.0
@@ -213,7 +211,6 @@ if ActiveObject.configuration.autoload_enumerable
       frequency_distribution = each_with_object(::Hash.new(0)) { |val, hsh| hsh[val] += 1 }
       frequency_top_two = frequency_distribution.sort_by { |_, val| -val }.take(2)
       top_two_first = frequency_top_two.first
-
       return if frequency_top_two.length != 1 && top_two_first.last == frequency_top_two.last.last
 
       top_two_first.first
@@ -260,6 +257,7 @@ if ActiveObject.configuration.autoload_enumerable
 
     def reject_outliers
       cz = critical_zscore
+
       reject { |value| zscore(value) > cz }
     end
 
@@ -269,16 +267,19 @@ if ActiveObject.configuration.autoload_enumerable
 
     def select_outliers
       cz = critical_zscore
+
       select { |value| zscore(value) > cz }
     end
 
     def several?
       found_count = 0
+
       if block_given?
         each { |*opt| found_count += 1 if yield(*opt) }
       else
         each { |opt| found_count += 1 if opt }
       end
+
       found_count > 1
     end
 
@@ -298,7 +299,6 @@ if ActiveObject.configuration.autoload_enumerable
 
     def take_last(num)
       collection_length = to_a.length
-
       return self if num > collection_length
 
       self[(collection_length - num)..-1]
@@ -314,7 +314,6 @@ if ActiveObject.configuration.autoload_enumerable
 
     def variance(identity = 0)
       collection_length = length
-
       return identity if collection_length <= 1
 
       total = inject(0.0) { |sum, val| sum + (val - mean)**2.0 }

data/lib/active_object/hash.rb

@@ -33,13 +33,13 @@ module ActiveObject
 
     # rubocop:disable Lint/UnusedMethodArgument
     def collect_keys(&block)
-      return(enum_for(:collect_keys)) unless block_given?
+      return enum_for(:collect_keys) unless block_given?
 
       collect { |key, _| yield(key) }
     end
 
     def collect_values(&block)
-      return(enum_for(:collect_values)) unless block_given?
+      return enum_for(:collect_values) unless block_given?
 
       collect { |_, val| yield(val) }
     end
@@ -216,7 +216,7 @@ module ActiveObject
 
     def slice(*keys)
       keys.flatten
-          .each_with_object(self.class.new) { |key, hsh| hsh[key] = self[key] if key?(key) }
+          .each_with_object({}) { |key, hsh| hsh[key] = self[key] if key?(key) }
     end
 
     def slice!(*keys)
@@ -270,7 +270,7 @@ module ActiveObject
 
     # rubocop:disable Lint/UnusedMethodArgument
     def transform_keys!(&block)
-      return(enum_for(:transform_keys!)) unless block_given?
+      return enum_for(:transform_keys!) unless block_given?
 
       each_key { |key| self[yield(key)] = delete(key) }
       self
@@ -283,7 +283,7 @@ module ActiveObject
 
     # rubocop:disable Lint/UnusedMethodArgument
     def transform_values!(&block)
-      return(enum_for(:transform_values!)) unless block_given?
+      return enum_for(:transform_values!) unless block_given?
 
       each { |key, val| self[key] = yield(val) }
     end

data/lib/active_object/integer.rb

@@ -3,7 +3,18 @@
 module ActiveObject
   module Integer
     ROMAN_VALUES ||= {
-      M: 1000, CM: 900, D: 500, CD: 400, C: 100, XC: 90, L: 50, XL: 40, X: 10, IX: 9, V: 5, IV: 4,
+      M: 1000,
+      CM: 900,
+      D: 500,
+      CD: 400,
+      C: 100,
+      XC: 90,
+      L: 50,
+      XL: 40,
+      X: 10,
+      IX: 9,
+      V: 5,
+      IV: 4,
       I: 1
     }.freeze
 

data/lib/active_object/kernel.rb

@@ -3,9 +3,10 @@
 if ActiveObject.configuration.autoload_kernel
   module Kernel
 
-    SANITIZE_EVAL_REGEX ||= /\[\d*,?\d*,?\d*\]/
+    SANITIZE_EVAL_REGEX ||= /\[\d*,?\d*,?\d*\]/.freeze
+    CALLER_METHOD_REGEX ||= /`([^']*)'/.freeze
 
-    # rubocop:disable Lint/RescueException, Security/Eval
+    # rubocop:disable Security/Eval
     def safe_eval
       eval(self)
     rescue Exception
@@ -18,13 +19,13 @@ if ActiveObject.configuration.autoload_kernel
 
       eval(val)
     end
-    # rubocop:enable Lint/RescueException, Security/Eval
+    # rubocop:enable Security/Eval
 
     private
 
     # rubocop:disable Style/PerlBackrefs
     def caller_name
-      caller(1..1).first =~ /`([^']*)'/ && $1
+      caller(1..1).first =~ CALLER_METHOD_REGEX && $1
     end
     # rubocop:enable Style/PerlBackrefs
 

data/lib/active_object/numeric.rb

@@ -40,16 +40,22 @@ module ActiveObject
         meter meters millimeter millimeters centimeter centimeters decimeter decimeters decameter
         decameters hectometer hectometers kilometer kilometers
       ],
-      imperical: %i[inch inches foot feet yard yards mile miles nautical_mile nautical_miles]
+      imperical: %i[
+        inch inches foot feet yard yards mile miles nautical_mile nautical_miles
+      ]
     }.freeze
     MASS_KEYS ||= {
       metric: %i[
         gram grams milligram milligrams centigram centigrams decigram decigrams decagram decagrams
         hectogram hectograms kilogram kilograms metric_ton metric_tons
       ],
-      imperical: %i[ounce ounces pound pounds stone stones ton tons]
+      imperical: %i[
+        ounce ounces pound pounds stone stones ton tons
+      ]
     }.freeze
-    TEMPERATURE_KEYS ||= %i[celsius fahrenheit kelvin].freeze
+    TEMPERATURE_KEYS ||= %i[
+      celsius fahrenheit kelvin
+    ].freeze
     TIME_KEYS ||= %i[
       second seconds minute minutes hour hours day days week weeks year years decade decades century
       centuries millennium millenniums
@@ -323,15 +329,13 @@ module ActiveObject
     # rubocop:enable Style/NumericPredicate, Style/YodaCondition
 
     def ordinal
-      if (11..13).cover?(abs % 100)
-        'th'
-      else
-        case abs % 10
-        when 1 then 'st'
-        when 2 then 'nd'
-        when 3 then 'rd'
-        else 'th'
-        end
+      return 'th' if (11..13).cover?(abs % 100)
+
+      case abs % 10
+      when 1 then 'st'
+      when 2 then 'nd'
+      when 3 then 'rd'
+      else 'th'
       end
     end
 
@@ -356,8 +360,7 @@ module ActiveObject
       to_s.rjust(precision, pad_number.to_s)
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/LineLength, Metrics/MethodLength, Metrics/PerceivedComplexity
     def pad_precision(options = {})
       pad_number = options[:pad_number] || 0
       precision = options[:precision] || 2
@@ -374,8 +377,7 @@ module ActiveObject
         string[0..(ljust_count - 1)]
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
-    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/LineLength, Metrics/MethodLength, Metrics/PerceivedComplexity
 
     def percentage_of(number)
       return 0 if zero? || number.zero?
@@ -433,6 +435,7 @@ module ActiveObject
 
     def to_byte(from, to)
       assert_inclusion_of_valid_keys!(BYTE_KEYS, from, to)
+
       to_f * 1.send("#{from}_in_bytes").to_f / 1.send("#{to}_in_bytes").to_f
     end
 
@@ -445,6 +448,7 @@ module ActiveObject
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def to_length(from, to)
       assert_inclusion_of_valid_keys!(LENGTH_KEYS.values.flatten, from, to)
+
       metric_keys = LENGTH_KEYS.fetch(:metric)
       return self if from == to
 
@@ -467,11 +471,10 @@ module ActiveObject
         end
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def to_mass(from, to)
       assert_inclusion_of_valid_keys!(MASS_KEYS.values.flatten, from, to)
+
       metric_keys = MASS_KEYS.fetch(:metric)
       return self if from == to
 
@@ -503,10 +506,10 @@ module ActiveObject
       difference = (self - value).abs
 
       values.each do |val|
-        if (self - val).abs < difference
-          difference = (self - val).abs
-          value = val
-        end
+        next unless (self - val).abs < difference
+
+        difference = (self - val).abs
+        value = val
       end
 
       value
@@ -518,12 +521,13 @@ module ActiveObject
       "#{pad_precision(options.only(:precision))}#{unit}"
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
     def to_temperature(from, to)
       assert_inclusion_of_valid_keys!(TEMPERATURE_KEYS, from, to)
-      return self if from == to
 
       case to
+      when from
+        self
       when :celsius
         from == :kelvin ? (self - 273.15) : ((self - 32.0) * 5.0 / 9.0)
       when :fahrenheit
@@ -532,10 +536,11 @@ module ActiveObject
         from == :celsius ? (self + 273.15) : (((self - 32.0) * 5.0 / 9.0) + 273.15)
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
 
     def to_time(from, to)
       assert_inclusion_of_valid_keys!(TIME_KEYS, from, to)
+
       (to_f * 1.send("#{from}_in_seconds").to_f) / 1.send("#{to}_in_seconds").to_f
     end
 

data/lib/active_object/object.rb

@@ -2,8 +2,12 @@
 
 module ActiveObject
   module Object
-    FALSE_VALUES ||= [false, 0, '0', 'false', 'FALSE', 'f', 'F'].freeze
-    TRUE_VALUES ||= [true, 1, '1', 'true', 'TRUE', 't', 'T'].freeze
+    FALSE_VALUES ||= [
+      false, 0, '0', 'false', 'FALSE', 'f', 'F'
+    ].freeze
+    TRUE_VALUES ||= [
+      true, 1, '1', 'true', 'TRUE', 't', 'T'
+    ].freeze
 
     def array?
       is_a?(Array)

data/lib/active_object/range.rb

@@ -8,12 +8,10 @@ module ActiveObject
     end
 
     def include_with_range?(other)
-      if other.is_a?(Range)
-        operator = exclude_end? && !other.exclude_end? ? :< : :<=
-        include?(other.first) && other.last.send(operator, last)
-      else
-        include?(other)
-      end
+      return include?(other) unless other.is_a?(Range)
+
+      operator = exclude_end? && !other.exclude_end? ? :< : :<=
+      include?(other.first) && other.last.send(operator, last)
     end
 
     def overlaps?(other)

data/lib/active_object/string.rb

@@ -5,10 +5,12 @@ module ActiveObject
 
     def any?(*keys)
       included = false
+
       keys.flatten.each do |key|
         included = include?(key)
         break if included
       end
+
       included
     end
 
@@ -19,7 +21,6 @@ module ActiveObject
     def camelize(first_letter = :upper)
       if first_letter.to_sym != :lower
         regex_last = ::Regexp.last_match(1).upcase
-
         to_s.gsub(%r{\/(.?)}) { "::#{regex_last}" }.gsub(%r{^/(?:^|_)(.)}) { regex_last }
       else
         "#{to_s.first.chr.downcase}#{camelize(self)[1..-1]}"
@@ -265,8 +266,7 @@ module ActiveObject
                       when String then chars_to_keep.chars
                       when Array then chars_to_keep.map(&:to_s)
                       when Range then chars_to_keep.to_a.map(&:to_s)
-                      else
-                        raise TypeError, 'Invalid parameter'
+                      else raise TypeError, 'Invalid parameter'
                       end
 
       chars.keep_if { |chr| chars_to_keep.include?(chr) }.join
@@ -323,10 +323,10 @@ module ActiveObject
     def truncate(truncate_at, options = {})
       return dup unless length > truncate_at
 
+      seperator = options[:separator]
       omission = options[:omission] || '...'
       size_with_room_for_omission = truncate_at - omission.length
 
-      seperator = options[:separator]
       stop = if seperator
                rindex(seperator || '', size_with_room_for_omission) || size_with_room_for_omission
              else
@@ -339,7 +339,6 @@ module ActiveObject
     def truncate_words(words_count, options = {})
       sep = options[:separator] || /\s+/
       sep = ::Regexp.escape(sep.to_s) unless sep.is_a(Regexp)
-
       return self unless self =~ /\A((?:.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m
 
       "#{::Regexp.last_match(1)}#{options[:omissio] || '...'}"

data/lib/active_object/time.rb

@@ -201,6 +201,7 @@ module ActiveObject
 
     def count_seconds_since(time)
       time = time.to_time if time.respond_to?(:to_time)
+
       (to_f - time.to_f).abs
     end
 
@@ -221,7 +222,6 @@ module ActiveObject
     def format(string)
       delimiters = string.scan(/\W+/)
       formatters = string.scan(/[a-z0-9_]+/i)
-
       string = formatters.map { |unit| "%#{STRING_UNITS.fetch(unit.to_sym)}#{delimiters.shift}" }
 
       strftime(string.join)

data/lib/active_object/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveObject
-  VERSION ||= '5.7.0'
+  VERSION ||= '5.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_object
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler