Initialize Store's state with the given options object

Author: st0012

lib/rdoc/rdoc.rb

@@ -460,12 +460,6 @@ def document options
       @last_modified = setup_output_dir @options.op_dir, @options.force_update
     end
 
-    @store.encoding = @options.encoding
-    @store.dry_run  = @options.dry_run
-    @store.main     = @options.main_page
-    @store.title    = @options.title
-    @store.path     = @options.op_dir
-
     @start_time = Time.now
 
     @store.load_cache

lib/rdoc/rubygems_hook.rb

@@ -188,13 +188,7 @@ def generate
     @rdoc = new_rdoc
     @rdoc.options = options
 
-    store = RDoc::Store.new(options)
-    store.encoding = options.encoding
-    store.dry_run  = options.dry_run
-    store.main     = options.main_page
-    store.title    = options.title
-
-    @rdoc.store = store
+    @rdoc.store = RDoc::Store.new(options)
 
     say "Parsing documentation for #{@spec.full_name}"
 

lib/rdoc/store.rb

@@ -121,11 +121,11 @@ def message # :nodoc:
   # Creates a new Store of +type+ that will load or save to +path+
 
   def initialize(options, path: nil, type: nil)
-    @dry_run  = false
-    @encoding = nil
-    @path     = path
-    @type     = type
     @options  = options
+    @dry_run  = options.dry_run
+    @encoding = options.encoding
+    @path     = path || options.op_dir
+    @type     = type
 
     @cache = {
       :ancestors                   => {},
@@ -135,10 +135,10 @@ def initialize(options, path: nil, type: nil)
       :c_singleton_class_variables => {},
       :encoding                    => @encoding,
       :instance_methods            => {},
-      :main                        => nil,
+      :main                        => options.main_page,
       :modules                     => [],
       :pages                       => [],
-      :title                       => nil,
+      :title                       => options.title,
     }
 
     @classes_hash = {}

test/rdoc/test_rdoc_store.rb

@@ -90,7 +90,7 @@ def assert_cache imethods, cmethods, attrs, modules,
       :class_methods               => cmethods,
       :c_class_variables           => {},
       :c_singleton_class_variables => {},
-      :encoding                    => nil,
+      :encoding                    => Encoding::UTF_8,
       :instance_methods            => imethods,
       :modules                     => modules,
       :pages                       => pages,
@@ -447,6 +447,10 @@ def test_load_cache
       Marshal.dump cache, io
     end
 
+    # Store prioritize @encoding over the cached value
+    # See we need to unset @encoding to test the cached value
+    @s.encoding = nil
+
     @s.load_cache
 
     assert_equal cache, @s.cache
@@ -497,7 +501,7 @@ def test_load_cache_no_cache
       :class_methods               => {},
       :c_class_variables           => {},
       :c_singleton_class_variables => {},
-      :encoding                    => nil,
+      :encoding                    => Encoding::UTF_8,
       :instance_methods            => {},
       :main                        => nil,
       :modules                     => [],
@@ -530,6 +534,10 @@ def test_load_cache_legacy
       Marshal.dump cache, io
     end
 
+    # Store prioritize @encoding over the cached value
+    # See we need to unset @encoding to test the cached value
+    @s.encoding = nil
+
     @s.load_cache
 
     expected = {
@@ -685,7 +693,7 @@ def test_save
       },
       :main => nil,
       :modules => %w[Mod Object Object::SubClass],
-      :encoding => nil,
+      :encoding => Encoding::UTF_8,
       :pages => %w[README.txt],
       :title => nil,
     }