more_core_extensions 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e072368f5dec0db13f1df4e2ff8319494087d15
-  data.tar.gz: cf9f2bbb0c0a9ae9857a073479e44816ea622149
+  metadata.gz: c8d64c7762ab50f5ccf50df6ab0617196c5033ff
+  data.tar.gz: 6eddc491ea72be38afd73e62e1f81440c52622fb
 SHA512:
-  metadata.gz: f2a860d28460607a3d28f51e140754171ee53e49c5546a25f5202f35f620e3d2bfb8609a3ffe6afbe826a0ccac48abe033d0e0f2a9a058d35450d67ce213d4c7
-  data.tar.gz: 4515f726acb409bff78d078e92f3ce56daf3d60d57f45858149782be684f5c33b213f132d71267171e03d577cc7c8fd21e66718d747a03d69077e558491e7ee5
+  metadata.gz: e31fdff37332985b3849f2047b5826988060bfcf53ee2fd34c934e3b2b0f3174a8a99321719eb2af6376b14dddd730d887352cbe5d20a4dbdbab80784a26c5eb
+  data.tar.gz: 4b54bf02dc41e38429d4b819981444e1a868708214dff14c14b9f0583b0aac533b90b26f6a46b35f92f75a2cd39e1c75ee9ca6d89fe6e57eda6590d740cbd783

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

@@ -1,5 +1,4 @@
-require 'active_support'
-require 'active_support/core_ext/object/blank'
+require 'more_core_extensions/core_ext/object/blank'
 
 module MoreCoreExtensions
   module ArrayDeletes

data/lib/more_core_extensions/core_ext/hash/deletes.rb

@@ -1,5 +1,4 @@
-require 'active_support'
-require 'active_support/core_ext/object/blank'
+require 'more_core_extensions/core_ext/object/blank'
 
 module MoreCoreExtensions
   module HashDeletes

data/lib/more_core_extensions/core_ext/object/blank.rb

@@ -0,0 +1,149 @@
+# Copied from https://github.com/rails/rails/blob/v5.0.0/activesupport/lib/active_support/core_ext/object/blank.rb
+# With the release of ActiveSupport v5.0.0 a minimum required_ruby_version of '>= 2.2.2' was added.
+# This code has been copied here so that we can continue to support ruby versions that don't meet that requirement.
+
+unless Object.respond_to?(:blank?)
+  class Object
+    # An object is blank if it's false, empty, or a whitespace string.
+    # For example, +false+, '', '   ', +nil+, [], and {} are all blank.
+    #
+    # This simplifies
+    #
+    #   !address || address.empty?
+    #
+    # to
+    #
+    #   address.blank?
+    #
+    # @return [true, false]
+    def blank?
+      respond_to?(:empty?) ? !!empty? : !self
+    end
+
+    # An object is present if it's not blank.
+    #
+    # @return [true, false]
+    def present?
+      !blank?
+    end
+
+    # Returns the receiver if it's present otherwise returns +nil+.
+    # <tt>object.presence</tt> is equivalent to
+    #
+    #    object.present? ? object : nil
+    #
+    # For example, something like
+    #
+    #   state   = params[:state]   if params[:state].present?
+    #   country = params[:country] if params[:country].present?
+    #   region  = state || country || 'US'
+    #
+    # becomes
+    #
+    #   region = params[:state].presence || params[:country].presence || 'US'
+    #
+    # @return [Object]
+    def presence
+      self if present?
+    end
+  end
+
+  class NilClass
+    # +nil+ is blank:
+    #
+    #   nil.blank? # => true
+    #
+    # @return [true]
+    def blank?
+      true
+    end
+  end
+
+  class FalseClass
+    # +false+ is blank:
+    #
+    #   false.blank? # => true
+    #
+    # @return [true]
+    def blank?
+      true
+    end
+  end
+
+  class TrueClass
+    # +true+ is not blank:
+    #
+    #   true.blank? # => false
+    #
+    # @return [false]
+    def blank?
+      false
+    end
+  end
+
+  class Array
+    # An array is blank if it's empty:
+    #
+    #   [].blank?      # => true
+    #   [1,2,3].blank? # => false
+    #
+    # @return [true, false]
+    alias_method :blank?, :empty?
+  end
+
+  class Hash
+    # A hash is blank if it's empty:
+    #
+    #   {}.blank?                # => true
+    #   { key: 'value' }.blank?  # => false
+    #
+    # @return [true, false]
+    alias_method :blank?, :empty?
+  end
+
+  class String
+    BLANK_RE = /\A[[:space:]]*\z/
+
+    # A string is blank if it's empty or contains whitespaces only:
+    #
+    #   ''.blank?       # => true
+    #   '   '.blank?    # => true
+    #   "\t\n\r".blank? # => true
+    #   ' blah '.blank? # => false
+    #
+    # Unicode whitespace is supported:
+    #
+    #   "\u00a0".blank? # => true
+    #
+    # @return [true, false]
+    def blank?
+      # The regexp that matches blank strings is expensive. For the case of empty
+      # strings we can speed up this method (~3.5x) with an empty? call. The
+      # penalty for the rest of strings is marginal.
+      empty? || BLANK_RE === self
+    end
+  end
+
+  class Numeric #:nodoc:
+    # No number is blank:
+    #
+    #   1.blank? # => false
+    #   0.blank? # => false
+    #
+    # @return [false]
+    def blank?
+      false
+    end
+  end
+
+  class Time #:nodoc:
+    # No Time is blank:
+    #
+    #   Time.now.blank? # => false
+    #
+    # @return [false]
+    def blank?
+      false
+    end
+  end
+end

data/lib/more_core_extensions/core_ext/object.rb

@@ -1 +1,2 @@
+require 'more_core_extensions/core_ext/object/blank'
 require 'more_core_extensions/core_ext/object/namespace'

data/lib/more_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module MoreCoreExtensions
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/spec/core_ext/hash/nested_spec.rb

@@ -190,39 +190,43 @@ describe Hash do
   include_examples "core_ext/hash/nested"
 end
 
-require 'active_support'
-require 'active_support/core_ext/hash'
-describe HashWithIndifferentAccess do
-  let(:hash) do
-    described_class.new.merge(
-      "a" => 1,
-      "b" => {},
-      "c" => {"c1" => 2},
-      "d" => {"d1" => {"d2" => {"d3" => 3}}},
-      "e" => Hash.new(4),
-      "f" => described_class.new { |h, k| h[k] = described_class.new },
-      nil => {nil => 7},
-      ["h", "i"] => 8
-    )
-
-    # NOTE: "f" has to be initialized in that way due to a bug in
-    #   HashWithIndifferentAccess and assigning a Hash with a default proc.
-    #
-    # 1.9.3 :001 > h1 = Hash.new
-    # 1.9.3 :002 > h1[:a] = Hash.new { |h, k| h[k] = Hash.new }
-    # 1.9.3 :003 > h1[:a].class
-    #  => Hash
-    # 1.9.3 :004 > h1[:a][:b].class
-    #  => Hash
-    #
-    # 1.9.3 :005 > require 'active_support/all'
-    # 1.9.3 :006 > h2 = HashWithIndifferentAccess.new
-    # 1.9.3 :007 > h2[:a] = Hash.new { |h, k| h[k] = Hash.new }
-    # 1.9.3 :008 > h2[:a].class
-    #  => ActiveSupport::HashWithIndifferentAccess
-    # 1.9.3 :009 > h2[:a][:b].class
-    #  => NilClass
+begin
+  require 'active_support'
+  require 'active_support/core_ext/hash'
+  describe HashWithIndifferentAccess do
+    let(:hash) do
+      described_class.new.merge(
+        "a"        => 1,
+        "b"        => {},
+        "c"        => {"c1" => 2},
+        "d"        => {"d1" => {"d2" => {"d3" => 3}}},
+        "e"        => Hash.new(4),
+        "f"        => described_class.new { |h, k| h[k] = described_class.new },
+        nil        => {nil => 7},
+        ["h", "i"] => 8
+      )
+
+      # NOTE: "f" has to be initialized in that way due to a bug in
+      #   HashWithIndifferentAccess and assigning a Hash with a default proc.
+      #
+      # 1.9.3 :001 > h1 = Hash.new
+      # 1.9.3 :002 > h1[:a] = Hash.new { |h, k| h[k] = Hash.new }
+      # 1.9.3 :003 > h1[:a].class
+      #  => Hash
+      # 1.9.3 :004 > h1[:a][:b].class
+      #  => Hash
+      #
+      # 1.9.3 :005 > require 'active_support/all'
+      # 1.9.3 :006 > h2 = HashWithIndifferentAccess.new
+      # 1.9.3 :007 > h2[:a] = Hash.new { |h, k| h[k] = Hash.new }
+      # 1.9.3 :008 > h2[:a].class
+      #  => ActiveSupport::HashWithIndifferentAccess
+      # 1.9.3 :009 > h2[:a][:b].class
+      #  => NilClass
+    end
+
+    include_examples "core_ext/hash/nested"
   end
