bookscan_client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80c696dea04315b45a82d625d144baea979194f
-  data.tar.gz: c2b7930302400b35f5d9c29efa08e0d55d8b69da
+  metadata.gz: 2127994119e09cb507b05d5e7b1bb93e804239cf
+  data.tar.gz: f875faa5e71e836e423eb2dd0401eb4e65d67055
 SHA512:
-  metadata.gz: 9d22b93bbfd8bdb6179a5a643b5d956550fb971cc94dd9907ca58a6f63f432dd484aad1ca52301915a5b5dbbc1a635b4d78826e64cb27cc12f1ad5199f05a997
-  data.tar.gz: c9acf428a24ad4b60fcf7c5b8b566dc789be28163b93d1723dfd4e6913d7b05ef064f7bfaf1836787c5d364a67be18c43dc559751defa4b147de5031c9274179
+  metadata.gz: 8dd14137e893130ab759fb0e5dea9c4eccb0c19f4d4271e77481cb87205ca83f6838a2ef2a9fa4535fd1a66b096c1c9ef7c53e78dc6f8e0d95477b2b1d382e9c
+  data.tar.gz: 9eea2e94a6bf0a47dca73d5ca7ad6e8175cb6a874c42d34426a4a328412e82f004c3b30376678f895231a61599eacfc24414cb58d8e7a14117aefda809472ce4

data/lib/bookscan_client.rb

@@ -12,6 +12,7 @@ class BookscanClient
     LOGIN = "https://system.bookscan.co.jp/login.php"
     MYPAGE = "https://system.bookscan.co.jp/bookshelf_all_cover.php"
     DOWNLOAD = "https://system.bookscan.co.jp/download.php"
+    OPTIMIZED_BOOKS = "https://system.bookscan.co.jp/tunelablist.php"
   end
 
   def initialize(logger: Logger.new(STDOUT), sleep: 0.5)
@@ -31,7 +32,28 @@ class BookscanClient
 
   def books
     page = fetch(URL::MYPAGE)
-    BookscanClient::Model::Book.parse_books(page)
+    page.search("#sortable_box .showbook").map{|book_link|
+      url = "#{BookscanClient::URL::ROOT}#{book_link.attr("href")}"
+      params = CGI.parse(URI.parse(url).query)
+      next unless %w[f h d].all?{|key| params.keys.include?(key) }
+      image = book_link.search("img")
+
+      book = BookscanClient::Model::Book.new(filename: params["f"][0], hash: params["h"][0], digest: params["d"][0])
+      book.image_url = image[0].attr("data-original") unless image.empty?
+
+      book
+    }
+  end
+
+  def optimized_books
+    page = fetch(URL::OPTIMIZED_BOOKS)
+    page.search("a.download").map{|book_link|
+      url = "#{BookscanClient::URL::ROOT}#{book_link.attr("href")}"
+      params = CGI.parse(URI.parse(url).query)
+      next unless %w[f d].all?{|key| params.keys.include?(key) }
+
+      BookscanClient::Model::OptimizedBook.new(filename: params["f"][0], digest: params["d"][0])
+    }
   end
 
   def cookies

data/lib/bookscan_client/model.rb

@@ -1 +1,2 @@
 require "bookscan_client/model/book"
+require "bookscan_client/model/optimized_book"

data/lib/bookscan_client/model/book.rb

@@ -10,20 +10,6 @@ class BookscanClient
         @image_url = image_url
       end
 
-      def self.parse_books(page)
-        page.search("#sortable_box .showbook").map{|book_link|
-          url = "#{BookscanClient::URL::ROOT}#{book_link.attr("href")}"
-          params = CGI.parse(URI.parse(url).query)
-          next unless %w[f h d].all?{|key| params.keys.include?(key) }
-          image = book_link.search("img")
-
-          book = Book.new(filename: params["f"][0], hash: params["h"][0], digest: params["d"][0])
-          book.image_url = image[0].attr("data-original") unless image.empty?
-
-          book
-        }
-      end
-
       def download_url
         "#{BookscanClient::URL::DOWNLOAD}?d=#{digest}&f=#{CGI.escape(filename)}"
       end

data/lib/bookscan_client/model/optimized_book.rb

@@ -0,0 +1,16 @@
+class BookscanClient
+  module Model
+    class OptimizedBook
+      attr_accessor :filename, :digest
+
+      def initialize(filename: nil, digest: nil)
+        @filename = filename
+        @digest = digest
+      end
+
+      def download_url
+        "#{BookscanClient::URL::DOWNLOAD}?d=#{digest}&f=#{CGI.escape(filename)}&optimize=1"
+      end
+    end
+  end
+end

data/lib/bookscan_client/version.rb

@@ -1,3 +1,3 @@
 class BookscanClient
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/bookscan_client_test.rb

@@ -2,6 +2,7 @@ require_relative "./test_helper"
 
 describe BookscanClient do
   before do
+    stub_requests
     @client = BookscanClient.new
   end
 
@@ -17,4 +18,15 @@ describe BookscanClient do
       assert_equal books[1].image_url, "http://example.com/hoge.jpg"
     end
   end
+
+  describe "#optimized_books" do
+    it "returns optimized_book model array" do
+      optbooks = @client.optimized_books
+      assert_equal optbooks.size, 2
+      assert_equal optbooks[0].filename, "filename1"
+      assert_equal optbooks[0].digest, "digest1"
+      assert_equal optbooks[1].filename, "filename2"
+      assert_equal optbooks[1].digest, "digest2"
+    end
+  end
 end

data/test/data/optimized_books.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+
+<a class="download" href="download.php?d=digest1&f=filename1">optimized book 1</a>
+
+<a class="download" href="download.php?d=digest2&f=filename2">optimized book 2</a>
+
+</body>
+</html>

data/test/test_helper.rb

@@ -8,10 +8,15 @@ require "webmock/minitest"
 WEBMOCK_DATADIR = File.expand_path('../data', __FILE__)
 WEBMOCK_PAGES = {
     BookscanClient::URL::MYPAGE => "mypage.html",
+    BookscanClient::URL::OPTIMIZED_BOOKS => "optimized_books.html",
 }
-WEBMOCK_PAGES.each do |url, filename|
-  path = File.expand_path(filename, WEBMOCK_DATADIR)
-  WebMock.
-      stub_request(:get, url).
-      to_return(body: File.new(path), status: 200, headers: { 'Content-Type' => 'text/html' })
+
+def stub_requests
+  WEBMOCK_PAGES.each do |url, filename|
+    path = File.join(WEBMOCK_DATADIR, filename)
+    WebMock.
+        stub_request(:get, url).
+        to_return(body: File.new(path), status: 200, headers: { 'Content-Type' => 'text/html' })
+    p "stub #{url}"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookscan_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - hogelog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -138,9 +138,11 @@ files:
 - lib/bookscan_client.rb
 - lib/bookscan_client/model.rb
 - lib/bookscan_client/model/book.rb
+- lib/bookscan_client/model/optimized_book.rb
 - lib/bookscan_client/version.rb
 - test/bookscan_client_test.rb
 - test/data/mypage.html
+- test/data/optimized_books.html
 - test/test_helper.rb
 homepage: https://github.com/hogelog/bookscan-client-ruby
 licenses:
@@ -169,4 +171,5 @@ summary: Unofficial bookscan client.
 test_files:
 - test/bookscan_client_test.rb
 - test/data/mypage.html
+- test/data/optimized_books.html
 - test/test_helper.rb