syoboi_calendar 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5261efe9fb199a761c6212fce48a35eb2057f929
-  data.tar.gz: b28ef3da5e1afebbf208fa112793657bd491e537
+  metadata.gz: 6198d0d820f2c6005636a48403f17b363a04fb17
+  data.tar.gz: 0fd21d40332d20febf1fc15403770d35f90ac5d4
 SHA512:
-  metadata.gz: 540c45673ee1e2f82ee96e91ec1ff747b1ac3febc276e500582b30b2c75ec66cc880026b4ac75fee20179d69eccca37999091e4af787bbc60b261df21cd50d3c
-  data.tar.gz: de6d0d097673a97ba601e4cb83c6a8325986aec5cc5aa7c3c7d2ec82e2d9fbe9db60323c29861cf5ff9b345c5d729125de7a045d07b986a00a594355c8e5b016
+  metadata.gz: 36f9c42cd64d720b59110a884a194c4fbe823e85bd3323e186923e003f65fca566ddfbc1e426f6da758944b99f01cb29b0b4e0b7eaebe981348196b831f52bed
+  data.tar.gz: 6f6ff38c9e8e939cf0885f43d40ae0522ecf08deb314516ca749364b95221e592e53d36ab31c1559c823f7bfe186e3eb1fff95bc1346059750557ed1a8e33a4f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.0
+
+- Refactor internal implementation
+- Add `TID=*` query if no `:title_id` option given on `#list_titles`
+
 ## 0.4.0
 
 - Change client method names (e..g `#programs` to `#list_programs`)

data/README.md

@@ -153,12 +153,6 @@ Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=ProgLookup&JOIN=Su
 client.list_programs(played_from: Time.new(2000, 1, 1), played_to: Time.new(2000, 2, 1))
 ```
 
-Eage-loads related resources.
-
-```ruby
-client.list_programs(include: [:channel, :title])
-```
-
 ### SyoboiCalendar::Client#list_titles
 
 Sends an HTTP request to `http://cal.syoboi.jp/db.php?Command=TitleLookup`.

data/lib/syoboi_calendar/client.rb

@@ -1,18 +1,46 @@
 module SyoboiCalendar
   class Client
+    ENDPOINT_BASE_URL = "http://cal.syoboi.jp"
+    ENDPOINT_PATH = "/db.php"
+
+    # @return [Faraday::Connection]
+    def connection
+      @connection ||= ::Faraday::Connection.new(url: ENDPOINT_BASE_URL) do |connection|
+        connection.adapter :net_http
+        connection.response :mashify
+        connection.response :xml
+        connection.response :raise_error
+      end
+    end
+
     # @return [Array<SyoboiCalendar::Resources::Channel>]
     def list_channels(options = {})
-      Processors::Channel.process(options)
+      query = ::SyoboiCalendar::Queries::ChannelQuery.new(options)
+      faraday_response = get(query.to_hash)
+      ::SyoboiCalendar::Responses::ChannelsResponse.new(faraday_response)
     end
 
     # @return [Array<SyoboiCalendar::Resources::Program>]
     def list_programs(options = {})
-      Processors::Program.process(options)
+      query = ::SyoboiCalendar::Queries::ProgramQuery.new(options)
+      faraday_response = get(query.to_hash)
+      ::SyoboiCalendar::Responses::ProgramsResponse.new(faraday_response)
     end
 
     # @return [Array<SyoboiCalendar::Resources::Title>]
     def list_titles(options = {})
-      Processors::Title.process(options)
+      query = ::SyoboiCalendar::Queries::TitleQuery.new(options)
+      faraday_response = get(query.to_hash)
+      ::SyoboiCalendar::Responses::TitlesResponse.new(faraday_response)
+    end
+
+    private
+
+    # @private
+    # @param query [Hash]
+    # @return [Faraday::Response]
+    def get(query)
+      connection.get(ENDPOINT_PATH, query)
     end
   end
 end

data/lib/syoboi_calendar/queries/base_query.rb

@@ -0,0 +1,77 @@
+module SyoboiCalendar
+  module Queries
+    class BaseQuery
+      class << self
+        attr_writer :property_names
+
+        # @note Override
+        def inherited(child_class)
+          child_class.property_names = property_names.clone
+        end
+
+        # @return [Array<Symbol>]
+        def property_names
+          @property_names ||= []
+        end
+
+        # @param property_name [Symbol]
+        def property(property_name)
+          property_names << property_name
+        end
+      end
+
+      property :Command
+      property :LastUpdate
+
+      def initialize(options = {})
+        @options = options
+      end
+
+      # @return [String]
+      def Command
+        raise ::NotImplementedError
+      end
+
+      # @return [String, nil]
+      def LastUpdate
+        format_time_range(options[:updated_from], options[:updated_to])
+      end
+
+      # @return [Hash]
+      def to_hash
+        self.class.property_names.each_with_object({}) do |property_name, result|
+          value = send(property_name)
+          unless value.nil?
+            result[property_name.to_s] = value
+          end
+        end
+      end
+
+      private
+
+      # @param [Time, nil]
+      # @return [String]
+      def format_time(time)
+        if time
+          time.strftime("%Y%m%d_%H%M%S")
+        end
+      end
+
+      # @param started_at [Time, nil]
+      # @param finished_at [Time, nil]
+      def format_time_range(started_at, finished_at)
+        if started_at || finished_at
+          [
+            format_time(started_at),
+            format_time(finished_at),
+          ].join("-")
+        end
+      end
+
+      # @return [Hash]
+      def options
+        @options
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/queries/channel_query.rb

@@ -0,0 +1,19 @@
+module SyoboiCalendar
+  module Queries
+    class ChannelQuery < BaseQuery
+      COMMAND = "ChLookup"
+
+      property :ChID
+
+      # @return [String, nil]
+      def ChID
+        options[:channel_id]
+      end
+
+      # @note Override
+      def Command
+        COMMAND
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/queries/program_query.rb

@@ -0,0 +1,51 @@
+module SyoboiCalendar
+  module Queries
+    class ProgramQuery < BaseQuery
+      COMMAND = "ProgLookup"
+
+      JOIN = "SubTitles"
+
+      property :ChID
+      property :Count
+      property :JOIN
+      property :PID
+      property :Range
+      property :StTime
+
+      # @return [Integer, nil]
+      def ChID
+        options[:channel_id]
+      end
+
+      # @note Override
+      def Command
+        COMMAND
+      end
+
+      # @return [Integer, nil]
+      def Count
+        options[:count]
+      end
+
+      # @return [String]
+      def JOIN
+        JOIN
+      end
+
+      # @return [Integer, nil]
+      def PID
+        options[:program_id]
+      end
+
+      # @return [String, nil]
+      def Range
+        format_time_range(options[:played_from], options[:played_to])
+      end
+
+      # @return [String, nil]
+      def StTime
+        format_time_range(options[:started_from], options[:started_to])
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/queries/title_query.rb

@@ -0,0 +1,19 @@
+module SyoboiCalendar
+  module Queries
+    class TitleQuery < BaseQuery
+      COMMAND = "TitleLookup"
+
+      property :TID
+
+      # @note Override
+      def Command
+        COMMAND
+      end
+
+      # @return [Integer, String]
+      def TID
+        options[:title_id] || "*"
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/resources/{base.rb → base_resource.rb}

@@ -1,6 +1,6 @@
 module SyoboiCalendar
   module Resources
-    class Base
+    class BaseResource
       # @return [Hashie::Mash]
       attr_reader :response
 

data/lib/syoboi_calendar/resources/{channel.rb → channel_resource.rb}

@@ -1,6 +1,6 @@
 module SyoboiCalendar
   module Resources
-    class Channel < Base
+    class ChannelResource < BaseResource
       # @return [String, nil]
       def comment
         response.ChComment

data/lib/syoboi_calendar/resources/{program.rb → program_resource.rb}

@@ -1,6 +1,6 @@
 module SyoboiCalendar
   module Resources
-    class Program < Base
+    class ProgramResource < BaseResource
       # @return [SyoboiCalendar::Resources::Channel, nil]
       attr_accessor :channel
 

data/lib/syoboi_calendar/resources/{title.rb → title_resource.rb}

@@ -1,6 +1,6 @@
 module SyoboiCalendar
   module Resources
-    class Title < Base
+    class TitleResource < BaseResource
       # @return [Integer, nil]
       def category_id
         response.Cat.try(:to_i)

data/lib/syoboi_calendar/responses/base_response.rb

@@ -0,0 +1,31 @@
+module SyoboiCalendar
+  module Responses
+    class BaseResponse
+      include ::Enumerable
+
+      # @param faraday_response [Faraday::Response]
+      def initialize(faraday_response)
+        @faraday_response = faraday_response
+      end
+
+      # @note Override
+      def each
+        resources.map do |resource|
+          yield resource
+        end
+      end
+
+      private
+
+      # @return [Array<SyoboiCalendar::Resources::BaseResource>]
+      def resources
+        raise ::NotImplementedError
+      end
+
+      # @return [Faraday::Response]
+      def faraday_response
+        @faraday_response
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/responses/channels_response.rb

@@ -0,0 +1,12 @@
+module SyoboiCalendar
+  module Responses
+    class ChannelsResponse < BaseResponse
+      # @note Override
+      def resources
+        ::Array.wrap(faraday_response.body.ChLookupResponse.ChItems.ChItem).map do |element|
+          ::SyoboiCalendar::Resources::ChannelResource.new(element)
+        end
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/responses/programs_response.rb

@@ -0,0 +1,12 @@
+module SyoboiCalendar
+  module Responses
+    class ProgramsResponse < BaseResponse
+      # @note Override
+      def resources
+        ::Array.wrap(faraday_response.body.ProgLookupResponse.ProgItems.ProgItem).map do |element|
+          ::SyoboiCalendar::Resources::ProgramResource.new(element)
+        end
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/responses/titles_response.rb

@@ -0,0 +1,12 @@
+module SyoboiCalendar
+  module Responses
+    class TitlesResponse < BaseResponse
+      # @note Override
+      def resources
+        ::Array.wrap(faraday_response.body.TitleLookupResponse.TitleItems.TitleItem).map do |element|
+          ::SyoboiCalendar::Resources::TitleResource.new(element)
+        end
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/version.rb

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

data/lib/syoboi_calendar.rb

@@ -1,28 +1,19 @@
 require "active_support/concern"
 require "active_support/core_ext/array/wrap"
-require "active_support/core_ext/class/attribute"
-require "active_support/core_ext/enumerable"
 require "active_support/core_ext/object/try"
-require "active_support/core_ext/string/inflections"
 require "faraday"
 require "faraday_middleware"
 
 require "syoboi_calendar/client"
-require "syoboi_calendar/connector"
-require "syoboi_calendar/parsers/base"
-require "syoboi_calendar/parsers/channel"
-require "syoboi_calendar/parsers/program"
-require "syoboi_calendar/parsers/title"
-require "syoboi_calendar/processors/base"
-require "syoboi_calendar/processors/channel"
-require "syoboi_calendar/processors/program"
-require "syoboi_calendar/processors/title"
-require "syoboi_calendar/query_builders/base"
-require "syoboi_calendar/query_builders/channel_id_queriable"
-require "syoboi_calendar/query_builders/channel"
-require "syoboi_calendar/query_builders/program"
-require "syoboi_calendar/query_builders/title"
-require "syoboi_calendar/resources/base"
-require "syoboi_calendar/resources/channel"
-require "syoboi_calendar/resources/program"
-require "syoboi_calendar/resources/title"
+require "syoboi_calendar/queries/base_query"
+require "syoboi_calendar/queries/channel_query"
+require "syoboi_calendar/queries/program_query"
+require "syoboi_calendar/queries/title_query"
+require "syoboi_calendar/resources/base_resource"
+require "syoboi_calendar/resources/channel_resource"
+require "syoboi_calendar/resources/program_resource"
+require "syoboi_calendar/resources/title_resource"
+require "syoboi_calendar/responses/base_response"
+require "syoboi_calendar/responses/channels_response"
+require "syoboi_calendar/responses/programs_response"
+require "syoboi_calendar/responses/titles_response"

data/spec/syoboi_calendar/client_spec.rb

@@ -192,17 +192,16 @@ describe ::SyoboiCalendar::Client do
         stub_request(:get, //).to_rack(app)
       end
 
-      it "returns an Array of ::SyoboiCalendar::Resources::Channel" do
+      it "returns channels" do
         channels = subject
-        channels[0].should be_a ::SyoboiCalendar::Resources::Channel
-        channels[0].comment.should == "DummyComment"
-        channels[0].epg_url.should == "http://example.com/epg-url"
-        channels[0].group_id.should == 1
-        channels[0].id.should == 3
-        channels[0].iepg_name.should == "DummyiEPGName"
-        channels[0].name.should == "DummyChannelName"
-        channels[0].number.should == 3
-        channels[0].url.should == "http://example.com/"
+        channels.first.comment.should == "DummyComment"
+        channels.first.epg_url.should == "http://example.com/epg-url"
+        channels.first.group_id.should == 1
+        channels.first.id.should == 3
+        channels.first.iepg_name.should == "DummyiEPGName"
+        channels.first.name.should == "DummyChannelName"
+        channels.first.number.should == 3
+        channels.first.url.should == "http://example.com/"
       end
     end
   end
@@ -368,34 +367,21 @@ describe ::SyoboiCalendar::Client do
         stub_request(:get, //).to_rack(app)
       end
 
-      it "returns an Array of ::SyoboiCalendar::Resources::Program" do
+      it "returns programs" do
         programs = subject
-        programs[0].should be_a ::SyoboiCalendar::Resources::Program
-        programs[0].channel_id.should == 3
-        programs[0].comment.should == "DummyComment"
-        programs[0].count.should == 1
-        programs[0].deleted?.should == false
-        programs[0].finished_at.should == Time.parse("2000-01-01 00:00:00")
-        programs[0].flag.should == 9
-        programs[0].id.should == 1
-        programs[0].revision.should == 2
-        programs[0].started_at.should == Time.parse("2000-01-01 00:00:00")
-        programs[0].sub_title.should == "DummySubTitle"
-        programs[0].title_id.should == 2
-        programs[0].updated_at.should == Time.parse("2000-01-01 00:00:00")
-        programs[0].warn.should == 1
-      end
-    end
-
-    context "with :include option" do
-      let!(:request) do
-        stub_request(:get, //).to_rack(app)
-      end
-
-      it "eager loads related resources" do
-        programs = client.list_programs(includes: [:channel, :title])
-        programs[0].channel.should be_a ::SyoboiCalendar::Resources::Channel
-        programs[0].title.should be_a ::SyoboiCalendar::Resources::Title
+        programs.first.channel_id.should == 3
+        programs.first.comment.should == "DummyComment"
+        programs.first.count.should == 1
+        programs.first.deleted?.should == false
+        programs.first.finished_at.should == Time.parse("2000-01-01 00:00:00")
+        programs.first.flag.should == 9
+        programs.first.id.should == 1
+        programs.first.revision.should == 2
+        programs.first.started_at.should == Time.parse("2000-01-01 00:00:00")
+        programs.first.sub_title.should == "DummySubTitle"
+        programs.first.title_id.should == 2
+        programs.first.updated_at.should == Time.parse("2000-01-01 00:00:00")
+        programs.first.warn.should == 1
       end
     end
   end
@@ -414,6 +400,7 @@ describe ::SyoboiCalendar::Client do
         options: {},
         query: {
           Command: "TitleLookup",
+          TID: "*",
         },
       },
       {
@@ -432,6 +419,7 @@ describe ::SyoboiCalendar::Client do
         query: {
           Command: "TitleLookup",
           LastUpdate: "20000101_000000-",
+          TID: "*",
         },
       },
       {
@@ -441,16 +429,19 @@ describe ::SyoboiCalendar::Client do
         query: {
           Command: "TitleLookup",
           LastUpdate: "-20000101_000000",
+          TID: "*",
         },
       },
       {
         options: {
           updated_from: ::Time.new(2000, 1, 1),
           updated_to: ::Time.new(2000, 1, 1),
+          TID: "*",
         },
         query: {
           Command: "TitleLookup",
           LastUpdate: "20000101_000000-20000101_000000",
+          TID: "*",
         },
       },
     ].each do |example|
@@ -472,26 +463,25 @@ describe ::SyoboiCalendar::Client do
         stub_request(:get, //).to_rack(app)
       end
 
-      it "returns an Array of ::SyoboiCalendar::Resources::Title" do
+      it "returns titles" do
         titles = subject
-        titles[0].should be_a ::SyoboiCalendar::Resources::Title
-        titles[0].category_id.should == 4
-        titles[0].comment.should == "DummyComment"
-        titles[0].first_channel.should == "DummyChannel"
-        titles[0].first_end_month.should == 1
-        titles[0].first_end_year.should == 2000
-        titles[0].first_month.should == 1
-        titles[0].first_year.should == 2000
-        titles[0].keywords.should == "DummyKeywords"
-        titles[0].short_title.should == "DummyShortTitle"
-        titles[0].sub_titles.should == "DummySubTitles"
-        titles[0].id.should == 2
-        titles[0].name.should == "DummyTitle"
-        titles[0].english_name.should == "DummyEnglishTitle"
-        titles[0].flag.should == 0
-        titles[0].kana.should == "ダミータイトル"
-        titles[0].point.should == 6
-        titles[0].rank.should == 1
+        titles.first.category_id.should == 4
+        titles.first.comment.should == "DummyComment"
+        titles.first.first_channel.should == "DummyChannel"
+        titles.first.first_end_month.should == 1
+        titles.first.first_end_year.should == 2000
+        titles.first.first_month.should == 1
+        titles.first.first_year.should == 2000
+        titles.first.keywords.should == "DummyKeywords"
+        titles.first.short_title.should == "DummyShortTitle"
+        titles.first.sub_titles.should == "DummySubTitles"
+        titles.first.id.should == 2
+        titles.first.name.should == "DummyTitle"
+        titles.first.english_name.should == "DummyEnglishTitle"
+        titles.first.flag.should == 0
+        titles.first.kana.should == "ダミータイトル"
+        titles.first.point.should == 6
+        titles.first.rank.should == 1
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syoboi_calendar
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -166,24 +166,18 @@ files:
 - Rakefile
 - lib/syoboi_calendar.rb
 - lib/syoboi_calendar/client.rb
-- lib/syoboi_calendar/connector.rb
-- lib/syoboi_calendar/parsers/base.rb
-- lib/syoboi_calendar/parsers/channel.rb
-- lib/syoboi_calendar/parsers/program.rb
-- lib/syoboi_calendar/parsers/title.rb
-- lib/syoboi_calendar/processors/base.rb
-- lib/syoboi_calendar/processors/channel.rb
-- lib/syoboi_calendar/processors/program.rb
-- lib/syoboi_calendar/processors/title.rb
-- lib/syoboi_calendar/query_builders/base.rb
-- lib/syoboi_calendar/query_builders/channel.rb
-- lib/syoboi_calendar/query_builders/channel_id_queriable.rb
-- lib/syoboi_calendar/query_builders/program.rb
-- lib/syoboi_calendar/query_builders/title.rb
-- lib/syoboi_calendar/resources/base.rb
-- lib/syoboi_calendar/resources/channel.rb
-- lib/syoboi_calendar/resources/program.rb
-- lib/syoboi_calendar/resources/title.rb
+- lib/syoboi_calendar/queries/base_query.rb
+- lib/syoboi_calendar/queries/channel_query.rb
+- lib/syoboi_calendar/queries/program_query.rb
+- lib/syoboi_calendar/queries/title_query.rb
+- lib/syoboi_calendar/resources/base_resource.rb
+- lib/syoboi_calendar/resources/channel_resource.rb
+- lib/syoboi_calendar/resources/program_resource.rb
+- lib/syoboi_calendar/resources/title_resource.rb
+- lib/syoboi_calendar/responses/base_response.rb
+- lib/syoboi_calendar/responses/channels_response.rb
+- lib/syoboi_calendar/responses/programs_response.rb
+- lib/syoboi_calendar/responses/titles_response.rb
 - lib/syoboi_calendar/version.rb
 - spec/spec_helper.rb
 - spec/syoboi_calendar/client_spec.rb

data/lib/syoboi_calendar/connector.rb

@@ -1,27 +0,0 @@
-module SyoboiCalendar
-  class Connector
-    URL = "http://cal.syoboi.jp/"
-    PATH = "/db.php"
-
-    def get(query)
-      connection.get(path, query)
-    end
-
-    def connection
-      @connection ||= Faraday.new(url: url) do |connection|
-        connection.adapter :net_http
-        connection.response :mashify
-        connection.response :xml
-        connection.response :raise_error
-      end
-    end
-
-    def path
-      PATH
-    end
-
-    def url
-      URL
-    end
-  end
-end

data/lib/syoboi_calendar/parsers/base.rb

@@ -1,25 +0,0 @@
-module SyoboiCalendar
-  module Parsers
-    class Base
-      class << self
-        def parse(response)
-          new(response).parse
-        end
-      end
-
-      attr_reader :response
-
-      def initialize(response)
-        @response = response
-      end
-
-      def parse
-        items.map do |item|
-          resource_class.new(item)
-        end
-      rescue NoMethodError
-        []
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/parsers/channel.rb

@@ -1,15 +0,0 @@
-module SyoboiCalendar
-  module Parsers
-    class Channel < Base
-      private
-
-      def resource_class
-        Resources::Channel
-      end
-
-      def items
-        ::Array.wrap(response.ChLookupResponse.ChItems.ChItem)
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/parsers/program.rb

@@ -1,15 +0,0 @@
-module SyoboiCalendar
-  module Parsers
-    class Program < Base
-      private
-
-      def resource_class
-        Resources::Program
-      end
-
-      def items
-        ::Array.wrap(response.ProgLookupResponse.ProgItems.ProgItem)
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/parsers/title.rb

@@ -1,15 +0,0 @@
-module SyoboiCalendar
-  module Parsers
-    class Title < Base
-      private
-
-      def resource_class
-        Resources::Title
-      end
-
-      def items
-        ::Array.wrap(response.TitleLookupResponse.TitleItems.TitleItem)
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/processors/base.rb

@@ -1,43 +0,0 @@
-module SyoboiCalendar
-  module Processors
-    class Base
-      class << self
-        def process(*args)
-          new(*args).process
-        end
-      end
-
-      attr_reader :options
-
-      def initialize(options)
-        @options = options
-      end
-
-      def process
-        resources
-      end
-
-      private
-
-      def resources
-        @resources ||= begin
-          query = query_builder.build(options)
-          response = get(query)
-          parser.parse(response)
-        end
-      end
-
-      def connector
-        @connector ||= Connector.new
-      end
-
-      def get(query)
-        connector.get(query).body
-      end
-
-      def includes
-        ::Array.wrap(options[:includes])
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/processors/channel.rb

@@ -1,15 +0,0 @@
-module SyoboiCalendar
-  module Processors
-    class Channel < Base
-      private
-
-      def query_builder
-        QueryBuilders::Channel
-      end
-
-      def parser
-        Parsers::Channel
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/processors/program.rb

@@ -1,81 +0,0 @@
-module SyoboiCalendar
-  module Processors
-    class Program < Base
-      def process
-        include_channel if specified_to_include_channel?
-        include_title if specified_to_include_title?
-        resources
-      end
-
-      private
-
-      def query_builder
-        QueryBuilders::Program
-      end
-
-      def parser
-        Parsers::Program
-      end
-
-      def titles_indexed_by_id
-        @titles_indexed_by_id ||= titles.index_by(&:id)
-      end
-
-      def titles
-        Parsers::Title.parse(titles_response)
-      end
-
-      def titles_response
-        connector.get(titles_query).body
-      end
-
-      def titles_query
-        QueryBuilders::Title.build(title_id: title_ids.join(","))
-      end
-
-      def title_ids
-        resources.map(&:title_id)
-      end
-
-      def specified_to_include_title?
-        includes.include?(:title)
-      end
-
-      def specified_to_include_channel?
-        includes.include?(:channel)
-      end
-
-      def include_title
-        resources.each do |program|
-          program.title = titles_indexed_by_id[program.title_id]
-        end
-      end
-
-      def channels_indexed_by_id
-        @channels_indexed_by_id ||= channels.index_by(&:id)
-      end
-
-      def channels
-        Parsers::Channel.parse(channels_response)
-      end
-
-      def channels_response
-        connector.get(channels_query).body
-      end
-
-      def channels_query
-        QueryBuilders::Channel.build(channel_id: channel_ids.join(","))
-      end
-
-      def channel_ids
-        resources.map(&:channel_id)
-      end
-
-      def include_channel
-        resources.each do |program|
-          program.channel = channels_indexed_by_id[program.channel_id]
-        end
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/processors/title.rb

@@ -1,15 +0,0 @@
-module SyoboiCalendar
-  module Processors
-    class Title < Base
-      private
-
-      def query_builder
-        QueryBuilders::Title
-      end
-
-      def parser
-        Parsers::Title
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/query_builders/base.rb

@@ -1,81 +0,0 @@
-module SyoboiCalendar
-  module QueryBuilders
-    class Base
-      class << self
-        def build(*args)
-          new(*args).to_hash
-        end
-
-        def property(*properties)
-          self.properties += properties
-        end
-
-        def option(*options)
-          options.each do |option|
-            define_method(option) do
-              self.options[option]
-            end
-          end
-        end
-
-        def time_option(*names)
-          names.each do |name|
-            define_method("has_#{name}_time?") do
-              !!(send("#{name}_from") || send("#{name}_to"))
-            end
-
-            define_method("formatted_#{name}_from") do
-              send("#{name}_from").try(:strftime, "%Y%m%d_%H%M%S")
-            end
-
-            define_method("formatted_#{name}_to") do
-              send("#{name}_to").try(:strftime, "%Y%m%d_%H%M%S")
-            end
-          end
-        end
-      end
-
-      class_attribute :properties
-
-      self.properties = []
-
-      option(
-        :updated_from,
-        :updated_to,
-      )
-
-      time_option(
-        :updated,
-      )
-
-      property(
-        :Command,
-        :LastUpdate,
-      )
-
-      attr_reader :options
-
-      def initialize(options = {})
-        @options = options
-      end
-
-      def to_hash
-        to_hash_with_nil_value.reject {|key, value| value.nil? }
-      end
-
-      def to_hash_with_nil_value
-        properties.inject({}) do |hash, property|
-          hash.merge(property => send(property.to_s.underscore))
-        end
-      end
-
-      def properties
-        self.class.properties
-      end
-
-      def last_update
-        "#{formatted_updated_from}-#{formatted_updated_to}" if has_updated_time?
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/query_builders/channel.rb

@@ -1,13 +0,0 @@
-module SyoboiCalendar
-  module QueryBuilders
-    class Channel < Base
-      include ChannelIdQueriable
-
-      private
-
-      def command
-        "ChLookup"
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/query_builders/channel_id_queriable.rb

@@ -1,15 +0,0 @@
-module SyoboiCalendar
-  module QueryBuilders
-    module ChannelIdQueriable
-      extend ActiveSupport::Concern
-
-      included do
-        option :channel_id
-
-        property :ChID
-
-        alias ch_id channel_id
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/query_builders/program.rb

@@ -1,49 +0,0 @@
-module SyoboiCalendar
-  module QueryBuilders
-    class Program < Base
-      include ChannelIdQueriable
-
-      option(
-        :count,
-        :program_id,
-        :played_from,
-        :played_to,
-        :started_from,
-        :started_to,
-      )
-
-      time_option(
-        :played,
-        :started,
-      )
-
-      property(
-        :Count,
-        :JOIN,
-        :PID,
-        :Range,
-        :StTime,
-      )
-
-      alias pid program_id
-
-      private
-
-      def command
-        "ProgLookup"
-      end
-
-      def join
-        "SubTitles"
-      end
-
-      def range
-        "#{formatted_played_from}-#{formatted_played_to}" if has_played_time?
-      end
-
-      def st_time
-        "#{formatted_started_from}-#{formatted_started_to}" if has_started_time?
-      end
-    end
-  end
-end

data/lib/syoboi_calendar/query_builders/title.rb

@@ -1,17 +0,0 @@
-module SyoboiCalendar
-  module QueryBuilders
-    class Title < Base
-      option :title_id
-
-      property :TID
-
-      alias tid title_id
-
-      private
-
-      def command
-        "TitleLookup"
-      end
-    end
-  end
-end