syoboi_calendar 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6198d0d820f2c6005636a48403f17b363a04fb17
-  data.tar.gz: 0fd21d40332d20febf1fc15403770d35f90ac5d4
+  metadata.gz: 5346554a9e8ec0c05a1a7f9b715edd122ab8cce2
+  data.tar.gz: 28c95e9429d5626c612476f9386504cadc048e96
 SHA512:
-  metadata.gz: 36f9c42cd64d720b59110a884a194c4fbe823e85bd3323e186923e003f65fca566ddfbc1e426f6da758944b99f01cb29b0b4e0b7eaebe981348196b831f52bed
-  data.tar.gz: 6f6ff38c9e8e939cf0885f43d40ae0522ecf08deb314516ca749364b95221e592e53d36ab31c1559c823f7bfe186e3eb1fff95bc1346059750557ed1a8e33a4f
+  metadata.gz: 54c8869860f68a1d928a7bed7bee325c66c700da04a98088cfd24942053942b3ceac230d5d41f8f030bc7a8c8f7906b68d8140ea88963637765cb88beda1cbab
+  data.tar.gz: 7c147a0f1b67908fed9cd67ba2aab48daf161050140230e7a8f1f00d973ccd973d51450f9a0ee32f976e6b4971a46ce7c97de9ceaa99936635a1eef56f5add6d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.5.1
+
+- Support :title_id options on list_programs method
+- Support :fields option on list_programs and list_titles
+- Support multiple IDs and counts options on client methods
+
 ## 0.5.0
 
 - Refactor internal implementation

data/README.md

@@ -81,6 +81,12 @@ Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&JOIN=Su
 client.list_programs
 ```
 
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&JOIN=SubTitles&TID=1`.
+
+```ruby
+client.list_programs(title_id: 1)
+```
+
 Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&JOIN=SubTitles&PID=1`.
 
 ```ruby
@@ -99,6 +105,12 @@ Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&Count=1
 client.list_programs(count: 1)
 ```
 
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&Fields=PID&JOIN=SubTitles`.
+
+```ruby
+client.list_programs(fields: ["PID"])
+```
+
 Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&JOIN=SubTitles&LastUpdate=20000101_000000-`.
 
 ```ruby
@@ -155,7 +167,7 @@ client.list_programs(played_from: Time.new(2000, 1, 1), played_to: Time.new(2000
 
 ### SyoboiCalendar::Client#list_titles
 
-Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup`.
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup&TID=*`.
 
 ```ruby
 client.list_titles
@@ -167,25 +179,31 @@ Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup&TID=1`
 client.list_titles(title_id: 1)
 ```
 
-Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup&LastUpdate=20000101_000000-`.
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup&Fields=TID`.
+
+```ruby
+client.list_titles(fields: ["TID"])
+```
+
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookupp&TID=*&LastUpdate=20000101_000000-`.
 
 ```ruby
 client.list_titles(updated_from: Time.new(2000, 1, 1))
 ```
 
-Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup&LastUpdate=-20000101_000000`.
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookupp&TID=*&LastUpdate=-20000101_000000`.
 
 ```ruby
 client.list_titles(updated_to: Time.new(2000, 1, 1))
 ```
 
-Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup&LastUpdate=20000101_000000-20000201_000000`.
+Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookupp&TID=*&LastUpdate=20000101_000000-20000201_000000`.
 
 ```ruby
 client.list_titles(updated_from: Time.new(2000, 1, 1), updated_to: Time.new(2000, 2, 1))
 ```
 
-### SyoboiCalendar::Resources::Channel#comment
+### SyoboiCalendar::Resources::ChannelResource#comment
 
 ```ruby
 client.list_channels.first.comment
@@ -200,7 +218,7 @@ client.list_channels.first.comment
 
 </details>
 
-### SyoboiCalendar::Resources::Channel#epg_url
+### SyoboiCalendar::Resources::ChannelResource#epg_url
 
 ```ruby
 client.list_channels.first.epg_url
@@ -215,7 +233,7 @@ client.list_channels.first.epg_url
 
 </details>
 
-### SyoboiCalendar::Resources::Channel#group_id
+### SyoboiCalendar::Resources::ChannelResource#group_id
 
 ```ruby
 client.list_channels.first.group_id
@@ -230,7 +248,7 @@ client.list_channels.first.group_id
 
 </details>
 
-### SyoboiCalendar::Resources::Channel#id
+### SyoboiCalendar::Resources::ChannelResource#id
 
 ```ruby
 client.list_channels.first.id
@@ -245,7 +263,7 @@ client.list_channels.first.id
 
 </details>
 
-### SyoboiCalendar::Resources::Channel#iepg_name
+### SyoboiCalendar::Resources::ChannelResource#iepg_name
 
 ```ruby
 client.list_channels.first.iepg_name
@@ -260,7 +278,7 @@ client.list_channels.first.iepg_name
 
 </details>
 
-### SyoboiCalendar::Resources::Channel#number
+### SyoboiCalendar::Resources::ChannelResource#number
 
 ```ruby
 client.list_channels.first.number
@@ -275,7 +293,7 @@ client.list_channels.first.number
 
 </details>
 
-### SyoboiCalendar::Resources::Channel#url
+### SyoboiCalendar::Resources::ChannelResource#url
 
 ```ruby
 client.list_channels.first.url
@@ -290,7 +308,7 @@ client.list_channels.first.url
 
 </details>
 
-### SyoboiCalendar::Resources::Program#channel_id
+### SyoboiCalendar::Resources::ProgramResource#channel_id
 
 ```ruby
 client.list_programs.first.channel_id
@@ -305,7 +323,7 @@ client.list_programs.first.channel_id
 
 </details>
 
-### SyoboiCalendar::Resources::Program#comment
+### SyoboiCalendar::Resources::ProgramResource#comment
 
 ```ruby
 client.list_programs[96].comment
@@ -320,7 +338,7 @@ client.list_programs[96].comment
 
 </details>
 
-### SyoboiCalendar::Resources::Program#count
+### SyoboiCalendar::Resources::ProgramResource#count
 
 ```ruby
 client.list_programs.first.count
@@ -335,7 +353,7 @@ client.list_programs.first.count
 
 </details>
 
-### SyoboiCalendar::Resources::Program#deleted?
+### SyoboiCalendar::Resources::ProgramResource#deleted?
 
 ```ruby
 client.list_programs.first.count
@@ -350,7 +368,7 @@ false
 
 </details>
 
-### SyoboiCalendar::Resources::Program#finished_at
+### SyoboiCalendar::Resources::ProgramResource#finished_at
 
 ```ruby
 client.list_programs.first.finished_at.to_s
@@ -365,7 +383,7 @@ client.list_programs.first.finished_at.to_s
 
 </details>
 
-### SyoboiCalendar::Resources::Program#flag
+### SyoboiCalendar::Resources::ProgramResource#flag
 
 ```ruby
 client.list_programs.first.flag
@@ -380,7 +398,7 @@ client.list_programs.first.flag
 
 </details>
 
-### SyoboiCalendar::Resources::Program#revision
+### SyoboiCalendar::Resources::ProgramResource#revision
 
 ```ruby
 client.list_programs.first.revision
@@ -395,7 +413,7 @@ client.list_programs.first.revision
 
 </details>
 
-### SyoboiCalendar::Resources::Program#started_at
+### SyoboiCalendar::Resources::ProgramResource#started_at
 
 ```ruby
 client.list_programs.first.started_at.to_s
@@ -410,7 +428,7 @@ client.list_programs.first.started_at.to_s
 
 </details>
 
-### SyoboiCalendar::Resources::Program#sub_title
+### SyoboiCalendar::Resources::ProgramResource#sub_title
 
 ```ruby
 client.list_programs.first.sub_title
@@ -425,7 +443,7 @@ client.list_programs.first.sub_title
 
 </details>
 
-### SyoboiCalendar::Resources::Program#title_id
+### SyoboiCalendar::Resources::ProgramResource#title_id
 
 ```ruby
 client.list_programs.first.title_id
@@ -440,7 +458,7 @@ client.list_programs.first.title_id
 
 </details>
 
-### SyoboiCalendar::Resources::Program#updated_at
+### SyoboiCalendar::Resources::ProgramResource#updated_at
 
 ```ruby
 client.list_programs.first.updated_at.to_s
@@ -455,7 +473,7 @@ client.list_programs.first.updated_at.to_s
 
 </details>
 
-### SyoboiCalendar::Resources::Program#warn
+### SyoboiCalendar::Resources::ProgramResource#warn
 
 ```ruby
 client.list_programs.first.warn
@@ -470,7 +488,7 @@ client.list_programs.first.warn
 
 </details>
 
-### SyoboiCalendar::Resources::Title#category_id
+### SyoboiCalendar::Resources::TitleResource#category_id
 
 ```ruby
 client.list_titles(title_id: 1).first.category_id
@@ -485,7 +503,7 @@ client.list_titles(title_id: 1).first.category_id
 
 </details>
 
-### SyoboiCalendar::Resources::Title#comment
+### SyoboiCalendar::Resources::TitleResource#comment
 
 ```ruby
 client.list_titles(title_id: 1).first.comment
@@ -500,7 +518,7 @@ client.list_titles(title_id: 1).first.comment
 
 </details>
 
-### SyoboiCalendar::Resources::Title#english_name
+### SyoboiCalendar::Resources::TitleResource#english_name
 
 ```ruby
 client.list_titles(title_id: 8).first.english_name
@@ -515,7 +533,7 @@ client.list_titles(title_id: 8).first.english_name
 
 </details>
 
-### SyoboiCalendar::Resources::Title#first_channel
+### SyoboiCalendar::Resources::TitleResource#first_channel
 
 ```ruby
 client.list_titles(title_id: 1).first.first_channel
@@ -530,7 +548,7 @@ client.list_titles(title_id: 1).first.first_channel
 
 </details>
 
-### SyoboiCalendar::Resources::Title#first_end_month
+### SyoboiCalendar::Resources::TitleResource#first_end_month
 
 ```ruby
 client.list_titles(title_id: 1).first.first_end_month
@@ -545,7 +563,7 @@ client.list_titles(title_id: 1).first.first_end_month
 
 </details>
 
-### SyoboiCalendar::Resources::Title#first_end_year
+### SyoboiCalendar::Resources::TitleResource#first_end_year
 
 ```ruby
 client.list_titles(title_id: 1).first.first_end_year
@@ -560,7 +578,7 @@ client.list_titles(title_id: 1).first.first_end_year
 
 </details>
 
-### SyoboiCalendar::Resources::Title#first_month
+### SyoboiCalendar::Resources::TitleResource#first_month
 
 ```ruby
 client.list_titles(title_id: 1).first.first_month
@@ -575,7 +593,7 @@ client.list_titles(title_id: 1).first.first_month
 
 </details>
 
-### SyoboiCalendar::Resources::Title#first_year
+### SyoboiCalendar::Resources::TitleResource#first_year
 
 ```ruby
 client.list_titles(title_id: 1).first.first_year
@@ -590,7 +608,7 @@ client.list_titles(title_id: 1).first.first_year
 
 </details>
 
-### SyoboiCalendar::Resources::Title#flag
+### SyoboiCalendar::Resources::TitleResource#flag
 
 ```ruby
 client.list_titles(title_id: 1).first.flag
@@ -605,7 +623,7 @@ client.list_titles(title_id: 1).first.flag
 
 </details>
 
-### SyoboiCalendar::Resources::Title#id
+### SyoboiCalendar::Resources::TitleResource#id
 
 ```ruby
 client.list_titles(title_id: 1).first.id
@@ -620,7 +638,7 @@ client.list_titles(title_id: 1).first.id
 
 </details>
 
-### SyoboiCalendar::Resources::Title#kana
+### SyoboiCalendar::Resources::TitleResource#kana
 
 ```ruby
 client.list_titles(title_id: 1).first.kana
@@ -635,7 +653,7 @@ client.list_titles(title_id: 1).first.kana
 
 </details>
 
-### SyoboiCalendar::Resources::Title#keywords
+### SyoboiCalendar::Resources::TitleResource#keywords
 
 ```ruby
 client.list_titles(title_id: 2).first.keywords
@@ -650,7 +668,22 @@ client.list_titles(title_id: 2).first.keywords
 
 </details>
 
-### SyoboiCalendar::Resources::Title#point
+### SyoboiCalendar::Resources::TitleResource#name
+
+```ruby
+client.list_titles(title_id: 1).first.name
+```
+
+<details>
+<summary>Result</summary>
+
+```ruby
+"魔法遣いに大切なこと"
+```
+
+</details>
+
+### SyoboiCalendar::Resources::TitleResource#point
 
 ```ruby
 client.list_titles(title_id: 1).first.point
@@ -665,7 +698,7 @@ client.list_titles(title_id: 1).first.point
 
 </details>
 
-### SyoboiCalendar::Resources::Title#rank
+### SyoboiCalendar::Resources::TitleResource#rank
 
 ```ruby
 client.list_titles(title_id: 1).first.rank
@@ -680,7 +713,7 @@ client.list_titles(title_id: 1).first.rank
 
 </details>
 
-### SyoboiCalendar::Resources::Title#short_title
+### SyoboiCalendar::Resources::TitleResource#short_title
 
 ```ruby
 client.list_titles(title_id: 4).first.short_title
@@ -695,7 +728,7 @@ client.list_titles(title_id: 4).first.short_title
 
 </details>
 
-### SyoboiCalendar::Resources::Title#sub_titles
+### SyoboiCalendar::Resources::TitleResource#sub_titles
 
 ```ruby
 client.list_titles(title_id: 1).first.sub_titles

data/lib/syoboi_calendar/queries/base_query.rb

@@ -49,6 +49,12 @@ module SyoboiCalendar
 
       private
 
+      # @param [Array, Integer, String]
+      # @return [String]
+      def format_comma_separated_values(values)
+        ::Array.wrap(values).join(",")
+      end
+
       # @param [Time, nil]
       # @return [String]
       def format_time(time)

data/lib/syoboi_calendar/queries/channel_query.rb

@@ -7,7 +7,9 @@ module SyoboiCalendar
 
       # @return [String, nil]
       def ChID
-        options[:channel_id]
+        if options[:channel_id]
+          format_comma_separated_values(options[:channel_id])
+        end
       end
 
       # @note Override

data/lib/syoboi_calendar/queries/program_query.rb

@@ -7,14 +7,18 @@ module SyoboiCalendar
 
       property :ChID
       property :Count
+      property :Fields
       property :JOIN
       property :PID
       property :Range
       property :StTime
+      property :TID
 
-      # @return [Integer, nil]
+      # @return [String, nil]
       def ChID
-        options[:channel_id]
+        if options[:channel_id]
+          format_comma_separated_values(options[:channel_id])
+        end
       end
 
       # @note Override
@@ -22,9 +26,18 @@ module SyoboiCalendar
         COMMAND
       end
 
-      # @return [Integer, nil]
+      # @return [String, nil]
       def Count
-        options[:count]
+        if options[:count]
+          format_comma_separated_values(options[:count])
+        end
+      end
+
+      # @return [String, nil]
+      def Fields
+        if options[:fields]
+          format_comma_separated_values(options[:fields])
+        end
       end
 
       # @return [String]
@@ -32,9 +45,11 @@ module SyoboiCalendar
         JOIN
       end
 
-      # @return [Integer, nil]
+      # @return [String, nil]
       def PID
-        options[:program_id]
+        if options[:program_id]
+          format_comma_separated_values(options[:program_id])
+        end
       end
 
       # @return [String, nil]
@@ -46,6 +61,13 @@ module SyoboiCalendar
       def StTime
         format_time_range(options[:started_from], options[:started_to])
       end
+
+      # @return [String, nil]
+      def TID
+        if options[:title_id]
+          format_comma_separated_values(options[:title_id])
+        end
+      end
     end
   end
 end

data/lib/syoboi_calendar/queries/title_query.rb

@@ -3,6 +3,7 @@ module SyoboiCalendar
     class TitleQuery < BaseQuery
       COMMAND = "TitleLookup"
 
+      property :Fields
       property :TID
 
       # @note Override
@@ -10,9 +11,20 @@ module SyoboiCalendar
         COMMAND
       end
 
-      # @return [Integer, String]
+      # @return [String, nil]
+      def Fields
+        if options[:fields]
+          format_comma_separated_values(options[:fields])
+        end
+      end
+
+      # @return [String]
       def TID
-        options[:title_id] || "*"
+        if options[:title_id]
+          format_comma_separated_values(options[:title_id])
+        else
+          "*"
+        end
       end
     end
   end

data/lib/syoboi_calendar/version.rb

@@ -1,3 +1,3 @@
 module SyoboiCalendar
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syoboi_calendar
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport