sub_diff 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9bf511596ffa127d50dbb11ca5c23455c22e2e9
-  data.tar.gz: 1ddf085a4b05b5053d42f7934211ff40af9f7d24
+  metadata.gz: 752cac400652db441bd35020203e6ab107dd11a6
+  data.tar.gz: 4f2ec9341e8f352dbf3df9f447d6865e655e1ffe
 SHA512:
-  metadata.gz: 156e609d5da9583939778c4b1b38b97f044ee168b3f2f668ffcc646f0a7960e5c57d887744f8be7d945c2c0849755a7c456769ebc22232dbeb7aecc7c2a4b266
-  data.tar.gz: 6468333a0d3e6ec9be8479c2ecbe261b856abf7494073729b7f71202c65cab11c7b9ebd65440c4db5de19a12fb184a007c93281b117d25bcd0f0c947e6a86e6b
+  metadata.gz: cd95af17191c1b86ed572c8115b32f673beea23c16a15f4d87adb50b94a9b62bdca391054b2ab9e623792d67b6770932a310e759ee0c931ac46c12b1788f2082
+  data.tar.gz: 39aa674adade0b204e99a553531cd736214a629593b0b5c5c053880c038d0113947fb1bc6f21729cb9b02a93291b80cdec74c08f0f9a466c2ec55010e2ba4a32

data/Gemfile.lock

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

data/lib/sub_diff/adapter.rb

@@ -0,0 +1,29 @@
+module SubDiff
+  class Adapter
+    extend Forwardable
+
+    def_delegators :differ, :builder
+    def_delegators :builder, :diff_method
+    def_delegators :instance, :diff
+
+    attr_reader :differ
+
+    def initialize(differ)
+      @differ = differ
+    end
+
+    private
+
+    def instance
+      adapter_class.new(differ)
+    end
+
+    def adapter_class
+      Module.nesting.last.const_get(adapter_name)
+    end
+
+    def adapter_name
+      diff_method.to_s.capitalize
+    end
+  end
+end

data/lib/sub_diff/builder.rb

@@ -1,8 +1,10 @@
 module SubDiff
   class Builder
-    def initialize(string, type)
+    attr_reader :string, :diff_method
+
+    def initialize(string, diff_method)
       @string = string
-      @type = type
+      @diff_method = diff_method
     end
 
     def diff(*args, &block)
@@ -21,8 +23,6 @@ module SubDiff
 
     private
 
-    attr_reader :string, :type
-
     def build_diff_collection(&block)
       collection.reset(&block).dup
     end
@@ -32,19 +32,11 @@ module SubDiff
     end
 
     def adapter
-      adapter_class.new(differ)
-    end
-
-    def adapter_class
-      Module.nesting.last.const_get(adapter_name)
-    end
-
-    def adapter_name
-      type.to_s.capitalize
+      @adapter ||= Adapter.new(differ)
     end
 
     def differ
-      Differ.new(self, type)
+      @differ ||= Differ.new(self)
     end
   end
 end

data/lib/sub_diff/differ.rb

@@ -2,26 +2,23 @@ module SubDiff
   class Differ
     extend Forwardable
 
-    def_delegators :builder, :string
+    def_delegators :builder, :diff_method, :string
 
-    def initialize(builder, type)
+    attr_reader :builder
+
+    def initialize(builder)
       @builder = builder
-      @type = type
     end
 
     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|
+      string.send(diff_method, args.first) do |match|
         diff = { :match => match, :prefix => $`, :suffix => $' }
         diff[:replacement] = match.sub(*args, &block)
         yield(builder, diff)
       end
     end
-
-    private
-
-    attr_reader :builder, :type
   end
 end

data/lib/sub_diff/gsub.rb

@@ -16,8 +16,10 @@ module SubDiff
     end
 
     def suffix(_diff, search)
+      suffix = super
       matcher = suffix_matcher(search)
-      super unless super.send(matcher, search)
+      skip_suffix = suffix.send(matcher, search)
+      suffix unless skip_suffix
     end
 
     def suffix_matcher(search)

data/lib/sub_diff/sub.rb

@@ -1,5 +1,7 @@
 module SubDiff
   class Sub
+    attr_reader :differ
+
     def initialize(differ)
       @differ = differ
     end
@@ -15,8 +17,6 @@ module SubDiff
 
     private
 
-    attr_reader :differ
-
     def process(builder, diff, search)
       builder << prefix(diff)
       builder.push(diff[:replacement], diff[:match])

data/lib/sub_diff/version.rb

@@ -1,3 +1,3 @@
 module SubDiff
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/lib/sub_diff.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sub_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Sean Huber
@@ -39,6 +39,7 @@ files:
 - LICENSE
 - README.md
 - lib/sub_diff.rb
+- lib/sub_diff/adapter.rb
 - lib/sub_diff/builder.rb
 - lib/sub_diff/collection.rb
 - lib/sub_diff/core_ext/string.rb