ero_getter 1.3.9 → 1.4.0

data/VERSION

@@ -1 +1 @@
-1.3.9
+1.4.0

data/ero_getter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ero_getter"
-  s.version = "1.3.9"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["masarakki"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/downloader/wakuteka_sokuhou.rb",
     "lib/ero_getter.rb",
     "lib/ero_getter/base.rb",
+    "lib/ero_getter/livedoor.rb",
     "spec/downloader/elog_bakufu_spec.rb",
     "spec/downloader/gazou_sokuhou_spec.rb",
     "spec/downloader/mink_channel_spec.rb",
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
     "spec/downloader/shimo_soku_spec.rb",
     "spec/downloader/wakuteka_sokuhou_spec.rb",
     "spec/ero_getter/base_spec.rb",
+    "spec/ero_getter/livedoor_spec.rb",
     "spec/ero_getter_spec.rb",
     "spec/samples/elog_bakufu/sample.html",
     "spec/samples/gazou_sokuhou/sample.html",

data/lib/downloader/shimo_soku.rb

@@ -1,20 +1,6 @@
 # -*- coding: utf-8 -*-
-class ShimoSoku < EroGetter::Base
-  name '下速'
-  url %r{http://blog.livedoor.jp/pramo/archives/\d+.html}
-
-  target "img.pict" do |path|
-    if path.parent.name == "a" && path.parent[:href] =~ /jpe?g|gif|png$/
-      path.parent[:href]
-    else
-      path[:src]
-    end
-  end
-
-  sub_directory do
-    url.match(/(\d+).html/)[1]
-  end
-
-  filename { |attr| "%04d%s" % [attr[:index], attr[:ext]] }
 
+class ShimoSoku < EroGetter::Livedoor
+  name '下速'
+  blog_id 'pramo'
 end

data/lib/downloader/wakuteka_sokuhou.rb

@@ -1,17 +1,7 @@
 # -*- coding: utf-8 -*-
-class WakutekaSokuhou < EroGetter::Base
+class WakutekaSokuhou < EroGetter::Livedoor
 
   name 'わくてか速報'
-  url %r{http://blog.livedoor.jp/wakusoku/archives/(\d+).html}
-
-  target ".article-body-inner a > img" do |path|
-    path.parent[:href] if path.parent[:href] =~ /jpe?g|gif|png$/
-  end
-
-  sub_directory do
-    url.match(/(\d+)\.html/)[1]
-  end
-
-  filename {|attr| "%04d%s" % [attr[:index], attr[:ext]] }
+  blog_id 'wakusoku'
 
 end

data/lib/ero_getter/livedoor.rb

@@ -0,0 +1,22 @@
+class EroGetter::Livedoor < EroGetter::Base
+  class << self
+    def blog_id(id)
+      self.url Regexp.new("http://blog.livedoor.jp/#{id}/archives/\\d+.html")
+    end
+  end
+
+  target "img.pict" do |path|
+    if path.parent.name == "a" && path.parent[:href] =~ /jpe?g|gif|png$/
+      path.parent[:href]
+    else
+      path[:src]
+    end
+  end
+
+  sub_directory do
+    url.match(/(\d+).html/)[1]
+  end
+
+  filename { |attr| "%04d%s" % [attr[:index], attr[:ext]] }
+end
+

data/lib/ero_getter.rb

@@ -1,5 +1,6 @@
 class EroGetter
   autoload :Base, 'ero_getter/base'
+  autoload :Livedoor, 'ero_getter/livedoor'
 
   def detect(url)
     self.class.url_mapping.each_pair do |regex, klazz|

data/spec/ero_getter/livedoor_spec.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe EroGetter::Livedoor do
+  subject { @klass }
+  before do
+    @klass = Class.new(EroGetter::Livedoor) do
+      name 'てすと'
+      blog_id 'hoge'
+    end
+  end
+  it { subject.instance_methods.should include :url_regex }
+  it do
+    lambda {
+      subject.new('http://blog.livedoor.jp/hoge/archives/101010.html')
+    }.should_not raise_error
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ero_getter
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -199,6 +199,7 @@ files:
 - lib/downloader/wakuteka_sokuhou.rb
 - lib/ero_getter.rb
 - lib/ero_getter/base.rb
+- lib/ero_getter/livedoor.rb
 - spec/downloader/elog_bakufu_spec.rb
 - spec/downloader/gazou_sokuhou_spec.rb
 - spec/downloader/mink_channel_spec.rb
@@ -207,6 +208,7 @@ files:
 - spec/downloader/shimo_soku_spec.rb
 - spec/downloader/wakuteka_sokuhou_spec.rb
 - spec/ero_getter/base_spec.rb
+- spec/ero_getter/livedoor_spec.rb
 - spec/ero_getter_spec.rb
 - spec/samples/elog_bakufu/sample.html
 - spec/samples/gazou_sokuhou/sample.html
@@ -235,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1588994846028462914
+      hash: 1975741745447522419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: