Track down use of uninitialized instance variables (2.7 issue).

Author: gkellogg

lib/rdf/model/literal.rb

@@ -166,20 +166,20 @@ def initialize(value, language: nil, datatype: nil, lexical: nil, validate: fals
       @object   = value.freeze
       @string   = lexical if lexical
       @string   = value if !defined?(@string) && value.is_a?(String)
-      @string   = @string.encode(Encoding::UTF_8).freeze if @string
-      @object   = @string if @string && @object.is_a?(String)
+      @string   = @string.encode(Encoding::UTF_8).freeze if instance_variable_defined?(:@string)
+      @object   = @string if instance_variable_defined?(:@string) && @object.is_a?(String)
       @language = language.to_s.downcase.to_sym if language
       @datatype = RDF::URI(datatype).freeze if datatype
       @datatype ||= self.class.const_get(:DATATYPE) if self.class.const_defined?(:DATATYPE)
-      @datatype ||= @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
+      @datatype ||= instance_variable_defined?(:@language) && @language ? RDF.langString : RDF::URI("http://www.w3.org/2001/XMLSchema#string")
     end
 
     ##
     # Returns the value as a string.
     #
     # @return [String]
     def value
-      @string || to_s
+      instance_variable_defined?(:@string) && @string || to_s
     end
 
     ##

lib/rdf/reader.rb

@@ -647,7 +647,7 @@ def current_line
     ##
     # @return [String]
     def readline
-      @line = @line_rest || @input.readline
+      @line = instance_variable_defined?(:@line_rest) && @line_rest || @input.readline
       @line, @line_rest = @line.split("\r", 2)
       @line = String.new if @line.nil? # not frozen
       @line.chomp!

lib/rdf/repository.rb

@@ -607,7 +607,7 @@ def mutated?
         # @see Transaction#execute
         def execute
           raise TransactionError, 'Cannot execute a rolled back transaction. ' \
-                                  'Open a new one instead.' if @rolledback
+                                  'Open a new one instead.' if instance_variable_defined?(:@rolledback) && @rolledback
 
           raise TransactionError, 'Error merging transaction. Repository' \
                                   'has changed during transaction time.' unless 

lib/rdf/transaction.rb

@@ -247,7 +247,7 @@ def inspect!
     # @raise [TransactionError] if the transaction can't be applied
     def execute
       raise TransactionError, 'Cannot execute a rolled back transaction. ' \
-                              'Open a new one instead.' if @rolledback
+                              'Open a new one instead.' if instance_variable_defined?(:@rolledback) && @rolledback
       @changes.apply(@repository)
     end
 

lib/rdf/util/file.rb

@@ -98,7 +98,7 @@ def self.open_url(base_uri, proxy: nil, headers: {}, verify_none: false, **optio
               headers:      response.headers
             }
 
-            remote_document = RemoteDocument.new(response.body, document_options)
+            RemoteDocument.new(response.body, document_options)
           when 300..399
             # Document base is redirected location
             # Location may be relative
@@ -215,7 +215,7 @@ def self.open_url(base_uri, proxy: nil, headers: {}, verify_none: false, **optio
             headers:      response.headers
           }
 
-          remote_document = RemoteDocument.new(response.body, document_options)
+          RemoteDocument.new(response.body, document_options)
         else
           raise IOError, "<#{base_uri}>: #{response.status}"
         end

lib/rdf/util/logger.rb

@@ -17,20 +17,20 @@ module Logger
     # @param [Hash{Symbol => Object}] options
     # @option options [Logger, #<<] :logger
     # @return [Logger, #write, #<<]
-    def logger(**options)
+    def logger(logger: nil, **options)
       # Guard against undefined instance variables, which may be a warning if used.
-      @logger = nil unless instance_variable_defined?(:@logger) || frozen?
-      @options = nil unless instance_variable_defined?(:@options) || frozen?
-      logger = options.fetch(:logger, @logger)
-      logger = @options[:logger] if logger.nil? && @options
+      @options = {} unless instance_variable_defined?(:@options) || frozen?
+      logger ||= @logger if instance_variable_defined?(:@logger)
+      logger = @options[:logger] if logger.nil? && instance_variable_defined?(:@options) && @options
       if logger.nil?
         # Unless otherwise specified, use $stderr
-        logger = (@options || options)[:logger] = IOWrapper.new($stderr)
+        logger = IOWrapper.new($stderr)
 
         # Reset log_statistics so that it's not inherited across different instances
         logger.log_statistics.clear if logger.respond_to?(:log_statistics)
       end
-      logger = (@options || options)[:logger] = ::Logger.new(::File.open(::File::NULL, "w"))  unless logger # Incase false was used, which is frozen
+      logger = ::Logger.new(::File.open(::File::NULL, "w"))  unless logger # Incase false was used, which is frozen
+      @options[:logger] ||= logger if instance_variable_defined?(:@options)
       logger.extend(LoggerBehavior) unless logger.is_a?(LoggerBehavior)
       logger
     end

lib/rdf/vocabulary.rb

@@ -70,7 +70,7 @@ class << self
       # @return [Enumerator]
       def each(&block)
         if self.equal?(Vocabulary)
-          if @vocabs
+          if instance_variable_defined?(:@vocabs) && @vocabs
             @vocabs.select(&:name).each(&block)
           else
             # This is needed since all vocabulary classes are defined using
@@ -356,7 +356,7 @@ def property(*args)
       def ontology(*args)
         case args.length
         when 0
-          @ontology
+          @ontology if instance_variable_defined?(:@ontology)
         else
           uri, options = args
           URI.cache.delete(uri.to_s.to_sym)  # Clear any previous entry
@@ -507,7 +507,7 @@ def each_statement(&block)
         end
 
         # Also include the ontology, if it's not also a property
-        @ontology.each_statement(&block) if @ontology && @ontology != self
+        @ontology.each_statement(&block) if self.ontology && self.ontology != self
       end
 
       ##

spec/model_node_spec.rb

@@ -111,7 +111,7 @@
   end
 
   its(:to_base) {is_expected.to eq "_:foo"}
-  its(:to_unique_base) {is_expected.to match /^_:g/}
+  its(:to_unique_base) {is_expected.to match(/^_:g/)}
 
   describe "#to_unique_base" do
     it "uses the to_unique_base of original if duped" do