opendmm 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/lib/opendmm/makers/das.rb +6 -2
  4. data/lib/opendmm/{makers → makers_broken}/anna_and_hanako.rb +0 -0
  5. data/lib/opendmm/site.rb +6 -1
  6. data/lib/opendmm/utils.rb +1 -1
  7. data/lib/opendmm/version.rb +1 -1
  8. data/test/av_entertainments_fixtures/MKBD-S40.json +2 -1
  9. data/test/av_entertainments_fixtures/SKYHD-108.json +2 -1
  10. data/test/{maker_fixtures → broken}/ANND-066.json +0 -0
  11. data/test/{maker_fixtures_broken → broken}/BIJN-006.json +0 -0
  12. data/test/{maker_fixtures_broken → broken}/CLUB-003.json +0 -0
  13. data/test/{maker_fixtures_broken → broken}/HIGH-107.json +0 -0
  14. data/test/{mgstage_fixtures → broken}/SIRO-1088.json +0 -0
  15. data/test/fixture_test.rb +4 -2
  16. data/test/maker_fixtures/10musume 082914_01.json +10 -1
  17. data/test/maker_fixtures/AVOP-061.json +12 -0
  18. data/test/maker_fixtures/DASD-001.json +12 -0
  19. data/test/maker_fixtures/DAZD-001.json +12 -0
  20. data/test/maker_fixtures/PLA-001.json +12 -0
  21. metadata +13 -13
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4567e87668be68827799986d96cec471b49c9f94
4
- data.tar.gz: 8b6054c10e194034da1957a90391d2460213b768
3
+ metadata.gz: 2f40a6b105e2ceced83b443cc6687f44f43d04ea
4
+ data.tar.gz: 793e63193ccdceb089e80daac6ca3332de405905
5
5
  SHA512:
6
- metadata.gz: 1163bcd3f39ce87e80656a9c0a6e8838ae305ff5f0eaa724f0f01e5b08ad1eec28a04a241e1a0e8954732c491f6b454b781f5b0b60a9f88ca07f0eea8b45a908
7
- data.tar.gz: db61585be63b0db9998b70cedb0c3f362dda22b08750cdeb3005c4ce4cc7a714b2612dc2e6a95bed2f226e822e644693b314f8f2317fe668f0bfdf8094338442
6
+ metadata.gz: d30a90318d7ad0669447407c0b1fa58e029788fc32f26c8e0ef138705bdbfeef2e1c46681f0c3ffcc6fcccce50a9bf2da8a1df008ca77c7eaa0a4344934a1a51
7
+ data.tar.gz: 1ad520f2d0363c15acbf55b73d1846ccbd3a2a17487ff5eb4b54dd6a90f93c8386df7b5c45a32b7bc8edc9c8eb4b468eb0b1ecde868870f78254f425692c17ce
data/.gitignore CHANGED
@@ -1,2 +1,3 @@
1
+ logs
1
2
  pkg
2
3
  Gemfile.lock
data/lib/opendmm/makers/das.rb CHANGED
@@ -1,7 +1,11 @@
1
1
  base_uri 'www.dasdas.jp'
2
2
 
3
3
  register_product(
4
- /^(AVOP|DASD|DAZD|PLA)-?(\d{3})$/i,
4
+ /^(DASD|DAZD|PLA)-?(\d{3})$/i,
5
+ '/works/-/detail/=/cid=#{$1.downcase}#{$2}/',
6
+ )
7
+ register_product(
8
+ /^(AVOP)-?(061)$/i,
5
9
  '/works/-/detail/=/cid=#{$1.downcase}#{$2}/',
6
10
  )
7
11
 
@@ -21,7 +25,7 @@ def self.parse_product_html(html)
21
25
  maker: 'ダスッ！',
22
26
  movie_length: specs['収録時間：'].text,
23
27
  release_date: specs['発売日：'].text,
24
- # sample_images: Array
28
+ sample_images: html.css('.digestImage > li > a').map { |a| a['href'] },
25
29
  # scenes: Array
26
30
  series: specs['シリーズ：'].text,
27
31
  # subtitle: String
data/lib/opendmm/site.rb CHANGED
@@ -13,6 +13,7 @@ module OpenDMM
13
13
 
14
14
  klass.include HTTParty
15
15
  klass.follow_redirects false
16
+ klass.default_timeout 10
16
17
 
17
18
  klass.extend ClassMethods
18
19
  end
@@ -68,7 +69,11 @@ module OpenDMM
68
69
  extra_info.each do |k, v|
69
70
  details[k] ||= v
70
71
  end
71
- Utils.finalize_details_hash details
72
+ details = Utils.finalize_details_hash details
73
+ %i(code cover_image maker page thumbnail_image title).each do |key|
74
+ return unless details[key]
75
+ end
76
+ details
72
77
  end
73
78
  end
74
79
  end
data/lib/opendmm/utils.rb CHANGED
@@ -85,7 +85,7 @@ module OpenDMM
85
85
  details[:sample_images] = details[:sample_images].map do |uri|
86
86
  join_url_if_relative(details[:page], uri)
87
87
  end if details[:sample_images]
88
- details[:movie_length] = ChronicDuration.parse(details[:movie_length]) if details[:movie_length]
88
+ details[:movie_length] = ChronicDuration.parse(details[:movie_length]).to_i if details[:movie_length]
89
89
  details[:release_date] = Date.parse(details[:release_date]) if details[:release_date].instance_of? String
90
90
  details.sort.to_h
91
91
  end
data/lib/opendmm/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OpenDMM
2
- VERSION = '0.4.1'
2
+ VERSION = '0.4.2'
3
3
  end
data/test/av_entertainments_fixtures/MKBD-S40.json CHANGED
@@ -21,7 +21,8 @@
21
21
  "巨大電マ責め",
22
22
  "ブルーレイ・ディスク",
23
23
  "★週間ランク1位獲得作品",
24
- "★2週連続第1位獲得作品"
24
+ "★2週連続第1位獲得作品",
25
+ "ムゲンエンターテインメント キラリ (3D/2D BLU-RAY) $22.00"
25
26
  ],
26
27
  "code": "MKBD-S40",
27
28
  "cover_image": "http://imgs.aventertainments.com/new/bigcover/DVD1MKBD-S40.jpg",
data/test/av_entertainments_fixtures/SKYHD-108.json CHANGED
@@ -38,7 +38,8 @@
38
38
  "巨大電マ責め",
39
39
  "男のアナルを舐める",
40
40
  "ボンテージ",
41
- "ブルーレイ・ディスク"
41
+ "ブルーレイ・ディスク",
42
+ "スカイハイエンターテインメント (BD) $24.00"
42
43
  ],
43
44
  "code": "SKYHD-108",
44
45
  "cover_image": "http://imgs.aventertainments.com/new/bigcover/DVD1SKYHD-108.jpg",
data/test/{maker_fixtures → broken}/ANND-066.json RENAMED
File without changes
data/test/{mgstage_fixtures → broken}/SIRO-1088.json RENAMED
File without changes
data/test/fixture_test.rb CHANGED
@@ -57,11 +57,13 @@ class FixtureTest < Minitest::Test
57
57
  end
58
58
  end
59
59
 
60
- { 'maker' => 'OpenDMM::Maker',
60
+ {
61
+ 'av_entertainments' => 'OpenDMM::SearchEngine::AvEntertainments',
61
62
  'dmm' => 'OpenDMM::SearchEngine::Dmm',
62
63
  'jav_library' => 'OpenDMM::SearchEngine::JavLibrary',
64
+ 'maker' => 'OpenDMM::Maker',
63
65
  'mgstage' => 'OpenDMM::SearchEngine::Mgstage',
64
- 'av_entertainments' => 'OpenDMM::SearchEngine::AvEntertainments' }.each do |category, klass|
66
+ }.each do |category, klass|
65
67
  Dir[File.dirname(__FILE__) + "/#{category}_fixtures/*.json"].each do |file|
66
68
  name = File.basename(file, '.json')
67
69
  eval <<-TESTCASE
data/test/maker_fixtures/10musume 082914_01.json CHANGED
@@ -5,7 +5,16 @@
5
5
  "categories": [
6
6
  "色白",
7
7
  "生ハメ",
8
- "ふつう"
8
+ "ふつう",
9
+ "美乳",
10
+ "ミディアム",
11
+ "フェラチオ",
12
+ "素人",
13
+ "美尻",
14
+ "美脚",
15
+ "浴衣・着物",
16
+ "クンニ",
17
+ "ザーメン"
9
18
  ],
10
19
  "code": "10musume 082914_01",
11
20
  "cover_image": "http://www.10musume.com/moviepages/082914_01/images/str.jpg",
data/test/maker_fixtures/AVOP-061.json CHANGED
@@ -12,6 +12,18 @@
12
12
  "movie_length": 9600,
13
13
  "page": "http://www.dasdas.jp/works/-/detail/=/cid=avop061/",
14
14
  "release_date": "2014-08-01",
15
+ "sample_images": [
16
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-01.jpg",
17
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-02.jpg",
18
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-03.jpg",
19
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-04.jpg",
20
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-05.jpg",
21
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-06.jpg",
22
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-07.jpg",
23
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-08.jpg",
24
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-09.jpg",
25
+ "http://www.dasdas.jp/images/works/avop061/avop061jp-10.jpg"
26
+ ],
15
27
  "thumbnail_image": "http://www.dasdas.jp/images/works/avop061/avop061pl.jpg",
16
28
  "title": "全発射本物精子！ノーカット11連続中出しセックス＆ザーメンごっくん22連発プラスアナルマ○コぶっかけ精子ねじ込み30発さらに初黒人3穴ファック！"
17
29
  }
data/test/maker_fixtures/DASD-001.json CHANGED
@@ -12,6 +12,18 @@
12
12
  "movie_length": 7200,
13
13
  "page": "http://www.dasdas.jp/works/-/detail/=/cid=dasd001/",
14
14
  "release_date": "2007-04-25",
15
+ "sample_images": [
16
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-01.jpg",
17
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-02.jpg",
18
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-03.jpg",
19
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-04.jpg",
20
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-05.jpg",
21
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-06.jpg",
22
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-07.jpg",
23
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-08.jpg",
24
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-09.jpg",
25
+ "http://www.dasdas.jp/images/works/dasd001/dasd001jp-10.jpg"
26
+ ],
15
27
  "series": "20連発中出し！",
16
28
  "thumbnail_image": "http://www.dasdas.jp/images/works/dasd001/dasd001pl.jpg",
17
29
  "title": "グラビアアイドル青木りん20連発中出し！"
data/test/maker_fixtures/DAZD-001.json CHANGED
@@ -9,6 +9,18 @@
9
9
  "movie_length": 14400,
10
10
  "page": "http://www.dasdas.jp/works/-/detail/=/cid=dazd001/",
11
11
  "release_date": "2007-10-25",
12
+ "sample_images": [
13
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-01.jpg",
14
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-02.jpg",
15
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-03.jpg",
16
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-04.jpg",
17
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-05.jpg",
18
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-06.jpg",
19
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-07.jpg",
20
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-08.jpg",
21
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-09.jpg",
22
+ "http://www.dasdas.jp/images/works/dazd001/dazd001jp-10.jpg"
23
+ ],
12
24
  "series": "総集編",
13
25
  "thumbnail_image": "http://www.dasdas.jp/images/works/dazd001/dazd001pl.jpg",
14
26
  "title": "100連発中出し！"
data/test/maker_fixtures/PLA-001.json CHANGED
@@ -12,6 +12,18 @@
12
12
  "movie_length": 7200,
13
13
  "page": "http://www.dasdas.jp/works/-/detail/=/cid=pla001/",
14
14
  "release_date": "2010-04-25",
15
+ "sample_images": [
16
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-01.jpg",
17
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-02.jpg",
18
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-03.jpg",
19
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-04.jpg",
20
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-05.jpg",
21
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-06.jpg",
22
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-07.jpg",
23
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-08.jpg",
24
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-09.jpg",
25
+ "http://www.dasdas.jp/images/works/pla001/pla001jp-10.jpg"
26
+ ],
15
27
  "thumbnail_image": "http://www.dasdas.jp/images/works/pla001/pla001pl.jpg",
16
28
  "title": "復活 夕樹舞子"
17
29
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opendmm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.1
4
+ version: 0.4.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jun Zhou
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-11-12 00:00:00.000000000 Z
11
+ date: 2014-12-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -126,7 +126,6 @@ files:
126
126
  - lib/opendmm/maker.rb
