opendmm 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5602987a6b01ab1017a8915c143c29b5957168d6
-  data.tar.gz: 226ce57ca923192f3d184eff15246f56250fd647
+  metadata.gz: cd69df580c19412e2d9e73e3cb76beaa9a5aed6c
+  data.tar.gz: 1503a5023206062b73c29cc4de822e68ea08fc38
 SHA512:
-  metadata.gz: a268edb5eadebf10a64d042ccb8cd6d858ecaa3d168d83371d2b2422d890ead0c5924286f1611ee6110917c26d010b2f8a5693e00d79c5420f145b65247b473c
-  data.tar.gz: b9d9cddd14cb63898e49f8a13fb11a029c5c2db6384f55d0d5b6d03ead47cfa395a812364a8ad7af3e707cdee8d24e550d81fc0249bcadcf54b680b3c5a1dbbc
+  metadata.gz: bec6daead86a2b9f0b4a5646ac96ca62acad326f59b39f4c883bfec168c98221e62c3a8276aa495c53c1c99492d3ff81238d50bcb904308e51f0b5bb873ced4d
+  data.tar.gz: 719b561ca21e542a1d64fb49923cbdbb0ef2105781f03fb104beae99730506514f6d2a9a9bb139306e64387c869ece4fea4261873f857e999721dc19c8c60351

data/lib/opendmm.rb

@@ -1,10 +1,13 @@
 require 'opendmm/version'
 require 'opendmm/maker'
 require 'opendmm/search_engines/jav_library'
+require 'opendmm/search_engines/dmm'
 
 module OpenDMM
   def self.search!(name)
-    details = Maker.search(name) || SearchEngine::JavLibrary.search(name)
+    details = Maker.search(name) ||
+              SearchEngine::JavLibrary.search(name) ||
+              SearchEngine::Dmm.search(name)
     return nil unless details
     details = details.squish_hard
     if !details[:cover_image].start_with?('http')

data/lib/opendmm/maker.rb

@@ -13,6 +13,13 @@ module OpenDMM
         module Site
           include HTTParty
           follow_redirects false
+
+          def self.get(uri)
+            super(uri)
+          rescue Errno::ETIMEDOUT => e
+            tries++
+            tries <= 5 ? retry : raise
+          end
         end
 
         def self.search(name)
@@ -57,9 +64,6 @@ module OpenDMM
         return result if result
       end
       nil
-    rescue Errno::ETIMEDOUT => e
-      tries++
-      tries <= 5 ? retry : raise
     end
   end
 end

data/lib/opendmm/search_engines/dmm.rb

@@ -0,0 +1,62 @@
+require 'opendmm/utils'
+
+module OpenDMM
+  module SearchEngine
+    module Dmm
+      module Site
+        include HTTParty
+        base_uri 'www.dmm.co.jp'
+        follow_redirects false
+
+        def self.search(name)
+          name = name.split(/[-_\s]/).map do |token|
+            token =~ /\d{1,4}/ ? sprintf("%05d", token.to_i) : token
+          end.join(' ')
+          get("/search/=/searchstr=#{CGI::escape(name)}")
+        end
+
+        def self.get(uri)
+          super(uri)
+        rescue Errno::ETIMEDOUT => e
+          tries++
+          tries <= 5 ? retry : raise
+        end
+      end
+
+      module Parser
+        def self.parse_search_result(content)
+          html = Nokogiri::HTML(content)
+          first_result = html.css('#list > li > div > p.tmb > a').first
+          first_result['href'] if first_result
+        end
+
+        def self.parse_item(content)
+          page_uri = content.request.last_uri
+          html = Nokogiri::HTML(content)
+          specs = Utils.hash_by_split(html.css('//*[@id="mu"]/div/table/tr/td[1]/table/tr').map(&:text))
+          return {
+            actresses:       specs['出演者'].split,
+            code:            specs['品番'],
+            cover_image:     html.at_css('#sample-video > a')['href'],
+            directors:       specs['監督'].split,
+            genres:          specs['ジャンル'].split,
+            label:           specs['レーベル'],
+            maker:           specs['メーカー'],
+            movie_length:    specs['収録時間'],
+            page:            page_uri.to_s,
+            release_date:    specs['商品発売日'],
+            series:          specs['シリーズ'],
+            thumbnail_image: html.at_css('#sample-video > a > img')['src'],
+            title:           html.css('#title').text,
+          }
+        end
+      end
+
+      def self.search(name)
+        search_result = Site.search(name)
+        item_uri = Parser.parse_search_result(search_result)
+        Parser.parse_item(Site.get(item_uri)) if item_uri
+      end
+    end
+  end
+end

