sub_diff 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752cac400652db441bd35020203e6ab107dd11a6
-  data.tar.gz: 4f2ec9341e8f352dbf3df9f447d6865e655e1ffe
+  metadata.gz: 21eca8a2613f2283e8b2ef108dd26fcc8fff6b97
+  data.tar.gz: 28b9f6a0700801ddcdc7968dad2c881554216697
 SHA512:
-  metadata.gz: cd95af17191c1b86ed572c8115b32f673beea23c16a15f4d87adb50b94a9b62bdca391054b2ab9e623792d67b6770932a310e759ee0c931ac46c12b1788f2082
-  data.tar.gz: 39aa674adade0b204e99a553531cd736214a629593b0b5c5c053880c038d0113947fb1bc6f21729cb9b02a93291b80cdec74c08f0f9a466c2ec55010e2ba4a32
+  metadata.gz: 3dcd408aae1f8d2feee698eaf84cd0e447d7fc8fd11a91e10147dcf96714fff538eca8dfe8b397e7c916722fe78dd6b8c3813b9b574f0be2bdb66b550b4f0e7f
+  data.tar.gz: 18145f531b6e8e73fec399c49db871ac410b5b5e1b648da6c0fa80cb061e5013663899eb72e572069269830201b4f53a2947997e5bf367403898ea8751295674

data/.travis.yml

@@ -5,8 +5,6 @@ addons:
 install: bundle install --jobs 3 --retry 3
 
 rvm:
-  - 1.8.7
-  - 1.9.3
   - 2.0.0
   - ruby-head
 

data/Gemfile

@@ -2,6 +2,4 @@ source 'https://www.rubygems.org'
 
 gemspec
 
-unless RUBY_VERSION =~ /1\.8\./
-  gem 'codeclimate-test-reporter'
-end
+gem 'codeclimate-test-reporter'

data/Gemfile.lock

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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Sean Huber - github@shuber.io
+Copyright (c) 2011-2015 Sean Huber - github@shuber.io
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -16,7 +16,9 @@ gem install sub_diff
 
 ## Requirements
 
