syoboi_calendar 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53da71b944bae16571ebf66bc151f3d554a1688b
-  data.tar.gz: ad48c2b0925bdc8715fbb32ad1249d100f9fdae4
+  metadata.gz: c784bb59897bd758d21932242d40099f76a6620d
+  data.tar.gz: 9670e8cb32bce32fba0a8be526fe8c570bcf97b0
 SHA512:
-  metadata.gz: d61e719e947709f931796b838ea28969307d853ba16a28b4bd554576f9de08d44c34f812e3b8fd5d07bb565816017b1ae9b3d4adb3e6bfa45b5cafb85430201b
-  data.tar.gz: 2a04c00611955ef239903eb072574a58dc27eef4b6909c96394ff5228e2c2ce27f661caf298a7e95bf1a1dbd4b6ea03281b08d918145ce656ecb1f68b124588b
+  metadata.gz: 37c20a5b6d89934ae1ad18741d07e30052736f34beb257a595375ff9d39a952462c74c59ba2d217787c163877e8ead5294e9a489a44f7b714243113676ffb20e
+  data.tar.gz: f2cdf3fe11d729a1d657b1e6c08e3cf9714b92e5d32790c02ae97a5656bcd3fa89377aac2aef290d440fbe5c74e9e77328944f981915518e94dcdfdc38988f0b

data/.travis.yml

@@ -1,8 +1,11 @@
 branches:
   only:
-    - master
+  - master
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+- 1.9.3
+- 2.0.0
+- 2.1.0
+env:
+  global:
+    secure: jireAT1B+27QH2v5EUjdIu9/ELwA+fj67PtCFiw7nSvzzQV4sC94/otyrPlNqsLKijWk+fQw5XcW9HvSTXvCgGguQn5AGW+MjPu9AbuZAbWf6ayZFHIgaPxmBzFYZaC2yK9XL0kVMG/UdhDM9Vy9auf1kDPphMhwAGZ2yjuSBj0=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+* SyoboiCalendar::Client returns an Array of resources
+
 ## 0.2.1
 * SyoboiCalendar::Client returns a Hashie::Mash as a response
 

data/README.md

@@ -1,4 +1,5 @@
-# SyoboiCalendar
+# SyoboiCalendar [![Build Status](https://travis-ci.org/r7kamura/syoboi_calendar.png)](https://travis-ci.org/r7kamura/syoboi_calendar) [![Code Climate](https://codeclimate.com/github/r7kamura/syoboi_calendar.png)](https://codeclimate.com/github/r7kamura/syoboi_calendar) [![Code Climate](https://codeclimate.com/github/r7kamura/syoboi_calendar/coverage.png)](https://codeclimate.com/github/r7kamura/syoboi_calendar)
+
 Search Japanese anime from [SyoboiCalendar](http://cal.syoboi.jp/).
 
 ## Installation
@@ -11,7 +12,7 @@ gem "syoboi_calendar"
 ```ruby
 require "syoboi_calendar"
 
-client = SyoboiCalendar::Client
+client = SyoboiCalendar::Client.new
 client.channels #=> a Hashie::Mash instance
 client.programs #=> a Hashie::Mash instance
 client.titles   #=> a Hashie::Mash instance

data/lib/syoboi_calendar/client.rb

@@ -1,48 +1,43 @@
 module SyoboiCalendar
   class Client
-    attr_reader :options
-
-    def initialize(options = {})
-      @options = options
-    end
-
     def channels(options = {})
-      get(Queries::Channel, options)
+      process(
+        QueryBuilders::Channel,
+        Parsers::Channel,
+        options,
+      )
     end
 
     def programs(options = {})
-      get(Queries::Program, options)
+      process(
+        QueryBuilders::Program,
+        Parsers::Program,
+        options,
+      )
     end
 
     def titles(options = {})
-      get(Queries::Title, options)
+      process(
+        QueryBuilders::Title,
+        Parsers::Title,
+        options,
+      )
     end
 
     private
 
-    def get(query_class, options = {})
-      connection.get(path, query_class.new(options).to_hash).body
-    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 url
-      "http://#{host}/"
+    def connector
+      @connector ||= Connector.new
     end
 
-    def host
-      "cal.syoboi.jp"
+    def get(query)
+      connector.get(query).body
     end
 
-    def path
-      "/db.php"
+    def process(builder, parser, options)
+      query = builder.build(options)
+      response = get(query)
+      parser.parse(response)
     end
   end
 end

data/lib/syoboi_calendar/connector.rb

@@ -0,0 +1,27 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,15 @@
+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/{queries → query_builders}/base.rb

@@ -1,7 +1,11 @@
 module SyoboiCalendar
-  module Queries
+  module QueryBuilders
     class Base
       class << self
+        def build(options)
+          new(options).to_hash
+        end
+
         def property(*properties)
           self.properties += properties
         end

data/lib/syoboi_calendar/{queries → query_builders}/channel.rb

@@ -1,5 +1,5 @@
 module SyoboiCalendar
-  module Queries
+  module QueryBuilders
     class Channel < Base
       include ChannelIdQueriable
 

data/lib/syoboi_calendar/{queries → query_builders}/channel_id_queriable.rb

@@ -1,5 +1,5 @@
 module SyoboiCalendar
-  module Queries
+  module QueryBuilders
     module ChannelIdQueriable
       extend ActiveSupport::Concern
 

data/lib/syoboi_calendar/{queries → query_builders}/program.rb

@@ -1,5 +1,5 @@
 module SyoboiCalendar
-  module Queries
+  module QueryBuilders
     class Program < Base
       include ChannelIdQueriable
 

data/lib/syoboi_calendar/{queries → query_builders}/title.rb

@@ -1,5 +1,5 @@
 module SyoboiCalendar
-  module Queries
+  module QueryBuilders
     class Title < Base
       option :title_id
 

data/lib/syoboi_calendar/resources/base.rb

@@ -0,0 +1,15 @@
+module SyoboiCalendar
+  module Resources
+    class Base
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+      end
+
+      def updated_at
+        Time.parse(response.LastUpdate)
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/resources/channel.rb

@@ -0,0 +1,37 @@
+module SyoboiCalendar
+  module Resources
+    class Channel < Base
+      def comment
+        response.ChComment
+      end
+
+      def epg_url
+        response.ChEPGURL
+      end
+
+      def group_id
+        response.ChGID.try(:to_i)
+      end
+
+      def id
+        response.ChID.try(:to_i)
+      end
+
+      def name
+        response.ChName
+      end
+
+      def number
+        response.ChNumber.try(:to_i)
+      end
+
+      def url
+        response.ChURL
+      end
+
+      def iepg_name
+        response.ChiEPGName
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/resources/program.rb

@@ -0,0 +1,53 @@
+module SyoboiCalendar
+  module Resources
+    class Program < Base
+      def id
+        response.PID.try(:to_i)
+      end
+
+      def title_id
+        response.TID.try(:to_i)
+      end
+
+      def started_at
+        Time.parse(response.StTime)
+      end
+
+      def finished_at
+        Time.parse(response.EdTime)
+      end
+
+      def count
+        response.Count.try(:to_i)
+      end
+
+      def sub_title
+        response.STSubTitle
+      end
+
+      def comment
+        response.ProgComment
+      end
+
+      def flag
+        response.Flag.try(:to_i)
+      end
+
+      def deleted?
+        response.Deleted != "0"
+      end
+
+      def warn
+        response.Warn.try(:to_i)
+      end
+
+      def channel_id
+        response.ChID.try(:to_i)
+      end
+
+      def revision
+        response.Revision.try(:to_i)
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/resources/title.rb

@@ -0,0 +1,73 @@
+module SyoboiCalendar
+  module Resources
+    class Title < Base
+      def category_id
+        response.Cat.try(:to_i)
+      end
+
+      def comment
+        response.Comment
+      end
+
+      def first_channel
+        response.FirstCh
+      end
+
+      def first_end_month
+        response.FirstEndMonth.try(:to_i)
+      end
+
+      def first_end_year
+        response.FirstEndYear.try(:to_i)
+      end
+
+      def first_month
+        response.FirstMonth.try(:to_i)
+      end
+
+      def first_year
+        response.FirstYear.try(:to_i)
+      end
+
+      def keywords
+        response.Keywords
+      end
+
+      def short_title
+        response.ShortTitle
+      end
+
+      def sub_titles
+        response.SubTitles
+      end
+
+      def id
+        response.TID.try(:to_i)
+      end
+
+      def name
+        response.Title
+      end
+
+      def english_name
+        response.TitleEN
+      end
+
+      def flag
+        response.TitleFlag.try(:to_i)
+      end
+
+      def kana
+        response.TitleYomi
+      end
+
+      def point
+        response.UserPoint.try(:to_i)
+      end
+
+      def rank
+        response.UserPointRank.try(:to_i)
+      end
+    end
+  end
+end

data/lib/syoboi_calendar/version.rb

@@ -1,3 +1,3 @@
 module SyoboiCalendar
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/syoboi_calendar.rb

@@ -1,4 +1,5 @@
 require "active_support/concern"
+require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/string/inflections"
@@ -6,8 +7,17 @@ require "faraday"
 require "faraday_middleware"
 
 require "syoboi_calendar/client"
-require "syoboi_calendar/queries/base"
-require "syoboi_calendar/queries/channel_id_queriable"
-require "syoboi_calendar/queries/channel"
-require "syoboi_calendar/queries/program"
-require "syoboi_calendar/queries/title"
+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/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"

data/spec/spec_helper.rb

@@ -1,9 +1,18 @@
 require "simplecov"
 SimpleCov.start
 
-require "syoboi_calendar"
 require "webmock/rspec"
 
+if ENV["CI"]
+  WebMock.disable_net_connect!(allow: "codeclimate.com")
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
+require "syoboi_calendar"
+require "rack"
+require "active_support/all"
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/syoboi_calendar/client_spec.rb

@@ -22,6 +22,122 @@ describe SyoboiCalendar::Client do
     {}
   end
 
+  let(:query) do
+    {}
+  end
+
+  let(:dummy_channels_response) do
+    <<-EOS.strip_heredoc
+      <?xml version="1.0" encoding="UTF-8"?>
+      <ChLookupResponse>
+        <Result>
+          <Code>200</Code>
+          <Message>
+          </Message>
+        </Result>
+        <ChItems>
+          <ChItem id="3">
+            <ChComment>DummyComment</ChComment>
+            <ChEPGURL>http://example.com/epg-url</ChEPGURL>
+            <ChGID>1</ChGID>
+            <ChID>3</ChID>
+            <ChName>DummyChannelName</ChName>
+            <ChNumber>3</ChNumber>
+            <ChURL>http://example.com/</ChURL>
+            <ChiEPGName>DummyiEPGName</ChiEPGName>
+            <LastUpdate>2000-01-01 00:00:00</LastUpdate>
+          </ChItem>
+        </ChItems>
+      </ChLookupResponse>
+    EOS
+  end
+
+  let(:dummy_programs_response) do
+    <<-EOS.strip_heredoc
+      <?xml version="1.0" encoding="UTF-8"?>
+      <ProgLookupResponse>
+        <ProgItems>
+          <ProgItem id="1">
+            <ChID>3</ChID>
+            <Count>1</Count>
+            <Deleted>0</Deleted>
+            <EdTime>2000-01-01 00:00:00</EdTime>
+            <Flag>9</Flag>
+            <LastUpdate>2000-01-01 00:00:00</LastUpdate>
+            <PID>1</PID>
+            <ProgComment>DummyComment</ProgComment>
+            <Revision>2</Revision>
+            <STSubTitle>DummySubTitle</STSubTitle>
+            <StOffset>0</StOffset>
+            <StTime>2000-01-01 00:00:00</StTime>
+            <SubTitle></SubTitle>
+            <TID>2</TID>
+            <Warn>1</Warn>
+          </ProgItem>
+        </ProgItems>
+        <Result>
+          <Code>200</Code>
+          <Message>
+          </Message>
+        </Result>
+      </ProgLookupResponse>
+    EOS
+  end
+
+  let(:dummy_titles_response) do
+    <<-EOS.strip_heredoc
+      <?xml version="1.0" encoding="UTF-8"?>
+      <TitleLookupResponse>
+        <Result>
+          <Code>200</Code>
+          <Message>
+          </Message>
+        </Result>
+        <TitleItems>
+          <TitleItem id="2">
+            <Cat>4</Cat>
+            <Comment>DummyComment</Comment>
+            <FirstCh>DummyChannel</FirstCh>
+            <FirstEndMonth>1</FirstEndMonth>
+            <FirstEndYear>2000</FirstEndYear>
+            <FirstMonth>1</FirstMonth>
+            <FirstYear>2000</FirstYear>
+            <Keywords>DummyKeywords</Keywords>
+            <LastUpdate>2000-01-01 00:00:00</LastUpdate>
+            <ShortTitle>DummyShortTitle</ShortTitle>
+            <SubTitles>DummySubTitles</SubTitles>
+            <TID>2</TID>
+            <Title>DummyTitle</Title>
+            <TitleEN>DummyEnglishTitle</TitleEN>
+            <TitleFlag>0</TitleFlag>
+            <TitleYomi>ダミータイトル</TitleYomi>
+            <UserPoint>6</UserPoint>
+            <UserPointRank>1</UserPointRank>
+          </TitleItem>
+        </TitleItems>
+      </TitleLookupResponse>
+    EOS
+  end
+
+  let(:app) do
+    ->(env) do
+      [
+        200,
+        { "Content-type" => "application/xml" },
+        [
+          case env["QUERY_STRING"]
+          when /ProgLookup/
+            dummy_programs_response
+          when /ChLookup/
+            dummy_channels_response
+          else
+            dummy_titles_response
+          end,
+        ],
+      ]
+    end
+  end
+
   subject do
     call
     request
@@ -68,6 +184,25 @@ describe SyoboiCalendar::Client do
         end
       end
     end
+
+    context "with real response" do
+      let!(:request) do
+        stub_request(:get, //).to_rack(app)
+      end
+
+      it "returns an Array of SyoboiCalendar::Resources::Channel" do
+        channels = client.channels
+        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/"
+      end
+    end
   end
 
   describe "#titles" do
@@ -111,6 +246,34 @@ describe SyoboiCalendar::Client do
         end
       end
     end
+
+    context "with real response" do
+      let!(:request) do
+        stub_request(:get, //).to_rack(app)
+      end
+
+      it "returns an Array of SyoboiCalendar::Resources::Title" do
+        titles = client.titles
+        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
+      end
+    end
   end
 
   describe "#programs" do
@@ -186,5 +349,29 @@ describe SyoboiCalendar::Client do
         end
       end
     end
+
+    context "with real response" do
+      let!(:request) do
+        stub_request(:get, //).to_rack(app)
+      end
+
+      it "returns an Array of SyoboiCalendar::Resources::Program" do
+        programs = client.programs
+        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
   end
 end

data/syoboi_calendar.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "hashie"
   spec.add_dependency "multi_xml"
+  spec.add_development_dependency "codeclimate-test-reporter", ">= 0.3.0"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rack"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "2.14.1"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syoboi_calendar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,11 +194,20 @@ files:
 - Rakefile
 - lib/syoboi_calendar.rb
 - lib/syoboi_calendar/client.rb
-- lib/syoboi_calendar/queries/base.rb
-- lib/syoboi_calendar/queries/channel.rb
-- lib/syoboi_calendar/queries/channel_id_queriable.rb
-- lib/syoboi_calendar/queries/program.rb
-- lib/syoboi_calendar/queries/title.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/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/version.rb
 - spec/spec_helper.rb
 - spec/syoboi_calendar/client_spec.rb