pixiv 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a15fda5ed4b1295bc489807d64ed2af7c8fc84e0
+  data.tar.gz: df8d3d98c7bc4eb398f8b83b11828db630bba4e8
+SHA512:
+  metadata.gz: 57e2290c398f7f287bf20d0bbe57c8062f516b292626088ede1b5d0efa640f8e0cdc5948749c123860c7acc060c0d770848d1f869065e7f8d5b0d7606a40d803
+  data.tar.gz: 7d370d9351429439a49f00de960812b699514c1c4fe5a63b1f94eaca6863bcc564e83653fea63d06ca818f43be0817ac6531300b732424b4ed8849eecd032ca3

data/Changelog.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 2013-09-01 0.0.9
+
+- Updated for new pixiv layout and added tests (thanks @co-me!)
+- Fixed broken xpaths for medium- and original-sized images
+- Fixed a bug where `Pixiv::Client#work_list` would raise an error

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/README.md

@@ -56,7 +56,7 @@ member.works.each do |illust|
 end
 
 me = pixiv.member
-me.bookmarks do |illust|
+me.bookmarks.each do |illust|
   author = illust.member
   puts author.name
   puts author.works.count

data/lib/pixiv/bookmark_list.rb

@@ -7,7 +7,7 @@ module Pixiv
 
     # @return [Integer]
     lazy_attr_reader(:total_count) {
-      node = at!('a[href="/bookmark.php?type=illust_all"]')
+      node = at!('.column-label .count-badge')
       node.inner_text[/\d+/].to_i
     }
     # @return [Array<Hash{Symbol=>Object}, nil>]

data/lib/pixiv/client.rb

@@ -74,7 +74,7 @@ module Pixiv
     def work_list(member_or_id = member_id, page = 1)
       list = illust_list_with_class(WorkList, member_or_id, page)
       # Cheat; member_name will not found on your own work list.
-      list.send(:set_attrs!, member_name: member_name) if list.owner_id == member_id
+      list.send(:set_attrs!, member_name: member.name) if list.owner_id == member_id
       list
     end
 

data/lib/pixiv/illust.rb

@@ -15,9 +15,9 @@ module Pixiv
     # @return [String]
     lazy_attr_reader(:small_image_url) { at!('meta[property="og:image"]')['content'] }
     # @return [String]
-    lazy_attr_reader(:medium_image_url) { image_url_components.join('_m') }
+    lazy_attr_reader(:medium_image_url) { at!('.works_display img')['src'] }
     # @return [String]
-    lazy_attr_reader(:original_image_url) { illust? && image_url_components.join('') }
+    lazy_attr_reader(:original_image_url) { illust? ? image_url_components.join('') : nil }
     # @return [Array<String>]
     lazy_attr_reader(:original_image_urls) {
       illust? ? [original_image_url]
@@ -68,15 +68,11 @@ module Pixiv
     def illust?; !manga? end
     # @return [Boolean]
     def manga?; !!num_pages end
-    # @return [String]
-    def medium_image_url; image_url_components.join('_m') end
-    # @return [String]
-    def original_image_url; image_url_components.join('') end
 
     private
 
     def image_url_components
-      @image_url_components ||= small_image_url.match(%r{^(.+)_s(\.\w+(?:\?\d+)?)$}).to_a[1, 3]
+      @image_url_components ||= medium_image_url.match(%r{^(.+)_m(\.\w+(?:\?\d+)?)$}).to_a[1, 3]
     end
   end
 

data/lib/pixiv/owned_illust_list.rb

@@ -20,11 +20,13 @@ module Pixiv
 
     # @return [Integer]
     lazy_attr_reader(:page) {
-      at!('ul.page-list .current').inner_text.to_i
+      node = doc.at('ul.page-list .current')
+      node ? node.inner_text.to_i : 1
     }
     # @return [Boolean]
     lazy_attr_reader(:last?) {
-      at!('ul.page-list .current').next_element.nil?
+      node = doc.at('ul.page-list .current')
+      node ? node.next_element.nil? : true
     }
     # @return [Integer]
     lazy_attr_reader(:member_id) {
@@ -71,4 +73,4 @@ module Pixiv
     # @!parse alias owner member
     def owner; member end
   end
-end
+end

data/lib/pixiv/search_result_list.rb

@@ -63,16 +63,17 @@ module Pixiv
     attr_reader :search_opts
 
     lazy_attr_reader(:page) {
-      at!('.pager li.current').inner_text.to_i
+      node = doc.at('.page-list li.current')
+      node ? node.inner_text.to_i : 1
     }
     lazy_attr_reader(:last?) {
-      doc.at('//nav[@class="pager"]//a[@rel="next"]').nil?
+      doc.at('//div[@class="pager-container"]//a[@rel="next"]').nil?
     }
     lazy_attr_reader(:total_count) {
-      at!('.info > .count').inner_text.to_i
+      at!('.column-label > .count-badge').inner_text.to_i
     }
     lazy_attr_reader(:page_hashes) {
-      search!('#search-result li.image').map {|n| hash_from_list_item(n) }
+      search!('.column-search-result li.image-item').map {|n| hash_from_list_item(n) }
     }
 
     def url
@@ -112,17 +113,17 @@ module Pixiv
     private
 
     def hash_from_list_item(node)
-      member_node = node.at('p.user a')
-      illust_node = node.at('a')
+      member_node = node.at('.user')
+      illust_node = node.at('.work')
       illust_id = illust_node['href'][/illust_id=(\d+)/, 1].to_i
       {
         url: Illust.url(illust_id),
         illust_id: illust_id,
-        title: illust_node.at('h2').inner_text,
+        title: illust_node.at('h1').inner_text,
         member_id: member_node['href'][/\?id=(\d+)/, 1].to_i,
         member_name: member_node.inner_text,
         small_image_url: illust_node.at('img')['src'],
       }
     end
   end
-end
+end

data/lib/pixiv/version.rb

@@ -1,3 +1,3 @@
 module Pixiv
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/pixiv/work_list.rb

@@ -7,14 +7,14 @@ module Pixiv
 
     # @return [Integer]
     lazy_attr_reader(:total_count) {
-      node = at!('.layout-cell .count-badge')
+      node = at!('.manage-unit .count-badge')
       node.inner_text[/\d+/].to_i
     }
     # @return [String, nil] member_name
     #   member_name == nil if this work list is your own
     lazy_attr_reader(:member_name) {
-      node = doc.at('.profile_area a')
-      node && node['title']
+      node = doc.at('.profile-unit h1')
+      node && node.inner_text
     }
     # @return [Array<Hash{Symbol=>Object}, nil>]
     lazy_attr_reader(:page_hashes) {

data/spec/fixtures/member_6_bookmark_list.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Member #6 Bookmarks</title>
+  <script>
+    pixiv.context.userId = '6';
+  </script>
+</head>
+<body>
+  <div class="_unit action-unit">
+    <div class="column-label">
+      <span class="count-badge">1234件</span>
+    </div>
+    <nav class="column-order-menu">
+      <div class="pager-container">
+        <ul class="page-list">
+          <li>1</li>
+          <li class="current">2</li>
+          <li>3</li>
+        </ul>
+        <span class="next"><a rel="next"></a></span>
+      </div>
+    </nav>
+    <div class="display_works">
+      <ul>
+        <li id="li_98765">
+          <a href="/member_illust.php?illust_id=123" class="work"><img src="http://i1.pixiv.net/img1/img/hanako/123_s.jpg" />Illust #123</a>
+          <br>
+          <a href="member_illust.php?id=456">Hanako</a>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="_unit profile-unit">
+    <a href="/member.php?id=6">
+      <h1 class="user">Sayoko</h1>
+    </a>
+  </div>
+</body>
+</html>

data/spec/fixtures/member_6_work_list.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Member #6 Works</title>
+  <script>
+    pixiv.context.userId = '6';
+  </script>
+</head>
+<body>
+  <div class="_unit manage-unit">
+    <span class="count-badge">123件</span>
+    <ul class="column-order-menu">
+      <div class="pager-container">
+        <ul class="page-list">
+          <li>1</li>
+          <li class="current">2</li>
+          <li>3</li>
+        </ul>
+        <span class="next"><a rel="next"></a></span>
+      </div>
+    </ul>
+    <div class="display_works">
+      <ul>
+        <li class="image-item">
+          <a href="/member_illust.php?illust_id=345" class="work"><img src="http://i1.pixiv.net/img1/img/sayoko/345_s.jpg" /><h1>Illust #345</h1></a>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="_unit profile-unit">
+    <a href="/member.php?id=6">
+      <h1 class="user">Sayoko</h1>
+    </a>
+  </div>
+</body>
+</html>

data/spec/fixtures/search_hoge.html

@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Search hoge</title>
+</head>
+<body>
+  <div class="_unit">
+    <div class="column-label">
+      <!-- total_count = 12345 -->
+      <span class="count-badge">12345件</span>
+    </div>
+    <div class="pager-container">
+      <ul class="page-list">
+        <li>1</li>
+        <!-- page = 2 -->
+        <li class="current">2</li>
+        <li>3</li>
+      </ul>
+      <!-- last? = false -->
+      <span class="next"><a rel="next"></a></span>
+    </div>
+
+    <!-- page_hashes -->
+    <section class="column-search-result">
+      <ul>
+        <li class="image-item">
+          <a href="/member_illust.php?illust_id=345" class="work">
+            <img src="http://i1.pixiv.net/img1/img/sayoko/345_s.jpg" />
+            <h1>Illust #345</h1>
+          </a>
+          <a href="/member_illust.php?id=6" class="user">Sayoko</a>
+        </li>
+      </ul>
+    </section>
+  </div>
+</body>
+</html>

data/spec/pixiv/bookmark_list_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Pixiv::BookmarkList do
+  describe '.new' do
+    before do
+      agent = Mechanize.new
+      @doc = agent.get(File.join('file://', fixture_path, 'member_6_bookmark_list.html'))
+    end
+    subject { Pixiv::BookmarkList.new(@doc) }
+    its(:total_count) { should == 1234 }
+    its(:page_hashes) {
+      should == [
+        { :url             => 'http://www.pixiv.net/member_illust.php?mode=medium&illust_id=123',
+          :illust_id       => 123,
+          :title           => 'Illust #123',
+          :member_id       => 456,
+          :member_name     => 'Hanako',
+          :small_image_url => 'http://i1.pixiv.net/img1/img/hanako/123_s.jpg' }
+      ]
+    }
+  end
+end

data/spec/pixiv/search_result_list_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Pixiv::SearchResultList do
+  describe '.new' do
+    before do
+      @doc = fixture_as_doc('search_hoge.html')
+      @attrs = {
+        query: 'hoge',
+        search_opts: {}
+      }
+    end
+    subject { Pixiv::SearchResultList.new(@doc, @attrs) }
+    its(:page) { should == 2 }
+    its(:last?) { should == false }
+    its(:total_count) { should == 12345 }
+    its(:page_hashes) {
+      should == [
+        { :url             => 'http://www.pixiv.net/member_illust.php?mode=medium&illust_id=345', 
+          :illust_id       => 345,
+          :title           => 'Illust #345',
+          :member_id       => 6,
+          :member_name     => 'Sayoko',
+          :small_image_url => 'http://i1.pixiv.net/img1/img/sayoko/345_s.jpg' }
+      ]
+    }
+  end
+end

data/spec/pixiv/work_list_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Pixiv::WorkList do
+  describe '.new' do
+    before do
+      agent = Mechanize.new
+      @doc = agent.get(File.join('file://', fixture_path, 'member_6_work_list.html'))
+    end
+    subject { Pixiv::WorkList.new(@doc) }
+    its(:total_count) { should == 123 }
+    its(:member_name) { should == "Sayoko" }
+    its(:page_hashes) {
+      should == [
+        { :url             => 'http://www.pixiv.net/member_illust.php?mode=medium&illust_id=345',
+          :illust_id       => 345,
+          :title           => 'Illust #345',
+          :member_id       => 6,
+          :member_name     => 'Sayoko',
+          :small_image_url => 'http://i1.pixiv.net/img1/img/sayoko/345_s.jpg' }
+      ]
+    }
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: pixiv
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomoki Aonuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- Changelog.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -106,40 +98,51 @@ files:
 - spec/fixtures/empty.html
 - spec/fixtures/illust_345.html
 - spec/fixtures/member_6.html
+- spec/fixtures/member_6_bookmark_list.html
+- spec/fixtures/member_6_work_list.html
+- spec/fixtures/search_hoge.html
+- spec/pixiv/bookmark_list_spec.rb
 - spec/pixiv/illust_spec.rb
 - spec/pixiv/member_spec.rb
 - spec/pixiv/page_spec.rb
+- spec/pixiv/search_result_list_spec.rb
+- spec/pixiv/work_list_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/uasi/pixiv
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A client library for pixiv
 test_files:
 - spec/fixtures/empty.html
 - spec/fixtures/illust_345.html
 - spec/fixtures/member_6.html
+- spec/fixtures/member_6_bookmark_list.html
+- spec/fixtures/member_6_work_list.html
+- spec/fixtures/search_hoge.html
+- spec/pixiv/bookmark_list_spec.rb
 - spec/pixiv/illust_spec.rb
 - spec/pixiv/member_spec.rb
 - spec/pixiv/page_spec.rb
+- spec/pixiv/search_result_list_spec.rb
+- spec/pixiv/work_list_spec.rb
 - spec/spec_helper.rb
 has_rdoc: