more_core_extensions 1.0.2 → 1.1.0

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

@@ -0,0 +1,21 @@
+require 'active_support/core_ext/object/blank'
+
+module MoreCoreExtensions
+  module ArrayDeletes
+    # Deletes all items where the value is nil
+    #
+    #   [1, [], nil].delete_nils # => [1, []]
+    def delete_nils
+      delete_if { |i| i.nil? }
+    end
+
+    # Deletes all items where the value is blank
+    #
+    #   [1, [], nil].delete_blanks # => [1]
+    def delete_blanks
+      delete_if { |i| i.blank? }
+    end
+  end
+end
+
+Array.send(:include, MoreCoreExtensions::ArrayDeletes)

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

@@ -29,6 +29,18 @@ module MoreCoreExtensions
     def include_all?(*items)
       (items - self).empty?
     end
+
+    #
+    # Returns whether the Array has a value at the index.
+    #
+    #   [1, 2, 3].includes_index?(-4)  #=> false
+    #   [1, 2, 3].includes_index?(-3)  #=> true
+    #   [1, 2, 3].includes_index?(1)  #=> true
+    #   [1, 2, 3].includes_index?(2)  #=> true
+    #   [1, 2, 3].includes_index?(3)  #=> false
+    def includes_index?(index)
+      (-self.length...self.length).cover?(index)
+    end
   end
 end
 

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

@@ -0,0 +1,15 @@
+require_relative '../shared/nested'
+
+module MoreCoreExtensions
+  module ArrayNested
+    include MoreCoreExtensions::Shared::Nested
+    extend  MoreCoreExtensions::Shared::Nested
+
+    def delete_blank_paths
+      self.each { |v| v.delete_blank_paths if v.respond_to?(:delete_blank_paths) }
+      self.delete_blanks
+    end
+  end
+end
+
+Array.send(:include, MoreCoreExtensions::ArrayNested)

data/lib/more_core_extensions/core_ext/array.rb

@@ -1,5 +1,7 @@
+require 'more_core_extensions/core_ext/array/deletes'
 require 'more_core_extensions/core_ext/array/duplicates'
 require 'more_core_extensions/core_ext/array/inclusions'
+require 'more_core_extensions/core_ext/array/nested'
 require 'more_core_extensions/core_ext/array/random'
 require 'more_core_extensions/core_ext/array/stretch'
 require 'more_core_extensions/core_ext/array/tableize'

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

@@ -1,59 +1,13 @@
+require_relative '../shared/nested'
+
 module MoreCoreExtensions
   module HashNested
-    def fetch_path(*args)
-      args = args.first if args.length == 1 && args.first.kind_of?(Array)
-      raise ArgumentError, "must pass at least one key" if args.empty?
-
-      child = self[args.first]
-      return child if args.length == 1
-      return nil unless child.kind_of?(Hash)
-      return child.fetch_path(args[1..-1])
-    end
-
-    def has_key_path?(*args)
-      args = args.first if args.length == 1 && args.first.kind_of?(Array)
-      raise ArgumentError, "must pass at least one key" if args.empty?
-
-      key = args.first
-      has_child = self.has_key?(key)
-      return has_child if args.length == 1
-
-      child = self[key]
-      return false unless child.kind_of?(Hash)
-      return child.has_key_path?(args[1..-1])
-    end
-    alias include_path? has_key_path?
-    alias key_path?     has_key_path?
-    alias member_path?  has_key_path?
-
-    def store_path(*args)
-      raise ArgumentError, "must pass at least one key, and a value" if args.length < 2
-      value = args.pop
-      args = args.first if args.length == 1 && args.first.kind_of?(Array)
-
-      key = args.first
-      if args.length == 1
-        self[key] = value
-      else
-        child = self[key]
-        unless child.kind_of?(Hash)
-          self[key] = self.class.new
-          child = self[key]
-        end
-        child.store_path(args[1..-1], value)
-      end
-    end
-
-    def delete_path(*args)
-      args = args.first if args.length == 1 && args.first.kind_of?(Array)
-      raise ArgumentError, "must pass at least one key" if args.empty?
+    include MoreCoreExtensions::Shared::Nested
+    extend  MoreCoreExtensions::Shared::Nested
 
-      key = args.first
-      if args.length == 1 || !(child = self[key]).kind_of?(Hash)
-        self.delete(key)
-      else
-        child.delete_path(args[1..-1])
-      end
+    def delete_blank_paths
+      self.each_value { |v| v.delete_blank_paths if v.respond_to?(:delete_blank_paths) }
+      self.delete_blanks
     end
   end
 end

data/lib/more_core_extensions/core_ext/shared/nested.rb

@@ -0,0 +1,83 @@
+module MoreCoreExtensions
+  module Shared
+    module Nested
+
+      def delete_path(*args)
+        args = args.first if args.length == 1 && args.first.kind_of?(Array)
+        raise ArgumentError, "must pass at least one key" if args.empty?
+
+        key = args.first
+        raise ArgumentError, "must be a number" if self.kind_of?(Array) && !key.kind_of?(Numeric)
+
+        child = self[key]
+        if args.length == 1 || !child.respond_to?(:delete_path)
+          self.kind_of?(Array) ? self.delete_at(key) : self.delete(key)
+        else
+          child.delete_path(args[1..-1])
+        end
+      end
+
+      def fetch_path(*args)
+        args = args.first if args.length == 1 && args.first.kind_of?(Array)
+        raise ArgumentError, "must pass at least one key" if args.empty?
+
+        key = args.first
+        raise ArgumentError, "must be a number" if self.kind_of?(Array) && !key.kind_of?(Numeric)
+
+        child = self[key]
+        return child if args.length == 1
+        return nil unless child.respond_to?(:fetch_path)
+        return child.fetch_path(args[1..-1])
+      end
+
+      def has_key_path?(*args)
+        args = args.first if args.length == 1 && args.first.kind_of?(Array)
+        raise ArgumentError, "must pass at least one key" if args.empty?
+
+        key = args.first
+        raise ArgumentError, "must be a number" if self.kind_of?(Array) && !key.kind_of?(Numeric)
+
+        has_child = self.kind_of?(Array) ? self.includes_index?(key) : self.has_key?(key)
+        return has_child if args.length == 1
+
+        child = self[key]
+        return false unless child.respond_to?(:has_key_path?)
+        return child.has_key_path?(args[1..-1])
+      end
+      alias include_path? has_key_path?
+      alias key_path?     has_key_path?
+      alias member_path?  has_key_path?
+
+      def store_path(*args)
+        raise ArgumentError, "must pass at least one key, and a value" if args.length < 2
+        value = args.pop
+        args = args.first if args.length == 1 && args.first.kind_of?(Array)
+
+        key = args.first
+        raise ArgumentError, "must be a number" if self.kind_of?(Array) && !key.kind_of?(Numeric)
+
+        if args.length == 1
+          self[key] = value
+        else
+          child = self[key]
+          unless child.respond_to?(:store_path)
+            self[key] = self.class.new
+            child = self[key]
+          end
+          child.store_path(args[1..-1].push, value)
+        end
+      end
+
+      def find_path(val)
+        self.each_with_index do |v, k|
+          k, v = v if self.kind_of?(Hash)
+          return [k] if v == val
+
+          c = v.respond_to?(:find_path) ? v.find_path(val) : []
+          return c.unshift(k) unless c.blank?
+        end
+        []
+      end
+    end
+  end
+end

data/lib/more_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module MoreCoreExtensions
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/core_ext/array/deletes_spec.rb

@@ -0,0 +1,17 @@
+require_relative "../../spec_helper"
+
+describe Array do
+  it "#delete_nils" do
+    [].delete_nils.should == []
+    [1].delete_nils.should == [1]
+    [nil].delete_nils.should == []
+    [1, [], nil].delete_nils.should == [1, []]
+  end
+
+  it "#delete_blanks" do
+    [].delete_blanks.should == []
+    [1].delete_blanks.should == [1]
+    [nil].delete_blanks.should == []
+    [1, [], nil].delete_blanks.should == [1]
+  end
+end

data/spec/core_ext/array/inclusions_spec.rb

@@ -30,4 +30,12 @@ describe Array do
     ['1', '2', '3'].include_all?('1', '4').should be_false
     ['1', '2', '3'].include_all?('4', '5').should be_false
   end
+
+  it "#includes_index?" do
+    [1, 2, 3].includes_index?(-4).should be_false
+    [1, 2, 3].includes_index?(-3).should be_true
+    [1, 2, 3].includes_index?(1).should be_true
+    [1, 2, 3].includes_index?(2).should be_true
+    [1, 2, 3].includes_index?(3).should be_false
+  end
 end

data/spec/core_ext/array/nested_spec.rb

@@ -0,0 +1,185 @@
+require_relative "../../spec_helper"
+
+shared_examples_for "core_ext/array/nested will not modify arguments" do |meth|
+  it "will not modify arguments" do
+    args = (meth == :store_path ? [1] : [])
+
+    key  = [3, 0, 1, 2]
+    key2 = key.dup
+    array.send(meth, key2, *args)
+    key2.should == key
+
+    key  = [4, 0, 1]
+    key2 = key.dup
+    array.send(meth, key2, *args)
+    key2.should == key
+  end
+end
+
+shared_examples_for "core_ext/array/nested" do
+  context '#fetch_path' do
+    it "with various values" do
+      array.fetch_path(0).should == 1
+      array.fetch_path(1).should == []
+      array.fetch_path(1, 0).should be_nil
+      array.fetch_path(1, 0, 1).should be_nil
+      array.fetch_path(2).should == [2]
+      array.fetch_path(2, 0).should == 2
+      array.fetch_path(-4, 0).should == 2
+      array.fetch_path(2, 0, 1).should be_nil
+      array.fetch_path(3, 0, 0, 0).should == 3
+      array.fetch_path(3, 0, 1, 999).should be_nil
+      array.fetch_path(3, 0, 1, 2, 3).should be_nil
+      array.fetch_path(4).should == [nil, nil, nil, nil]
+      array.fetch_path(4, 0).should be_nil
+      array.fetch_path(4, 0, 1).should be_nil
+      array.fetch_path(5).should == []
+      array.fetch_path(5, 0).should be_nil
+      array.fetch_path(5, 0, 1).should be_nil
+    end
+
+    it "with a nil value should raise ArgumentError" do
+      lambda { array.fetch_path(nil) }.should raise_error(ArgumentError)
+      lambda { array.fetch_path(3, nil, 0) }.should raise_error(ArgumentError)
+    end
+
+    it "with invalid values" do
+      lambda { array.fetch_path }.should raise_error(ArgumentError)
+    end
+
+    include_examples "core_ext/array/nested will not modify arguments", :fetch_path
+  end
+
+  context "#store_path" do
+    it "on an empty array" do
+      a = described_class.new
+      a.store_path(0, 1)
+      a.should == [1]
+
+      a = described_class.new
+      a.store_path(1, 0, 2)
+      a.should == [nil, [2]]
+    end
+
+    it "on an existing array" do
+      array.store_path(1, 0, 2)
+      array[1].should == [2]
+      array.store_path(2, 0, 3)
+      array[2].should == [3]
+      array.store_path(-4, 0, 3)
+      array[2].should == [3]
+    end
+
+    it "on an existing item that is not a array" do
+      array.store_path(0, 2)
+      array[0].should == 2
+      array.store_path(0, 0, 3)
+      array[0].should == [3]
+    end
+
+    it "with an array of args" do
+      a = described_class.new
+      a.store_path([3, 0, 1, 2], 3)
+      a.should == [nil, nil, nil, [[nil, [nil, nil, 3]]]]
+    end
+
+    it "with a nil value" do
+      a = described_class.new
+      a.store_path(0, 1, nil)
+      a.should == [[nil, nil]]
+    end
+
+    it "with an Array value" do
+      a = described_class.new
+      a.store_path(0, 1, [2, 3])
+      a.should == [[nil, [2, 3]]]
+    end
+
+    it "with a Hash value" do
+      a = described_class.new
+      a.store_path(0, 1, {2 => 3})
+      a.should == [[nil, {2 => 3}]]
+    end
+
+    it "with invalid values" do
+      lambda { described_class.new.store_path }.should raise_error(ArgumentError)
+      lambda { described_class.new.store_path(1) }.should raise_error(ArgumentError)
+    end
+
+    include_examples "core_ext/array/nested will not modify arguments", :store_path
+  end
+
+  context '#has_key_path?' do
+    it "with various values" do
+      array.has_key_path?(0).should be_true
+      array.has_key_path?(1).should be_true
+      array.has_key_path?(1, 0).should be_false
+      array.has_key_path?(1, 0, 1).should be_false
+      array.has_key_path?(2).should be_true
+      array.has_key_path?(2, 0).should be_true
+      array.has_key_path?(2, 0, 1).should be_false
+      array.has_key_path?(3, 0, 1, 2).should be_false
+      array.has_key_path?(3, 0, 1, 999).should be_false
+      array.has_key_path?(3, 0, 1, 2, 3).should be_false
+      array.has_key_path?(4).should be_true
+      array.has_key_path?(4, 0).should be_true
+      array.has_key_path?(4, 0, 1).should be_false
+      array.has_key_path?(5).should be_true
+      array.has_key_path?(5, 0).should be_false
+      array.has_key_path?(5, 0, 1).should be_false
+    end
+
+    it "with a nil value" do
+      lambda { array.fetch_path(nil) }.should raise_error(ArgumentError)
+      lambda { array.fetch_path(3, nil, 0) }.should raise_error(ArgumentError)
+    end
+
+    it "with invalid values" do
+      lambda { array.has_key_path? }.should raise_error(ArgumentError)
+    end
+
+    include_examples "core_ext/array/nested will not modify arguments", :has_key_path?
+  end
+
+  context "#delete_path" do
+    it "on a nested array" do
+      array.delete_path(3, 0, 0, 0)
+      array[3].should == [[[]]]
+    end
+
+    it "with an invalid path" do
+      array.delete_path(3, 0, 5)
+      array[3].should == [[[3]]]
+    end
+
+    include_examples "core_ext/array/nested will not modify arguments", :delete_path
+  end
+
+  it "#delete_blank_paths" do
+    array.delete_blank_paths.should == [1, [2], [[[3]]]]
+  end
+
+  context "#find_path" do
+    it "with a real value" do
+      array.find_path(3).should == [3, 0, 0, 0]
+    end
+
+    it "with non-existent value" do
+      array.find_path(42).should == []
+    end
+  end
+end
+
+describe Array do
+  let(:array) do
+    [ 1,
+      [],
+      [2],
+      [[[3]]],
+      Array.new(4),
+      described_class.new { |i| i = described_class.new }
+    ]
+  end
+
+  include_examples "core_ext/array/nested"
+end

data/spec/core_ext/hash/nested_spec.rb

@@ -38,12 +38,16 @@ shared_examples_for "core_ext/hash/nested" do
     end
 
     it "with a nil value" do
-      hash.fetch_path(nil).should be_nil
+      hash.fetch_path(nil).should == {nil => 7}
       hash.fetch_path("d", nil, "d1").should be_nil
       hash.fetch_path("e", nil).should == 4
       hash.fetch_path("e", nil, "e1").should be_nil
     end
 
+    it "with array key" do
+      hash.fetch_path([["h", "i"]]).should == 8
+    end
+
     it "with invalid values" do
       lambda { hash.fetch_path }.should raise_error(ArgumentError)
     end
@@ -76,10 +80,10 @@ shared_examples_for "core_ext/hash/nested" do
       hash["a"].should == {"a1" => 3}
     end
 
-    it "with an array of keys" do
+    it "with an array key" do
       h = described_class.new
-      h.store_path(["d", "d1", "d2", "d3"], 3)
-      h.should == {"d" => {"d1" => {"d2" => {"d3" => 3}}}}
+      h.store_path([["d", "d1"], ["d2", "d3"]], 3)
+      h.should == {["d", "d1"] => {["d2", "d3"] => 3}}
     end
 
     it "with a nil value" do
@@ -129,7 +133,7 @@ shared_examples_for "core_ext/hash/nested" do
     end
 
     it "with a nil value" do
-      hash.has_key_path?(nil).should be_false
+      hash.has_key_path?(nil).should be_true
       hash.has_key_path?("d", nil, "d1").should be_false
       hash.has_key_path?("e", nil).should be_false
       hash.has_key_path?("e", nil, "e1").should be_false
@@ -143,8 +147,32 @@ shared_examples_for "core_ext/hash/nested" do
   end
 
   context "#delete_path" do
+    it "on a nested hash" do
+      hash.delete_path("d", "d1", "d2", "d3")
+      hash["d"].should == {"d1"=>{"d2"=>{}}}
+    end
+
+    it "with an invalid path" do
+      hash.delete_path("d", "d1", :d)
+      hash["d"].should == {"d1"=>{"d2"=>{"d3"=>3}}}
+    end
+
     include_examples "core_ext/hash/nested will not modify arguments", :delete_path
   end
+
+  it "#delete_blank_paths" do
+    hash.delete_blank_paths.should == {"a"=>1, "c"=>{"c1"=>2}, "d"=>{"d1"=>{"d2"=>{"d3"=>3}}}, nil=>{nil=>7}, ["h", "i"]=>8}
+  end
+
+  context "#find_path" do
+    it "with a real value" do
+      hash.find_path(3).should == ["d", "d1", "d2", "d3"]
+    end
+
+    it "with non-existent value" do
+      hash.find_path(42).should == []
+    end
+  end
 end
 
 describe Hash do
@@ -155,7 +183,9 @@ describe Hash do
       "c" => {"c1" => 2},
       "d" => {"d1" => {"d2" => {"d3" => 3}}},
       "e" => Hash.new(4),
-      "f" => Hash.new { |h, k| h[k] = Hash.new }
+      "f" => Hash.new { |h, k| h[k] = Hash.new },
+      nil => {nil => 7},
+      ["h", "i"] => 8
     }
   end
 
@@ -171,7 +201,9 @@ describe HashWithIndifferentAccess do
       "c" => {"c1" => 2},
       "d" => {"d1" => {"d2" => {"d3" => 3}}},
       "e" => Hash.new(4),
-      "f" => described_class.new { |h, k| h[k] = described_class.new }
+      "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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: more_core_extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,21 +109,26 @@ files:
 - lib/more_core_extensions.rb
 - lib/more_core_extensions/all.rb
 - lib/more_core_extensions/core_ext/array.rb
+- lib/more_core_extensions/core_ext/array/deletes.rb
 - lib/more_core_extensions/core_ext/array/duplicates.rb
 - lib/more_core_extensions/core_ext/array/inclusions.rb
+- lib/more_core_extensions/core_ext/array/nested.rb
 - lib/more_core_extensions/core_ext/array/random.rb
 - lib/more_core_extensions/core_ext/array/stretch.rb
 - lib/more_core_extensions/core_ext/array/tableize.rb
 - lib/more_core_extensions/core_ext/hash.rb
 - lib/more_core_extensions/core_ext/hash/deletes.rb
 - lib/more_core_extensions/core_ext/hash/nested.rb
+- lib/more_core_extensions/core_ext/shared/nested.rb
 - 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/version.rb
 - more_core_extensions.gemspec
+- spec/core_ext/array/deletes_spec.rb
 - spec/core_ext/array/duplicates_spec.rb
 - spec/core_ext/array/inclusions_spec.rb
+- spec/core_ext/array/nested_spec.rb
 - spec/core_ext/array/stretch_spec.rb
 - spec/core_ext/array/tableize_spec.rb
 - spec/core_ext/hash/deletes_spec.rb
@@ -144,18 +149,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1712580559107520706
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1712580559107520706
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -164,8 +163,10 @@ specification_version: 3
 summary: MoreCoreExtensions are a set of core extensions beyond those provided by
   ActiveSupport.
 test_files:
+- spec/core_ext/array/deletes_spec.rb
 - spec/core_ext/array/duplicates_spec.rb
 - spec/core_ext/array/inclusions_spec.rb
+- spec/core_ext/array/nested_spec.rb
 - spec/core_ext/array/stretch_spec.rb
 - spec/core_ext/array/tableize_spec.rb
 - spec/core_ext/hash/deletes_spec.rb