opendmm 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6ea973455b774abc19e51008836971866daac43
-  data.tar.gz: 6c38bdafae17d2f0babc4a962fa405601ae235ee
+  metadata.gz: 07cd647f8aaa049f14ea6485efb50f227954265c
+  data.tar.gz: 1b086c6958c894635be7435740d06f5dc505e701
 SHA512:
-  metadata.gz: 15834035612a443ac0ece31c4b907ab9d2e50bdee73302327bc4ab31ac1f036a09c751a03c6af33843ab94751336a99cfae03505837bb6eb518c77dd74eca6f4
-  data.tar.gz: 8d7d852fe2f8b9271b476b646fc885ad0ce7fb6f94827cc4a423463fec24fa4c586a6ea35f305621d038043447834230cb82dfc0c8234b74fc632f579a259b26
+  metadata.gz: ff95d011bdda8bcb5b2ddd0ed5ce0e96efacf253a1a2d0dbf757355accbe3d206480ef15d509d8e27f52fd86831e9d44f57c8b474d7fbc9a377a79d0bd28b686
+  data.tar.gz: fb94f7d85805152bb42e4f23dc3b236eedb5b816f7fe990ad4fec5f6999f806523bf0006d46c23bbac213a50e4c275f02f11bd1814da155299e1993843a6fd58

data/.travis.yml

@@ -1,3 +1,6 @@
 language: ruby
 rvm:
   - 2.1.2
+branch:
+  only:
+    - master

data/Rakefile

@@ -15,7 +15,7 @@ namespace :fixture do
       puts "#{args[:id]} not found"
       next
     end
-    File.open(File.join(File.dirname(__FILE__) + "/test/fixtures/#{args[:id]}.json"), 'w') do |file|
+    File.open(File.join(File.dirname(__FILE__) + "/test/maker_fixtures/#{args[:id]}.json"), 'w') do |file|
       puts "Generating #{args[:id]}.json"
       file.puts JSON.pretty_generate(fixture)
     end
@@ -23,7 +23,7 @@ namespace :fixture do
 
   desc 'Regenerate all fixtures'
   task :regenerate => :install do
-    Dir[File.dirname(__FILE__) + '/test/fixtures/*.json'].each do |path|
+    Dir[File.dirname(__FILE__) + '/test/maker_fixtures/*.json'].each do |path|
       File.open(path, 'w') do |file|
         id = File.basename(path, '.json')
         puts "Generating #{id}.json"
@@ -39,35 +39,43 @@ namespace :maker do
     File.open(File.join(File.dirname(__FILE__) + "/lib/opendmm/makers/#{args[:name].underscore}.rb"), 'w') do |file|
       puts "Generating #{args[:name].underscore}.rb"
       file.puts <<-CODE
-module OpenDMM
-  module Maker
-    module #{args[:name].underscore.classify}
-      include Maker
+base_uri 'example.com'
 
-      module Site
-        include HTTParty
-        base_uri 'example.com'
+register_product(
+  /^(EXAM)-?(\d{3})$/i,
+  '#{$1.downcase}#{$2}',
+)
 
-        def self.item(name)
-          case name
-          when /^(EXAM)-?(\\d{3})$/i
-            get("/#\{$1.downcase\}#\{$2\}")
-          end
-        end
-      end
+private
 
-      module Parser
-        def self.parse(content)
-          page_uri = content.request.last_uri
-          html = Nokogiri::HTML(content)
-          return {
-            page:            page_uri.to_s,
-          }
-        end
-      end
-    end
-  end
+def self.parse_product_html(html)
+  {
+  #   actresses:       Array
+  #   actress_types:   Array
+  #   boobs:           String
+  #   brand:           String
+  #   categories:      Array
+  #   code:            String
+  #   cover_image:     String
+  #   description:     String
+  #   directors:       Array
+  #   genres:          Array
+  #   label:           String
+  #   maker:           String
+  #   movie_length:    String
+  #   page:            String
+  #   release_date:    String
+  #   sample_images:   Array
+  #   scenes:          Array
+  #   series:          String
+  #   subtitle:        String
+  #   theme:           String
+  #   thumbnail_image: String
+  #   title:           String
+  #   __extra:         Hash
+  }
 end
+
 CODE
     end
   end

data/bin/opendmm

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
-require "json"
-require "optparse"
-require "pp"
-require "opendmm"
+require 'json'
+require 'optparse'
+require 'pp'
+require 'opendmm'
 
 options = { json: false }
 OptionParser.new do |opts|
-  opts.on("-j", "--[no-]json", "JSON mode") do |j|
+  opts.on('-j', '--[no-]json', 'JSON mode') do |j|
     options[:json] = j
   end
 end.parse!
 
-details = OpenDMM.search!(ARGV.first)
+details = OpenDMM.search(ARGV.first, true)
 if details
   if options[:json]
     puts JSON.pretty_generate(details)
@@ -20,5 +20,5 @@ if details
     pp details
   end
 else
-  puts "Unknown product: " + ARGV.first
+  puts 'Unknown product: ' + ARGV.first
 end

data/lib/opendmm.rb

@@ -1,34 +1,43 @@
 require 'opendmm/version'
 require 'opendmm/maker'
-require 'opendmm/search_engines/jav_library'
-require 'opendmm/search_engines/dmm'
+require 'opendmm/search_engine'
 
 module OpenDMM
-  def self.search!(name)
-    details = Maker.search(name) ||
-              SearchEngine::JavLibrary.search(name) ||
-              SearchEngine::Dmm.search(name)
-    return nil unless details
-    details = details.squish_hard
-    details[:cover_image] = join_if_relative(details[:page], details[:cover_image])
-    details[:thumbnail_image] = join_if_relative(details[:page], details[:thumbnail_image])
-    details[:sample_images] = details[:sample_images].map do |uri|
-      join_if_relative(details[:page], uri)
-    end if details[:sample_images]
-    details[:movie_length] = ChronicDuration.parse(details[:movie_length]) if details[:movie_length]
-    details[:release_date] = Date.parse(details[:release_date]) if details[:release_date]
-    details
-  end
+  # Known fields:
+  #
+  # {
+  #   actresses:       Array
+  #   actress_types:   Array
+  #   boobs:           String
+  #   brand:           String
+  #   categories:      Array
+  #   code:            String
+  #   cover_image:     String
+  #   description:     String
+  #   directors:       Array
+  #   genres:          Array
+  #   label:           String
+  #   maker:           String
+  #   movie_length:    String
+  #   page:            String
+  #   release_date:    String
+  #   sample_images:   Array
+  #   scenes:          Array
+  #   series:          String
+  #   subtitle:        String
+  #   theme:           String
+  #   thumbnail_image: String
+  #   title:           String
+  #   __extra:         Hash
+  # }
 
-  def self.search(name)
-    search! name
-  rescue
+  def self.search(name, debug = false)
+    Maker.search(name) || SearchEngine::JavLibrary.search(name) || SearchEngine::Dmm.search(name)
+  rescue => e
+    if debug
+      puts e.inspect
+      puts e.backtrace.join("\n")
+    end
     nil
   end
-
-private
-  def self.join_if_relative(page_url, image_url)
-    return nil unless image_url
-    image_url.start_with?('http') ? image_url : URI.join(page_url, image_url).to_s
-  end
 end

data/lib/opendmm/maker.rb

@@ -1,67 +1,12 @@
-require 'active_support/core_ext/string/filters'
-require 'httparty'
-require 'logger'
-require 'nokogiri'
-require 'opendmm/utils'
+require 'opendmm/site'
 
 module OpenDMM
   module Maker
-    @@makers = []
-
-    def self.included(klass)
-      klass.module_eval <<-CODE
-        module Site
-          include HTTParty
-          follow_redirects false
-
-          def self.get(uri)
-            super(uri)
-          rescue Errno::ETIMEDOUT => e
-            tries ||= 0
-            tries++
-            tries <= 5 ? retry : raise
-          end
-        end
-
-        def self.search(name)
-          item = Site.item(name)
-          Parser.parse(item) if item && item.code == 200
-        end
-      CODE
-      @@makers << klass
-    end
-
-    # Known fields:
-    #
-    # {
-    #   actresses:       Array
-    #   actress_types:   Array
-    #   boobs:           String
-    #   brand:           String
-    #   categories:      Array
-    #   code:            String
-    #   cover_image:     String
-    #   description:     String
-    #   directors:       Array
-    #   genres:          Array
-    #   label:           String
-    #   maker:           String
-    #   movie_length:    String
-    #   page:            String
-    #   release_date:    String
-    #   sample_images:   Array
-    #   scenes:          Array
-    #   series:          String
-    #   subtitle:        String
-    #   theme:           String
-    #   thumbnail_image: String
-    #   title:           String
-    #   __extra:         Hash
-    # }
+    @@makers = Array.new
 
     def self.search(name)
       @@makers.each do |maker|
-        result = maker.search(name)
+        result = maker.product(name)
         return result if result
       end
       nil
@@ -70,5 +15,19 @@ module OpenDMM
 end
 
 Dir[File.dirname(__FILE__) + '/makers/*.rb'].each do |file|
-  require file
+  module_name = File.basename(file, '.rb').camelize
+  eval <<-MAKER
+
+module OpenDMM
+  module Maker
+    module #{module_name}
+      include Site
+      #{File.read(file)}
+    end
+
+    @@makers << #{module_name}
+  end
+end
+
+MAKER
 end

data/lib/opendmm/makers/aknr.rb

@@ -1,38 +1,22 @@
-module OpenDMM
-  module Maker
-    module Aknr
-      include Maker
+base_uri 'www.aknr.com'
 
-      module Site
-        base_uri 'www.aknr.com'
+register_product(
+  /^(FSET)-?(\d{3})$/i,
+  '/works/#{$1.downcase}-#{$2}/',
+)
 
-        def self.item(name)
-          case name
-          when /^(FSET)-?(\d{3})$/i
-            get("/works/#{$1.downcase}-#{$2}/")
-          end
-        end
-      end
+private
 
-      module Parser
-        def self.parse(content)
-          page_uri = content.request.last_uri
-          html = Nokogiri::HTML(content)
-          return {
-            actresses:       html.css('//*[@id="info"]/div[3]/div[2]').text.split,
-            code:            html.css('//*[@id="info"]/div[5]/div[2]').text,
-            cover_image:     html.at_css('#jktimg_l2 > a')['href'],
-            directors:       html.css('//*[@id="info"]/div[4]/div[2]').text.split,
-            maker:           'AKNR',
-            movie_length:    html.css('//*[@id="info"]/div[6]/div[2]').text,
-            page:            page_uri.to_s,
-            release_date:    html.css('//*[@id="info"]/div[2]/div[2]').text,
-            sample_images:   html.css('#photo > p > a').map { |a| a['href'] },
-            thumbnail_image: html.at_css('#jktimg_l2 > a > img')['src'],
-            title:           html.css('#mainContent2 > h1').text,
-          }
-        end
-      end
-    end
-  end
+def self.parse_product_html(html)
+  {
+    actresses:       html.css('//*[@id="info"]/div[3]/div[2]').text.split,
+    cover_image:     html.at_css('#jktimg_l2 > a')['href'],
+    directors:       html.css('//*[@id="info"]/div[4]/div[2]').text.split,
+    maker:           'AKNR',
+    movie_length:    html.css('//*[@id="info"]/div[6]/div[2]').text,
+    release_date:    html.css('//*[@id="info"]/div[2]/div[2]').text,
+    sample_images:   html.css('#photo > p > a').map { |a| a['href'] },
+    thumbnail_image: html.at_css('#jktimg_l2 > a > img')['src'],
+    title:           html.css('#mainContent2 > h1').text,
+  }
 end

data/lib/opendmm/makers/ako3.rb

@@ -1,38 +1,22 @@
-module OpenDMM
-  module Maker
-    module Ako3
-      include Maker
+base_uri 'www.ako-3.com'
 
-      module Site
-        base_uri 'www.ako-3.com'
+register_product(
+  /^(AKO)-?(\d{3})$/i,
+  '/work/item.php?itemcode=#{$1.upcase}#{$2}',
+)
 
-        def self.item(name)
-          case name
-          when /^(AKO)-?(\d{3})$/i
-            get("/work/item.php?itemcode=#{$1.upcase}#{$2}")
-          end
-        end
-      end
+private
 
-      module Parser
-        def self.parse(content)
-          page_uri = content.request.last_uri
-          html = Nokogiri::HTML(content)
-          specs = Utils.hash_by_split(html.css('div#spec-area > div.release').map(&:text))
-          return {
-            actresses:       [ html.css('//*[@id="spec-area"]/div[2]').text ],
-            code:            specs['商品番号'],
-            cover_image:     html.at_css('div.jacket a')['href'],
-            description:     html.css('div#caption').text,
-            maker:           specs['メーカー'],
-            page:            page_uri.to_s,
-            release_date:    specs['配信日'],
-            sample_images:   html.css('ul.sampleimg li a').map { |a| a['href'] },
-            thumbnail_image: html.at_css('#title-area > div > div.jacket > a > img')['src'],
-            title:           html.css('div.maintitle').text,
-          }
-        end
-      end
-    end
-  end
+def self.parse_product_html(html)
+  specs = Utils.hash_by_split(html.css('div#spec-area > div.release').map(&:text))
+  {
+    actresses:       [ html.css('//*[@id="spec-area"]/div[2]').text ],
+    cover_image:     html.at_css('div.jacket a')['href'],
+    description:     html.css('div#caption').text,
+    maker:           specs['メーカー'],
+    release_date:    specs['配信日'],
+    sample_images:   html.css('ul.sampleimg li a').map { |a| a['href'] },
+    thumbnail_image: html.at_css('#title-area > div > div.jacket > a > img')['src'],
+    title:           html.css('div.maintitle').text,
+  }
 end

data/lib/opendmm/makers/anna_and_hanako.rb

@@ -1,40 +1,24 @@
-module OpenDMM
-  module Maker
-    module AnnaAndHanako
-      include Maker
+base_uri 'anna-and-hanako.jp'
 
-      module Site
-        base_uri 'anna-and-hanako.jp'
+register_product(
+  /^(ANND)-?(\d{3})$/i,
+  '/works/#{$1.downcase}/#{$1.downcase}#{$2}.html',
+)
 
-        def self.item(name)
-          case name
-          when /^(ANND)-?(\d{3})$/i
-            get("/works/#{$1.downcase}/#{$1.downcase}#{$2}.html")
-          end
-        end
-      end
+private
 
-      module Parser
-        def self.parse(content)
-          page_uri = content.request.last_uri
-          html = Nokogiri::HTML(Utils.force_utf8(content))
-          specs = Utils.hash_by_split(html.xpath('//*[@id="pake-bottom-box_r"]/dl/p').map(&:text))
-          return {
-            actresses:       specs['出演者'].split('/'),
-            code:            specs['品番'],
-            cover_image:     html.at_xpath('//*[@id="pake-bottom-box"]/dl/a')['href'],
-            description:     html.xpath('//*[@id="txt-bottom-box"]').text,
-            directors:       specs['監督'].split('/'),
-            maker:           'アンナと花子',
-            movie_length:    specs['収録時間'],
-            page:            page_uri.to_s,
-            release_date:    specs['発売日'],
-            sample_images:   html.xpath('//*[@id="mein-sanpuru-sam"]/a').map { |a| a['href'] },
-            thumbnail_image: html.at_xpath('//*[@id="pake-bottom-box"]/dl/a/img')['src'],
-            title:           html.xpath('//*[@id="mein-left-new-release-box"]/div/div/h5').text,
-          }
-        end
-      end
-    end
-  end
+def self.parse_product_html(html)
+  specs = Utils.hash_by_split(html.xpath('//*[@id="pake-bottom-box_r"]/dl/p').map(&:text))
+  {
+    actresses:       specs['出演者'].split('/'),
+    cover_image:     html.at_xpath('//*[@id="pake-bottom-box"]/dl/a')['href'],
+    description:     html.xpath('//*[@id="txt-bottom-box"]').text,
+    directors:       specs['監督'].split('/'),
+    maker:           'アンナと花子',
+    movie_length:    specs['収録時間'],
+    release_date:    specs['発売日'],
+    sample_images:   html.xpath('//*[@id="mein-sanpuru-sam"]/a').map { |a| a['href'] },
+    thumbnail_image: html.at_xpath('//*[@id="pake-bottom-box"]/dl/a/img')['src'],
+    title:           html.xpath('//*[@id="mein-left-new-release-box"]/div/div/h5').text,
+  }
 end