opendmm 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9fd109fd9892fc2cfc406afc24cef8a5e9ea074
-  data.tar.gz: 75c288cb6b2f99207cee3732979eb0872d5000de
+  metadata.gz: fef917ffa04e30b83e92fcdce69f4d92c83006de
+  data.tar.gz: 3abff14037ac54df6af8ef421ca7d8ee538f0aa3
 SHA512:
-  metadata.gz: 0df748805f49ad23c4810348dccdc10b705089794a91fa4eeab3acbf12c2c8df36e2303e8222857b1a29ac6ecf3210961b951576c229ed9a16c15400284972e4
-  data.tar.gz: 2cc330c9b81004a9588961a7b97cc86db347f98bb97eeb5e430da293cc7adf990537898abe3f79b14e479dc7634c57c3366c486cb1a6374627e939bc88f3e62e
+  metadata.gz: e86153d2202b017d9b5696c3df5046e306b2863bbb0c25667e057af9da6213b9da0c22b5340a0242c9b8e36fab1e8644cb94fc2cb087d2237a286bafd0b80ca1
+  data.tar.gz: 2797b8aa6aa8d380e0e335c22206605f55a2cd2268d85c0da8fea08624898a714984474dffb5e9775a4512b89c7da02cd06c41bf7fa99b0510a5a5c97e37222b

data/lib/opendmm/engines/av_entertainments.rb

@@ -22,7 +22,7 @@ module OpenDMM
       private
 
       def self.normalize(query)
-        query.scan(/((?:S2|2D|3D|[a-z]){2,6}?)[-_\s]?(S?\d{2,5})/i).map do |pair|
+        query.scan(/((?:S2|2D|3D|[a-z]){2,6}?)[-_\s]?([SM]?\d{2,5})/i).map do |pair|
           alpha = pair[0].upcase
           digit = pair[1]
           case alpha

data/lib/opendmm/engines/tokyo_hot.rb

@@ -7,14 +7,12 @@ module OpenDMM
       def self.search(query)
         query = normalize(query)
         return unless query
-        return MovieN.new(query).details if query.start_with? 'n'
-        return MovieK.new(query).details if query.start_with? 'k'
+        Movie.new(query).details
       end
 
       private
 
       def self.normalize(query)
-        # return unless query =~ /Tokyo[-_\s]*Hot/
         return unless query =~ /(k|n)(\d{3,4})/
         "#{$1}#{$2.rjust(4, '0')}"
       end
@@ -23,54 +21,55 @@ module OpenDMM
         include HTTParty
         base_uri 'www.tokyo-hot.com'
 
-        def self.list_n
-          @@list_n ||= get '/j/new_video0000_j.html'
-        end
-
-        def self.list_k
-          @@list_k ||= get '/j/k_video0000_j.html'
+        def self.search(query)
+          get "http://www.tokyo-hot.com/product/?q=#{CGI::escape(query)}"
         end
       end
 
-      class MovieN < OpenDMM::Movie
-        def initialize(query)
-          super(query, Site.list_n)
-
-          @details.code         = "Tokyo Hot #{query}"
-          @details.maker        = 'Tokyo Hot'
-
-          link = @html.at_xpath("//a[contains(@href, '#{@query}')]")
-          @details.page         = link['href']
-          @details.cover_image  = link.at_css('img')['src']
+      class Search
+        def initialize(query, response)
+          @query = query
+          @response = response
+          @html = Nokogiri.HTML @response
+        end
 
-          table = link.ancestors('table').first
-          table.css('br').each do |br|
-            br.replace "\n"
-          end
-          @details.title        = table.at_xpath('tr[1]').text
-          @details.actresses    = table.at_xpath('tr[2]').text.squish.remove('--').split(/[\s、,]/)
-          @details.release_date = table.at_xpath('tr[3]').text.remove('更新日')
+        def result
+          candidate = @html.at_css('#main > ul > li > a')['href']
+          URI.join(@response.request.last_uri.to_s, candidate).to_s
         end
       end
 
-      class MovieK < OpenDMM::Movie
+      class Movie < OpenDMM::Movie
         def initialize(query)
-          super(query, Site.list_k)
+          search = Search.new(query, Site.search(query))
+          super(query, Site.get(search.result))
 
-          @details.code         = "Tokyo Hot #{query}"
-          @details.maker        = 'Tokyo Hot'
+          @details.maker = 'Tokyo Hot'
 
-          link = @html.at_xpath("//a[contains(@href, '#{@query}')]")
-          @details.page         = link['href']
-          @details.cover_image  = link.at_css('img')['src']
+          @details.title = @html.at_css('#container > div.pagetitle > h2').text
+          @details.cover_image = @html.at_css('#container > div.movie.cf > div.in > div.flowplayer > video')['poster']
+          @details.description = @html.at_css('#main > div.contents > div.sentence').text
 
-          table = link.ancestors('table').first
-          @details.title        = table.at_xpath('tr[1]').text.remove('-').squish
-          if @details.title =~ /餌食牝\s(.*)/
-            @details.actresses = $1.squish.split
-            @details.title = '餌食牝'
+          @html.css('#main > div.contents > div.infowrapper > dl > dt').each do |dt|
+            dd = dt.next_element
+            case dt.text
+            when /出演者/
+              @details.actresses = dd.css('a').map(&:text)
+            when /シリーズ/
+              @details.series = dd.text
+            when /カテゴリ/
+              @details.categories = dd.css('a').map(&:text)
+            when /配信開始日/
+              @details.release_date = dd.text
+            when /収録時間/
+              @details.movie_length = dd.text
+            when /作品番号/
+              @details.code = 'Tokyo Hot ' + dd.text
+            end
           end
-          @details.release_date = table.at_xpath('tr[2]').text.remove('更新日')
+
+          @details.sample_images = @html.css('#main > div.contents > div.scap > a,
+                                              #main > div.contents > div.vcap > a').map { |a| a['href'] }
         end
       end
     end

data/lib/opendmm/movie.rb

@@ -81,11 +81,11 @@ module OpenDMM
         when :String
           value.to_s.squish
         when :URI
-          URI.join(self.base_uri, value).to_s
+          URI.join(self.base_uri, URI.escape(value)).to_s
         when :URIArray
           raise "Field #{key} not an array: #{value}" unless value.instance_of? Array
           value.map do |uri|
-            URI.join(self.base_uri, uri.squish).to_s
+            URI.join(self.base_uri, URI.escape(uri)).to_s
           end.sort
         else
           raise ArgumentError.new("Unknown value type: #{type}")

data/lib/opendmm/version.rb

@@ -1,3 +1,3 @@
 module OpenDMM
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opendmm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jun Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler