consadole_aggregator 0.1.8 → 0.1.9

data/Gemfile.lock

@@ -7,16 +7,16 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.1)
-    nokogiri (1.4.4)
+    json (1.5.3)
+    nokogiri (1.4.6)
     oauth (0.4.4)
-    rake (0.9.1)
+    rake (0.9.2)
     rcov (0.9.9)
     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-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/bin/consadole_aggregator

@@ -5,12 +5,12 @@ params = ARGV.getopts(nil, "module:news", "output:log", "date:")
 $:.unshift(File.expand_path('../../lib', __FILE__)) if $0 == __FILE__
 
 require 'consadole_aggregator'
+require 'logger'
+path = File.expand_path('../../log', __FILE__) + '/exec_result.log'
+log = Logger.new(path)
 
 output = case params['output']
          when 'log'
-           require 'logger'
-           path = File.expand_path('../../log', __FILE__) + '/exec_result.log'
-           log = Logger.new(path)
            puts "output to #{path}"
            ->(element){
              if element.kind_of?(ConsadoleAggregator::Live::Timeline)
@@ -41,7 +41,15 @@ output = case params['output']
 case params['module']
 when 'news'
   modules = ConsadoleAggregator::News.constants.map{ |k| ConsadoleAggregator::News.const_get(k).new }
-  modules.each{ |m| m.update &output }
+  modules.each do |m|
+    log.info "start #{m}"
+    begin
+      m.update &output
+    rescue
+      log.error $!
+    end
+    log.info "end #{m}"
+  end
 when 'live'
   reservation_time = params['date'] ? Time.parse(params['date']) : nil
   ConsadoleAggregator::Live.reserve(reservation_time).execute &output

data/consadole_aggregator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{consadole_aggregator}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["niku"]
-  s.date = %q{2011-06-10}
+  s.date = %q{2011-06-24}
   s.default_executable = %q{consadole_aggregator}
   s.description = %q{ It aggregates infomation of 'Consadole Sapporo' }
   s.email = %q{niku@niku.name}
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/consadole_aggregator/live/timeline.rb",
     "lib/consadole_aggregator/news.rb",
     "log/.gitignore",
+    "spec/consadole_aggregator/aggregatable_spec.rb",
     "spec/consadole_aggregator/helper_spec.rb",
     "spec/consadole_aggregator/live/timeline_spec.rb",
     "spec/consadole_aggregator/live_spec.rb",

data/lib/consadole_aggregator/aggregatable.rb

@@ -37,7 +37,8 @@ module ConsadoleAggregator
     def get_strage
       @strage ||= YAML.load_file(build_strage_path) || [] # fix when YAML.load_file is nil
     rescue
-      @strage = []
+      @logger.error $!
+      raise
     end
 
     def save_strage

data/spec/consadole_aggregator/aggregatable_spec.rb

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+require_relative '../spec_helper'
+
+module ConsadoleAggregator
+  describe Aggregatable do
+    before do
+      @articles = [{ url:'http://example.jp/',  title:'hoge' },
+                   { url:'http://example.com/', title:'fuga' }]
+      get_resource_stub = double('get_resource')
+      get_resource_stub.stub(:call).and_return('')
+      parse_list_stub = double('parse_list')
+      parse_list_stub.stub(:call).and_return(['http://example.jp/', 'http://example.com/'])
+      parse_article_stub = double('parse_article')
+      parse_article_stub.stub(:call) do |arg|
+        if arg == 'http://example.jp/'
+          { url:arg, title:'hoge' }
+        else
+          { url:arg, title:'fuga' }
+        end
+      end
+      klass = Class.new do
+        include Aggregatable
+        @get_resource  = get_resource_stub
+        @parse_list    = parse_list_stub
+        @parse_article = parse_article_stub
+      end
+      ConsadoleAggregator::News.const_set(:TestClass, klass) # FIXME How do I suppress warning?
+      subject.stub(:save_strage)
+    end
+
+    subject{ News::TestClass.new }
+
+    describe '#get_new_articles' do
+      context 'when article straged' do
+        before do
+          @straged = [@articles.first]
+          subject.stub!(:get_strage).and_return(@straged)
+        end
+        it 'should return part of articles' do
+          subject.get_new_articles.should == @articles - @straged
+        end
+      end
+    end
+
+    describe '#update' do
+      context 'when default' do
+        it 'should call ordered' do
+          subject.should_receive(:get_new_articles).ordered.and_return([])
+          subject.should_receive(:save_strage).ordered
+          subject.update
+        end
+      end
+      context 'when new_articles exist' do
+        before do
+          YAML.stub!(:load_file).and_return([])
+          subject.stub!(:get_new_articles).and_return(@articles)
+        end
+        it 'should add strage' do
+          expect{ subject.update }.to change{ subject.get_strage.dup }.from([]).to(@articles)
+        end
+      end
+    end
+
+    describe '#get_strage' do
+      context 'when yaml can load' do
+        it 'should load from yaml' do
+          YAML.should_receive(:load_file).with(/\/db\/TestClass.yaml$/)
+          subject.get_strage
+        end
+      end
+      context 'when yaml can\'t load' do
+        before do
+          YAML.stub!(:load_file){ raise }
+        end
+        it 'should load from yaml' do
+          except{ subject.get_strage }.to should_raise
+        end
+      end
+    end
+
+    describe '#build_strage_path' do
+      context 'when Testclass' do
+        it { subject.build_strage_path.should match /\/db\/TestClass.yaml$/ }
+      end
+    end
+  end
+end

data/spec/consadole_aggregator/news_spec.rb

@@ -74,9 +74,7 @@ describe ConsadoleAggregator do
         before do
           YAML.stub!(:load_file){ raise }
         end
-        it 'should load from yaml' do
-          subject.get_strage == []
-        end
+        it { expect{ subject.get_strage }.to raise_error }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consadole_aggregator
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-10 00:00:00.000000000 +09:00
+date: 2011-06-24 00:00:00.000000000 +09:00
 default_executable: consadole_aggregator
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2166034280 !ruby/object:Gem::Requirement
+  requirement: &2162193580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166034280
+  version_requirements: *2162193580
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &2166057680 !ruby/object:Gem::Requirement
+  requirement: &2162192700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166057680
+  version_requirements: *2162192700
 - !ruby/object:Gem::Dependency
   name: rubytter
-  requirement: &2166060080 !ruby/object:Gem::Requirement
+  requirement: &2162191980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166060080
+  version_requirements: *2162191980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2166063720 !ruby/object:Gem::Requirement
+  requirement: &2162191340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166063720
+  version_requirements: *2162191340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2166158020 !ruby/object:Gem::Requirement
+  requirement: &2162190520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166158020
+  version_requirements: *2162190520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166380200 !ruby/object:Gem::Requirement
+  requirement: &2162189760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166380200
+  version_requirements: *2162189760
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2166378600 !ruby/object:Gem::Requirement
+  requirement: &2162189100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166378600
+  version_requirements: *2162189100
 description: ! ' It aggregates infomation of ''Consadole Sapporo'' '
 email: niku@niku.name
 executables:
@@ -117,6 +117,7 @@ files:
 - lib/consadole_aggregator/live/timeline.rb
 - lib/consadole_aggregator/news.rb
 - log/.gitignore
+- spec/consadole_aggregator/aggregatable_spec.rb
 - spec/consadole_aggregator/helper_spec.rb
 - spec/consadole_aggregator/live/timeline_spec.rb
 - spec/consadole_aggregator/live_spec.rb
@@ -271,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3581637451903569852
+      hash: -1076847756677944312
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: