syobocal 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0398de2d798888a3de127fc65f3d5b7e80571e9ce0fb14a5167787dae9714d4
-  data.tar.gz: 4851e93fe58065998cbecba8ea6c598b2e0971c145a755157636aa5f2f91ed11
+  metadata.gz: a2b86d38d425a78a79903d700e893f1bf830a862ac4cd088124ad613d24890f3
+  data.tar.gz: b911625bb75f55c90efd4cdf3ab66aa64501ce0cf329f01a022bc3e3ee131834
 SHA512:
-  metadata.gz: 4b617073199d1f4e2ecb320e908d9874cbc67ad4a3154b268ff35466712397f4e802b07aa4fd30697f5803feb2cea9bbae3b2f92cfd7ea3d0f5a04c8536e9603
-  data.tar.gz: 3d8cde4777e1de49b68fcf533e3171fbc658e48292ab75970c428ed5dcadc8302d0fe37d428492c7fe34a9dfa86072abedc115d005472c8a0b2f339f66b61411
+  metadata.gz: 6efb4dad943bdffd02a0e75c1b9a21cfd25637e84f9d4822ffaab15a7eff5360669580ad22955d8d04cb5f79966d9292a1f9ad5c27d5aec1644e0b8d8060ad3b
+  data.tar.gz: 55590f077651aa76520e8d076cf8b122d8c1c7ea8dc2e06fc65c7e3a2bf9f0f58731c0a4cb44e3bb148084e051b6b4293ce97475a40d3944edf9244c33f67ffc

data/README.md

@@ -135,20 +135,39 @@ pp parser.casts.first
 #   [#<Syobocal::Comment::Person:0x0000564600051cd8 @name="悠木碧", @note=nil>]>
 
 pp parser.musics.first
-# #<Syobocal::Comment::Music:0x00005646000afc98
+# #<Syobocal::Comment::Music:0x0000561287c8f1a0
 #  @category="オープニングテーマ",
 #  @data_list=
-#   [#<Syobocal::Comment::MusicData:0x00005646000a0b30
+#   [#<Syobocal::Comment::MusicData:0x0000561287c8b8e8
 #     @attr="作詞・作曲",
+#     @attr_note=nil,
+#     @attr_text="作詞・作曲",
+#     @people=
+#      [#<Syobocal::Comment::Person:0x0000561287c8ba28 @name="渡辺翔", @note=nil>],
 #     @value="渡辺翔">,
-#    #<Syobocal::Comment::MusicData:0x00005646000a06a8
+#    #<Syobocal::Comment::MusicData:0x0000561287c8a3d0
 #     @attr="主題歌協力",
+#     @attr_note=nil,
+#     @attr_text="主題歌協力",
+#     @people=
+#      [#<Syobocal::Comment::Person:0x0000561287c8a510 @name="外村敬一", @note=nil>],
 #     @value="外村敬一">,
-#    #<Syobocal::Comment::MusicData:0x00005646000a0428
+#    #<Syobocal::Comment::MusicData:0x0000561287c88e90
 #     @attr="歌",
+#     @attr_note=nil,
+#     @attr_text="歌",
+#     @people=
+#      [#<Syobocal::Comment::Person:0x0000561287c88fd0
+#        @name="ClariS",
+#        @note=nil>],
 #     @value="ClariS">,
-#    #<Syobocal::Comment::MusicData:0x00005646000afd38
+#    #<Syobocal::Comment::MusicData:0x0000561287c8f2e0
 #     @attr="使用話数",
+#     @attr_note=nil,
+#     @attr_text="使用話数",
+#     @people=
+#      [#<Syobocal::Comment::Person:0x0000561287c8f560 @name="#1～#9", @note=nil>,
+#       #<Syobocal::Comment::Person:0x0000561287c8f420 @name="#11", @note=nil>],
 #     @value="#1～#9、#11">],
 #  @title="コネクト">
 ```

data/lib/syobocal.rb

@@ -20,6 +20,7 @@ require "syobocal/comment/element/row"
 require "syobocal/comment/element/text"
 require "syobocal/comment/element/text_node"
 require "syobocal/comment/element/root"
+require "syobocal/comment/helper/fragment"
 require "syobocal/comment/parser"
 require "syobocal/comment/staff"
 require "syobocal/comment/cast"

data/lib/syobocal/comment/helper/fragment.rb

@@ -0,0 +1,80 @@
+module Syobocal
+  module Comment
+    module Helper
+      class Fragment
+        CHILD_BEGIN = '('
+        CHILD_END = ')'
+        SEPARATOR = '、'
+
+        attr_reader :text, :child, :following
+
+        def initialize(text, child, following)
+          @text, @child, @following = text, child, following
+        end
+
+        def self.parse(str)
+          chars = str.each_char.to_a
+
+          parse_chars(chars)
+        end
+
+        def self.parse_chars(chars)
+          text = ""
+          child = nil
+          following = nil
+
+          until chars.empty?
+            c = chars.shift
+
+            case c
+            when CHILD_BEGIN
+              child = parse_chars(chars)
+            when CHILD_END
+              return Fragment.new(text, child, following)
+            when SEPARATOR
+              following = parse_chars(chars)
+            else
+              text << c
+            end
+          end
+
+          Fragment.new(text, child, following)
+        end
+
+        def pretty_output(level = 0)
+          line = level.times.map{' '}.join
+
+          line << text
+
+          puts line
+
+          child&.pretty_output(level + 1)
+
+          following&.pretty_output(level)
+        end
+
+        def to_a
+          array = [self]
+          target = self
+
+          while target.following
+            array << target.following
+            target = target.following
+          end
+
+          array
+        end
+
+        def to_s
+          to_a.map{|f|
+            if f.child
+              "#{f.text}(#{f.child.to_s})"
+            else
+              "#{f.text}"
+            end
+          }.join(SEPARATOR)
+        end
+      end
+    end
+  end
+end

data/lib/syobocal/comment/music_data.rb

@@ -1,14 +1,14 @@
 module Syobocal
   module Comment
     class MusicData
-      attr_reader :attr, :value
+      attr_reader :attr, :attr_text, :attr_note, :value, :people
 
-      def initialize(attr, value)
-        @attr, @value = attr, value
+      def initialize(attr, attr_text, attr_note, value, people)
+        @attr, @attr_text, @attr_note, @value, @people = attr, attr_text, attr_note, value, people
       end
 
       def ==(other)
-        other.instance_of?(self.class) && other.attr == attr && other.value == value
+        other.instance_of?(self.class) && other.attr == attr && other.attr_text == attr_text && other.attr_note == other.attr_note && other.value == value && other.people == people
       end
     end
   end

data/lib/syobocal/comment/person.rb

@@ -19,6 +19,15 @@ module Syobocal
 
         Person.new(name, note)
       end
+
+      def self.multi_parse(str)
+        Helper::Fragment.parse(str).to_a.map{|f|
+          name = f.text
+          note = f&.child&.to_s
+
+          Person.new(name, note)
+        }
+      end
     end
   end
 end

data/lib/syobocal/comment/section.rb

@@ -52,8 +52,21 @@ module Syobocal
 
         data_list = rows.map do |row|
           attr = row.attr_node.inner_text
+
+          attr_fragment = Helper::Fragment.parse(attr)
+
+          if attr_fragment.to_a.size == 1
+            attr_text = attr_fragment.text
+            attr_note = attr_fragment&.child&.to_s
+          else
+            attr_text = attr_fragment.to_s
+            attr_note = nil
+          end
+
           value = row.value_node.inner_text
-          MusicData.new(attr, value)
+          people = Person.multi_parse(value)
+
+          MusicData.new(attr, attr_text, attr_note, value, people)
         end
 
         Music.new(title, category, data_list)

data/lib/syobocal/version.rb

@@ -1,3 +1,3 @@
 module Syobocal
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syobocal
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - xmisao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,6 +100,7 @@ files:
 - lib/syobocal/comment/element/row.rb
 - lib/syobocal/comment/element/text.rb
 - lib/syobocal/comment/element/text_node.rb
+- lib/syobocal/comment/helper/fragment.rb
 - lib/syobocal/comment/music.rb
 - lib/syobocal/comment/music_data.rb
 - lib/syobocal/comment/parser.rb