sub_diff 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db20a712d5a1c4827ecdb355b8bf7908014acf55
-  data.tar.gz: 2e0fada841e581713251b66ead8df9dad486d3cd
+  metadata.gz: dc9000575a6556b4b118600aa932fec2efdf92c6
+  data.tar.gz: 0052e7df82331d0beff26bb09cf447be317ab995
 SHA512:
-  metadata.gz: 210f157fb1dd0ec4da7384d888ed07399507372a8afd0f11bfdc5583935012dc736c947c1f528aabe86386030570e29f5976fc1057f0c95e2c3064a0e79b0520
-  data.tar.gz: 3f4c90c216981bb97c04edb43785e5a1cabc5376858e8b82f0c5b36f853ed02da542addfab1f491eab301622505601962d2f07eff137877ffc46af6ae70bee45
+  metadata.gz: be6f74f1cb8a5965931792a42e46a0638ff2573bb41893df7a2a4f12f7e2b8557d760b3bb80f474e0e2e8e526361e0684ea06dfd7dc084b0394955120be7608e
+  data.tar.gz: 5f520e25084f52d1a60a1a925bfd9310b741c8a45b77e45893dcb632d6ce258e4eaa8b53ecac4435740405c89fb5c4cd5250356293b5a405719cbe9614f66d45

data/Gemfile.lock

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

data/README.md

@@ -29,10 +29,10 @@ This gem introduces a couple new methods to [`String`](http://ruby-doc.org/core-
 These methods accept the same arguments as their `sub` and `gsub` counterparts.
 
 ```ruby
-replaced = 'this is a test'.gsub_diff(/(\S*is)/, 'replaced(\1)') #=> #<DiffCollection:0x007fc532049508>
+replaced = 'this is a test'.gsub_diff(/(\S*is)/, 'replaced(\1)') #=> #<SubDiff::Collection:0x007fc532049508>
 ```
 
-The difference is that it returns a `DiffCollection` instead. This object behaves just like a `String`.
+The difference is that it returns a `SubDiff::Collection` instead. This object behaves like a `String`.
 
 ```ruby
 puts replaced #=> "replaced(this) replaced(is) a test"
@@ -88,13 +88,15 @@ end
 
 [YARD Documentation](http://www.rubydoc.info/github/shuber/sub_diff)
 
-* `Diff#changed?`
-* `Diff#value`
-* `Diff#value_was`
-* `DiffCollection#changed?`
-* `DiffCollection#diffs`
-* `DiffCollection#each`
-* `DiffCollection#size`
+* `String#gsub`
+* `String#sub`
+* `SubDiff::Diff#changed?`
+* `SubDiff::Diff#value`
+* `SubDiff::Diff#value_was`
+* `SubDiff::Collection#changed?`
+* `SubDiff::Collection#diffs`
+* `SubDiff::Collection#each`
+* `SubDiff::Collection#size`
 
 ## Testing
 

data/lib/sub_diff/builder.rb

@@ -1,34 +1,38 @@
-require 'forwardable'
-require 'sub_diff/collection'
-require 'sub_diff/differ'
-require 'sub_diff/gsub'
-
 module SubDiff
   class Builder < Struct.new(:string, :type)
-    extend Forwardable
+    def diff(*args, &block)
+      builder.diff(*args, &block)
+      collection
+    end
 
-    def_delegators :instance, :diff
+    def push(*args)
+      if args.compact.any?
+        diff = Diff.new(*args)
+        collection.push(diff)
+      end
+    end
+    alias_method :<<, :push
 
     private
 
-    def instance
-      builder.new(differ)
-    end
-
     def builder
-      Module.nesting.last.const_get(constant)
+      constant.new(differ)
     end
 
     def constant
+      Module.nesting.last.const_get(constant_name)
+    end
+
+    def constant_name
       type.to_s.capitalize
     end
 
     def differ
-      Differ.new(collection, type)
+      Differ.new(self, type)
     end
 
     def collection
-      Collection.new(string)
+      @collection ||= Collection.new(string)
     end
   end
 end

data/lib/sub_diff/collection.rb

@@ -1,7 +1,3 @@
-require 'delegate'
-require 'forwardable'
-require 'sub_diff/diff'
-
 module SubDiff
   class Collection < SimpleDelegator
     extend Forwardable
@@ -21,19 +17,7 @@ module SubDiff
       diffs.any?(&:changed?)
     end
 
-    def push(*args)
-      if args.compact.any?
-        diff = Diff.new(*args)
-        append(diff)
-      end
-
-      self
-    end
-    alias_method :<<, :push
-
-    private
-
-    def append(diff)
+    def push(diff)
       unless diff.empty?
         diffs << diff
         __setobj__(diffs.join)

data/lib/sub_diff/core_ext/string.rb

@@ -1,5 +1,3 @@
-require 'sub_diff/builder'
-
 module SubDiff
   module CoreExt
     module String

data/lib/sub_diff/diff.rb

@@ -1,5 +1,3 @@
-require 'delegate'
-
 module SubDiff
   class Diff < SimpleDelegator
     attr_reader :value_was

data/lib/sub_diff/differ.rb

@@ -1,22 +1,18 @@
-require 'forwardable'
-
 module SubDiff
-  class Differ < Struct.new(:collection, :type)
+  class Differ < Struct.new(:builder, :type)
     extend Forwardable
 
-    def_delegators :collection, :string
+    def_delegators :builder, :string
 
-    def diff(*args)
+    def each_diff(*args)
       # Ruby 1.8.7 does not support additional args after * (splat)
       block = args.pop
 
       string.send(type, args.first) do |match|
         diff = { :match => match, :prefix => $`, :suffix => $' }
         diff[:replacement] = match.sub(*args, &block)
-        yield(collection, diff)
+        yield(builder, diff)
       end
-
-      collection
     end
   end
 end

data/lib/sub_diff/gsub.rb

@@ -1,10 +1,8 @@
-require 'sub_diff/sub'
-
 module SubDiff
   class Gsub < Sub
     private
 
-    def diff!(_builder, diff, _search)
+    def process(_builder, diff, _search)
       super
       last_prefix << prefix(diff) << diff[:match]
     end

data/lib/sub_diff/sub.rb

@@ -4,14 +4,14 @@ module SubDiff
       # Ruby 1.8.7 does not support additional args after * (splat)
       args.push(block)
 
-      differ.diff(*args) do |builder, diff|
-        diff!(builder, diff, args.first)
+      differ.each_diff(*args) do |builder, diff|
+        process(builder, diff, args.first)
       end
     end
 
     private
 
-    def diff!(builder, diff, search)
+    def process(builder, diff, search)
       builder << prefix(diff)
       builder.push(diff[:replacement], diff[:match])
       builder << suffix(diff, search)

data/lib/sub_diff/version.rb

@@ -1,3 +1,3 @@
 module SubDiff
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/sub_diff.rb

@@ -1,4 +1,12 @@
+require 'delegate'
+require 'forwardable'
 require 'sub_diff/core_ext/string'
+require 'sub_diff/builder'
+require 'sub_diff/collection'
+require 'sub_diff/diff'
+require 'sub_diff/differ'
+require 'sub_diff/sub'
+require 'sub_diff/gsub'
 require 'sub_diff/version'
 
 String.send(:include, SubDiff::CoreExt::String)

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ rescue LoadError
   # Ignore when testing with Ruby 1.8.7
 end
 
+require File.expand_path('../../lib/sub_diff', __FILE__)
+
 RSpec.configure do |config|
   config.filter_run :focus
   config.raise_errors_for_deprecations!

data/spec/sub_diff/collection_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../lib/sub_diff/collection', __FILE__)
-
 RSpec.describe SubDiff::Collection do
   subject { described_class.new(diffable) }
 
@@ -7,12 +5,14 @@ RSpec.describe SubDiff::Collection do
 
   describe '#changed?' do
     it 'should return true if any diffs have changed' do
-      subject.push('one', 'two')
+      diff = double('diff', :changed? => true, :empty? => false)
+      subject.push(diff)
       expect(subject).to be_changed
     end
 
     it 'should return false if no diffs have changed' do
-      subject.push('same', 'same')
+      diff = double('diff', :changed? => false, :empty? => false)
+      subject.push(diff)
       expect(subject).not_to be_changed
     end
 
@@ -27,27 +27,15 @@ RSpec.describe SubDiff::Collection do
   end
 
   describe '#push' do
-    it 'should return self' do
-      expect(subject.push).to eq(subject)
-    end
-
-    it 'should append an unchanged diff' do
-      block = proc { subject.push('unchanged') }
+    it 'should append a diff' do
+      diff = double('diff', :empty? => false)
+      block = proc { subject.push(diff) }
       expect(block).to change(subject.diffs, :size)
     end
 
-    it 'should append a changed diff' do
-      block = proc { subject.push('now', 'was') }
-      expect(block).to change(subject.diffs, :size)
-    end
-
-    it 'should not append a nil diff' do
-      block = proc { subject.push(nil) }
-      expect(block).not_to change(subject.diffs, :size)
-    end
-
     it 'should not append an empty diff' do
-      block = proc { subject.push('') }
+      diff = double('diff', :empty? => true)
+      block = proc { subject.push(diff) }
       expect(block).not_to change(subject.diffs, :size)
     end
   end

data/spec/sub_diff/diff_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../lib/sub_diff/diff', __FILE__)
-
 RSpec.describe SubDiff::Diff do
   let(:diff)                   { described_class.new(value, value_was) }
   let(:diff_without_value_was) { described_class.new(value) }

data/spec/sub_diff_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../lib/sub_diff', __FILE__)
-
 RSpec.describe SubDiff do
   subject { 'this is a simple test' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sub_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sean Huber