consadole_aggregator 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -3,23 +3,23 @@ GEM
   specs:
     diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.5.1)
     nokogiri (1.4.4)
     oauth (0.4.4)
-    rake (0.8.7)
+    rake (0.9.1)
     rcov (0.9.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
     rubytter (1.4.2)
       json (>= 1.1.3)
       oauth (>= 0.3.6)

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/consadole_aggregator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{consadole_aggregator}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["niku"]
-  s.date = %q{2011-05-08}
+  s.date = %q{2011-06-09}
   s.default_executable = %q{consadole_aggregator}
   s.description = %q{ It aggregates infomation of 'Consadole Sapporo' }
   s.email = %q{niku@niku.name}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "consadole_aggregator.gemspec",
     "db/.gitignore",
     "lib/consadole_aggregator.rb",
+    "lib/consadole_aggregator/aggregatable.rb",
     "lib/consadole_aggregator/helper.rb",
     "lib/consadole_aggregator/live.rb",
     "lib/consadole_aggregator/live/timeline.rb",
@@ -46,7 +47,6 @@ Gem::Specification.new do |s|
     "spec/ext/consaclub.txt",
     "spec/ext/consadolenews.txt",
     "spec/ext/consadolephotos.txt",
-    "spec/ext/consadolesponsornews.txt",
     "spec/ext/forzaconsadole.txt",
     "spec/ext/hochiyomiuri.txt",
     "spec/ext/jsgoalnews.txt",
@@ -179,15 +179,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/niku/consadole_aggregator}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{It aggregates infomation of 'Consadole Sapporo'}
-  s.test_files = [
-    "spec/consadole_aggregator/helper_spec.rb",
-    "spec/consadole_aggregator/live/timeline_spec.rb",
-    "spec/consadole_aggregator/live_spec.rb",
-    "spec/consadole_aggregator/news_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/consadole_aggregator/aggregatable.rb

@@ -0,0 +1,61 @@
+require 'logger'
+require 'yaml'
+
+module ConsadoleAggregator
+  module Aggregatable
+    def initialize logger=nil
+      @logger = logger || Logger.new(nil)
+    end
+
+    def get_new_articles
+      get_resource = self.class.get_resource
+      parse_list = self.class.parse_list
+      parse_article = self.class.parse_article
+      raise NotImplementedError unless get_resource && parse_list && parse_article
+      list_url = get_resource.call
+      article_urls = parse_list.call(list_url)
+      article_urls.each_with_object([]) do |article_url, memo|
+        article = parse_article.call(article_url)
+        memo.push(article) if article && !get_strage.include?(article)
+      end
+    end
+
+    def update
+      @logger.info('begin of update')
+      get_new_articles.each do |article|
+        begin
+          yield article if block_given?
+          @strage << article
+        rescue
+          @logger.error $!
+        end
+      end
+      save_strage
+      @logger.info('end of update')
+    end
+
+    def get_strage
+      @strage ||= YAML.load_file(build_strage_path) || [] # fix when YAML.load_file is nil
+    rescue
+      @strage = []
+    end
+
+    def save_strage
+      YAML.dump(@strage, File.new(build_strage_path, 'w'))
+    end
+
+    def build_strage_path
+      class_name = /([^:]+)$/.match(self.class.to_s)[1]
+      File.expand_path(File.dirname(__FILE__) + "/../../db/#{class_name}.yaml")
+    end
+
+    # define class method's
+    def self.included(mod)
+      mod.extend ClassMethods
+    end
+
+    module ClassMethods
+      attr_accessor :get_resource, :parse_list, :parse_article
+    end
+  end
+end

data/lib/consadole_aggregator/live.rb

@@ -8,25 +8,13 @@ require_relative 'live/timeline.rb'
 
 module ConsadoleAggregator
   module Live
-    BASE_URI = URI.parse('http://www.consadole-sapporo.jp/view/s674.html')
 
     def self.reserve reservation_time=nil, opt ={}
       Live.new(reservation_time, opt)
     end
 
-    def self.get_resource
-      Net::HTTP.get(BASE_URI).toutf8
-    end
-
-    def self.parse
-      doc = Nokogiri::HTML.parse(get_resource)
-      doc.search('hr + p').last.inner_html.split(/<br>|\n/).reverse.each_with_object([]) do |line, memo|
-        timeline = Timeline.parse line
-        memo << timeline if timeline
-      end
-    end
-
     class Live
+      include Aggregatable
       attr_reader :reservation_time, :posted, :times, :wait_sec
 
       def initialize reservation_time=nil, opt ={}
@@ -70,6 +58,27 @@ module ConsadoleAggregator
         end
       end
 
+      def self.get_resource
+        ->{ Net::HTTP.get(URI.parse('http://www.consadole-sapporo.jp/view/s674.html')).toutf8 }
+      end
+
+      def self.parse_list
+        ->(list){
+          live_block = Nokogiri::HTML::parse(list)
+            .search("hr + p")
+            .last
+            .inner_html
+          lines = live_block
+            .split(/<br>|\n/)
+            .delete_if{ |line| line.empty? || line =~ /&lt;前|後半&gt;/ }
+          lines.map{ |line| line.sub(/　+$/, "") }.reverse
+        }
+      end
+
+      def self.parse_article
+        ->(article){ Timeline.parse article }
+      end
+
       private
       def be_daemonize
         Process.daemon

data/lib/consadole_aggregator/news.rb

@@ -4,67 +4,9 @@ require 'rss'
 require 'uri'
 require 'kconv'
 require 'net/http'
-require 'yaml'
 require 'nokogiri'
 
 module ConsadoleAggregator
-  module Aggregatable
-    def initialize logger=nil
-      @logger = logger || Logger.new(nil)
-    end
-
-    def get_new_articles
-      get_resource = self.class.get_resource
-      parse_list = self.class.parse_list
-      parse_article = self.class.parse_article
-      raise NotImplementedError unless get_resource && parse_list && parse_article
-      list_url = get_resource.call
-      article_urls = parse_list.call(list_url)
-      article_urls.each_with_object([]) do |article_url, memo|
-        article = parse_article.call(article_url)
-        memo.push(article) if article && !get_strage.include?(article)
-      end
-    end
-
-    def update
-      @logger.info('begin of update')
-      get_new_articles.each do |article|
-        begin
-          yield article if block_given?
-          @strage << article
-        rescue
-          @logger.error $!
-        end
-      end
-      save_strage
-      @logger.info('end of update')
-    end
-
-    def get_strage
-      @strage ||= YAML.load_file(build_strage_path) || [] # fix when YAML.load_file is nil
-    rescue
-      @strage = []
-    end
-
-    def save_strage
-      YAML.dump(@strage, File.new(build_strage_path, 'w'))
-    end
-
-    def build_strage_path
-      class_name = /([^:]+)$/.match(self.class.to_s)[1]
-      File.expand_path(File.dirname(__FILE__) + "/../../db/#{class_name}.yaml")
-    end
-
-    # define class method's
-    def self.included(mod)
-      mod.extend ClassMethods
-    end
-
-    module ClassMethods
-      attr_accessor :get_resource, :parse_list, :parse_article
-    end
-  end
-
   module News
     def self.get_resource(url_path)
       Net::HTTP.get(URI.parse(url_path)).toutf8
@@ -120,24 +62,15 @@ module ConsadoleAggregator
       ],
       Consadolenews:
       [
-       ->{ get_resource('http://www.consadole-sapporo.jp/news/diary.cgi') },
-       ->(list){ Nokogiri::HTML(list).search('table.frametable > tr  a').reverse },
-       ->(article){ { url:article['href'], title:article.text } }
-      ],
-      Consadolesponsornews:
-      [
-       ->{ get_resource('http://www.consadole-sapporo.jp/snews/diary.cgi') },
-       ->(list){ Nokogiri::HTML(list).search('table.frametable > tr  a').reverse },
-       ->(article){ { url:article['href'], title:article.text } }
+       ->{ get_resource('http://www.consadole-sapporo.jp/news/atom.xml') },
+       ->(list){ RSS::Parser.parse(list, false).items.map{ |e| { url:e.link, title:e.title } }.reverse },
+       ->(article){ article }
       ],
       Consadolephotos:
       [
-       ->{ get_resource('http://www.consadole-sapporo.jp/comment.txt') },
-       ->(list){ list.split("\n").reverse },
-       ->(article){
-         photo = article.match(/^&?text(?<number>\d\d)=(?<title>.+)/)
-         { url:"http://www.consadole-sapporo.jp/img/#{photo[:number]}.jpg", title:photo[:title] }
-       }
+       ->{ get_resource('http://www.consadole-sapporo.jp/') },
+       ->(list){ Nokogiri::HTML(list).search('div.anythingSlider img').reverse },
+       ->(article){ { url:article['src'], title:article['alt'] } }
       ],
       Jsgoalnews:
       [

data/lib/consadole_aggregator.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require_relative 'consadole_aggregator/helper.rb'
+require_relative 'consadole_aggregator/aggregatable.rb'
 require_relative 'consadole_aggregator/live.rb'
 require_relative 'consadole_aggregator/news.rb'
 

data/spec/consadole_aggregator/live_spec.rb

@@ -7,37 +7,43 @@ describe ConsadoleAggregator do
   describe Live do
     describe '.get_resource' do
       it 'should exec Net::HTTP.get with Live::BASE_URI' do
-        Net::HTTP.should_receive(:get).with(Live::BASE_URI).and_return(File.read(File.dirname(__FILE__) + '/../ext/live/s674.html'))
-        Live.get_resource
+        Net::HTTP.should_receive(:get)
+          .with(URI.parse('http://www.consadole-sapporo.jp/view/s674.html'))
+          .and_return(File.read(File.dirname(__FILE__) + '/../ext/live/s674.html'))
+        Live::Live.get_resource.call
       end
     end
 
-    describe '.parse' do
+    describe '.parse_list' do
       context 'when start of game' do
-        before { Live.stub!(:get_resource).and_return(File.read(File.dirname(__FILE__) + '/../ext/live/s674.html').toutf8) }
-        subject{ Live.parse }
+        let(:resource){ File.read(File.dirname(__FILE__) + '/../ext/live/s674.html').toutf8 }
+        let(:parsed_list){ Live::Live.parse_list.call(resource) }
+        subject{ parsed_list }
         it{ should have(3).items }
       end
       context 'when end of game' do
-        before { Live.stub!(:get_resource).and_return(File.read(File.dirname(__FILE__) + '/../ext/live/s674.html.120').toutf8) }
+        let(:resource){ File.read(File.dirname(__FILE__) + '/../ext/live/s674.html.120').toutf8 }
+        let(:parsed_list){ Live::Live.parse_list.call(resource) }
         describe 'first TimeLine' do
-          subject{ Live.parse.first }
-          its(:time){ should == '試合開始' }
-          its(:post){ should == '札幌ボールでキックオフ' }
+          subject{ parsed_list.first }
+          it{ should == '試合開始　札幌ボールでキックオフ' }
         end
         describe 'second TimeLine' do
-          subject{ Live.parse[1] }
-          its(:time){ should == '1分' }
-          its(:post){ should == '右サイドからボールをつながれ攻撃を仕掛けられるが札幌DFが落ち着いてクリア' }
+          subject{ parsed_list[1] }
+          it{ should == '1分　右サイドからボールをつながれ攻撃を仕掛けられるが札幌DFが落ち着いてクリア' }
         end
         describe 'last TimeLine' do
-          subject{ Live.parse.last }
-          its(:time){ should == '試合終了' }
-          its(:post){ should == 'ロスタイムも余裕のプレーで相手の攻撃を許さず、3試合連続完封で3連勝を飾る' }
+          subject{ parsed_list.last }
+          it{ should == '試合終了　ロスタイムも余裕のプレーで相手の攻撃を許さず、3試合連続完封で3連勝を飾る' }
         end
       end
     end
 
+    describe '.parse_article' do
+      let(:article){ '1分　右サイドからボールをつながれ攻撃を仕掛けられるが札幌DFが落ち着いてクリア' }
+      it{ Live::Live.parse_article.call(article) }
+    end
+
     describe '.reserve' do
       context 'given Time' do
         it 'give constructor with Time ' do

data/spec/consadole_aggregator/news_spec.rb

@@ -103,8 +103,6 @@ describe ConsadoleAggregator do
         ->{ File.read('./spec/ext/consaclub.txt').toutf8 }
       ConsadoleAggregator::News::Consadolenews.get_resource =
         ->{ File.read('./spec/ext/consadolenews.txt').toutf8 }
-      ConsadoleAggregator::News::Consadolesponsornews.get_resource =
-        ->{ File.read('./spec/ext/consadolesponsornews.txt').toutf8 }
       ConsadoleAggregator::News::Consadolephotos.get_resource =
         ->{ File.read('./spec/ext/consadolephotos.txt').toutf8 }
       ConsadoleAggregator::News::Jsgoalnews.get_resource =
@@ -137,14 +135,19 @@ describe ConsadoleAggregator do
     it 'Consaclub should not raise Exception' do
       expect{ ConsadoleAggregator::News::Consaclub.new.get_new_articles }.to_not raise_error
     end
-    it 'Consadolenews should not raise Exception' do
-      expect{ ConsadoleAggregator::News::Consadolenews.new.get_new_articles }.to_not raise_error
-    end
-    it 'Consadolesponsornews should not raise Exception' do
-      expect{ ConsadoleAggregator::News::Consadolesponsornews.new.get_new_articles }.to_not raise_error
+    describe ConsadoleAggregator::News::Consadolenews do
+      subject{ ConsadoleAggregator::News::Consadolenews.new }
+      it 'Consadolenews should not raise Exception' do
+        expect{ subject.get_new_articles }.to_not raise_error
+      end
+      it{ subject.get_new_articles.should have_at_least(1).items }
     end
-    it 'Consadolephotos should not raise Exception' do
-      expect{ ConsadoleAggregator::News::Consadolephotos.new.get_new_articles }.to_not raise_error
+    describe ConsadoleAggregator::News::Consadolephotos do
+      subject{ ConsadoleAggregator::News::Consadolephotos.new }
+      it 'Consadolephotos should not raise Exception' do
+        expect{ subject.get_new_articles }.to_not raise_error
+      end
+      it{ subject.get_new_articles.should have_at_least(1).items }
     end
     it 'Jsgoalnews should not raise Exception' do
       expect{ ConsadoleAggregator::News::Jsgoalnews.new.get_new_articles }.to_not raise_error