generator.rb in komic-cli-0.1.1

- old
+ new

@@ -5,11 +5,11 @@
 require 'json-schema'
 require 'mini_magick'
 require 'base64'
 
 require 'komic/version'
-require 'komic/generator/helpers'
+require 'komic/utils'
 
 module Komic
   class ThumbnailsBuilder
     def initialize(files)
       @images = files
@@ -99,11 +99,11 @@
         </svg>
       )
     end
 
     def create_fake_image(filename, size)
-      size = Helpers.parse_size(size)
+      size = Utils.parse_size(size)
       file = Tempfile.new([filename, '.svg'])
       image_width = size[:width]
       image_height = size[:height]
       file.write render_fake_svg({ width: image_width, height: image_height })
       file.close
@@ -139,25 +139,26 @@
       File.open(thumbnail_path, 'w') do |file|
         file.write thumbnails_builder.to_build
       end
 
       files.map do |image, index|
-        image[:src] = Helpers.get_relativepath_as(image[:src], root_dir)
+        image[:src] = Utils.get_relative_path(image[:src], root_dir)
         image
       end
 
       meta = {
         description: 'TEST',
         name: 'TEST',
         author: { name: 'TEST' },
         thumbnails: {
           height: 200,
-          path: Helpers.get_relativepath_as(thumbnail_path, root_dir),
+          path: Utils.get_relative_path(thumbnail_path, root_dir),
         },
       }
 
-      # TODO(yangqing): require deep_merge, dirty but work
-      meta.merge!(data[:meta]) unless data[:meta].nil?
+      unless data[:meta].nil?
+        meta = Utils.deep_merge_hashes(meta, data[:meta])
+      end
 
       content_builder = ContentBuilder.new(meta, files)
       File.open(File.join(root_dir, './content.json'), 'w') do |file|
         file.write content_builder.to_build
       end