-Ruby 1.8.7+
+Ruby 2.0+
+
+For older Ruby versions (1.8+), use the [1.0.7](https://github.com/shuber/sub_diff/tree/1.0.7) tag.
 
 
 ## Usage
@@ -118,4 +120,4 @@ bundle exec rspec
 
 ## License
 
-[MIT](https://github.com/shuber/sub_diff/blob/master/LICENSE)  - Copyright © 2011 Sean Huber
+[MIT](https://github.com/shuber/sub_diff/blob/master/LICENSE)  - Copyright © 2011-2015 Sean Huber

data/lib/sub_diff/collection.rb

@@ -4,7 +4,6 @@ module SubDiff
     include Enumerable
 
     def_delegators :diffs, :each, :size
-    def_delegators :__getobj__, :to_s
 
     attr_reader :string, :diffs
 

data/lib/sub_diff/differ.rb

@@ -10,13 +10,10 @@ module SubDiff
       @builder = builder
     end
 
-    def each_diff(*args)
-      # Ruby 1.8.7 does not support additional args after * (splat)
-      block = args.pop
-
-      string.send(diff_method, args.first) do |match|
-        diff = { :match => match, :prefix => $`, :suffix => $' }
-        diff[:replacement] = match.sub(*args, &block)
+    def each_diff(search, *args, block)
+      string.send(diff_method, search) do |match|
+        diff = { match: match, prefix: $`, suffix: $' }
+        diff[:replacement] = match.sub(search, *args, &block)
         yield(builder, diff)
       end
     end

data/lib/sub_diff/sub.rb

@@ -6,12 +6,9 @@ module SubDiff
       @differ = differ
     end
 
-    def diff(*args, &block)
-      # Ruby 1.8.7 does not support additional args after * (splat)
-      args.push(block)
-
-      differ.each_diff(*args) do |builder, diff|
-        process(builder, diff, args.first)
+    def diff(search, *args, &block)
+      differ.each_diff(search, *args, block) do |builder, diff|
+        process(builder, diff, search)
       end
     end
 

data/lib/sub_diff/version.rb

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

data/spec/sub_diff/collection_spec.rb

@@ -5,13 +5,13 @@ RSpec.describe SubDiff::Collection do
 
   describe '#changed?' do
     it 'should return true if any diffs have changed' do
-      diff = double('diff', :changed? => true, :empty? => false)
+      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
-      diff = double('diff', :changed? => false, :empty? => false)
+      diff = double('diff', changed?: false, empty?: false)
       subject.push(diff)
       expect(subject).not_to be_changed
     end
@@ -48,13 +48,13 @@ RSpec.describe SubDiff::Collection do
 
   describe '#push' do
     it 'should append a diff' do
-      diff = double('diff', :empty? => false)
+      diff = double('diff', empty?: false)
       block = proc { subject.push(diff) }
       expect(block).to change(subject.diffs, :size)
     end
 
     it 'should not append an empty diff' do
-      diff = double('diff', :empty? => true)
+      diff = double('diff', empty?: true)
       block = proc { subject.push(diff) }
       expect(block).not_to change(subject.diffs, :size)
     end

data/spec/sub_diff_spec.rb

@@ -46,13 +46,11 @@ RSpec.describe SubDiff do
       end
     end
 
-    if RUBY_VERSION > '1.8.7'
-      context 'with a hash' do
-        it 'should process arguments correctly' do
-          result = subject.sub_diff(/simple/, 'simple' => 'harder')
-          expect(result.to_s).to eq('this is a harder test')
-          expect(result.size).to eq(3)
-        end
+    context 'with a hash' do
+      it 'should process arguments correctly' do
+        result = subject.sub_diff(/simple/, 'simple' => 'harder')
+        expect(result.to_s).to eq('this is a harder test')
+        expect(result.size).to eq(3)
       end
     end
   end
@@ -102,13 +100,11 @@ RSpec.describe SubDiff do
       end
     end
 
-    if RUBY_VERSION > '1.8.7'
-      context 'with a hash' do
-        it 'should process arguments correctly' do
-          result = subject.gsub_diff(/(\S*is)/, 'is' => 'IS', 'this' => 'THIS')
-          expect(result.to_s).to eq('THIS IS a simple test')
-          expect(result.size).to eq(4)
-        end
+    context 'with a hash' do
+      it 'should process arguments correctly' do
+        result = subject.gsub_diff(/(\S*is)/, 'is' => 'IS', 'this' => 'THIS')
+        expect(result.to_s).to eq('THIS IS a simple test')
+        expect(result.size).to eq(4)
       end
     end
   end

data/sub_diff.gemspec

@@ -1,18 +1,19 @@
 require File.expand_path('../lib/sub_diff/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.author           = 'Sean Huber'
-  s.email            = 'github@shuber.io'
-  s.extra_rdoc_files = %w(LICENSE)
-  s.files            = `git ls-files`.split("\n")
-  s.homepage         = 'https://github.com/shuber/sub_diff'
-  s.license          = 'MIT'
-  s.name             = 'sub_diff'
-  s.rdoc_options     = %w(--charset=UTF-8 --inline-source --line-numbers --main README.md)
-  s.require_paths    = %w(lib)
-  s.summary          = 'Inspect the changes of your `String#sub` and `String#gsub` replacements'
-  s.test_files       = `git ls-files -- spec/*`.split("\n")
-  s.version          = SubDiff::VERSION
+  s.author                = 'Sean Huber'
+  s.email                 = 'github@shuber.io'
+  s.extra_rdoc_files      = %w(LICENSE)
+  s.files                 = `git ls-files`.split("\n")
+  s.homepage              = 'https://github.com/shuber/sub_diff'
+  s.license               = 'MIT'
+  s.name                  = 'sub_diff'
+  s.rdoc_options          = %w(--charset=UTF-8 --inline-source --line-numbers --main README.md)
+  s.require_paths         = %w(lib)
+  s.required_ruby_version = '>= 2.0.0'
+  s.summary               = 'Inspect the changes of your `String#sub` and `String#gsub` replacements'
+  s.test_files            = `git ls-files -- spec/*`.split("\n")
+  s.version               = SubDiff::VERSION
 
   s.add_development_dependency 'rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sub_diff
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean Huber
@@ -70,7 +70,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="