ellen-syoboi_calendar 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76860f9b7414a8f31229cfcc572588ac51b1a714
-  data.tar.gz: 4d3c21a6e8ba0e35f407d69ae66c7f204172eb5e
+  metadata.gz: b5407684549c70fbee83244ff539c04a37c962ee
+  data.tar.gz: 0bdc13a03589da35e52cfa63811a6090d41bdbd8
 SHA512:
-  metadata.gz: 37ba08772ec90e7cc41f58264c8f7cf7daa998ed7f0e157dc0d410d4b1107b00978a897810498f5f2cf8cc7929a6b1a2a6a53ec3e26daa521e41f741736fe22b
-  data.tar.gz: f8dd18aa078c8d408d330abdad7431fbbda2ae5b0cd67b7bc657c8a1cc7598b5627723b393b9e4a7352607d0b3b68d6fb88dadf84fcb0f3eb6d5bd1d6b35476c
+  metadata.gz: 329582c7428aab4ee2b49ccf0540599f7bfc7b2ef89aea7aeb3bcbfaa4ad4826c0731ee966d76315e0598ac44c36890c46ffa141a37a83a13a8f1e04ec06a1e5
+  data.tar.gz: 8955e82270eca0749206c7d89cf9d5878e8871c3931e86fd99a249732227f3f6343f04967ca6fd5a353bc2a004351648d6f070f0495fa550220ef0fda4033ee8

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+## 0.0.2
+* Add SYOBOI_CALENDAR_CHANNEL_IDS ENV to filter programs
+* Search in 04:00..28:00
+
+## 0.0.1
+* 1st Release

data/README.md

@@ -11,3 +11,6 @@ gem "ellen-syoboi_calendar"
 ```
 @ellen list anime
 ```
+
+## Screenshot
+![](https://raw.githubusercontent.com/r7kamura/ellen-syoboi_calendar/master/images/screenshot.gif)

data/lib/ellen/handlers/syoboi_calendar.rb

@@ -1,4 +1,6 @@
+require "active_support/core_ext/enumerable"
 require "active_support/core_ext/numeric/time"
+require "active_support/core_ext/date"
 require "active_support/core_ext/time"
 
 module Ellen
@@ -6,15 +8,25 @@ module Ellen
     class SyoboiCalendar < Base
       on(/list anime\z/, name: "list", description: "List today's anime")
 
+      env :SYOBOI_CALENDAR_CHANNEL_IDS, "Comma-separated channel IDs to filter programs", optional: true
+
       def list(message)
-        message.reply(descriptions.join("\n"))
+        message.reply(description)
       end
 
       private
 
+      def description
+        if descriptions.empty?
+          "No programs found"
+        else
+          descriptions.join("\n")
+        end
+      end
+
       def descriptions
-        programs_sorted_by_started_at.map do |program|
-          "#{program[:started_at].strftime("%Y-%m-%d %H:%M")} #{titles_by_id[program[:title_id]][:title]} #{program[:count]}"
+        @descriptions ||= programs_sorted_by_started_at.map do |program|
+          "#{program.started_at_in_string} #{titles_index_by_id[program.title_id].title} #{program.count}"
         end
       end
 
@@ -22,19 +34,17 @@ module Ellen
         @client ||= ::SyoboiCalendar::Client.new
       end
 
-      def titles_by_id
-        @titles_by_id ||= titles.inject({}) do |table, title|
-          table.merge(title[:id] => title)
-        end
+      def titles_index_by_id
+        @titles_by_id ||= titles.index_by(&:id)
       end
 
       def titles
         [get_titles.TitleLookupResponse.TitleItems.TitleItem].flatten.map do |title|
-          {
+          Ellen::SyoboiCalendar::Title.new(
             id: title.id,
             title: title.Title,
             short_title: title.ShortTitle,
-          }
+          )
         end
       end
 
@@ -50,46 +60,62 @@ module Ellen
 
       def title_ids_in_programs
         programs.map do |program|
-          program[:title_id]
+          program.title_id
         end
       end
 
       def programs_sorted_by_started_at
-        programs.sort_by do |program|
-          program[:started_at]
-        end
+        programs.sort_by(&:started_at)
       end
 
       def programs
-        @programs ||= [get_programs.ProgLookupResponse.ProgItems.ProgItem].flatten.map do |program|
-          {
+        @programs ||= get_programs.map do |program|
+          Ellen::SyoboiCalendar::Program.new(
             count: program.Count,
             channel_id: program.ChID,
             sub_title: program.STSubTitle,
             title_id: program.TID,
-            started_at: Time.parse(program.StTime),
-            finished_at: Time.parse(program.EdTime),
-          }
+            started_at: program.StTime,
+            finished_at: program.EdTime,
+          )
         end
       end
 
       def get_programs
-        client.programs(program_options)
+        if items = client.programs(program_options).ProgLookupResponse.ProgItems
+          [items.ProgItem].flatten.compact
+        else
+          []
+        end
       end
 
       def program_options
         {
           played_from: played_from,
           played_to: played_to,
-        }
+          channel_id: channel_ids,
+        }.reject {|key, value| value.nil? }
+      end
+
+      def channel_ids
+        ENV["SYOBOI_CALENDAR_CHANNEL_IDS"]
+      end
+
+      def now
+        @now ||= Time.now
       end
 
       def played_from
-        Time.now
+        now
       end
 
+      # 04:00 ~ 28:00
       def played_to
-        Time.now.end_of_day
+        if now.hour >= 4
+          now.tomorrow.beginning_of_day + 4.hour
+        else
+          now.beginning_of_day + 4.hour
+        end
       end
     end
   end

data/lib/ellen/syoboi_calendar/program.rb

@@ -0,0 +1,22 @@
+module Ellen
+  module SyoboiCalendar
+    class Program < Record
+
+      property(
+        :channel_id,
+        :count,
+        :sub_title,
+        :title_id,
+      )
+
+      time_property(
+        :finished_at,
+        :started_at,
+      )
+
+      def started_at_in_string
+        started_at.strftime("%Y-%m-%d %H:%M")
+      end
+    end
+  end
+end

data/lib/ellen/syoboi_calendar/record.rb

@@ -0,0 +1,29 @@
+module Ellen
+  module SyoboiCalendar
+    class Record
+      class << self
+        def property(*names)
+          names.each do |name|
+            define_method(name) do
+              properties[name]
+            end
+          end
+        end
+
+        def time_property(*names)
+          names.each do |name|
+            define_method(name) do
+              Time.parse(properties[name])
+            end
+          end
+        end
+      end
+
+      attr_reader :properties
+
+      def initialize(properties)
+        @properties = properties
+      end
+    end
+  end
+end

data/lib/ellen/syoboi_calendar/title.rb

@@ -0,0 +1,12 @@
+module Ellen
+  module SyoboiCalendar
+    class Title < Record
+
+      property(
+        :id,
+        :short_title,
+        :title,
+      )
+    end
+  end
+end

data/lib/ellen/syoboi_calendar/version.rb

@@ -1,5 +1,5 @@
 module Ellen
   module SyoboiCalendar
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/ellen/syoboi_calendar.rb

@@ -3,3 +3,6 @@ require "syoboi_calendar"
 
 require "ellen/handlers/syoboi_calendar"
 require "ellen/syoboi_calendar/version"
+require "ellen/syoboi_calendar/record"
+require "ellen/syoboi_calendar/program"
+require "ellen/syoboi_calendar/title"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ellen-syoboi_calendar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -144,13 +144,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - ellen-syoboi_calendar.gemspec
+- images/screenshot.gif
 - lib/ellen/handlers/syoboi_calendar.rb
 - lib/ellen/syoboi_calendar.rb
+- lib/ellen/syoboi_calendar/program.rb
+- lib/ellen/syoboi_calendar/record.rb
+- lib/ellen/syoboi_calendar/title.rb
 - lib/ellen/syoboi_calendar/version.rb
 - spec/ellen/handlers/syoboi_calendar_spec.rb
 - spec/spec_helper.rb