127
127
  - lib/opendmm/makers/aknr.rb
128
128
  - lib/opendmm/makers/ako3.rb
129
- - lib/opendmm/makers/anna_and_hanako.rb
130
129
  - lib/opendmm/makers/apa.rb
131
130
  - lib/opendmm/makers/aroma.rb
132
131
  - lib/opendmm/makers/attackers.rb
@@ -164,6 +163,7 @@ files:
164
163
  - lib/opendmm/makers/tokyo_247.rb
165
164
  - lib/opendmm/makers/waap.rb
166
165
  - lib/opendmm/makers/xxx.rb
166
+ - lib/opendmm/makers_broken/anna_and_hanako.rb
167
167
  - lib/opendmm/makers_broken/high_scene.rb
168
168
  - lib/opendmm/makers_broken/to_satsu.rb
169
169
  - lib/opendmm/search_engine.rb
@@ -178,6 +178,11 @@ files:
178
178
  - test/av_entertainments_fixtures/MKBD-S40.json
179
179
  - test/av_entertainments_fixtures/SKYHD-108.json
180
180
  - test/av_entertainments_fixtures/sky107.json
181
+ - test/broken/ANND-066.json
182
+ - test/broken/BIJN-006.json
183
+ - test/broken/CLUB-003.json
184
+ - test/broken/HIGH-107.json
185
+ - test/broken/SIRO-1088.json
181
186
  - test/dmm_fixtures/DMYJ-001.json
182
187
  - test/dmm_fixtures/KHY-009.json
183
188
  - test/dmm_fixtures/RKI-294.json
@@ -203,7 +208,6 @@ files:
203
208
  - test/maker_fixtures/AKO-011.json
204
209
  - test/maker_fixtures/ALB-038.json
205
210
  - test/maker_fixtures/ALB-182.json
206
- - test/maker_fixtures/ANND-066.json
207
211
  - test/maker_fixtures/AP-001.json
208
212
  - test/maker_fixtures/APAA-182.json
209
213
  - test/maker_fixtures/APAK-051.json
@@ -373,10 +377,6 @@ files:
373
377
  - test/maker_fixtures/YRZ-009.json
374
378
  - test/maker_fixtures/YUM-001.json
375
379
  - test/maker_fixtures/ZEX-068.json
376
- - test/maker_fixtures_broken/BIJN-006.json
377
- - test/maker_fixtures_broken/CLUB-003.json
378
- - test/maker_fixtures_broken/HIGH-107.json
379
- - test/mgstage_fixtures/SIRO-1088.json
380
380
  homepage:
381
381
  licenses:
382
382
  - MIT
@@ -405,6 +405,11 @@ test_files:
405
405
  - test/av_entertainments_fixtures/MKBD-S40.json
406
406
  - test/av_entertainments_fixtures/SKYHD-108.json
407
407
  - test/av_entertainments_fixtures/sky107.json
408
+ - test/broken/ANND-066.json
409
+ - test/broken/BIJN-006.json
410
+ - test/broken/CLUB-003.json
411
+ - test/broken/HIGH-107.json
412
+ - test/broken/SIRO-1088.json
408
413
  - test/dmm_fixtures/DMYJ-001.json
409
414
  - test/dmm_fixtures/KHY-009.json
410
415
  - test/dmm_fixtures/RKI-294.json
@@ -430,7 +435,6 @@ test_files:
430
435
  - test/maker_fixtures/AKO-011.json
431
436
  - test/maker_fixtures/ALB-038.json
432
437
  - test/maker_fixtures/ALB-182.json
433
- - test/maker_fixtures/ANND-066.json
434
438
  - test/maker_fixtures/AP-001.json
435
439
  - test/maker_fixtures/APAA-182.json
436
440
  - test/maker_fixtures/APAK-051.json
@@ -600,7 +604,3 @@ test_files:
600
604
  - test/maker_fixtures/YRZ-009.json
601
605
  - test/maker_fixtures/YUM-001.json
602
606
  - test/maker_fixtures/ZEX-068.json
603
- - test/maker_fixtures_broken/BIJN-006.json
604
- - test/maker_fixtures_broken/CLUB-003.json
605
- - test/maker_fixtures_broken/HIGH-107.json
606
- - test/mgstage_fixtures/SIRO-1088.json