ero_getter 1.1.2 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/ero_getter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ero_getter"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["masarakki"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "spec/ero_getter/base_spec.rb",
     "spec/ero_getter_spec.rb",
     "spec/samples/nijigazou_sokuhou/first.html",
+    "spec/samples/nijigazou_sokuhou/global_last.html",
     "spec/samples/nijigazou_sokuhou/last.html",
     "spec/samples/nijigazou_sokuhou/middle.html",
     "spec/samples/pm_style/test.html",

data/lib/downloader/nijigazou_sokuhou.rb

@@ -15,7 +15,7 @@ class NijigazouSokuhou < EroGetter::Base
     File.join(chara, d)
   end
 
-  after ["//a[@rel='prev']", "//a[@rel='next']"] do |path|
+  connection ['a[rel=prev]', 'a[rel=next]'] do |path|
     path.text.match(Regexp.escape(title_part))
   end
 

data/lib/downloader/pm_style.rb

@@ -5,6 +5,7 @@ class PmStyle < EroGetter::Base
     path.parent[:href] if path[:alt] =~ /file\d+/
   end
   sub_directory do
-    targets.first.match(/pm_(.+)[a|b|c].zip$/)[1]
+    matches = targets.first.match(/pm_(.+?)(\d+)[a|b|c].zip$/)
+    "pm_#{matches[1]}_#{"%06d" % matches[2]}"
   end
 end

data/lib/ero_getter/base.rb

@@ -122,13 +122,14 @@ class EroGetter::Base
       end
     end
 
-    def after(xpath, &block)
+    def connection(css, &block)
       [:prev, :next].each_with_index do |method_name, index|
         var_name = "@#{method_name}".to_sym
         define_method(method_name) do
           unless instance_variable_defined?(var_name)
-            tag = document.xpath(xpath[index]).first
-            instance_variable_set(var_name, instance_exec(tag, &block) ? tag[:href] : nil)
+            tag = document.css(css[index]).first
+            instance_variable_set(var_name,
+              tag && instance_exec(tag, &block) ? tag[:href] : nil)
           end
           instance_variable_get(var_name)
         end

data/spec/downloader/nijigazou_sokuhou_spec.rb

@@ -43,5 +43,13 @@ describe NijigazouSokuhou do
       its(:next) { should be_nil }
       its(:prev) { should == url }
     end
+
+    context :global_last do
+      before do
+        fake(:get, url, 'nijigazou_sokuhou/global_last.html')
+      end
+
+      its(:next) { should be_nil }
+    end
   end
 end

data/spec/downloader/pm_style_spec.rb

@@ -14,6 +14,6 @@ describe PmStyle do
       'http://hpcgi2.nifty.com/r-seven/page.cgi?file=copy2/pm/120526/pm_chu2800b.zip',
       'http://hpcgi2.nifty.com/r-seven/page.cgi?file=copy2/pm/120526/pm_chu2800c.zip']
   }
-  its(:sub_directory) { should == 'chu2800' }
+  its(:sub_directory) { should == 'pm_chu_002800' }
 end
 

data/spec/ero_getter/base_spec.rb

@@ -2,112 +2,154 @@ require 'spec_helper'
 
 describe EroGetter::Base do
   let(:regex) { %r{http://example.net/\d+.html} }
-  before do
-    _regex = regex
-    fake(:get, regex, 'sample.html')
-    @klazz = Class.new(EroGetter::Base) do
-      name 'NijiEro BBS'
-      url _regex
+  let(:url) { 'http://example.net/10101010.html' }
+  subject { @dl }
 
-      target "ul#sources li a" do |elm|
-        elm[:href]
-      end
+  context :without_connection do
+    before do
+      _regex = regex
+      fake(:get, regex, 'sample.html')
+      @klazz = Class.new(EroGetter::Base) do
+        name 'NijiEro BBS'
+        url _regex
+
+        target "ul#sources li a" do |elm|
+          elm[:href]
+        end
 
-      sub_directory do
-        targets.map{|x| x.split(%r{/}).last }.join('/')
+        sub_directory do
+          targets.map{|x| x.split(%r{/}).last }.join('/')
+        end
       end
+      @klazz.stub(:to_s).and_return('TestClass')
     end
-    @klazz.stub(:to_s).and_return('TestClass')
-  end
 
-  describe "assign url_mapping" do
-    it { EroGetter.url_mapping.should have_key regex }
-    it { EroGetter.url_mapping[regex].should == @klazz }
-  end
+    describe "assign url_mapping" do
+      it { EroGetter.url_mapping.should have_key regex }
+      it { EroGetter.url_mapping[regex].should == @klazz }
+    end
 
-  describe :instance_methods do
-    subject { @dl }
-    context :good do
-      before do
-        @dl = @klazz.new('http://example.net/10101010.html')
-        EroGetter.stub(:mkdir).and_return(true)
-        EroGetter.stub('directory').and_return('/tmp')
-      end
-      its(:name) { should == 'NijiEro BBS' }
-      its(:url_regex) { should == regex }
-      its(:base_dir) { should == 'test_class' }
-      its(:http_client) { should be_a HTTPClient }
-      its(:document) { should be_a Nokogiri::HTML::Document }
-      its(:title) { should == 'EroGetter Server' }
-      its(:url) { should == 'http://example.net/10101010.html' }
-      its(:direction) { should == :none }
-      its(:targets) { should == ['https://github.com/masarakki/ero_getter_server',
-          'https://github.com/masarakki/ero_getter_chrome_extension'] }
-      its(:sub_directory) { should == 'ero_getter_server/ero_getter_chrome_extension' }
-      its(:directory) { should == '/tmp/test_class/ero_getter_server/ero_getter_chrome_extension' }
-      describe :after_run do
-        context :not_set_after do
-          its(:run_next?) { should be_false }
-          its(:run_prev?) { should be_false }
+    describe :instance_methods do
+      context :good do
+        before do
+          @dl = @klazz.new(url)
+          EroGetter.stub(:mkdir).and_return(true)
+          EroGetter.stub('directory').and_return('/tmp')
         end
+        its(:name) { should == 'NijiEro BBS' }
+        its(:url_regex) { should == regex }
+        its(:base_dir) { should == 'test_class' }
+        its(:http_client) { should be_a HTTPClient }
+        its(:document) { should be_a Nokogiri::HTML::Document }
+        its(:title) { should == 'EroGetter Server' }
+        its(:url) { should == url }
+        its(:direction) { should == :none }
+        its(:targets) { should == ['https://github.com/masarakki/ero_getter_server',
+            'https://github.com/masarakki/ero_getter_chrome_extension'] }
+        its(:sub_directory) { should == 'ero_getter_server/ero_getter_chrome_extension' }
+        its(:directory) { should == '/tmp/test_class/ero_getter_server/ero_getter_chrome_extension' }
 
-        context :direction_none do
-          context :has_next do
-            before do
-              @dl.stub(:next).and_return('hoge')
-            end
-            its(:run_next?) { should be_true }
+        describe :after_run do
+          context :not_set_after do
+            its(:run_next?) { should be_false }
             its(:run_prev?) { should be_false }
           end
-          context :has_prev do
-            before do
-              @dl.stub(:prev).and_return('hoge')
+
+          context :direction_none do
+            context :has_next do
+              before do
+                @dl.stub(:next).and_return('hoge')
+              end
+              its(:run_next?) { should be_true }
+              its(:run_prev?) { should be_false }
             end
-            its(:run_next?) { should be_false }
-            its(:run_prev?) { should be_true }
-          end
-          context :has_next_and_prev do
-            before do
-              @dl.stub(:prev).and_return('hoge')
-              @dl.stub(:next).and_return('hoge')
+            context :has_prev do
+              before do
+                @dl.stub(:prev).and_return('hoge')
+              end
+              its(:run_next?) { should be_false }
+              its(:run_prev?) { should be_true }
+            end
+            context :has_next_and_prev do
+              before do
+                @dl.stub(:prev).and_return('hoge')
+                @dl.stub(:next).and_return('hoge')
+              end
+              its(:run_next?) { should be_true }
+              its(:run_prev?) { should be_true }
             end
-            its(:run_next?) { should be_true }
-            its(:run_prev?) { should be_true }
           end
-        end
 
-        context :direction_prev do
-          before do
-            @dl.stub(:direction).and_return(:prev)
-          end
-          context :has_next do
+          context :direction_prev do
             before do
-              @dl.stub(:next).and_return('hoge')
+              @dl.stub(:direction).and_return(:prev)
+            end
+            context :has_next do
+              before do
+                @dl.stub(:next).and_return('hoge')
+              end
+              its(:run_next?) { should be_false }
             end
-            its(:run_next?) { should be_false }
           end
-        end
 
-        context :direction_next do
-          before do
-            @dl.stub(:direction).and_return(:next)
-          end
-          context :has_pref do
+          context :direction_next do
             before do
-              @dl.stub(:prev).and_return('hoge')
+              @dl.stub(:direction).and_return(:next)
+            end
+            context :has_pref do
+              before do
+                @dl.stub(:prev).and_return('hoge')
+              end
+              its(:run_prev?) { should be_false }
             end
-            its(:run_prev?) { should be_false }
           end
         end
       end
+
+      context :url_mismatch do
+        it {
+          lambda {
+            @klazz.new('http://example.com/10101010.html')
+          }.should raise_error
+        }
+      end
     end
+  end
+
+  describe :connection do
+    before do
+      _regex = regex
+      klazz = Class.new(EroGetter::Base) do
+        url _regex
 
-    context :url_mismatch do
-      it {
-        lambda {
-          @klazz.new('http://example.com/10101010.html')
-        }.should raise_error
-      }
+        connection ['a[rel=prev]', 'a[rel=next]'] do |path|
+          path
+        end
+      end
+      @dl = klazz.new(url)
+    end
+
+    context :css_not_found do
+      before do
+        @dl.document.stub(:css).and_return([])
+      end
+      its(:prev) { should be_nil }
+      its(:next) { should be_nil }
+    end
+    context :css_find_but_invalid do
+      before do
+        @dl.document.stub(:css).and_return([false, true, true])
+      end
+      its(:prev) { should be_nil }
+      its(:next) { should be_nil }
+    end
+    context :css_find_and_valid do
+      before do
+        x = {:href => 'unko'}
+        @dl.document.stub(:css).and_return([x])
+      end
+      its(:prev) { should == 'unko' }
+      its(:next) { should == 'unko' }
     end
   end
 end