linked-list 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15032f04d676c41f8dedbb0d911c82a35944826d5469c3a32530548fc55efa5c
-  data.tar.gz: 3f8b4bab1f5d9dca9f88b2e4e9baa78b2e9120eaf41ad7c3095e4072b7609be9
+  metadata.gz: 203cf979a2f074eaa22dd987096ecf8ec298198344ddf1f8cafafca20be8552b
+  data.tar.gz: e8fc8a7584f411444d4685aa3c9ecc7328a2ba59f1f0e0de55a1abb2130ff63f
 SHA512:
-  metadata.gz: c174a97b29c738a4224025639b744c97f086f0cc80afe21f20678ea708be29ff956fd8e81feb4f606d7a1ac9376f2fb334afe7bd730e3b8263af69107255bc50
-  data.tar.gz: 0eeb55908b8b9ddeb7f477262899e1a8d990e013af21d0c723c64a9c92248b4a1964e48450f379de1642906c0f68e08ea4a7f20dda360e45346a4ce9dd057a4d
+  metadata.gz: 4e87238b13c8a4621ff4b30502f6d4295df7f9ad7a219144bfcdbea24c7676b859767f53b3070ac11707576f639a8f1323bd1e96903bcba76403c1a865a2d552
+  data.tar.gz: 9419f5694a938f436084247464b016c213b8914fdbcc3a255eed8fffbe21164938f6b10f27aac2187d985995c1120b6bbc581ea6c295a8fd7da45f5acbe01655

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.3.0
+  - 2.5.0
 cache: bundler

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# 0.0.11 / 2018-04-02
+
+## Added
+
+- Added `delete` and `delete_all` methods (mpospelov in [#2](https://github.com/spectator/linked-list/pull/2))
+
+# 0.0.10 / 2018-04-02
+
+## Fixed
+
+- Fixed bug when `@tail.prev` was mistekenly set to `nil` instead of `@tail.next` when popping elements off the list (Sonna in [#1](https://github.com/spectator/linked-list/pull/1))
+
+[Compare v0.0.9...v0.0.10](https://github.com/spectator/linked-list/compare/v0.0.9...v0.0.10)
+
+# 0.0.9 / 2013-12-11
+
+Initial release.

data/README.md

@@ -44,6 +44,9 @@ list.shift
 list.reverse
 list.reverse!
 
+list.delete(object)
+list.delete_all(object)
+
 list.each      # Enumerator object
 list.each { |e| puts e }
 
@@ -78,7 +81,7 @@ Please see `LinkedList::List`, `LinkedList::Node`, and
 
 ## TODO
 
-* Insert / delete in the middle
+* Insert in the middle
 
 ## Tests
 

data/lib/linked-list/conversions.rb

@@ -12,8 +12,7 @@ module LinkedList
     # New +Node+ object.
     #
     def Node(arg)
-      case arg
-      when ->(_arg) { _arg.respond_to?(:to_node) }
+      if arg.respond_to?(:to_node)
         arg.to_node
       else
         Node.new(arg)
@@ -31,10 +30,9 @@ module LinkedList
     # New +List+ object.
     #
     def List(arg)
-      case arg
-      when ->(_arg) { _arg.respond_to?(:to_list) }
+      if arg.respond_to?(:to_list)
         arg.to_list
-      when ->(_arg) { _arg.respond_to?(:to_ary) }
+      elsif arg.respond_to?(:to_ary)
         arg.to_ary.each_with_object(List.new) { |n, l| l.push(Node(n)) }
       else
         List.new.push(Node(arg))

data/lib/linked-list/list.rb

@@ -4,7 +4,7 @@ module LinkedList
   class List
     include Conversions
 
-    attr_reader  :length
+    attr_reader :length
     alias_method :size, :length
 
     def initialize
@@ -69,6 +69,30 @@ module LinkedList
       self
     end
 
+    # Removes first matched node.data from the the list by passed block or value.
+    #
+    # == Returns:
+    # Deleted node
+    #
+    def delete(val = nil, &block)
+      each_node.find(&__to_matcher(val, &block)).tap do |node_to_delete|
+        return if node_to_delete.blank?
+        __unlink(node_to_delete)
+      end.data
+    end
+
+    # Removes all matched data.data from the the list by passed block or value.
+    #
+    # == Returns:
+    # Array of deleted nodes
+    #
+    def delete_all(val = nil, &block)
+      each_node.select(&__to_matcher(val, &block)).each do |node_to_delete|
+        next if node_to_delete.blank?
+        __unlink(node_to_delete)
+      end.map(&:data)
+    end
+
     # Removes data from the end of the list.
     #
     # == Returns:
@@ -136,6 +160,17 @@ module LinkedList
       __each { |node| yield(node.data) }
     end
 
+    # Iterates over nodes from top to bottom passing node(LinkedList::Node instance)
+    # to the block if given. If no block given, returns +Enumerator+.
+    #
+    # == Returns:
+    # +Enumerator+ or yields list nodes to the block
+    #
+    def each_node
+      return to_enum(__callee__) unless block_given?
+      __each { |node| yield(node) }
+    end
+
     # Converts list to array.
     #
     def to_a
@@ -158,6 +193,25 @@ module LinkedList
 
     private
 
+    def __to_matcher(val = nil, &block)
+      raise ArgumentError, 'either value or block should be passed' if val && block_given?
+      block = ->(e) { e == val } unless block_given?
+      -> (node) { block.call(node.data) }
+    end
+
+    def __unlink(node)
+      if node.prev.blank?
+        node.next.prev = nil if node.next
+        @head = node.next
+      elsif node.next.blank?
+        node.prev.next = nil if node.prev
+        @tail = node.prev
+      else
+        node.prev.next, node.next.prev = node.next, node.prev
+      end
+      @length -= 1
+    end
+
     def __shift
       head = @head
       @head = @head.next

data/lib/linked-list/version.rb

@@ -2,6 +2,6 @@
 
 module Linked
   module List
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
   end
 end

data/linked-list.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Linked::List::VERSION
   spec.authors       = ['Yury Velikanau']
   spec.email         = ['yury.velikanau@gmail.com']
-  spec.description   = %q{Ruby implementation of Doubly Linked List, following some Ruby idioms.}
-  spec.summary       = %q{Ruby implementation of Doubly Linked List, following some Ruby idioms.}
+  spec.description   = %q(Ruby implementation of Doubly Linked List, following some Ruby idioms.)
+  spec.summary       = %q(Ruby implementation of Doubly Linked List, following some Ruby idioms.)
   spec.homepage      = 'https://github.com/spectator/linked-list'
   spec.license       = 'MIT'
 
@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'bundler',  '>= 1.3', '<= 2.0'
-  spec.add_development_dependency 'minitest', '>= 5.0', '<= 6.0'
+  spec.add_development_dependency 'bundler', '>= 1.3', '<= 2.0'
   spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'm', '~> 1.5.0'
+  spec.add_development_dependency 'minitest', '>= 5.0', '<= 6.0'
+  spec.add_development_dependency 'rake'
 end

data/test/list_test.rb

@@ -134,6 +134,193 @@ describe LinkedList::List do
     end
   end
 
+
+  describe '#delete' do
+    it 'raises error if block and value are passed' do
+      err = assert_raises ArgumentError do
+        assert_nil list.delete('x') { |d| d == 'x' }
+      end
+      assert_equal err.message, 'either value or block should be passed'
+    end
+
+    describe 'by block' do
+      it 'returns nil if list is empty' do
+        assert_nil list.delete { |d| d == 'x' }
+      end
+
+      it 'deletes value in first matching node' do
+        list.push('foo')
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete { |d| d == 'foo' }
+        assert_equal ['foo', 'bar', 'foo'], list.to_a
+      end
+
+      it 'returns deleted value' do
+        list.push('foo')
+        assert_equal 'foo', list.delete { |d| d == 'foo' }
+      end
+
+      it 'decreases length of list' do
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete { |d| d == 'foo' }
+        assert_equal 2, list.length
+        assert_equal ['bar', 'foo'], list.to_a
+      end
+
+      describe 'position edge cases' do
+        before do
+          list.push(0)
+          list.push(1)
+          list.push(2)
+        end
+
+        it 'deletes value from head' do
+          list.delete { |d| d == 0 }
+          assert_equal [1, 2], list.to_a
+          assert_equal 1, list.first
+        end
+
+        it 'deletes value from middle' do
+          list.delete { |d| d == 1 }
+          assert_equal [0, 2], list.to_a
+        end
+
+
+        it 'deletes value from tail' do
+          list.delete { |d| d == 2 }
+          assert_equal [0, 1], list.to_a
+          assert_equal 1, list.last
+        end
+      end
+    end
+
+    describe 'by data equality' do
+      it 'returns nil if list is empty' do
+        assert_nil list.delete('x')
+      end
+
+      it 'deletes value in first node' do
+        list.push('foo')
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete('foo')
+        assert_equal ['foo', 'bar', 'foo'], list.to_a
+      end
+
+      it 'returns deleted value' do
+        list.push('foo')
+        assert_equal 'foo', list.delete('foo')
+      end
+
+      it 'decreases length of list' do
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete('foo')
+        assert_equal 2, list.length
+        assert_equal ['bar', 'foo'], list.to_a
+      end
+
+      describe 'position edge cases' do
+        before do
+          list.push(0)
+          list.push(1)
+          list.push(2)
+        end
+
+        it 'deletes value from head' do
+          list.delete(0)
+          assert_equal [1, 2], list.to_a
+          assert_equal 1, list.first
+        end
+
+        it 'deletes value from middle' do
+          list.delete(1)
+          assert_equal [0, 2], list.to_a
+        end
+
+
+        it 'deletes value from tail' do
+          list.delete(2)
+          assert_equal [0, 1], list.to_a
+          assert_equal 1, list.last
+        end
+      end
+    end
+  end
+
+  describe '#delete_all' do
+    it 'raises error if block and value are passed' do
+      err = assert_raises ArgumentError do
+        assert_nil list.delete_all('x') { |d| d == 'x' }
+      end
+      assert_equal err.message, 'either value or block should be passed'
+    end
+
+    describe 'by block' do
+      it 'returns nil if list is empty' do
+        assert_equal list.delete_all { |d| d == 'x' }, []
+      end
+
+      it 'deletes value in first matching node' do
+        list.push('foo')
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete_all { |d| d == 'foo' }
+        assert_equal ['bar'], list.to_a
+      end
+
+      it 'returns deleted value' do
+        list.push('foo')
+        assert_equal ['foo'], list.delete_all { |d| d == 'foo' }
+      end
+
+      it 'decreases length of list' do
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete_all { |d| d == 'foo' }
+        assert_equal 1, list.length
+        assert_equal ['bar'], list.to_a
+      end
+    end
+
+    describe 'by data equality' do
+      it 'returns nil if list is empty' do
+        assert_nil list.delete('x')
+      end
+
+      it 'deletes all matched values' do
+        list.push('foo')
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete_all('foo')
+        assert_equal ['bar'], list.to_a
+      end
+
+      it 'returns deleted value' do
+        list.push('foo')
+        assert_equal ['foo'], list.delete_all('foo')
+      end
+
+      it 'decreases length of list' do
+        list.push('foo')
+        list.push('bar')
+        list.push('foo')
+        list.delete_all('foo')
+        assert_equal 1, list.length
+        assert_equal ['bar'], list.to_a
+      end
+    end
+  end
+
   describe '#shift' do
     it 'returns nil if list is empty' do
       assert_nil list.shift
@@ -200,6 +387,21 @@ describe LinkedList::List do
     end
   end
 
+  describe '#each_node' do
+    it 'returns enumerator if no block given' do
+      assert_instance_of Enumerator, list.each_node
+    end
+
+    it 'pass each node data to the block' do
+      list.push(node_1)
+      list.push(node_2)
+      nodes = []
+      list.each_node { |e| nodes << e }
+      assert_equal %w(foo bar), nodes.map(&:data)
+      assert_equal true, nodes.all? { |n| n.is_a?(LinkedList::Node) }
+    end
+  end
+
   describe '#each' do
     it 'returns enumerator if no block given' do
       assert_instance_of Enumerator, list.each

metadata

@@ -1,49 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: linked-list
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Yury Velikanau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<="
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +79,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md