allow to use shortcut key of config (#540)

enable to use @config["foo"] instead of @config["epubmaker"]["foo"] when using epubmaker

lib/epubmaker/producer.rb

@@ -69,7 +69,7 @@ def coverimage
 
     # Update parameters by merging from new parameter hash +params+.
     def merge_params(params)
-      @params = @params.deep_merge(params)
+      @params.deep_merge!(params)
       complement
 
       unless @params["epubversion"].nil?

lib/review/configure.rb

@@ -58,12 +58,13 @@ def self.values
     end
 
     def [](key)
+      maker = self.maker
+      if maker && self.key?(maker) && self.fetch(maker).key?(key)
+        return self.fetch(maker).fetch(key, nil)
+      end
       if self.key?(key)
         return self.fetch(key)
       end
-      if @maker && self.key?(@maker)
-        return self.fetch(@maker).fetch(key, nil)
-      end
     end
 
     def name_of(key)

lib/review/epubmaker.rb

@@ -33,6 +33,7 @@ def load_yaml(yamlfile)
     @producer = Producer.new(@params)
     @producer.load(yamlfile)
     @params = @producer.params
+    @params.maker = "epubmaker"
   end
 
   def produce(yamlfile, bookname=nil)

lib/review/pdfmaker.rb

@@ -97,6 +97,7 @@ def parse_opts(args)
 
     def execute(*args)
       @config = ReVIEW::Configure.values
+      @config.maker = "pdfmaker"
       cmd_config, yamlfile = parse_opts(args)
       loader = YAMLLoader.new
       @config.deep_merge!(loader.load_file(yamlfile))

test/test_configure.rb

@@ -16,7 +16,8 @@ def setup
                      "urnid" => "http://example.jp/",
                      "date" => "2011-01-01",
                      "language" => "ja",
-                     "epubmaker" => {"flattocindent" => true},
+                     "epubmaker" => {"flattocindent" => true,
+                                     "title" => "Sample Book(EPUB)"},
                    })
     @output = StringIO.new
     I18n.setup(@config["language"])
@@ -41,6 +42,13 @@ def test_configure_with_maker
     assert_equal true, @config["epubmaker"]["flattocindent"]
   end
 
+  def test_configure_with_maker_override
+    @config.maker = "epubmaker"
+    assert_equal "Sample Book(EPUB)", @config["title"]
+    @config.maker = "pdfmaker"
+    assert_equal "Sample Book", @config["title"]
+  end
+
   def test_configure_with_invalidmaker
     @config.maker = "pdfmaker"
     assert_equal nil, @config["flattocindent"]