sub_diff 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5b6f0499741992f3bc4208ecfea84003a86371f
-  data.tar.gz: 50d86038a21c0a18a7fc65381a0a99158d3e2f48
+  metadata.gz: 0e0a1c384ad9a38a3da768751496368956897495
+  data.tar.gz: bbf19547c4e3ffa7e418466b655f5f4f393133e4
 SHA512:
-  metadata.gz: 62a7a493cb66b51337b30df012cc7aeb19ae8f2502838c1f2401da4e32ba00a6a04ba00775b3d40c3e8f50ff4f0c66d5695855b5644f68c23e0c6b7183e19a8e
-  data.tar.gz: 83bbb97a007740f8ec3a9c9e06dcb43e85aabb6a69901126a4496fb8dbc4efc44a51a0d9a395124a5b88487e8da668623f60dc950bd015e4a9f6bed080c082c7
+  metadata.gz: 3335512ec9a6d1da59b76932415a0a5558332e871f28df968bbd4f319bc4e11aa77ed6843029c2d16efb9600c4d1ed8c0722a48581de94eb6bd8361c7ab4a7fb
+  data.tar.gz: 08afe03cecebf41f2ec96c65e7c02841bee5e80a34edda84d9b00a4625e5650c776bcd06aed4ab1dbd74ec86c2ff711a693bf8cb7decb5689f00f793c25861b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sub_diff (1.0.4)
+    sub_diff (1.0.5)
 
 GEM
   remote: https://www.rubygems.org/

data/README.md

@@ -94,8 +94,10 @@ end
 * `SubDiff::Diff#value`
 * `SubDiff::Diff#value_was`
 * `SubDiff::Collection#changed?`
+* `SubDiff::Collection#clear`
 * `SubDiff::Collection#diffs`
 * `SubDiff::Collection#each`
+* `SubDiff::Collection#reset`
 * `SubDiff::Collection#size`
 
 ## Testing

data/lib/sub_diff/builder.rb

@@ -6,9 +6,9 @@ module SubDiff
     end
 
     def diff(*args, &block)
-      @collection = Collection.new(string)
-      adapter.diff(*args, &block)
-      collection
+      build_diff_collection do
+        adapter.diff(*args, &block)
+      end
     end
 
     def push(*args)
@@ -21,7 +21,15 @@ module SubDiff
 
     private
 
-    attr_reader :collection, :string, :type
+    attr_reader :string, :type
+
+    def build_diff_collection(&block)
+      collection.reset(&block).dup
+    end
+
+    def collection
+      @collection ||= Collection.new(string)
+    end
 
     def adapter
       adapter_class.new(differ)

data/lib/sub_diff/collection.rb

@@ -3,9 +3,10 @@ module SubDiff
     extend Forwardable
     include Enumerable
 
-    attr_reader :string, :diffs
-
     def_delegators :diffs, :each, :size
+    def_delegators :__getobj__, :to_s
+
+    attr_reader :string, :diffs
 
     def initialize(string)
       @string = string
@@ -17,11 +18,23 @@ module SubDiff
       diffs.any?(&:changed?)
     end
 
+    def clear
+      diffs.clear
+      __setobj__('')
+    end
+
     def push(diff)
       unless diff.empty?
         diffs << diff
         __setobj__(diffs.join)
       end
     end
+
+    def reset
+      clear
+      __setobj__(string)
+      yield if block_given?
+      self
+    end
   end
 end

data/lib/sub_diff/version.rb

@@ -1,3 +1,3 @@
 module SubDiff
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/sub_diff/collection_spec.rb

@@ -21,6 +21,22 @@ RSpec.describe SubDiff::Collection do
     end
   end
 
+  describe '#clear' do
+    before { subject.push('example') }
+
+    let(:block) { proc { subject.clear } }
+
+    it 'should clear diffs' do
+      expect(block).to change(subject, :size)
+      expect(subject.diffs).to be_empty
+    end
+
+    it 'should clear string' do
+      expect(block).to change(subject, :to_s)
+      expect(subject.to_s).to eq('')
+    end
+  end
+
   describe '#each' do
     it { is_expected.to be_an(Enumerable) }
     it { is_expected.to delegate(:each).to(:diffs) }
@@ -40,6 +56,33 @@ RSpec.describe SubDiff::Collection do
     end
   end
 
+  describe '#reset' do
+    before { subject.push('example') }
+
+    let(:block) { proc { subject.reset } }
+
+    it 'should empty diffs' do
+      expect(block).to change(subject, :size)
+      expect(subject.diffs).to be_empty
+    end
+
+    it 'should reset string' do
+      expect(block).to change(subject, :to_s)
+      expect(subject.to_s).to eq(diffable)
+    end
+
+    it 'should yield if a block is given' do
+      local = 'test'
+      block = proc { local = 'changed' }
+      subject.reset(&block)
+      expect(local).to eq('changed')
+    end
+
+    it 'should return the instance itself' do
+      expect(block.call).to eq(subject)
+    end
+  end
+
   describe '#size' do
     it { is_expected.to delegate(:size).to(:diffs) }
 

data/spec/sub_diff_spec.rb

@@ -2,6 +2,14 @@ RSpec.describe SubDiff do
   subject { 'this is a simple test' }
 
   describe '#sub_diff' do
+    context 'when called multiple times with the same arguments' do
+      it 'should return a new object' do
+        first = subject.sub_diff('simple', 'very simple')
+        second = subject.sub_diff('simple', 'very simple')
+        expect(second.object_id).not_to eq(first.object_id)
+      end
+    end
+
     context 'with a string' do
       it 'should process arguments correctly' do
         result = subject.sub_diff('simple', 'very simple')
@@ -50,6 +58,14 @@ RSpec.describe SubDiff do
   end
 
   describe '#gsub_diff' do
+    context 'when called multiple times with the same arguments' do
+      it 'should return a new object' do
+        first = subject.gsub_diff('i', 'x')
+        second = subject.gsub_diff('x', 'x')
+        expect(second.object_id).not_to eq(first.object_id)
+      end
+    end
+
     context 'with a string' do
       it 'should process arguments correctly' do
         result = subject.gsub_diff('i', 'x')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sub_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sean Huber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec