imas-producer_schedule 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cffb58fc54114ecfb19bc8ff8fee4217e0af51a9
-  data.tar.gz: cdf9348eb17112dce472a7fdf2555172456368a9
+SHA256:
+  metadata.gz: e4321804a7a892548fe77bda0321221ef7fa46b38ec7fcb4ecb13f982103eaa3
+  data.tar.gz: 6df38e65ae6808ef1cd45a714efe47ae7d136d811c57b8c86527500fdf09e8c0
 SHA512:
-  metadata.gz: c73fe04fc60c75f79ed9d043c488216748623591033c55c06ef3e52ca60dac42d8233b382fd74e2b69a99a202625a59f89137e392852393c15af5bfcd393078b
-  data.tar.gz: 45d4f5ffcab22276ad52bdb9c8e35c7049f6d58b7b45ba67ba5f74d25b1a897e2a15ca28129ab81dc776dd182c4570d9d4bd078b4190be6b990864f32e1be13c
+  metadata.gz: 40359d98da528eb201867ce74cb60ae65beaae15bc92c585cd1a3d198c1f3f3b377d7d0bb6c4766fd9e38d607e63767e41e9d69c3f08bbf4dadee854b48fe950
+  data.tar.gz: 3a21b79e2f79755cf32a62ed820a306e9c729dd47a3763bb05662a1f0cc1f5c7ac2d216dcd32668161a65d9c8e8d2048303701801376d7a9065817ce617baf2b

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in imas-producer_schedule.gemspec

data/imas-producer_schedule.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"
   spec.add_dependency 'icalendar'
-  spec.add_dependency 'nokogiri', '~> 1.6.5'
+  spec.add_dependency 'nokogiri'
   spec.add_dependency 'activesupport'
 end

data/lib/imas/producer_schedule.rb

@@ -1,4 +1,6 @@
-require "imas/producer_schedule/version"
+# frozen_string_literal: true
+
+require 'imas/producer_schedule/version'
 require 'imas/producer_schedule/client'
 
 module Imas

data/lib/imas/producer_schedule/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 require 'icalendar'
 require 'nokogiri'
@@ -26,12 +28,13 @@ module Imas::ProducerSchedule
       /^TVアニメ「アイドルマスター シンデレラガールズ」2nd SEASON$/,
       /^シンデレラガールズ劇場 第.{1,2}話放送$/,
       /^アニメ アイドルマスター SideM 第.{1,2}話放送$/,
-
-    ]
+      /^アイドルマスター シャイニーカラーズ はばたきラジオステーション$/,
+      /^アニメ　アイドルマスター SideM　理由あってMini!　第.{1,2}話放送$/,
+      /^THE IDOLM@STER MUSIC ON THE RADIO$/
+    ].freeze
     HEADER_OFFSET = 3
     TZID = 'Asia/Tokyo'
-    DEFAULT_MONTH_PATH = File.join(File.expand_path('../../../../', __FILE__), 'months.yml')
-
+    DEFAULT_MONTH_PATH = File.join(File.expand_path('../../..', __dir__), 'months.yml')
 
     def initialize(month_path = DEFAULT_MONTH_PATH)
       @months = ::YAML.load_file(month_path)
@@ -40,30 +43,24 @@ module Imas::ProducerSchedule
     def output_cal(output_dir = '.')
       # カレンダー情報定義
       cals = [
-        { name:"プロデューサー予定表",
-          file:"schedule.ics",
-          test: lambda{|schedule| true },
-      },
-      { name:"定期配信番組除外版",
-        file:"schedule_irregular.ics",
-        test: lambda{|schedule| REGULAR_ARTICLE.none? {|re| schedule[:article] =~ re} },
-      },
-      { name:"定期配信番組のみ",
-        file:"schedule_regular.ics",
-        test: lambda{|schedule| REGULAR_ARTICLE.any? {|re| schedule[:article] =~ re} },
-      },
-      { name:"発売日",
-        file:"release_day.ics",
-        test: lambda{|schedule| schedule[:time] == "発売日"}
-      },
-      { name:"イベント" ,
-        file:"event.ics",
-        test: lambda{|schedule| schedule[:genre].include? "イベント"}
-      },
-      { name:"ニコ生" ,
-        file:"nico_live.ics",
-        test: lambda{|schedule| schedule[:genre].include? "ニコ生"}
-      },
+        { name: 'プロデューサー予定表',
+          file: 'schedule.ics',
+          test: ->(_schedule) { true } },
+        { name: '定期配信番組除外版',
+          file: 'schedule_irregular.ics',
+          test: ->(schedule) { REGULAR_ARTICLE.none? { |re| schedule[:article] =~ re } } },
+        { name: '定期配信番組のみ',
+          file: 'schedule_regular.ics',
+          test: ->(schedule) { REGULAR_ARTICLE.any? { |re| schedule[:article] =~ re } } },
+        { name: '発売日',
+          file: 'release_day.ics',
+          test: ->(schedule) { schedule[:time] == '発売日' } },
+        { name: 'イベント',
+          file: 'event.ics',
+          test: ->(schedule) { schedule[:genre].include? 'イベント' } },
+        { name: 'ニコ生',
+          file: 'nico_live.ics',
+          test: ->(schedule) { schedule[:genre].include? 'ニコ生' } }
       ]
 
       # タイトル・タイムゾーン設定
@@ -93,7 +90,7 @@ module Imas::ProducerSchedule
 
           # 日付時刻
           if s[:from].nil?
-            e.dtstart = Icalendar::Values::Date.new(sprintf("%04d%02d%02d", year, month, day), 'tzid' => TZID)
+            e.dtstart = Icalendar::Values::Date.new(format('%04d%02d%02d', year, month, day), 'tzid' => TZID)
           else
             st_tm = to_datetime(year, month, day, *split_time(s[:from]))
             ed_tm = st_tm
@@ -120,7 +117,6 @@ module Imas::ProducerSchedule
           cals.each do |c|
             c[:cal].add_event e if c[:test].call(s)
           end
-
         end
       end
 
@@ -129,39 +125,40 @@ module Imas::ProducerSchedule
         c[:cal].publish
         open(File.join(output_dir, c[:file]), 'w') { |f| f.write(c[:cal].to_ical) }
       end
-
     end
-    
+
     private
 
-    def to_schedule tr
+    def to_schedule(tr)
       # ジャンル
       genre = tr.at('.//td[@class="genre2"]').try(:text)
       # 内容・リンク
       article = tr.at('.//td[@class="article2"]').try(:text)
-      link  = tr.at('.//td[@class="article2"]/a').try(:[], 'href')
+      link = tr.at('.//td[@class="article2"]/a').try(:[], 'href')
       # 日付
       day = tr.at('.//td[@class="day2"]/img')
-      day = tr.at('.//td[@class="day"]/img') unless day
+      day ||= tr.at('.//td[@class="day"]/img')
       day = day['src'][-6..-5].to_i if day
       # 時刻
-      time =  tr.at('.//td[@class="time2"]').try(:text)
+      time = tr.at('.//td[@class="time2"]').try(:text)
       # From-To
       from, to = time.try(:tr, '１２３４５６７８９０：', '1234567890:').try(:scan, /\d\d:\d\d/)
       # 出演者
-      performance =  tr.at('.//td[@class="performance2"]/img').try(:[], 'alt')
+      performance = tr.at('.//td[@class="performance2"]/img').try(:[], 'alt')
       # 詳細
       description = "時間：#{time}\n"
-      description << "出演：#{performance}\n"
-      description << "記事：#{article}\n"
-      description << "リンク：#{link}\n"
+      description += "出演：#{performance}\n"
+      description += "記事：#{article}\n"
+      description += "リンク：#{link}\n"
 
       # ハッシュ生成
-      {day:day, time:time, genre:genre.try(:strip), article:article, link:link, from:from, to:to, description:description} unless article.blank?
+      unless article.blank?
+        { day: day, time: time, genre: genre.try(:strip), article: article, link: link, from: from, to: to, description: description }
+      end
     end
 
-    def parse_calendar url
-      html = open(url) { |f| f.read }
+    def parse_calendar(url)
+      html = URI.open(url, &:read)
       charset = 'utf-8'
 
       # htmlをパースしてオブジェクトを生成
@@ -171,7 +168,7 @@ module Imas::ProducerSchedule
       end.compact
     end
 
-    def to_datetime year, month, day, hour, min
+    def to_datetime(year, month, day, hour, min)
       if hour >= 24
         hour -= 24
         exceed = true
@@ -181,11 +178,11 @@ module Imas::ProducerSchedule
       Icalendar::Values::DateTime.new datetime, 'tzid' => TZID
     end
 
-    def split_time hm_string
+    def split_time(hm_string)
       hm_string.split(':').map(&:to_i)
     end
 
-    def set_timezone cal
+    def set_timezone(cal)
       cal.timezone do |t|
         t.tzid = TZID
         t.standard do |s|

data/lib/imas/producer_schedule/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Imas
   module ProducerSchedule
-    VERSION = "0.1.5"
+    VERSION = '0.1.7'
   end
 end

data/months.yml

@@ -27,3 +27,65 @@
 - [2016, '08', 8, 'c']
 - [2016, '09', 9, 'c']
 - [2016, '10', 10, 'c']
+- [2016, '11', 10, 'c']
+- [2016, '12', 10, 'c']
+- [2017, '1', 10, 'c']
+- [2017, '2', 10, 'c']
+- [2017, '3', 10, 'c']
+- [2017, '4', 10, 'c']
+- [2017, '5', 10, 'c']
+- [2017, '6', 10, 'c']
+- [2017, '7', 10, 'c']
+- [2017, '8', 10, 'c']
+- [2017, '9', 10, 'c']
+- [2017, '10', 10, 'c']
+- [2017, '11', 10, 'c']
+- [2017, '12', 10, 'c']
+- [2018, '1', 10, 'c']
+- [2018, '2', 10, 'c']
+- [2018, '3', 10, 'c']
+- [2018, '4', 10, 'c']
+- [2018, '5', 10, 'c']
+- [2018, '6', 10, 'c']
+- [2018, '7', 10, 'c']
+- [2018, '8', 10, 'c']
+- [2018, '9', 10, 'c']
+- [2018, '10', 10, 'c']
+- [2018, '11', 10, 'c']
+- [2018, '12', 10, 'c']
+- [2019, '1', 10, 'c']
+- [2019, '2', 10, 'c']
+- [2019, '3', 10, 'c']
+- [2019, '4', 10, 'c']
+- [2019, '5', 10, 'c']
+- [2019, '6', 10, 'c']
+- [2019, '7', 10, 'c']
+- [2019, '8', 10, 'c']
+- [2019, '9', 10, 'c']
+- [2019, '10', 10, 'c']
+- [2019, '11', 10, 'c']
+- [2019, '12', 10, 'c']
+- [2020, '1', 10, 'c']
+- [2020, '2', 10, 'c']
+- [2020, '3', 10, 'c']
+- [2020, '4', 10, 'c']
+- [2020, '5', 10, 'c']
+- [2020, '6', 10, 'c']
+- [2020, '7', 10, 'c']
+- [2020, '8', 10, 'c']
+- [2020, '9', 10, 'c']
+- [2020, '10', 10, 'c']
+- [2020, '11', 10, 'c']
+- [2020, '12', 10, 'c']
+- [2021, '1', 10, 'c']
+- [2021, '2', 10, 'c']
+- [2021, '3', 10, 'c']
+- [2021, '4', 10, 'c']
+- [2021, '5', 10, 'c']
+- [2021, '6', 10, 'c']
+- [2021, '7', 10, 'c']
+- [2021, '8', 10, 'c']
+- [2021, '9', 10, 'c']
+- [2021, '10', 10, 'c']
+- [2021, '11', 10, 'c']
+- [2021, '12', 10, 'c']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imas-producer_schedule
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - gomao9
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: calendar generator for im@s producers