consadole_aggregator 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/consadole_aggregator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{consadole_aggregator}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["niku"]
-  s.date = %q{2009-12-30}
+  s.date = %q{2010-02-15}
   s.email = %q{niku@niku.name}
   s.files = [
     ".gitignore",
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "spec/nikkan_sports/consadole.rdf",
      "spec/nikkan_sports/nikkan_sports_spec.rb",
      "spec/nikkan_sports/p-sc-tp0-20091225-579346.html",
+     "spec/nikkan_sports/p-sc-tp0-20100204-592466.html",
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/timeline/s674.html",

data/lib/consadole_aggregator/nikkan_sports.rb

@@ -1,51 +1,61 @@
 # -*- coding: utf-8 -*-
-require 'kconv'
 require 'rss'
 
 require 'rubygems'
 require 'hpricot' # 2009/12/26 現在 GAE では nokogiri が使えないので hpricot
+require 'dm-core'
+require 'dm-types'
+require 'dm-validations'
 
-module ConsadoleAggregator
+module Consadole
   module NikkanSports
-    FEED_URI = URI.parse('http://www.nikkansports.com/rss/soccer/jleague/consadole.rdf')
-
-    def NikkanSports.uris
-      rss = RSS::Parser.parse(FEED_URI, false)
-      rss.items.map(&:link)
-    end
-
     class Entry
-      IMAGE_BASE_URI = URI.parse('http://cache2.nipc.jp/soccer/news/')
-
-      def initialize doc
-        @doc = Hpricot(doc)
-      end
-
-      def uri
-        URI.parse(@doc.at('a')['href'])
-      end
+      module Parser
+        def self.included mod
+          mod.extend ClassMethods
+        end
 
-      def title
-        @doc.at('h1').inner_text
+        module ClassMethods
+          def parse uri, doc
+            target = Hpricot(doc)
+            entry = self.new
+            entry.uri = uri
+            entry.title = target.at('h1').inner_text
+            entry.text = target.search('div#news p')[0...-1].to_html.gsub(/【.+】<\/p>$/,'</p>')
+            entry.auther = target.search('div#news p')[0...-1].to_html.match(/【(.+)】<\/p>$/).to_a[1]
+            entry.post_date = Time.strptime(target.search('p.timeStamp').inner_text.match(/\d+年\d+月\d+日\d+時\d+分/).to_s, '%Y年%m月%d日%H時%M分')
+            if tmp = target.at('dl.photo img')
+              source = IMAGE_BASE_URI + tmp['src'].sub(/\.jpg$/, '-big.jpg')
+              entry.image_src = source
+              entry.image_binary = Net::HTTP.get(source)
+              entry.image_alt = tmp['alt']
+            end
+            entry
+          end
+        end
       end
 
-      def text
-        @doc.search('div#news p')[0...-1].to_html.gsub(/【.+】<\/p>$/,'</p>')
-      end
+      IMAGE_BASE_URI = URI.parse('http://cache2.nipc.jp/soccer/news/')
 
-      def auther
-        @doc.search('div#news p')[0...-1].to_html.match(/【(.+)】<\/p>$/)[1]
-      end
+      include Parser
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :uri, URI, :unique => true
+      property :title, String
+      property :text, Text
+      property :auther, String
+      property :post_date, Time
+      property :image_src, URI
+      property :image_alt, String
+      property :image_binary, Object
+    end
 
-      def post_date
-        Time.strptime(@doc.search('p.timeStamp').inner_text.match(/\d+年\d+月\d+日\d+時\d+分/).to_s, '%Y年%m月%d日%H時%M分')
-      end
+    FEED_URI = URI.parse('http://www.nikkansports.com/rss/soccer/jleague/consadole.rdf')
 
-      def image
-        if tmp = @doc.at('dl.photo img')
-          Image.new(IMAGE_BASE_URI + tmp['src'].sub(/\.jpg$/, '-big.jpg'), tmp['alt'])
-        end
-      end
+    def NikkanSports.uris
+      rss = RSS::Parser.parse(FEED_URI, false)
+      rss.items.map(&:link)
     end
   end
 end

data/lib/consadole_aggregator.rb

@@ -19,23 +19,3 @@ if RUBY_VERSION < '1.9'
     end
   end
 end
-
-module ConsadoleAggregator
-  Image = Struct.new :src, :alt, :binary do
-    def binary
-      self['binary'] ||= Net::HTTP.get(self['src']).encode(Encoding::BINARY)
-    end
-
-    def to_html
-      %Q{<image src="#{self.src}" alt="#{self.alt}">}
-    end
-  end
-end
-
-if __FILE__ == $0
-  DataMapper.setup(:default, 'sqlite3:db/test.sqlite3')
-  DataMapper.auto_migrate!
-
-  ConsadoleAggregator::NikkanSports.save
-  print ConsadoleAggregator::NikkanSports.rss
-end

data/spec/nikkan_sports/nikkan_sports_spec.rb

@@ -2,12 +2,14 @@
 require 'time'
 
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
-TEST_FILE_NAME = File.join(File.dirname(__FILE__), 'p-sc-tp0-20091225-579346.html')
+TEST_WITH_IMGAE_FILE_NAME = File.join(File.dirname(__FILE__), 'p-sc-tp0-20091225-579346.html')
+TEST_WITHOUT_IMAGE_FILE_NAME = File.join(File.dirname(__FILE__), 'p-sc-tp0-20100204-592466.html')
+TEST_WITHOUT_AUTHER_FILE_NAME = File.join(File.dirname(__FILE__), 'p-sc-tp0-20100204-592466.html')
 TEST_IMAGE_FILE_NAME = File.join(File.dirname(__FILE__), 'sc-091225-1-ns-big.jpg')
 
-describe ConsadoleAggregator::NikkanSports::Entry do
+describe Consadole::NikkanSports::Entry do
   before do
-    @doc = ConsadoleAggregator::NikkanSports::Entry.new(File.open(TEST_FILE_NAME).read)
+    @doc = Consadole::NikkanSports::Entry::parse(nil, File.open(TEST_WITH_IMGAE_FILE_NAME).read)
   end
 
   it 'title を実行した場合 ' do
@@ -26,26 +28,31 @@ describe ConsadoleAggregator::NikkanSports::Entry do
     @doc.post_date.should == Time.mktime(2009,12,25,8,21)
   end
 
-  it 'image を実行した場合' do
-    @doc.image.should be_true
-  end
-
   it 'image.src を実行した場合' do
-    @doc.image.src.should == URI.parse('http://cache2.nipc.jp/soccer/news/img/sc-091225-1-ns-big.jpg')
+    @doc.image.src.should === URI.parse('http://cache2.nipc.jp/soccer/news/img/sc-091225-1-ns-big.jpg')
   end
 
   it 'image.alt を実行した場合' do
     @doc.image.alt.should == '札幌入団記者会見でイエス・キリストのようなポーズを見せる中山'
   end
+
+  it 'auther が無い場合' do
+    no_image_doc = Consadole::NikkanSports::Entry::parse(File.open(TEST_WITHOUT_AUTHER_FILE_NAME).read)
+    no_image_doc.auther.should be_false
+  end
+
+  it 'image が無い場合' do
+    no_image_doc = Consadole::NikkanSports::Entry::parse(File.open(TEST_WITHOUT_IMAGE_FILE_NAME).read)
+    no_image_doc.image.should be_false
+  end
 end
 
-describe ConsadoleAggregator::NikkanSports do
+describe Consadole::NikkanSports do
   before do
-    @uris = ConsadoleAggregator::NikkanSports.uris
+    @uris = Consadole::NikkanSports.uris
   end
 
   it 'get を実行した場合 size が 50 であること' do
-    p @uris
     @uris.should have(50).itmes
   end