syobocal 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0398de2d798888a3de127fc65f3d5b7e80571e9ce0fb14a5167787dae9714d4
-  data.tar.gz: 4851e93fe58065998cbecba8ea6c598b2e0971c145a755157636aa5f2f91ed11
+  metadata.gz: a7c70f8c43481ff45aa94a288afc6efa6148e54bc5e2e30013c54a3e298f873b
+  data.tar.gz: 60692a1fbdf68e2f4acded6208706a1ac86e9d6934eb72f25858b9d12cd512ca
 SHA512:
-  metadata.gz: 4b617073199d1f4e2ecb320e908d9874cbc67ad4a3154b268ff35466712397f4e802b07aa4fd30697f5803feb2cea9bbae3b2f92cfd7ea3d0f5a04c8536e9603
-  data.tar.gz: 3d8cde4777e1de49b68fcf533e3171fbc658e48292ab75970c428ed5dcadc8302d0fe37d428492c7fe34a9dfa86072abedc115d005472c8a0b2f339f66b61411
+  metadata.gz: 3b2733ca8dd5ebaa5b7b52b84cc44235da6f460bf7516e647e12ae4225df629d6d2e8e45a914681671d53b5886d6fbdbadcee6ce3c77f5a7c0cc9e8c177bd622
+  data.tar.gz: d18ea750bc40dfc21b0a791df14d32fdc35a3fd49c460808922d205c36d229afd7fa4785b835a1539f81a35bf2578e70bcab2e92f1a752efb21a6f96a00e70b7

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/calchk.rb

@@ -1,7 +1,7 @@
 module Syobocal
   module CalChk
     def get(params = {})
-      parse(open(url(params)))
+      parse(URI.open(url(params)))
     end
 
     def url(params = {})

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/parser.rb

@@ -76,21 +76,25 @@ module Syobocal
       private
 
       def create_staff_list(rows)
-        rows.map do |row|
+        staffs = rows.map do |row|
           role = row.attr_node.inner_text
           people = row.value_node.split.map { |str| Person.parse(str) }
 
-          Staff.new(role, people)
+          Staff.new(role, people.select(&:valid?))
         end
+
+        staffs.select { |staff| !staff.people.empty? }
       end
 
       def create_cast_list(rows)
-        rows.map do |row|
+        casts = rows.map do |row|
           character = row.attr_node.inner_text
           people = row.value_node.split.map { |str| Person.parse(str) }
 
-          Cast.new(character, people)
+          Cast.new(character, people.select(&:valid?))
         end
+
+        casts.select { |cast| !cast.people.empty? }
       end
 
       def create_musics(sections)

data/lib/syobocal/comment/person.rb

@@ -14,10 +14,23 @@ module Syobocal
         other.instance_of?(self.class) && other.name == name && other.note == note
       end
 
+      def valid?
+        !name.nil? && !name.empty?
+      end
+
       def self.parse(str)
         _, name, note = *(str.match(/\A([^\(\)]+?)(?:\((.*?)\))?\Z/).to_a)
 
-        Person.new(name, note)
+        Person.new(name&.strip, note&.strip)
+      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

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/db.rb

@@ -36,7 +36,7 @@ module Syobocal
 
     module TitleLookup
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -91,7 +91,7 @@ module Syobocal
 
     module ProgLookup
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -143,7 +143,7 @@ module Syobocal
 
     module ChLookup
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -189,7 +189,7 @@ module Syobocal
 
     module ChGroupLookup
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -231,7 +231,7 @@ module Syobocal
 
     module TitleViewCount
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -247,7 +247,7 @@ module Syobocal
 
     module TitleRankHistory
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -263,7 +263,7 @@ module Syobocal
 
     module TitlePointHistory
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)
@@ -279,7 +279,7 @@ module Syobocal
 
     module TitlePointTop
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params)

data/lib/syobocal/json.rb

@@ -2,7 +2,7 @@ module Syobocal
   module JSON
     module TitleMedium
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -18,7 +18,7 @@ module Syobocal
 
     module TitleLarge
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -34,7 +34,7 @@ module Syobocal
 
     module TitleFull
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -50,7 +50,7 @@ module Syobocal
 
     module ProgramByPID
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -66,7 +66,7 @@ module Syobocal
 
     module ProgramByCount
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -82,7 +82,7 @@ module Syobocal
 
     module ProgramByDate
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -98,7 +98,7 @@ module Syobocal
 
     module SubTitles
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -114,7 +114,7 @@ module Syobocal
 
     module ChFilter
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})
@@ -130,7 +130,7 @@ module Syobocal
 
     module ChIDFilter
       def get(params = {})
-        parse(open(url(params)))
+        parse(URI.open(url(params)))
       end
 
       def url(params = {})

data/lib/syobocal/rss.rb

@@ -1,7 +1,7 @@
 module Syobocal
   module RSS
     def get(params = {})
-      parse(open(url(params)))
+      parse(URI.open(url(params)))
     end
 
     def url(params = {})

data/lib/syobocal/rss2.rb

@@ -1,7 +1,7 @@
 module Syobocal
   module RSS2
     def get(params = {})
-      parse(open(url(params)))
+      parse(URI.open(url(params)))
     end
 
     def url(params = {})

data/lib/syobocal/sub_titles/parser.rb

@@ -10,7 +10,7 @@ module Syobocal
       def parse
         return @parse if defined? @parse
 
-        @sub_titles.each_line.each_with_object([]){|line, array|
+        @sub_titles.each_line.each_with_object([]) { |line, array|
           m = FORMAT_REGEXP.match(line)
 
           array << SubTitle.new(m[1], m[2]) if m

data/lib/syobocal/version.rb

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

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/syobocal.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "syobocal/version"
@@ -24,7 +23,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rufo", "~> 0.7"
+  spec.add_dependency "rexml", "~> 3.2"
+  spec.add_dependency "rss", "~> 0.2"
+
+  spec.required_ruby_version = ">= 3.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syobocal
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.15.0
 platform: ruby
 authors:
 - xmisao
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rss
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Syoboi Calendar is the oldest and biggest ANIME information site, supported
   and hosted by anime fans in Japan. This gem make it easy to download information
   using web APIs of this site.
@@ -100,6 +128,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
@@ -121,7 +150,7 @@ homepage: https://github.com/xmisao/syobocal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,15 +158,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Simple gem for Syoboi Calendar
 test_files: []