diff --git a/lib/ever2boost/json_generator.rb b/lib/ever2boost/json_generator.rb index 8fcdb34..9061606 100644 --- a/lib/ever2boost/json_generator.rb +++ b/lib/ever2boost/json_generator.rb @@ -8,11 +8,11 @@ def build(notebook_list) folders = notebook_list.map do |list| { key: list.hash, - name: list.title, - color: list.color + color: list.color, + name: list.title } end - { folders: folders, version: '1.0' }.to_json + JSON.pretty_generate({ folders: folders, version: '1.0' }) end def output(notebook_list, output_dir) diff --git a/spec/json_generator_spec.rb b/spec/json_generator_spec.rb index 342c9e6..d7a08a6 100644 --- a/spec/json_generator_spec.rb +++ b/spec/json_generator_spec.rb @@ -5,7 +5,7 @@ let (:notelist1) { Ever2boost::NoteList.new(title: 'title1', guid: '012345abcdef') } let (:notelist2) { Ever2boost::NoteList.new(title: 'title2', guid: '0123456abcde') } let (:notebook_list) { [notelist1, notelist2] } - let (:json) { '{"folders":[{"key":"012345abcdef","name":"title1","color":"#E10051"},{"key":"0123456abcde","name":"title2","color":"#E10051"}],"version":"1.0"}' } + let (:json) { "{\n \"folders\": [\n {\n \"key\": \"012345abcdef\",\n \"color\": \"#E10051\",\n \"name\": \"title1\"\n },\n {\n \"key\": \"0123456abcde\",\n \"color\": \"#E10051\",\n \"name\": \"title2\"\n }\n ],\n \"version\": \"1.0\"\n}" } let (:output_dir) { 'spec/dist/evernote_storage' } describe '#build' do