pnote_client 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aefca9ca088bc2820cb547cc1440e8f16171f330
-  data.tar.gz: 7f906da6182fc767d86f66f609f2125154f1e873
+SHA256:
+  metadata.gz: 9b025808db4353d3e90385878656f10e3422c9437dd34d94a4e89bb62f3e01b7
+  data.tar.gz: 90c140ab343ac7d8367c212827411479d2570ac17d7a6606c585381b29867aa8
 SHA512:
-  metadata.gz: 5206517055ab81f50e9dd8fd55c0b3b2a0ec884d92ba7503bdf5213a4ea6b038b9b85a7111bc7741c64c06463006efa2990666dd9e899e3e7776ce97533ddd25
-  data.tar.gz: 44fcad012662f3149139acc9134ddb415fa1f981921e6f4501e2394f08913495c44ceaaa1b96885e5d7a188274b1abbe4d19be588bdb2da5c90bf9b406a1b05f
+  metadata.gz: 841b14e3656a5a0974c0f69adf014b97fa7bddb2cb09de954d6aef0d3b25d1749b3d30e03ca11681d1749caebd5ac36199eab9ff4efca9341713d9b4bd781a39
+  data.tar.gz: e9b068740e7cc0740b3d5e854b2e34a03e716ee3aa426ba3fe41ff3f5b8f4d2276470b27d930802449080ae26cb2812ece3815ef1ebe07784fd471c150922748

data/lib/pnote_client/converters/pnote_to_json_converter.rb

@@ -28,41 +28,20 @@ module PnoteClient
         @pnote_document.chapters.each do |chapter|
           chapter_hash = {
             title: chapter.title,
-            sub_chapters: [],
-            practices: []
+            sub_chapters: []
           }
           result[:chapters] << chapter_hash
 
-          # 단원의 소단원 목록
-          chapter.sub_chapters.each do |sub_chapter|
+          unless chapter.practices.empty? # 심화단원일 경우 "실전문제" 소단원 하나 만들어서 전부 넣기
             sub_chapter_hash = {
-              title: sub_chapter.title,
-              concepts: [],
+              title: '실전문제',
               exercises: [],
               practices: []
             }
             chapter_hash[:sub_chapters] << sub_chapter_hash
 
-            sub_chapter.concepts.each do |concept|
-              concept_hash = {
-                title: concept.title,
-                content: concept.content
-              }
-
-              sub_chapter_hash[:concepts] << concept_hash
-            end
-
-            sub_chapter.exercises.each do |exercise|
-              exercise_hash = {
-                question: exercise.question,
-                answer: exercise.answer,
-                explaination: exercise.explaination,
-                choices: exercise.choices
-              }
-              sub_chapter_hash[:exercises] << exercise_hash
-            end
-
-            sub_chapter.practices.each do |practice|
+            # 심화단원의 실전 문제
+            chapter.practices.each do |practice|
               practice_hash = {
                 question: practice.question,
                 answer: practice.answer,
@@ -73,19 +52,47 @@ module PnoteClient
               }
               sub_chapter_hash[:practices] << practice_hash
             end
-          end
+          else # 일반 단원일경우 소단원 채우기
+            chapter.sub_chapters.each do |sub_chapter|
+              sub_chapter_hash = {
+                title: sub_chapter.title,
+                concepts: [],
+                exercises: [],
+                practices: []
+              }
+              chapter_hash[:sub_chapters] << sub_chapter_hash
 
-          # 단원의 실전 문제
-          chapter.practices.each do |practice|
-            practice_hash = {
-              question: practice.question,
-              answer: practice.answer,
-              explaination: practice.explaination,
-              teacher_comments: practice.teacher_comments.sort_by {|tc| tc.index }.map(&:content),
-              choices: practice.choices,
-              tip: practice.tip
-            }
-            chapter_hash[:practices] << practice_hash
+              sub_chapter.concepts.each do |concept|
+                concept_hash = {
+                  title: concept.title,
+                  content: concept.content
+                }
+
+                sub_chapter_hash[:concepts] << concept_hash
+              end
+
+              sub_chapter.exercises.each do |exercise|
+                exercise_hash = {
+                  question: exercise.question,
+                  answer: exercise.answer,
+                  explaination: exercise.explaination,
+                  choices: exercise.choices
+                }
+                sub_chapter_hash[:exercises] << exercise_hash
+              end
+
+              sub_chapter.practices.each do |practice|
+                practice_hash = {
+                  question: practice.question,
+                  answer: practice.answer,
+                  explaination: practice.explaination,
+                  teacher_comments: practice.teacher_comments.sort_by {|tc| tc.index }.map(&:content),
+                  choices: practice.choices,
+                  tip: practice.tip
+                }
+                sub_chapter_hash[:practices] << practice_hash
+              end
+            end
           end
         end
 

data/lib/pnote_client/documents/hml/image.rb

@@ -16,7 +16,7 @@ module PnoteClient
         end
 
         def content
-          return "![image](#{@bin_item_id})"
+          return "\n![image](#{@bin_item_id})\n"
         end
 
         def textable?

data/lib/pnote_client/documents/hml/table.rb

@@ -37,7 +37,7 @@ module PnoteClient
             rows: rows_content
           }.to_json
 
-          return "![table](#{json})"
+          return "\n![table](#{json})\n"
         end
 
         def textable?

data/lib/pnote_client/documents/hml.rb

@@ -42,7 +42,7 @@ module PnoteClient
           paragraphs << Paragraph.from_tag(pg_tag)
         end
 
-        bin_item_tags = doc.xpath("//BINITEM")
+        bin_item_tags = doc.xpath("//BINITEM[@Type=Embedding]")
         bin_item_tags.each do |bin_item_tag|
           bin_items << BinaryItem.new(bin_item_tag, doc)
         end

data/lib/pnote_client/version.rb

@@ -1,3 +1,3 @@
 module PnoteClient
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pnote_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - bluesh55
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Convert PNote(.hml) file to json file