-
-  include_examples "core_ext/hash/nested"
+rescue LoadError
+  # ActiveSupport v5.0.0 requires ruby '>=2.2.2', skip these tests on older rubies.
 end

data/spec/core_ext/object/blank_spec.rb

@@ -0,0 +1,46 @@
+describe "blank" do
+  class EmptyTrue
+    def empty?
+      0
+    end
+  end
+
+  class EmptyFalse
+    def empty?
+      nil
+    end
+  end
+
+  BLANK   = [EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", '　', "\u00a0", [], {}].freeze
+  PRESENT = [EmptyFalse.new, Object.new, true, 0, 1, 'a', [nil], {nil => 0}].freeze
+
+  describe "#blank?" do
+    context "true" do
+      BLANK.each { |v| it(v.inspect) { expect(v).to be_blank } }
+    end
+
+    context "false" do
+      PRESENT.each { |v| it(v.inspect) { expect(v).to_not be_blank } }
+    end
+  end
+
+  describe "#present?" do
+    context "true" do
+      PRESENT.each { |v| it(v.inspect) { expect(v).to be_present } }
+    end
+
+    context "false" do
+      BLANK.each { |v| it(v.inspect) { expect(v).to_not be_present } }
+    end
+  end
+
+  describe "#presence" do
+    context "object" do
+      PRESENT.each { |v| it(v.inspect) { expect(v.presence).to eq(v) } }
+    end
+
+    context "nil" do
+      BLANK.each { |v| it(v.inspect) { expect(v.presence).to be_nil } }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: more_core_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jason Frey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 description: MoreCoreExtensions are a set of core extensions beyond those provided
   by ActiveSupport.
 email:
@@ -108,6 +108,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/object.rb
+- lib/more_core_extensions/core_ext/object/blank.rb
 - lib/more_core_extensions/core_ext/object/namespace.rb
 - lib/more_core_extensions/core_ext/shared/nested.rb
 - lib/more_core_extensions/core_ext/string.rb
@@ -124,6 +125,7 @@ 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/object/blank_spec.rb
 - spec/core_ext/object/namespace_spec.rb
 - spec/core_ext/string/formats_spec.rb
 - spec/core_ext/string/hex_dump_spec.rb
@@ -140,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -148,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: MoreCoreExtensions are a set of core extensions beyond those provided by
@@ -164,6 +166,7 @@ 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/object/blank_spec.rb
 - spec/core_ext/object/namespace_spec.rb
 - spec/core_ext/string/formats_spec.rb
 - spec/core_ext/string/hex_dump_spec.rb