Merge b868e63 into b6d6479

roo-rb · Dec 26, 2018 · cdca909 · cdca909
2 parents b6d6479 + b868e63
commit cdca909
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/roo/excelx/cell/base.rb b/lib/roo/excelx/cell/base.rb
@@ -58,7 +58,7 @@ def type
         end
 
         def formula?
-          !!@formula
+          !!(defined?(@formula) && @formula)
         end
 
         def link?

diff --git a/lib/roo/helpers/weak_instance_cache.rb b/lib/roo/helpers/weak_instance_cache.rb
@@ -10,7 +10,7 @@ module WeakInstanceCache
       def instance_cache(key)
         object = nil
 
-        if (ref = instance_variable_get(key)) && ref.weakref_alive?
+        if instance_variable_defined?(key) && (ref = instance_variable_get(key)) && ref.weakref_alive?
           begin
             object = ref.__getobj__
           rescue => e

diff --git a/test/excelx/cell/test_attr_reader_default.rb b/test/excelx/cell/test_attr_reader_default.rb
@@ -57,7 +57,7 @@ def test_cell_default_values
   def assert_values(object, value_hash)
     value_hash.each do |attr_name, expected_value|
       value = if attr_name.to_s.include?("@")
-                object.instance_variable_get(attr_name)
+                object.instance_variable_defined?(attr_name) ? object.instance_variable_get(attr_name) : nil
               else
                 object.public_send(attr_name)
       end