active_object 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b086d60737cb0514b88ba4642a862ef3ff25cd
-  data.tar.gz: cc2c957c05b705b207ba215aab661bb09ba31cb3
+  metadata.gz: f37d9b60515ee24fd151c29380721c78d9847e7a
+  data.tar.gz: 4221325bf0f0a5bc213dae699cd996b4a740a443
 SHA512:
-  metadata.gz: e9212c5d3d8c39fcfd5480be13f5b44835aae149520cd9fecd108fc97e804ab30c3f789bb5f1f6e1b52e278362ebeddd8eab934c858685dd501f9f13bb0f8df6
-  data.tar.gz: aee1d6bd64d7427bc2310564bc1bdd39505b138d2f08aa918cfa51a99c211c7ddb1080603688a5139ac43cb1babdbf51c613b00294fa3b021bf96c05b0aa2dcf
+  metadata.gz: ddfb290bd737a3644aa0bd4e955217b82f3e8f6dfb9823c6749e48b4fb1fcfba38278bba86aaaa04654abc6d0aec6921324188b39bae4f493942c0fceb2f56ba
+  data.tar.gz: 8d741cf05d954ed934158ac1bade24688d1f4a5cd8083ea6df25e85993dbf09d1407775f5bb9fae0ce756c9090f038423eb77fa19ba7c13feefbcf4656e1dbb4

data/.reek

@@ -34,7 +34,8 @@ TooManyStatements:
   exclude:
     - 'ActiveObject::Array#in_groups'
 UncommunicativeVariableName:
-  exclude:
-    - 'ActiveObject::Integer#factorial'
+  accept:
+    - !ruby/regexp /^.$/
+    - !ruby/regexp /[0-9]$/
 UtilityFunction:
   enabled: false

data/README.md

@@ -450,10 +450,11 @@ end
 ## Hash
 
 ####Assert Valid Keys:####
-`assert_valid_keys` raises an error if key is not included in a list of keys.
+`assert_valid_keys` and `assert_valid_keys!` raises an error if key is not included in a list of keys.
 
 ```ruby
 {}.assert_valid_keys(:foo)                               #=> {}
+{}.assert_valid_keys!(:foo)                              #=> raises 'ArgumentError: Empty hash. Valid keys are: :foo'
 { foo: 'bar' }.assert_valid_keys(:foo)                   #=> { foo: 'bar' }
 { foo: 'bar', baz: 'boz' }.assert_valid_keys(:foo, :boo) #=> raises 'ArgumentError: Unknown key: :baz. Valid keys are: :foo, :boo'
 ```
@@ -1654,8 +1655,8 @@ false.truthy? #=> false
 `parameterize` and `parameterize!` makes string suitable for a dashed url parameter string.
 
 ```ruby
-'example_string'.parameterize      #=> 'example-string'
-'example_string'.parameterize('?') #=> 'example?string'
+'example_string'.parameterize                 #=> 'example-string'
+'example_string'.parameterize(separator: '?') #=> 'example?string'
 ```
 
 ####Pollute:####

data/lib/active_object/array.rb

@@ -1,13 +1,13 @@
 module ActiveObject::Array
 
   def after(value)
-    return(nil) unless include?(value)
+    return unless include?(value)
 
     self[(index(value).to_i + 1) % length]
   end
 
   def before(value)
-    return(nil) unless include?(value)
+    return unless include?(value)
 
     self[(index(value).to_i - 1) % length]
   end
@@ -36,18 +36,14 @@ module ActiveObject::Array
 
   def dig(key, *rest)
     value = (self[key] rescue nil)
-    return if value.nil?
 
-    if rest.empty?
-      value
-    elsif value.respond_to?(:dig)
-      value.dig(*rest)
-    end
+    return if value.nil?
+    return value if rest.empty?
+    return value.dig(*rest) if value.respond_to?(:dig)
   end
 
   def duplicates(minimum = 2)
     hash = Hash.new(0)
-
     each { |val| hash[val] += 1 }
     hash.delete_if { |_, val| val < minimum }.keys
   end
@@ -57,7 +53,7 @@ module ActiveObject::Array
   end
 
   def groups(number)
-    return([]) if number <= 0
+    return [] if number <= 0
 
     num, rem = length.divmod(number)
     collection = (0..(num - 1)).collect { |val| self[(val * number), number] }

data/lib/active_object/enumerable.rb

@@ -5,12 +5,7 @@ module Enumerable
     result = []
     each do |ele|
       last_res = result.last
-
-      if last_res && (yield(last_res.last) == yield(ele))
-        last_res << ele
-      else
-        result << [ele]
-      end
+      last_res && (yield(last_res.last) == yield(ele)) ? last_res << ele : result << [ele]
     end
     result
   end
@@ -34,9 +29,7 @@ module Enumerable
 
   def drop_last(num)
     collection_length = to_a.length
-
-    return(self) if num > collection_length
-
+    return self if num > collection_length
     self[0...(collection_length - num)]
   end
 
@@ -108,7 +101,7 @@ module Enumerable
   end
 
   def mean(identity = 0)
-    return(identity) unless length.positive?
+    return identity unless length.positive?
 
     collection_length = length
     sum.to_f / collection_length.to_f
@@ -121,6 +114,7 @@ module Enumerable
     collection_sorted = sort
 
     return(identity) unless collection_length > 0.0
+
     half_collection = collection_length / 2.0
     sorted_collection = collection_sorted[half_collection]
 
@@ -133,17 +127,14 @@ module Enumerable
 
   # rubocop:disable Metrics/AbcSize
   def mode(identity = 0)
-    return(identity) unless length.positive?
+    return identity unless length.positive?
 
     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
 
-    if frequency_top_two.length != 1 && top_two_first.last == frequency_top_two.last.last
-      nil
-    else
-      top_two_first.first
-    end
+    return if frequency_top_two.length != 1 && top_two_first.last == frequency_top_two.last.last
+    top_two_first.first
   end
   # rubocop:ensable Metrics/AbcSize
 
@@ -156,7 +147,7 @@ module Enumerable
   end
 
   def range(identity = 0)
-    return(identity) unless length.positive?
+    return identity unless length.positive?
 
     collection_sorted = sort
     collection_sorted.last - collection_sorted.first
@@ -173,7 +164,7 @@ module Enumerable
   end
 
   def standard_deviation(identity = 0)
-    return(identity) if length < 2
+    return identity if length < 2
 
     Math.sqrt(variance)
   end
@@ -189,7 +180,7 @@ module Enumerable
   def take_last(num)
     collection_length = to_a.length
 
-    return(self) if num > collection_length
+    return self if num > collection_length
 
     self[(collection_length - num)..-1]
   end
@@ -205,7 +196,7 @@ module Enumerable
   def variance(identity = 0)
     collection_length = length
 
-    return(identity) if collection_length <= 1
+    return identity if collection_length <= 1
 
     total = inject(0.0) { |sum, val| sum + (val - mean)**2.0 }
     total.to_f / (collection_length.to_f - 1.0)

data/lib/active_object/hash.rb

@@ -4,10 +4,19 @@ module ActiveObject::Hash
     valid_keys.flatten!
 
     each_key do |key|
-      unless valid_keys.include?(key)
-        raise ArgumentError,
-              "Unknown key: #{key.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}"
-      end
+      next if valid_keys.include?(key)
+
+      raise ArgumentError,
+            "Unknown key: #{key.inspect}. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}"
+    end
+  end
+
+  def assert_valid_keys!(*valid_keys)
+    if empty?
+      raise ArgumentError,
+            "Empty hash. Valid keys are: #{valid_keys.map(&:inspect).join(', ')}"
+    else
+      assert_valid_keys(*valid_keys)
     end
   end
 
@@ -43,13 +52,10 @@ module ActiveObject::Hash
 
   def dig(key, *rest)
     value = (self[key] rescue nil)
-    return if value.nil?
 
-    if rest.empty?
-      value
-    elsif value.respond_to?(:dig)
-      value.dig(*rest)
-    end
+    return if value.nil?
+    return value if rest.empty?
+    return value.dig(*rest) if value.respond_to?(:dig)
   end
 
   def except(*keys)
@@ -148,9 +154,8 @@ module ActiveObject::Hash
   end
 
   def slice(*keys)
-    keys
-      .flatten
-      .each_with_object(self.class.new) { |key, hsh| hsh[key] = self[key] if key?(key) }
+    keys.flatten
+        .each_with_object(self.class.new) { |key, hsh| hsh[key] = self[key] if key?(key) }
   end
 
   def slice!(*keys)
@@ -169,9 +174,7 @@ module ActiveObject::Hash
   end
 
   def stringify_keys!
-    each_with_object({}) do |(key, val), options|
-      options[key.to_s] = val
-    end
+    each_with_object({}) { |(key, val), options| options[key.to_s] = val }
   end
 
   def strip
@@ -187,9 +190,7 @@ module ActiveObject::Hash
   end
 
   def symbolize_keys!
-    each_with_object({}) do |(key, val), options|
-      options[(key.to_sym rescue key) || key] = val
-    end
+    each_with_object({}) { |(key, val), options| options[(key.to_sym rescue key) || key] = val }
   end
 
   def symbolize_and_underscore_keys

data/lib/active_object/integer.rb

@@ -5,8 +5,9 @@ module ActiveObject::Integer
   }.freeze
 
   def factorial
-    return(1) if zero?
-    2.upto(self).inject(1) { |a, e| a * e }
+    return 1 if zero?
+
+    2.upto(self).inject(1) { |acc, elem| acc * elem }
   end
 
   def of(&block)
@@ -14,8 +15,8 @@ module ActiveObject::Integer
   end
 
   def roman
-    return('') if zero?
-    return("-#{(-self).roman}") if negative?
+    return '' if zero?
+    return "-#{(-self).roman}" if negative?
 
     ROMAN_VALUES.each { |key, val| return("#{key}#{(self - val).roman}") if val <= self }
   end

data/lib/active_object/numeric.rb

@@ -89,10 +89,12 @@ module ActiveObject::Numeric
       min_min = minimum.min
       min_max = minimum.max
 
-      return(min_min) if self < min_min
+      return min_min if self < min_min
+
       self > min_max ? min_max : self
     else
-      return(minimum) if self < minimum
+      return minimum if self < minimum
+
       self > maximum ? maximum : self
     end
   end
@@ -355,6 +357,7 @@ module ActiveObject::Numeric
     string << separator unless string.include?(separator)
     ljust_count = string.split(separator).first.length
     ljust_count += (string.count(separator) + precision) if precision.positive?
+
     if ljust_count >= string.length
       string.ljust(ljust_count, pad_number.to_s)
     else
@@ -413,8 +416,7 @@ module ActiveObject::Numeric
   alias_method :terabyte_in_bytes, :terabytes_in_bytes
 
   def to_byte(from, to)
