Refactor generator classes

Author: asmsuechan

lib/ever2boost/cli.rb

@@ -8,7 +8,7 @@ class CLI < Thor
     desc "import", "import from evernote"
     def import
       developer_token = ask('DEVELOPER_TOKEN:')
-      EvernoteAuthorizer.new(developer_token).generate_cson(DEFAULT_OUTPUT_DIR)
+      EvernoteAuthorizer.new(developer_token).import(DEFAULT_OUTPUT_DIR)
     end
 
     class << self

lib/ever2boost/cson_generator.rb

@@ -1,8 +1,7 @@
 module Ever2boost
   class CsonGenerator
     class << self
-      def generate(folder_hash, note, output_dir)
-        timestamp = self.timestamp
+      def build(folder_hash, note)
         md_note_content = MdConverter.convert(note.content)
         cson = <<-EOS
 type: "MARKDOWN_NOTE"
@@ -17,16 +16,18 @@ def generate(folder_hash, note, output_dir)
 createdAt: "#{timestamp}"
 updatedAt: "#{timestamp}"
         EOS
+      end
+
+      def timestamp
+        Time.now.strftime("%Y-%m-%dT%H:%M:%S")
+      end
 
+      def output(folder_hash, note, output_dir)
         FileUtils.mkdir_p("#{output_dir}/notes") unless FileTest.exist?("#{output_dir}/notes")
         File.open("#{output_dir}/notes/#{note.file_name}.cson", "w") do |f|
-          f.write(cson)
+          f.write(self.build(folder_hash, note))
         end
       end
-
-      def timestamp
-        "2017-01-21T14:32:48.984Z"
-      end
     end
   end
 end

lib/ever2boost/evernote_authorizer.rb

@@ -53,7 +53,7 @@ def fetch_notes(filter)
     def import(output_dir)
       FileUtils.mkdir_p(output_dir) unless FileTest.exist?(output_dir)
 
-      Ever2boost::JsonGenerator.generate_boostnote_json(self.notebook_list, output_dir)
+      Ever2boost::JsonGenerator.output(self.notebook_list, output_dir)
 
       self.notebook_guids.each do |notebook_guid|
         filter = Evernote::EDAM::NoteStore::NoteFilter.new(notebookGuid: notebook_guid)
@@ -64,7 +64,7 @@ def import(output_dir)
         notes.each do |note|
           self.notebook_list.each do |list|
             # TODO: break if note not found
-            CsonGenerator.generate(list.hash, note, output_dir) if list.guid == note.notebook_guid
+            CsonGenerator.output(list.hash, note, output_dir) if list.guid == note.notebook_guid
           end
         end
       end

lib/ever2boost/json_generator.rb

@@ -11,13 +11,13 @@ class JsonGenerator
     ].freeze
 
     class << self
-      def generate_boostnote_json(note_list, output_dir)
+      def build(notebook_list)
         folders = <<-EOS
         EOS
 
-        note_list.each do |list|
+        notebook_list.each do |list|
           random_color = self.random_color
-          brace = note_list.last == list ? '}' : '},'
+          brace = notebook_list.last == list ? '}' : '},'
           folders += <<-EOS
             {
               "key": "#{list.hash}",
@@ -35,16 +35,18 @@ def generate_boostnote_json(note_list, output_dir)
             "version": "1.0"
           }
         EOS
-
-        File.open("#{output_dir}/boostnote.json","w") do |f|
-          f.write(json)
-        end
       end
 
       def random_color
         index =  ((Random.new().rand * 7)*10.floor % 7).to_i
         FOLDER_COLORS[index]
       end
+
+      def output(notebook_list, output_dir)
+        File.open("#{output_dir}/boostnote.json","w") do |f|
+          f.write(self.build(notebook_list))
+        end
+      end
     end
   end
 end