polyfill 0.3.0 → 0.4.0

data/lib/polyfill/v2_4/integer/instance/round.rb

@@ -12,19 +12,17 @@ module Polyfill
               return super() if ndigits == 0
               return to_f if ndigits > 0
 
-              place = 10 ** -ndigits
-              (self.to_f / place).round * place
+              place = 10**-ndigits
+              (to_f / place).round * place
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::Integer do
-              include Method
-            end
+          refine ::Integer do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/integer/instance/truncate.rb

@@ -9,19 +9,17 @@ module Polyfill
               return super() if ndigits == 0
               return to_f if ndigits > 0
 
-              place = 10 ** -ndigits
-              (self.to_f / place).truncate * place
+              place = 10**-ndigits
+              (to_f / place).truncate * place
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::Integer do
-              include Method
-            end
+          refine ::Integer do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/io.rb

@@ -1,5 +1,5 @@
-require 'polyfill/v2_4/io/class'
-require 'polyfill/v2_4/io/instance'
+require_relative 'io/class'
+require_relative 'io/instance'
 
 module Polyfill
   module V2_4

data/lib/polyfill/v2_4/io/class.rb

@@ -1,5 +1,5 @@
-require 'polyfill/v2_4/io/class/foreach'
-require 'polyfill/v2_4/io/class/readlines'
+require_relative 'class/foreach'
+require_relative 'class/readlines'
 
 module Polyfill
   module V2_4

data/lib/polyfill/v2_4/io/class/foreach.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Polyfill
   module V2_4
     module IO
@@ -6,42 +8,30 @@ module Polyfill
           module Method
             def foreach(name, *args)
               hash, others = args.partition { |arg| arg.is_a?(::Hash) }
-
               chomps = hash[0] && hash[0][:chomp]
 
               unless block_given?
-                if chomps
-                  separator = others.find { |other| other.respond_to?(:to_str) }
+                return super(name, *others) unless chomps
 
-                  return Enumerator.new do |yielder|
-                    block =
-                      if separator
-                        Proc.new do |line|
-                          yielder.yield(line.chomp(separator))
-                        end
-                      else
-                        Proc.new do |line|
-                          yielder.yield(line.chomp)
-                        end
-                      end
-                    super(name, *others, &block)
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+
+                return ::Enumerator.new do |yielder|
+                  super(name, *others) do |line|
+                    yielder.yield(line.chomp(separator))
                   end
-                else
-                  return super(name, *others)
                 end
               end
 
               block =
                 if chomps
-                  separator = others.find { |other| other.respond_to?(:to_str) }
-                  if separator
-                    Proc.new do |line|
-                      yield(line.chomp(separator))
-                    end
-                  else
-                    Proc.new do |line|
-                      yield(line.chomp)
-                    end
+                  separator = others.find do |other|
+                    other.respond_to?(:to_str)
+                  end || $INPUT_RECORD_SEPARATOR
+
+                  proc do |line|
+                    yield(line.chomp(separator))
                   end
                 else
                   Proc.new
@@ -51,14 +41,12 @@ module Polyfill
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::IO.singleton_class do
-              include Method
-            end
+          refine ::IO.singleton_class do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/io/class/readlines.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Polyfill
   module V2_4
     module IO
@@ -10,26 +12,23 @@ module Polyfill
               inputs = super(file_name, *others)
 
               if hash[0] && hash[0][:chomp]
-                separator = others.find { |other| other.respond_to?(:to_str) }
-                if separator
-                  inputs.each { |input| input.chomp!(separator) }
-                else
-                  inputs.each(&:chomp!)
-                end
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+
+                inputs.each { |input| input.chomp!(separator) }
               end
 
               inputs
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::IO.singleton_class do
-              include Method
-            end
+          refine ::IO.singleton_class do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/io/instance.rb

@@ -1,7 +1,8 @@
-require 'polyfill/v2_4/io/instance/each_line'
-require 'polyfill/v2_4/io/instance/gets'
-require 'polyfill/v2_4/io/instance/readline'
-require 'polyfill/v2_4/io/instance/readlines'
+require_relative 'instance/each_line'
+require_relative 'instance/gets'
+require_relative 'instance/lines'
+require_relative 'instance/readline'
+require_relative 'instance/readlines'
 
 module Polyfill
   module V2_4
@@ -9,6 +10,7 @@ module Polyfill
       module Instance
         include EachLine
         include Gets
+        include Lines
         include Readline
         include Readlines
       end

data/lib/polyfill/v2_4/io/instance/each_line.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Polyfill
   module V2_4
     module IO
@@ -6,42 +8,29 @@ module Polyfill
           module Method
             def each_line(*args)
               hash, others = args.partition { |arg| arg.is_a?(::Hash) }
-
               chomps = hash[0] && hash[0][:chomp]
 
               unless block_given?
-                if chomps
-                  separator = others.find { |other| other.respond_to?(:to_str) }
+                return super(*others) unless chomps
 
-                  return Enumerator.new do |yielder|
-                    block =
-                      if separator
-                        Proc.new do |line|
-                          yielder.yield(line.chomp(separator))
-                        end
-                      else
-                        Proc.new do |line|
-                          yielder.yield(line.chomp)
-                        end
-                      end
-                    super(*others, &block)
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+                return ::Enumerator.new do |yielder|
+                  super(*others) do |line|
+                    yielder.yield(line.chomp(separator))
                   end
-                else
-                  return super(*others)
                 end
               end
 
               block =
                 if chomps
-                  separator = others.find { |other| other.respond_to?(:to_str) }
-                  if separator
-                    Proc.new do |line|
-                      yield(line.chomp(separator))
-                    end
-                  else
-                    Proc.new do |line|
-                      yield(line.chomp)
-                    end
+                  separator = others.find do |other|
+                    other.respond_to?(:to_str)
+                  end || $INPUT_RECORD_SEPARATOR
+
+                  proc do |line|
+                    yield(line.chomp(separator))
                   end
                 else
                   Proc.new
@@ -51,14 +40,12 @@ module Polyfill
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::IO do
-              include Method
-            end
+          refine ::IO do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/io/instance/gets.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Polyfill
   module V2_4
     module IO
@@ -10,26 +12,23 @@ module Polyfill
               input = super(*others)
 
               if !input.nil? && hash[0] && hash[0][:chomp]
-                separator = others.find { |other| other.respond_to?(:to_str) }
-                if separator
-                  input.chomp!(separator)
-                else
-                  input.chomp!
-                end
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+
+                input.chomp!(separator)
               end
 
               input
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::IO do
-              include Method
-            end
+          refine ::IO do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/io/instance/lines.rb

@@ -0,0 +1,54 @@
+require 'English'
+
+module Polyfill
+  module V2_4
+    module IO
+      module Instance
+        module Lines
+          module Method
+            def lines(*args)
+              hash, others = args.partition { |arg| arg.is_a?(::Hash) }
+              chomps = hash[0] && hash[0][:chomp]
+
+              unless block_given?
+                return super(*others) unless chomps
+
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+                return ::Enumerator.new do |yielder|
+                  super(*others) do |line|
+                    yielder.yield(line.chomp(separator))
+                  end
+                end
+              end
+
+              block =
+                if chomps
+                  separator = others.find do |other|
+                    other.respond_to?(:to_str)
+                  end || $INPUT_RECORD_SEPARATOR
+
+                  proc do |line|
+                    yield(line.chomp(separator))
+                  end
+                else
+                  Proc.new
+                end
+
+              super(*others, &block)
+            end
+          end
+
+          refine ::IO do
+            include Method
+          end
+
+          def self.included(base)
+            base.include Method
+          end
+        end
+      end
+    end
+  end
+end

data/lib/polyfill/v2_4/io/instance/readline.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Polyfill
   module V2_4
     module IO
@@ -10,26 +12,23 @@ module Polyfill
               input = super(*others)
 
               if hash[0] && hash[0][:chomp]
-                separator = others.find { |other| other.respond_to?(:to_str) }
-                if separator
-                  input.chomp!(separator)
-                else
-                  input.chomp!
-                end
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+
+                input.chomp!(separator)
               end
 
               input
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::IO do
-              include Method
-            end
+          refine ::IO do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end

data/lib/polyfill/v2_4/io/instance/readlines.rb

@@ -1,3 +1,5 @@
+require 'English'
+
 module Polyfill
   module V2_4
     module IO
@@ -10,26 +12,23 @@ module Polyfill
               inputs = super(*others)
 
               if hash[0] && hash[0][:chomp]
-                separator = others.find { |other| other.respond_to?(:to_str) }
-                if separator
-                  inputs.each { |input| input.chomp!(separator) }
-                else
-                  inputs.each(&:chomp!)
-                end
+                separator = others.find do |other|
+                  other.respond_to?(:to_str)
+                end || $INPUT_RECORD_SEPARATOR
+
+                inputs.each { |input| input.chomp!(separator) }
               end
 
               inputs
             end
           end
 
-          if RUBY_VERSION < '2.4.0'
-            refine ::IO do
-              include Method
-            end
+          refine ::IO do
+            include Method
+          end
 
-            def self.included(base)
-              base.include Method
-            end
+          def self.included(base)
+            base.include Method
           end
         end
       end