-    assert_valid_keys!(BYTE_KEYS, 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
 
@@ -426,9 +428,9 @@ module ActiveObject::Numeric
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   def to_length(from, to)
-    assert_valid_keys!(LENGTH_KEYS.values.flatten, from, to)
+    assert_inclusion_of_valid_keys!(LENGTH_KEYS.values.flatten, from, to)
     metric_keys = LENGTH_KEYS.fetch(:metric)
-    return(self) if from == to
+    return self if from == to
     metrics_included_from = metric_keys.include?(from)
 
     case to
@@ -451,9 +453,9 @@ module ActiveObject::Numeric
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
   def to_mass(from, to)
-    assert_valid_keys!(MASS_KEYS.values.flatten, from, to)
+    assert_inclusion_of_valid_keys!(MASS_KEYS.values.flatten, from, to)
     metric_keys = MASS_KEYS.fetch(:metric)
-    return(self) if from == to
+    return self if from == to
     metrics_included_from = metric_keys.include?(from)
 
     case to
@@ -476,7 +478,7 @@ module ActiveObject::Numeric
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
   def to_nearest_value(values = [])
-    return(self) if values.length.zero?
+    return self if values.length.zero?
 
     value = values.first
     difference = (self - value).abs
@@ -499,8 +501,8 @@ module ActiveObject::Numeric
 
   # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
   def to_temperature(from, to)
-    assert_valid_keys!(TEMPERATURE_KEYS, from, to)
-    return(self) if from == to
+    assert_inclusion_of_valid_keys!(TEMPERATURE_KEYS, from, to)
+    return self if from == to
 
     case to
     when :celsius
@@ -514,8 +516,7 @@ module ActiveObject::Numeric
   # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
   def to_time(from, to)
-    assert_valid_keys!(TIME_KEYS, 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
 
@@ -532,7 +533,7 @@ module ActiveObject::Numeric
   alias_method :week_in_seconds, :weeks_in_seconds
 
   def within?(number, epsilon = 0.01)
-    return(self == number) if epsilon.zero?
+    return self == number if epsilon.zero?
 
     alpha = to_f
     beta = number.to_f
@@ -554,7 +555,7 @@ module ActiveObject::Numeric
 
   private
 
-  def assert_valid_keys!(cns, from, to)
+  def assert_inclusion_of_valid_keys!(cns, from, to)
     return if cns.include?(from) && cns.include?(to)
     raise ArgumentError,
           [

data/lib/active_object/string.rb

@@ -17,9 +17,7 @@ module ActiveObject::String
     if first_letter.to_sym != :lower
       regex_last = Regexp.last_match(1).upcase
 
-      to_s
-        .gsub(%r{\/(.?)}) { "::#{regex_last}" }
-        .gsub(%r{^/(?:^|_)(.)}) { regex_last }
+      to_s.gsub(%r{\/(.?)}) { "::#{regex_last}" }.gsub(%r{^/(?:^|_)(.)}) { regex_last }
     else
       "#{to_s.first.chr.downcase}#{camelize(self)[1..-1]}"
     end
@@ -78,7 +76,7 @@ module ActiveObject::String
   end
 
   def ellipsize(ellipsize_at, options = {})
-    return(self) if length <= ellipsize_at
+    return self if length <= ellipsize_at
 
     separator = options[:separator] || '...'
     offset = options[:offset] || 4
@@ -91,7 +89,7 @@ module ActiveObject::String
   end
 
   def first(limit = 1)
-    return('') if limit.zero?
+    return '' if limit.zero?
 
     limit >= length ? self : to(limit - 1)
   end
@@ -107,12 +105,11 @@ module ActiveObject::String
   def humanize(options = {})
     capitalize = options[:capitalize] || true
 
-    underscore
-      .gsub(/_id\z/, '')
-      .tr('_', ' ')
-      .squish
-      .gsub(/([a-z\d]*)/i, &:downcase)
-      .gsub(/\A\w/) { |str| capitalize ? str.upcase : str }
+    underscore.gsub(/_id\z/, '')
+              .tr('_', ' ')
+              .squish
+              .gsub(/([a-z\d]*)/i, &:downcase)
+              .gsub(/\A\w/) { |str| capitalize ? str.upcase : str }
   end
 
   def humanize!(options = {})
@@ -147,12 +144,11 @@ module ActiveObject::String
   def labelize(options = {})
     capitalize = options[:capitalize] || true
 
-    underscore
-      .tr('_', ' ')
-      .squish
-      .gsub(/([a-z\d]*)/i, &:downcase)
-      .gsub(/\A\w/) { |str| capitalize ? str.upcase : str }
-      .gsub(/ id\z/, ' ID')
+    underscore.tr('_', ' ')
+              .squish
+              .gsub(/([a-z\d]*)/i, &:downcase)
+              .gsub(/\A\w/) { |str| capitalize ? str.upcase : str }
+              .gsub(/ id\z/, ' ID')
   end
 
   alias_method :labelcase, :labelize
@@ -164,7 +160,7 @@ module ActiveObject::String
   alias_method :labelcase!, :labelize!
 
   def last(limit = 1)
-    return('') if limit.zero?
+    return '' if limit.zero?
 
     limit >= length ? self : from(-limit)
   end
@@ -181,12 +177,12 @@ module ActiveObject::String
     to_i.ordinalize
   end
 
-  def parameterize(seperator = '-')
-    underscore.gsub(/\s+/, seperator).downcase
+  def parameterize(separator: '-')
+    underscore.gsub(/\s+/, separator).downcase
   end
 
-  def parameterize!(seperator = '-')
-    replace(parameterize(seperator))
+  def parameterize!(separator: '-')
+    replace(parameterize(separator: separator))
   end
 
   def pollute(delimiter = '^--^--^')
@@ -207,11 +203,7 @@ module ActiveObject::String
 
   def remove(*patterns)
     string = dup
-
-    patterns.flatten.each do |pat|
-      pat.is_a?(Range) ? string.slice!(pat) : string.gsub!(pat, '')
-    end
-
+    patterns.flatten.each { |pat| pat.is_a?(Range) ? string.slice!(pat) : string.gsub!(pat, '') }
     string
   end
 
@@ -236,13 +228,11 @@ module ActiveObject::String
   end
 
   def shift(*patterns)
-    if patterns.empty?
-      self[0]
-    else
-      string = dup
-      patterns.flatten.each { |pat| string.sub!(pat, '') }
-      string
-    end
+    return self[0] if patterns.empty?
+
+    string = dup
+    patterns.flatten.each { |pat| string.sub!(pat, '') }
+    string
   end
 
   def shift!(*patterns)
@@ -274,11 +264,11 @@ module ActiveObject::String
   end
 
   def slugify
-    gsub(/[^\x00-\x7F]+/, '')
-      .gsub(/[^\w_ \-]+/i, '')
-      .gsub(/[ \-]+/i, '-')
-      .gsub(/^\-|\-$/i, '')
-      .downcase
+    to_s.gsub(/[^\x00-\x7F]+/, '')
+        .gsub(/[^\w_ \-]+/i, '')
+        .gsub(/[ \-]+/i, '-')
+        .gsub(/^\-|\-$/i, '')
+        .downcase
   end
 
   def slugify!
@@ -318,7 +308,7 @@ module ActiveObject::String
   end
 
   def truncate(truncate_at, options = {})
-    return(dup) unless length > truncate_at
+    return dup unless length > truncate_at
 
     omission = options[:omission] || '...'
     size_with_room_for_omission = truncate_at - omission.length
@@ -337,19 +327,17 @@ module ActiveObject::String
     sep = options[:separator] || /\s+/
     sep = Regexp.escape(sep.to_s) unless sep.is_a(Regexp)
 
-    if self =~ /\A((?:.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m
-      "#{Regexp.last_match(1)}#{options[:omissio] || '...'}"
-    else
-      self
-    end
+    return self unless  self =~ /\A((?:.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m
+
+    "#{Regexp.last_match(1)}#{options[:omissio] || '...'}"
   end
 
   def underscore
-    gsub(/::/, '/')
-      .gsub(/([A-Z\d]+)([A-Z][a-z])/, "\1_\2")
-      .gsub(/([a-z\d])([A-Z])/, "\1_\2")
-      .tr('-', '_')
-      .downcase
+    to_s.gsub(/::/, '/')
+        .gsub(/([A-Z\d]+)([A-Z][a-z])/, "\1_\2")
+        .gsub(/([a-z\d])([A-Z])/, "\1_\2")
+        .tr('-', '_')
+        .downcase
   end
 
   def underscore!

data/lib/active_object/version.rb

@@ -1,3 +1,3 @@
 module ActiveObject
-  VERSION = '4.0.4'.freeze
+  VERSION = '4.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_object
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Gem for commonly used ruby object helpers.