opendmm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef198597eed1838f18bdea348b976e6f0ddebcf3
-  data.tar.gz: f5fe6baeec8b303d9bca0bd9635f069a37cec3fb
+  metadata.gz: 807b507fdae159cc6e2ef1ad1e795944180ee9dd
+  data.tar.gz: 5f04d17817251b805f5fe671b865ef7de792cc84
 SHA512:
-  metadata.gz: 8f215662315bc97bd6567ef8f2836f74cf905a091b511fb846c78c9c95e62c62b5cea80a3cbddc582e3a1617f49081f11f98bda0581869b5eebe5c95f108f7fa
-  data.tar.gz: 1f08c993484f83a3d7e6c51995f7a40071892d5c7865f7d1d1ba8b2b7889441f45369f0c53165f5711a9066337036f377fe562e53c3b4e8d277c92afc8c44eee
+  metadata.gz: 7b5802d38018ace981d8052f31789923a42cdc3ac94ed1caa1e8f26734739e9c1ecb8081f8c878e3b7957e1c4326d75cfaf36af0f8e642ca76f59e8239125552
+  data.tar.gz: bf1baf2b3b73676cf6b50a702561814d92175014408c7e24ad778151bef50416a05df3056355bcc085c2c3fc491f2c6270e302e50d217dddc9cc857109741f79

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
   - 2.1.2
-script: rake test GFW_MODE=1

data/lib/opendmm/maker.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/string/filters'
 require 'httparty'
+require 'logger'
 require 'nokogiri'
 require 'opendmm/utils'
 
@@ -51,8 +52,9 @@ module OpenDMM
         return result if result
       end
       nil
-    rescue
-      nil
+    rescue Errno::ETIMEDOUT => e
+      tries++
+      tries <= 5 ? retry : raise
     end
   end
 end

data/lib/opendmm/makers/candy.rb

@@ -22,7 +22,7 @@ module OpenDMM
           specs = Utils.hash_from_dl(html.css('#actress > div > dl'))
           return {
             actresses:       specs['出演女優'].css('a').map(&:text),
-            code:            specs['品番'].text,
+            code:            parse_code(specs['品番'].text),
             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),
@@ -35,6 +35,13 @@ module OpenDMM
             title:           html.css('#brand > div.m_t_4 > h3').text,
           }
         end
+
+        def self.parse_code(text)
+          return text unless text.include? '⁄'
+          text.lines.map do |line|
+            line.split '⁄'
+          end.squish_hard.to_h['DVD']
+        end
       end
     end
   end

data/lib/opendmm/search_engines/jav_library.rb

@@ -9,7 +9,7 @@ module OpenDMM
         follow_redirects false
 
         def self.search(name)
-          get("/ja/vl_searchbyid.php?keyword=#{name}")
+          get("/ja/vl_searchbyid.php?keyword=#{CGI::escape(name)}")
         end
 
         def self.item(id)
@@ -52,8 +52,9 @@ module OpenDMM
           jav_id = Parser.parse_search_result(search_result)
         end
         Parser.parse_item(Site.item(jav_id)) if jav_id
-      rescue
-        nil
+      rescue Errno::ETIMEDOUT => e
+        tries++
+        tries <= 5 ? retry : raise
       end
     end
   end

data/lib/opendmm/utils.rb

@@ -69,51 +69,33 @@ module OpenDMM
       $stderr = STDERR
       content = content.encode('UTF-8', encoding, invalid: :replace, undef: :replace, replace: '')
     end
+  end
+end
 
-    def self.cleanup(details)
-      return nil unless details
-      details = self.squish(details)
-      if details[:movie_length].instance_of? String
-        details[:movie_length] = ChronicDuration.parse(details[:movie_length])
-      end
-      if details[:page]
-        if details[:cover_image] && !details[:cover_image].start_with?('http')
-          details[:cover_image] = URI.join(details[:page], details[:cover_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[:thumbnail_image] && !details[:thumbnail_image].start_with?('http')
-          details[:thumbnail_image] = URI.join(details[:page], details[:thumbnail_image]).to_s
-        end
-      end
-      if details[:release_date].instance_of? String
-        details[:release_date] = Date.parse(details[:release_date])
-      end
-      details
-    end
+class Object
+  def squish_hard
+    presence
+  end
+end
 
-    def self.squish(obj)
-      case obj
-      when String
-        obj.squish!
-        obj.gsub!(/^[\s-]*$/, '')
-      when Hash
-        obj = obj.map do |k, v|
-          [k, squish(v)]
-        end.select do |kv|
-          kv.second.present?
-        end.to_h.symbolize_keys
-      when Array
-        obj = obj.map do |v|
-          squish(v)
-        end.select do |v|
-          v.present?
-        end
-      end
-      return obj.present? ? obj : nil
-    end
+class String
+  def squish_hard
+    squish.gsub(/^[\s-]*$/, '').presence
+  end
+end
+
+class Hash
+  def squish_hard
+    map do |k, v|
+      [k, v.squish_hard]
+    end.select do |k_v|
+      k_v.second.present?
+    end.to_h.presence
+  end
+end
+
+class Array
+  def squish_hard
+    map(&:squish_hard).select(&:present?).presence
   end
 end

data/lib/opendmm/version.rb

@@ -1,3 +1,3 @@
 module OpenDMM
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/opendmm.rb

@@ -4,6 +4,26 @@ require 'opendmm/search_engines/jav_library'
 
 module OpenDMM
   def self.search(name)
-    Utils.cleanup(Maker.search(name) || SearchEngine::JavLibrary.search(name))
+    details = Maker.search(name) || SearchEngine::JavLibrary.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
   end
 end

data/test/fixtures/CND-062.json

@@ -0,0 +1,29 @@
+{
+  "actresses": [
+    "鈴木心湖"
+  ],
+  "code": "CND-062",
+  "cover_image": "http://candy-av.com/images/works/cnd062/cnd062pl.jpg",
+  "description": "絶対美少女シリーズ、今月の新人は奇跡の透明感を持つ純白美肌の鈴木心湖！まさに容姿端麗、18歳とは思えない洗練された美しさの彼女は見た目の完成度だけでなく性格もとってもハートフル！時おり見せるあどけない表情や仕草と完成された容姿のギャップがたまりません！",
+  "genres": [
+    "デビュー作品"
+  ],
+  "movie_length": 7200,
+  "page": "http://candy-av.com/works/-/detail/=/cid=cnd062",
+  "release_date": "2013-10-01",
+  "sample_images": [
+    "http://candy-av.com/images/works/cnd062/cnd062jp-01.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-02.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-03.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-04.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-05.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-06.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-07.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-08.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-09.jpg",
+    "http://candy-av.com/images/works/cnd062/cnd062jp-10.jpg"
+  ],
+  "thumbnail_image": "http://candy-av.com/images/works/cnd062/cnd062pm.jpg",
+  "series": "絶・対・美・少・女",
+  "title": "絶・対・美・少・女 奇跡の純白透明感 AVデビュー 鈴木心湖（18歳）"
+}

data/test/fixtures_test.rb

@@ -17,7 +17,7 @@ class FixtureTest < Minitest::Test
   end
 
   def assert_has_basic_keys(product)
-    %i(code title thumbnail_image cover_image).each do |key|
+    %i(code title thumbnail_image cover_image page).each do |key|
       assert product[key], "Key #{key} should not be absent"
     end
   end
@@ -67,8 +67,6 @@ class FixtureTest
     assert_has_basic_keys(actual)
     assert_no_unknown_keys(actual)
     assert_equal expected, actual, HashDiff.diff(expected, actual)
-  rescue Errno::ETIMEDOUT => e
-    raise unless ENV['GFW_MODE']
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opendmm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jun Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,7 @@ files:
 - test/fixtures/CHS-015.json
 - test/fixtures/CLUB-003.json
 - test/fixtures/CND-012.json
+- test/fixtures/CND-062.json
 - test/fixtures/CWM-156.json
 - test/fixtures/Carib 021511-620.json
 - test/fixtures/DCOL-017.json
@@ -344,6 +345,7 @@ test_files:
 - test/fixtures/CHS-015.json
 - test/fixtures/CLUB-003.json
 - test/fixtures/CND-012.json
+- test/fixtures/CND-062.json
 - test/fixtures/CWM-156.json
 - test/fixtures/Carib 021511-620.json
 - test/fixtures/DCOL-017.json