syoboi_calendar 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b67926b1fd893f4d44887464f9b8d160d7789032
-  data.tar.gz: c1df3c20468b121b117ef08e3a42a79075aa0aec
+  metadata.gz: 1c6a3bc9030335c46951f952b015f41bcc659156
+  data.tar.gz: 2006ec81adcb5ebc472ac68fe9d083a01e312c17
 SHA512:
-  metadata.gz: 977d4653b70a7e7fde5ddaf83c25c759854d6b9c41325e3e1653f42fcb0fa35d7baf2e86b7dca1762d28ce5fb51ff7b7408a2b86ab1fd6e5a414c5a29bafa067
-  data.tar.gz: '058558e1d50597c9938b84d94743bddd5e6957d38151874d71848a69092c394aa2bb61a073061c455b0ea6f7563283779085eb525a9b36bd333541eeb270c010'
+  metadata.gz: 6c7b75cb9c9b4791087d4d4eb461222d8599fbc380cc8733d79edc8a028faf478ecd3cf16fcc66db808c5f7a42b315740beb7049befcfcc319fca1ccc855641b
+  data.tar.gz: 5bae958e577c981b030465ebb3daa12626187b231fc0593b197de95ee886e2c2f1e760b159f81ce2c6155938d8f64c6a3c4a0e24cd80fdfbd5a7434af5dcd2de

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.9.1
+
+- Fix bug on personality role name splitting
+- Change `SyoboiCalendar::Song` interface
+
 ## 0.9.0
 
 - Add `SyoboiCalendar::Resources::TitleResource#casts`

data/README.md

@@ -128,7 +128,7 @@ Available methods:
 
 ### SyoboiCalendar::Resources::ChannelGroupResource
 
-Available attributes:
+Available methods:
 
 - `#comment`
 - `#id`
@@ -137,7 +137,7 @@ Available attributes:
 
 ### SyoboiCalendar::Resources::ChannelResource
 
-Available attributes:
+Available methods:
 
 - `#channel_group_id`
 - `#comment`
@@ -150,7 +150,7 @@ Available attributes:
 
 ### SyoboiCalendar::Resources::ProgramResource
 
-Available attributes:
+Available methods:
 
 - `#channel_id`
 - `#comment`
@@ -168,7 +168,7 @@ Available attributes:
 
 ### SyoboiCalendar::Resources::TitleResource
 
-Available attributes:
+Available methods:
 
 - `#casts`
 - `#category_id`

data/lib/syoboi_calendar/comment_section.rb

@@ -1,11 +1,13 @@
 module SyoboiCalendar
   class CommentSection
-    NAME_CASTS = "キャスト"
-    NAME_STAFFS = "スタッフ"
+    PATTERN_NAME_CASTS = "キャスト"
+    PATTERN_NAME_STAFFS = "スタッフ"
     PATTERN_NAME_SONG_ENDING = /\Aエンディング\d*\s*「(.+)」\z/
     PATTERN_NAME_SONG_INSERTED = /\A挿入歌\d*\s*「(.+)」\z/
     PATTERN_NAME_SONG_OPENING = /\Aオープニング\d*\s*「(.+)」\z/
     PATTERN_NAME_SONG_THEME = /\A主題歌\d*\s*「(.+)」\z/
+    PATTERN_SONG_NAME = /「(.+)」/
+    PATTERN_SONG_ROLE = /(\S+)\s*「.+」/
 
     attr_reader :source
 
@@ -14,6 +16,19 @@ module SyoboiCalendar
       @source = source
     end
 
+    # @return [Boolean]
+    def about_casts?
+      PATTERN_NAME_CASTS === name
+    end
+
+    # @return [Boolean]
+    def about_song?
+      about_song_ending? ||
+        about_song_inserted? ||
+        about_song_opening? ||
+        about_song_theme?
+    end
+
     # @return [Boolean]
     def about_song_ending?
       PATTERN_NAME_SONG_ENDING === name
@@ -34,19 +49,16 @@ module SyoboiCalendar
       PATTERN_NAME_SONG_THEME === name
     end
 
-    # @return [Boolean]
-    def about_casts?
-      name == NAME_CASTS
-    end
-
     # @return [Boolean]
     def about_personalities?
-      about_casts? || about_staffs?
+      about_casts? ||
+        about_song? ||
+        about_staffs?
     end
 
     # @return [Boolean]
     def about_staffs?
-      name == NAME_STAFFS
+      PATTERN_NAME_STAFFS === name
     end
 
     # @return [Array<String>]
@@ -68,10 +80,8 @@ module SyoboiCalendar
     # @return [Hash{String => String}]
     def hash
       lines[1..-1].grep(/\A:/).each_with_object({}) do |line, result|
-        key_or_keys, value = line[1..-1].split(":", 2)
-        key_or_keys.split("・").each do |key|
-          result[key] = value.split("、")
-        end
+        key, value = line[1..-1].split(":", 2)
+        result[key] = value.split("、")
       end
     end
 
@@ -99,9 +109,22 @@ module SyoboiCalendar
     # @return [Hash]
     def song_attributes
       {
-        name: name,
-        source: hash,
+        name: song_name,
+        role: song_role,
+        personalities: personalities,
       }
     end
+
+    # @return [String, nil]
+    def song_name
+      if about_song?
+        name[PATTERN_SONG_NAME, 1]
+      end
+    end
+
+    # @return [String, nil]
+    def song_role
+        name[PATTERN_SONG_ROLE, 1]
+    end
   end
 end

data/lib/syoboi_calendar/song.rb

@@ -1,40 +1,21 @@
 module SyoboiCalendar
   class Song
-    KEY_ARRANGERS = "編曲"
-    KEY_COMPOSERS = "作曲"
-    KEY_LYRIC_WRITERS = "作詞"
-
     # @return [String]
     attr_reader :name
 
-    # @param name [String]
-    # @param source [Hash]
-    def initialize(name:, source:)
-      @name = name
-      @source = source
-    end
+    # @return [Array<SyoboiCalendar::Personality>]
+    attr_reader :personalities
 
-    # @return [Array<String>]
-    def arrangers
-      source[KEY_ARRANGERS]
-    end
-
-    # @return [Array<String>]
-    def composers
-      source[KEY_COMPOSERS]
-    end
-
-    # @return [Array<String>]
-    def lyric_writers
-      source[KEY_LYRIC_WRITERS]
-    end
-
-    private
+    # @return [String]
+    attr_reader :role
 
-    # @private
-    # @return [Hash]
-    def source
-      @source
+    # @param name [String]
+    # @param personalities [Array<SyoboiCalendar::Personality>]
+    # @param role [String]
+    def initialize(name:, personalities:, role:)
+      @name = name
+      @personalities = personalities
+      @role = role
     end
   end
 end

data/lib/syoboi_calendar/version.rb

@@ -1,3 +1,3 @@
 module SyoboiCalendar
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syoboi_calendar
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-11 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday