opendmm 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6316eee9768951bd050640f1df3ff633df713b2f
-  data.tar.gz: 9a3bb7293f2701d5a589e9457c636aa935738513
+  metadata.gz: 1aaf9655973d23c0b18ca2d59213c47937849f52
+  data.tar.gz: a493294bcb19539a86b534b586df4247a16b25d7
 SHA512:
-  metadata.gz: ae5a04a4f0fd4490a71610edb504876280fdaa9475bf4354a3b80c6c29cf447b9c4b27351b1191c6f50887fb8f80f84336e17a71be9958f6772671307948a5ff
-  data.tar.gz: b037dfe7be9b34fd75ea39914c53db2eda63079695193ed69f68ebc816431e9cc9553ea50bec566b94f51d85ec8f3cef91ccefa2056b2364afb95f60dda07690
+  metadata.gz: e0cd1a0d024c2ab0c6e8e7448b7c4f9e3881559d9207f2072d0502ce9c6e2fd218f3e2d04346c2c0c743532aee5dc0a242e438fa4cad13ca6816596f5f04c382
+  data.tar.gz: a32c9089df55e38bbc954548dbdf4e7389d9a857057598cac4d39331a5a7cda5bc8fcd99f111161eb3ca1a466e2520377a27a57368725fbd6cf494127480982b

data/Rakefile

@@ -50,7 +50,7 @@ module OpenDMM
 
         def self.item(name)
           case name
-          when /(EXAM)-?(\\d{3})/i
+          when /^(EXAM)-?(\\d{3})$/i
             get("/#\{$1.downcase\}#\{$2\}")
           end
         end

data/lib/opendmm.rb

@@ -10,23 +10,13 @@ module OpenDMM
               SearchEngine::Dmm.search(name)
     return nil unless details
     details = details.squish_hard
-    if !details[:cover_image].start_with?('http')
-      details[:cover_image] = URI.join(details[:page], details[:cover_image]).to_s
-    end
-    if !details[:thumbnail_image].start_with?('http')
-      details[:thumbnail_image] = URI.join(details[:page], details[:thumbnail_image]).to_s
-    end
-    if details[:sample_images]
-      details[:sample_images] = details[:sample_images].map do |uri|
-        uri.start_with?('http') ? uri : URI.join(details[:page], uri).to_s
-      end
-    end
-    if details[:movie_length].instance_of? String
-      details[:movie_length] = ChronicDuration.parse(details[:movie_length])
-    end
-    if details[:release_date].instance_of? String
-      details[:release_date] = Date.parse(details[:release_date])
-    end
+    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
 
@@ -35,4 +25,10 @@ module OpenDMM
   rescue
     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/makers/aknr.rb

@@ -23,6 +23,7 @@ module OpenDMM
             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,

data/lib/opendmm/makers/anna_and_hanako.rb

@@ -25,6 +25,7 @@ module OpenDMM
             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['発売日'],

data/lib/opendmm/makers/aurora.rb

@@ -28,7 +28,7 @@ module OpenDMM
             directors:       specs['監督'].css('ul li').map(&:text),
             genres:          specs['ジャンル'].css('ul li').map(&:text),
             label:           specs['レーベル'],
-            maker:           'Apache Project',
+            maker:           'Aurora Project',
             movie_length:    specs['収録時間'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,

data/lib/opendmm/makers/baltan.rb

@@ -24,6 +24,7 @@ module OpenDMM
             cover_image:     html.at_css('#content1 > section > div.img > img')['src'],
             description:     html.css('#content1 > section > p').text,
             label:           html.xpath('//*[@id="content1"]/section/div[2]/table/tr[4]/td').text,
+            maker:           'Baltan',
             movie_length:    html.xpath('//*[@id="content1"]/section/div[2]/table/tr[2]/td').text,
             page:            page_uri.to_s,
             release_date:    html.xpath('//*[@id="content1"]/section/div[2]/table/tr[3]/td').text,

data/lib/opendmm/makers/befree.rb

@@ -27,6 +27,7 @@ module OpenDMM
             description:     html.css('#content > div.main > section > p.comment').text,
             directors:       specs['監督：'].text.split,
             genres:          specs['ジャンル：'].css('a').map(&:text),
+            maker:           'BeFree',
             movie_length:    specs['収録時間'],
             page:            page_uri.to_s,
             release_date:    specs['発売日：'].text,

data/lib/opendmm/makers/bi.rb

@@ -27,6 +27,7 @@ module OpenDMM
             directors:       specs['監督'].split,
             genres:          specs['ジャンル'].split('/'),
             label:           specs['レーベル'],
+            maker:           '美',
             movie_length:    specs['収録時間'],
             page:            page_uri.to_s,
             release_date:    specs['発売日'],

data/lib/opendmm/makers/bijin_majo.rb

@@ -24,6 +24,7 @@ module OpenDMM
             code:            specs['品番：'].text,
             cover_image:     html.at_css('#detail_main > div.figure > a')['href'],
             description:     html.css('#detail_main > div.detail_item > p').text,
+            maker:           '美人魔女',
             movie_length:    specs['収録時間：'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日：'].text,

data/lib/opendmm/makers/candy.rb

@@ -25,6 +25,7 @@ module OpenDMM
             cover_image:     html.at_xpath('//*[@id="thumbnail"]/a[1]')['href'],
             description:     html.css('#brand > p.p_actress_detail').text,
             genres:          specs['ジャンル'].css('a').map(&:text),
+            maker:           'Candy',
             movie_length:    specs['収録時間'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,

data/lib/opendmm/makers/caribbean.rb

@@ -18,19 +18,20 @@ module OpenDMM
         def self.parse(content)
           page_uri = content.request.last_uri
           html = Nokogiri::HTML(content)
-          specs = Utils.hash_by_split(html.css('#main-content > div.main-content-movieinfo > div.movie-info > dl').map(&:text))
+          specs = Utils.hash_by_split(html.css('div.main-content-movieinfo > div.movie-info > dl').map(&:text))
           return {
             actresses:       specs['出演'].split,
             categories:      specs['カテゴリー'].split,
-            code:            "Carib " + page_uri.to_s.match(/\d{6}-\d{3}/)[0],
-            cover_image:     "./images/l_l.jpg",
-            description:     html.css('#main-content > div.main-content-movieinfo > div.movie-comment').text,
+            code:            'Carib ' + page_uri.to_s.split('/')[-2],
+            cover_image:     './images/l_l.jpg',
+            description:     html.css('div.main-content-movieinfo > div.movie-comment').text,
+            maker:           'Caribbean',
             movie_length:    specs['再生時間'],
             page:            page_uri.to_s,
             release_date:    specs['配信日'],
-            sample_images:   html.css('#main-content > div.detail-content.detail-content-gallery-old > table > tr > td > a').map{ |a| a['href'] }.reject{ |uri| uri =~ /\/member\// },
+            sample_images:   html.css('div.detail-content.detail-content-gallery-old > table > tr > td > a').map{ |a| a['href'] }.reject{ |uri| uri =~ /\/member\// },
             thumbnail_image: "./images/l_s.jpg",
-            title:           html.css('#main-content > div.main-content-movieinfo > div.video-detail > span.movie-title > h1').text,
+            title:           html.css('div.main-content-movieinfo > div.video-detail > span.movie-title > h1').text,
           }
         end
       end

data/lib/opendmm/makers/cross.rb

@@ -27,6 +27,7 @@ module OpenDMM
             description:     html.css('#details > div > p.story').text,
             directors:       specs['監督'].css('a').map(&:text),
             genres:          specs['ジャンル'].css('a').map(&:text),
+            maker:           'Cross',
             movie_length:    specs['収録時間'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,

data/lib/opendmm/makers/dmm_collection.rb

@@ -24,6 +24,7 @@ module OpenDMM
             code:            specs['品番'].text,
             cover_image:     html.at_xpath('//*[@id="package"]/h4/a')['href'],
             description:     html.xpath('//*[@id="comment"]/h5').text,
+            maker:           'D★Collection',
             movie_length:    specs['収録時間'].text,
             page:            page_uri.to_s,
             release_date:    specs['DVD発売日'].text,

data/lib/opendmm/makers/ebody.rb

@@ -26,6 +26,7 @@ module OpenDMM
             cover_image:     html.at_css('div.package > a.package-pic')["href"],
             description:     html.css('div.title-data > p.comment').text,
             genres:          specs['ジャンル'].css('a').map(&:text),
+            maker:           'E-Body',
             movie_length:    specs['収録時間'],
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,

data/lib/opendmm/makers/kawaii.rb

@@ -25,6 +25,7 @@ module OpenDMM
             cover_image:     html.at_css('#content > div.col300 > span.pake > p.textright > a > img')['src'].gsub(/pm.jpg$/, 'pl.jpg'),
             description:     html.css('#content > div.col540 > div > p.text').text,
             genres:          specs['ジャンル'].css('a').map(&:text),
+            maker:           'Kawaii',
             movie_length:    (specs['DVD収録時間'] || specs['Blu-ray収録時間']).text,
             page:            page_uri.to_s,
             release_date:    (specs['DVD発売日'] || specs['Blu-ray発売日']).text,

data/lib/opendmm/makers/kira_kira.rb

@@ -26,6 +26,7 @@ module OpenDMM
             description:     html.xpath('//*[@id="wrap-works"]/section/section[1]/p').text,
             genres:          specs['ジャンル'].css('ul > li').map(&:text),
             label:           specs['レーベル'].text,
+            maker:           'Kira☆Kira',
             movie_length:    specs['収録時間'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,

data/lib/opendmm/makers/madonna.rb

@@ -26,6 +26,7 @@ module OpenDMM
             description:     html.css('#column_contents > div > div.left_contents > p').text,
             directors:       specs['監督'].text.split,
             genres:          specs['ジャンル'].text.split,
+            maker:           'Madonna',
             movie_length:    specs['収録時間'].text.remove('DVD'),
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text.remove('DVD'),

data/lib/opendmm/makers/moodyz.rb

@@ -32,6 +32,7 @@ module OpenDMM
             directors:       specs['▪監督'].split,
             genres:          specs['▪ジャンル'].split('/'),
             label:           specs['▪レーベル'],
+            maker:           'Moodyz',
             movie_length:    specs['収録時間'],
             page:            page_uri.to_s,
             release_date:    specs['発売日'],

data/lib/opendmm/makers/opera.rb

@@ -27,6 +27,7 @@ module OpenDMM
             description:     html.css('#container-detail > div.pkg-data > div.comment-data').text,
             directors:       specs['監督'].css('a').map(&:text),
             genres:          specs['ジャンル'].css('a').map(&:text),
+            maker:           'Opera',
             movie_length:    specs['収録時間'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,

data/lib/opendmm/makers/oppai.rb

@@ -27,6 +27,7 @@ module OpenDMM
             description:     html.css('#content_main_detail > div > div.works_left > p.detail_txt').text,
             genres:          specs['ジャンル'].css('a').map(&:text),
             label:           specs['レーベル'].text,
+            maker:           'Oppai',
             movie_length:    dvd(specs['収録時間'].text),
             page:            page_uri.to_s,
             release_date:    dvd(specs['発売日'].text),

data/lib/opendmm/makers/premium.rb

@@ -27,6 +27,7 @@ module OpenDMM
             directors:       specs['監督'].split,
             genres:          specs['ジャンル'].split('/'),
             label:           specs['レーベル'],
+            maker:           'Premium',
             movie_length:    specs['DVD収録時間'] || specs['Blu-ray収録時間'],
             page:            page_uri.to_s,
             release_date:    specs['発売日'],

data/lib/opendmm/makers/s1.rb

@@ -26,6 +26,7 @@ module OpenDMM
             description:     html.css('#contents > p.tx-comment').text,
             directors:       specs['監督'].text.split,
             genres:          specs['ジャンル'].css('a').map(&:text),
+            maker:           'S1',
             page:            page_uri.to_s,
             release_date:    specs['発売日'].text,
             sample_images:   html.xpath('//*[@id="slide-photo"]/div[contains(@class, "slide") and not(contains(@class, "pake"))]/img').map { |img| img['src'] },

data/lib/opendmm/makers/s_cute.rb

@@ -0,0 +1,39 @@
+module OpenDMM
+  module Maker
+    module SCute
+      include Maker
+
+      module Site
+        include HTTParty
+        base_uri 'www.s-cute.com'
+
+        def self.item(name)
+          case name
+          when /^S[-_]?Cute\s*(\d{3}[-_]\w+[-_]\d{2})$/i, /^S[-_]?Cute\s*((ps\d|swm)[-_]\d{2}[-_]\w+)$/i
+            get("/contents/#{$1}/")
+          end
+        end
+      end
+
+      module Parser
+        def self.parse(content)
+          page_uri = content.request.last_uri
+          html = Nokogiri::HTML(content)
+          specs = html.xpath('//*[@class="detail"]/article/p[2]').text.split('|')
+          return {
+            code:            'S-Cute ' + page_uri.to_s.split('/').last,
+            cover_image:     html.at_css('#movie > div > div > div > a > img')['src'],
+            description:     html.css('//*[@class="detail"]/article/p[4]').text,
+            maker:           'S-Cute',
+            movie_length:    specs[1],
+            page:            page_uri.to_s,
+            release_date:    specs[0],
+            sample_images:   html.css('#grid-gallery > div.item > div > a').map { |a| a['href'] },
+            thumbnail_image: html.at_css('div.cast > a > img')['src'],
+            title:           html.css('div.detail > article > h3').text,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/opendmm/makers/tameikegoro.rb

@@ -27,6 +27,7 @@ module OpenDMM
             directors:       specs['監督'].split,
             genres:          specs['ジャンル'].split,
             label:           specs['レーベル'],
+            maker:           '溜池ゴロー',
             page:            page_uri.to_s,
             release_date:    specs['発売日'].remove('DVD/'),
             sample_images:   html.css('#sample-pic > a > img').map { |img| img['src'].gsub(/js(?=-\d+\.jpg)/, 'jp') },

data/lib/opendmm/makers/to_satsu.rb

@@ -24,6 +24,7 @@ module OpenDMM
             cover_image:     html.at_css('#main > div > div.main-detail > div.ttl-pac > a')['href'],
             description:     html.xpath('//*[@id="main"]/div/div[@class="main-detail"]/div[@class="ttl-comment"]/div[not(@class)]').text,
             genres:          specs['ジャンル：'].text,
+            maker:           '変態紳士倶楽部',
             movie_length:    specs['収録時間：'].text,
             page:            page_uri.to_s,
             release_date:    specs['発売日：'].text,

data/lib/opendmm/version.rb

@@ -1,3 +1,3 @@
 module OpenDMM
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/{fixtures_test.rb → fixture_test.rb}

@@ -17,7 +17,7 @@ class FixtureTest < Minitest::Test
   end
 
   def assert_has_basic_keys(product)
-    %i(code title thumbnail_image cover_image page).each do |key|
+    %i(code cover_image maker page thumbnail_image title).each do |key|
       assert product[key], "Key #{key} should not be absent"
     end
   end

data/test/fixtures/ANND-066.json

@@ -9,6 +9,7 @@
   "directors": [
     "武井寅泰"
   ],
+  "maker": "アンナと花子",
   "movie_length": 7200,
   "page": "http://anna-and-hanako.jp/works/annd/annd066.html",
   "release_date": "2010-08-19",

data/test/fixtures/APAA-182.json

@@ -17,7 +17,7 @@
     "女子校生",
     "ハメ撮り"
   ],
-  "maker": "Apache Project",
+  "maker": "Aurora Project",
   "movie_length": 6540,
   "page": "http://www.aurora-pro.com/shop/-/product/p/goods_id=APAA-182",
   "release_date": "2012-11-13",

data/test/fixtures/APAK-051.json

@@ -18,7 +18,7 @@
     "凌辱",
     "第三者撮り"
   ],
-  "maker": "Apache Project",
+  "maker": "Aurora Project",
   "movie_length": 8340,
   "page": "http://www.aurora-pro.com/shop/-/product/p/goods_id=APAK-051",
   "release_date": "2012-12-25",

data/test/fixtures/BBI-104.json

@@ -12,6 +12,7 @@
     "ごっくん",
     "痴女"
   ],
+  "maker": "美",
   "movie_length": 7200,
   "page": "http://bi-av.com/works/bbi/bbi104.html",
   "release_date": "2010-04-25",

data/test/fixtures/BEB-001.json

@@ -14,6 +14,7 @@
     "痴女"
   ],
   "label": "美ッ痴",
+  "maker": "美",
   "movie_length": 7200,
   "page": "http://bi-av.com/works/beb/beb001.html",
   "release_date": "2010-12-25",

data/test/fixtures/BF-175.json

@@ -11,6 +11,7 @@
   "genres": [
     "家庭教師"
   ],
+  "maker": "BeFree",
   "movie_length": 7200,
   "page": "http://befreebe.com/works/bf/bf175.html",
   "release_date": "2012-02-07",

data/test/fixtures/BID-017.json

@@ -19,6 +19,7 @@
     "共演"
   ],
   "label": "DELUXE",
+  "maker": "美",
   "movie_length": 7200,
   "page": "http://bi-av.com/works/bid/bid017.html",
   "release_date": "2010-10-25",

data/test/fixtures/BIJN-006.json

@@ -5,6 +5,7 @@
   "code": "BIJN-006",
   "cover_image": "http://bijin-majo-av.com/images/works/bijn/bijn006/bijn006pl.jpg",
   "description": "タイトなミニスカートに黒いパンストがセクシーなりささんは、モード系の美人妻です。エロにのめり込むとどんどん淫乱に変貌！オナニーになるとすっかり快楽の虜になり！ローターから始まり、極太バイブもズッポリ咥えた下のお口は、手を放してもバイブを咥えたまま落としません。シマリの良いヴァギナで男のモノを食べつくし、セックスを堪能するりささんの乱れる姿をたっぷりとお楽しみください。",
+  "maker": "美人魔女",
   "movie_length": 6300,
   "page": "http://bijin-majo-av.com/works/bijn/bijn006.html",
   "release_date": "2014-01-13",

data/test/fixtures/BLK-049.json

@@ -11,6 +11,7 @@
     "巨乳"
   ],
   "label": "kira☆kira BLACK GAL",
+  "maker": "Kira☆Kira",
   "movie_length": 7200,
   "page": "http://kirakira-av.com/works/-/detail/=/cid=blk049",
   "release_date": "2011-09-19",

data/test/fixtures/BWB-005.json

@@ -10,6 +10,7 @@
     "魯山神"
   ],
   "label": "接吻とレズと乱交",
+  "maker": "美",
   "movie_length": 7200,
   "page": "http://bi-av.com/works/bwb/bwb005.html",
   "release_date": "2011-10-25",

data/test/fixtures/CLUB-003.json

@@ -2,6 +2,7 @@
   "code": "CLUB-003",
   "cover_image": "http://to-satsu.com/images/works/club003/club003pl.jpg",
   "description": "優雅で清楚な人妻が集う南青山の某高級マッサージ店。顧客満足度が高いセレブ妻を魅了するハイソサエティーなおもてなしは特別なオイルを使用した経路リンパマッサージ。エレガントな人妻は量より質を選び、施術師の紳士的かつ変態的なマッサージで声を押し殺しアソコを濡らし成熟した敏感なカラダが素直に反応する!",
+  "maker": "変態紳士倶楽部",
   "movie_length": 13800,
   "page": "http://to-satsu.com/works/club/club003/club003.html",
   "release_date": "2012-09-01",