data/lib/opendmm/search_engines/jav_library.rb

@@ -15,6 +15,13 @@ module OpenDMM
         def self.item(id)
           get("/ja/?v=#{id}")
         end
+
+        def self.get(uri)
+          super(uri)
+        rescue Errno::ETIMEDOUT => e
+          tries++
+          tries <= 5 ? retry : raise
+        end
       end
 
       module Parser
@@ -52,9 +59,6 @@ module OpenDMM
           jav_id = Parser.parse_search_result(search_result)
         end
         Parser.parse_item(Site.item(jav_id)) if jav_id
-      rescue Errno::ETIMEDOUT => e
-        tries++
-        tries <= 5 ? retry : raise
       end
     end
   end

data/lib/opendmm/version.rb

@@ -1,3 +1,3 @@
 module OpenDMM
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/test/fixtures/DMYJ-001.json

@@ -0,0 +1,20 @@
+{
+  "code": "dmyj00001",
+  "cover_image": "http://pics.dmm.co.jp/digital/video/dmyj00001/dmyj00001pl.jpg",
+  "directors": [
+    "三谷任三郎"
+  ],
+  "genres": [
+    "看護婦・ナース",
+    "素人",
+    "独占配信",
+    "ハイビジョン"
+  ],
+  "maker": "ゲンエキ",
+  "movie_length": 7140,
+  "page": "http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=dmyj00001/",
+  "release_date": "2012-10-12",
+  "series": "素人娘にお願いしました。",
+  "thumbnail_image": "http://pics.dmm.co.jp/digital/video/dmyj00001/dmyj00001ps.jpg",
+  "title": "素人娘にお願いしました 19歳介護士"
+}

data/test/fixtures_test.rb

@@ -63,7 +63,7 @@ Dir[File.dirname(__FILE__) + '/fixtures/*.json'].each do |path|
 class FixtureTest
   def test_#{name.parameterize.underscore}
     expected = load_product('#{path}')
-    actual = OpenDMM.search('#{name}')
+    actual = OpenDMM.search!('#{name}')
     assert_has_basic_keys(actual)
     assert_no_unknown_keys(actual)
     assert_equal expected, actual, HashDiff.diff(expected, actual)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendmm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Jun Zhou
@@ -155,6 +155,7 @@ files:
 - lib/opendmm/makers/tameikegoro.rb
 - lib/opendmm/makers/to_satsu.rb
 - lib/opendmm/makers/waap.rb
+- lib/opendmm/search_engines/dmm.rb
 - lib/opendmm/search_engines/jav_library.rb
 - lib/opendmm/utils.rb
 - lib/opendmm/version.rb
@@ -190,6 +191,7 @@ files:
 - test/fixtures/Carib 021511-620.json
 - test/fixtures/DCOL-017.json
 - test/fixtures/DGL-007.json
+- test/fixtures/DMYJ-001.json
 - test/fixtures/DOM-045.json
 - test/fixtures/EBOD-109.json
 - test/fixtures/ECB-078.json
@@ -350,6 +352,7 @@ test_files:
 - test/fixtures/Carib 021511-620.json
 - test/fixtures/DCOL-017.json
 - test/fixtures/DGL-007.json
+- test/fixtures/DMYJ-001.json
 - test/fixtures/DOM-045.json
 - test/fixtures/EBOD-109.json
 - test/fixtures/ECB-078.json