pixiv 0.0.2 → 0.0.3

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.env
 .yardoc
 Gemfile.lock
 InstalledFiles

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - ruby-head
+  - 1.9.3
+notifications:
+  email:
+    - uasi@uasi.jp

data/Rakefile

@@ -1 +1,16 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+task :c => :console
+
+desc 'start console'
+task :console do
+  Bundler.with_clean_env do
+    console_helper = File.expand_path('../console_helper.rb', __FILE__)
+    load_env = File.exist?('.env') ? 'source .env' : 'true'
+    exec "#{load_env} && pry -r #{console_helper} -e 'init;'"
+  end
+end

data/console_helper.rb

@@ -0,0 +1,38 @@
+def init
+  id = ENV['PIXIV_ID'] or warn 'PIXIV_ID is not set'
+  password = ENV['PIXIV_PASSWORD'] or warn 'PIXIV_PASSWORD is not set'
+  abort unless id && password
+
+  proxy =
+    begin
+      if ENV['HTTP_PROXY']
+        host, port = ENV['HTTP_PROXY'].split(/:/)
+        [host, (port || 80).to_i]
+      else
+        nil
+      end
+    end
+
+  require 'bundler/setup'
+  Bundler.require
+
+  $pixiv = Pixiv.new(id, password) do |agent|
+    agent.user_agent_alias = 'Mac Safari'
+    agent.set_proxy(*proxy) if proxy
+  end
+
+  Kernel.const_set(:P, $pixiv)
+  Kernel.const_set(:M, $pixiv.member)
+end
+
+def I(id)
+  $pixiv.illust(id)
+end
+
+def M(id)
+  $pixiv.member(id)
+end
+
+def BL(member_id, p = 1)
+  $pixiv.bookmark_list(member_id, p)
+end

data/lib/pixiv/bookmark_list.rb

@@ -19,7 +19,7 @@ module Pixiv
     # @return [Integer]
     lazy_attr_reader(:member_id) { doc.body.match(/pixiv\.context\.userId = '(\d+)'/).to_a[1].to_i }
     # @return [Array<Integer>]
-    lazy_attr_reader(:illust_ids) { search!('li[id^="li_"] a[href^="member_illust.php?mode=medium"]').map {|n| n.attr('href').match(/illust_id=(\d+)$/).to_a[1].to_i } }
+    lazy_attr_reader(:illust_ids) { search!('li[id^="li_"] a[href^="member_illust.php?mode=medium"]').map {|n| n['href'].match(/illust_id=(\d+)$/).to_a[1].to_i } }
     # @return [Array<Hash{Symbol=>Object}, nil>]
     lazy_attr_reader(:illust_hashes) {
       search!('li[id^="li_"]').map {|node| illust_hash_from_bookmark_item(node) }
@@ -55,7 +55,7 @@ module Pixiv
         title: illust_node.inner_text,
         member_id: member_node['href'].match(/\?id=(\d+)/).to_a[1].to_i,
         member_name: member_node.inner_text,
-        small_image_url: illust_node.at('img').attr('src'),
+        small_image_url: illust_node.at('img')['src'],
       }
     end
   end

data/lib/pixiv/client.rb

@@ -53,17 +53,19 @@ module Pixiv
     end
 
     # @param [Integer] illust_id
-    # @return [Pixiv::Illust]
+    # @return [Pixiv::Illust] illust bound to +self+
     def illust(illust_id)
       attrs = {illust_id: illust_id}
-      Illust.lazy_new(attrs) { agent.get(Illust.url(illust_id)) }
+      illust = Illust.lazy_new(attrs) { agent.get(Illust.url(illust_id)) }
+      illust.bind(self)
     end
 
     # @param [Integer] member_id
-    # @return [Pixiv::Member]
+    # @return [Pixiv::Member] member bound to +self+
     def member(member_id = member_id)
       attrs = {member_id: member_id}
-      Member.lazy_new(attrs) { agent.get(Member.url(member_id)) }
+      member = Member.lazy_new(attrs) { agent.get(Member.url(member_id)) }
+      member.bind(self)
     end
 
     # @param [Pixiv::Member, Integer] member_or_member_id
@@ -136,7 +138,7 @@ module Pixiv
     end
 
     def member_id_from_mypage(doc)
-      doc.at('.profile_area a').attr('href').match(/(\d+)$/).to_a[1].to_i
+      doc.at('.profile_area a')['href'].match(/(\d+)$/).to_a[1].to_i
     end
 
     # Generate filename from +pattern+ in context of +illust+ and +url+
@@ -170,6 +172,7 @@ module Pixiv
     end
   end
 
+  # @private
   class DownloadActionRegistry
     def initialize(&block)
       instance_eval(&block) if block

data/lib/pixiv/illust.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 module Pixiv
   class Illust < Page
     # Returns the URL for given +illust_id+
@@ -8,7 +10,7 @@ module Pixiv
     end
 
     # @return [String]
-    lazy_attr_reader(:small_image_url) { at!('meta[property="og:image"]').attr('content') }
+    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') }
     # @return [String]
@@ -19,20 +21,35 @@ module Pixiv
               : (0...num_pages).map {|n| image_url_components.join("_p#{n}") }
     }
     # @return [String]
-    lazy_attr_reader(:original_image_referer) { ROOT_URL + '/' + at!('//div[@class="works_display"]/a').attr('href') }
+    lazy_attr_reader(:original_image_referer) { ROOT_URL + '/' + at!('//div[@class="works_display"]/a')['href'] }
     # @return [Integer]
-    lazy_attr_reader(:illust_id) { at!('#rpc_i_id').attr('title').to_i }
+    lazy_attr_reader(:illust_id) { at!('#rpc_i_id')['title'].to_i }
     # @return [Integer]
-    lazy_attr_reader(:member_id) { at!('#rpc_u_id').attr('title').to_i }
+    lazy_attr_reader(:member_id) { at!('#rpc_u_id')['title'].to_i }
     # @return [String]
-    lazy_attr_reader(:member_name) { raise NotImplementError.new('XXX') }
+    lazy_attr_reader(:member_name) {
+      at!('title').inner_text.match(%r!^「#{Regexp.escape(title)}」/「(.+)」の(?:イラスト|漫画) \[pixiv\]$!).to_a[1]
+    }
     # @return [String]
-    lazy_attr_reader(:title) { raise NotImplementError.new('XXX') }
+    lazy_attr_reader(:title) { at!('.work-info h1.title').inner_text }
     # @return [Integer]
     lazy_attr_reader(:num_pages) {
-      n = at!('//ul[@class="meta"]/li[2]').inner_text.match(/(\d+)P$/).to_a[1]
-      n && n.to_i
+      n = doc.at('//ul[@class="meta"]/li[2]')
+      n && n.inner_text.match(/(\d+)P$/).to_a[1].to_i
     }
+    # @return [Array<String>]
+    lazy_attr_reader(:tag_names) { search!('ul.tags a.text').map {|n| n.inner_text } }
+    # @return [String]
+    lazy_attr_reader(:caption) { at!('.work-info .caption').inner_text }
+    # @api experimental
+    # @return [Array<Nokogiri::XML::NodeSet, nil>]
+    lazy_attr_reader(:anchors_in_caption) { doc.search('.work-info .caption a') }
+    # @return [Integer]
+    lazy_attr_reader(:views_count) { at!('.view-count').inner_text.to_i }
+    # @return [Integer]
+    lazy_attr_reader(:rated_count) { at!('.rated-count').inner_text.to_i }
+    # @return [Integer]
+    lazy_attr_reader(:score) { at!('.score-count').inner_text.to_i }
 
     alias id illust_id
     alias original_image_referrer original_image_referer # referrer vs. referer

data/lib/pixiv/member.rb

@@ -10,13 +10,27 @@ module Pixiv
     # @return [String]
     lazy_attr_reader(:name) { at!('.profile_area h2').inner_text }
     # @return [Integer]
-    lazy_attr_reader(:member_id) { at!('input[name="user_id"]').attr('value').to_i }
+    lazy_attr_reader(:member_id) { at!('input[name="user_id"]')['value'].to_i }
     # return [Integer]
-    lazy_attr_reader(:pixiv_id) { at!('.profile_area img').attr('src').match(%r{/profile/([a-z_-]+)/}).to_a[1] }
+    lazy_attr_reader(:pixiv_id) { at!('.profile_area img')['src'].match(%r{/profile/([a-z_-]+)/}).to_a[1] }
 
     alias id member_id
 
     # @return [String]
     def url; self.class.url(member_id) end
   end
+
+  module Member::WithClient
+    include Page::WithClient
+
+    # (see Pixiv::Client#bookmark_list)
+    def bookmark_list(page_num = 1)
+      client.bookmark_list(self, page_num)
+    end
+
+    # (see Pixiv::Client#bookmarks)
+    def bookmarks(page_num = 1, &block)
+      client.bookmarks(self, page_num, &block)
+    end
+  end
 end

data/lib/pixiv/page.rb

@@ -49,6 +49,21 @@ module Pixiv
       self
     end
 
+    # Bind +self+ to +client+
+    # @return self
+    def bind(client)
+      if self.class.const_defined?(:WithClient)
+        mod = self.class.const_get(:WithClient)
+      else
+        mod = Page::WithClient
+      end
+      unless singleton_class.include?(mod)
+        extend(mod)
+      end
+      self.client = client
+      self
+    end
+
     protected
 
     # Defines lazy attribute reader
@@ -85,14 +100,19 @@ module Pixiv
     # @param [String] path XPath or CSS path
     # @return [Nokogiri::HTML::Node]
     def at!(path, node = doc)
-      node.at(path) || Error::NodeNotFound.new("node for `#{path}` not found").raise
+      node.at(path) or raise Error::NodeNotFound, "node for `#{path}` not found"
     end
 
     # +node.search(path) or raise error
     # @param [String] path XPath or CSS path
     # @return [Array<Nokogiri::HTML::Node>]
     def search!(path, node = doc)
-      node.search(path) || Error::NodeNotFound.new("node for `#{path}` not found").raise
+      node.search(path) or raise Error::NodeNotFound, "node for `#{path}` not found"
     end
   end
+
+  module Page::WithClient
+    # @return [Pixiv::Client]
+    attr_accessor :client
+  end
 end

data/lib/pixiv/version.rb

@@ -1,3 +1,3 @@
 module Pixiv
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/pixiv.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = Pixiv::VERSION
   gem.authors       = ["Tomoki Aonuma"]
   gem.email         = ["uasi@uasi.jp"]
-  gem.description   = %q{A client library for Pixiv}
-  gem.summary       = %q{A client library for Pixiv}
+  gem.description   = %q{A client library for pixiv}
+  gem.summary       = %q{A client library for pixiv}
   gem.homepage      = "https://github.com/uasi/pixiv"
 
   gem.files         = `git ls-files`.split($/)
@@ -18,4 +18,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'mechanize', '~> 2.0'
+
+  gem.add_development_dependency 'rake', '>= 0.8.7'
+  gem.add_development_dependency 'rspec', '~> 2.12'
+  gem.add_development_dependency 'webmock', '~> 1.9'
 end

data/spec/fixtures/empty.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title></title>
+</head>
+<body>
+</body>
+</html>
+

data/spec/fixtures/illust_345.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <!-- small_image_url = "http://i1.pixiv.net/img1/img/sayoko/345_s.jpg" -->
+  <meta property="og:image" content="http://i1.pixiv.net/img1/img/sayoko/345_s.jpg">
+  <!-- member_name = "Sayoko" -->
+  <title>「Illust #345」/「Sayoko」のイラスト [pixiv]</title>
+</head>
+<body>
+  <!-- The misleading h1.title element -->
+  <h1 class="title">pixiv logo here</h1>
+  <div class="work-info">
+    <!-- title = "Illust #345" -->
+    <h1 class="title">Illust #345</h1>
+    <!-- caption = "Caption" -->
+    <p class="caption">Caption</p>
+  </div>
+  <!-- illust_id = 345 -->
+  <div id="rpc_i_id" title="345"></div>
+  <!-- member_id = 6 -->
+  <div id="rpc_u_id" title="6"></div>
+  <!-- tag_names = ["tag_1", "tag_2", "tag_3"] -->
+  <ul class="tags">
+    <li><a class="text">tag_1</a></li>
+    <li><a class="text">tag_2</a></li>
+    <li><a class="text">tag_3</a></li>
+  </ul>
+  <!-- views_count = 1000 -->
+  <div class="view-count">1000</div>
+  <!-- rated_count = 10 -->
+  <div class="rated-count">10</div>
+  <!-- score = 100 -->
+  <div class="score-count">100</div>
+</body>
+</html>

data/spec/fixtures/member_6.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Member #6</title>
+</head>
+<body>
+  <div class="profile_area">
+    <!-- name = "Sayoko" -->
+    <h2>Sayoko</h2>
+    <!-- pixiv_id = "sayoko" -->
+    <img src="http://i1.pixiv.net/img1/profile/sayoko/123456.jpg">
+  </div>
+  <!-- member_id = 6 -->
+  <form action="/bookmark_add.php" method="post">
+    <input type="hidden" name="user_id" value="6">
+  </form>
+</body>
+</html>
+

data/spec/pixiv/illust_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+
+describe Pixiv::Illust do
+  let(:illust_doc) { fixture_as_doc('illust_345.html') }
+
+  describe '.new' do
+    subject { Pixiv::Illust.new(illust_doc) }
+    its(:title) { should == 'Illust #345' }
+    its(:illust_id) { should == 345 }
+    its(:member_id) { should == 6 }
+    its(:member_name) { should == 'Sayoko' }
+    its(:tag_names) { should == %w[tag_1 tag_2 tag_3]}
+    its(:caption) { should == 'Caption' }
+    its(:views_count) { should == 1000 }
+    its(:rated_count) { should == 10 }
+    its(:score) { should == 100 }
+    its(:small_image_url) { should == 'http://i1.pixiv.net/img1/img/sayoko/345_s.jpg' }
+    its(:medium_image_url) { should == 'http://i1.pixiv.net/img1/img/sayoko/345_m.jpg' }
+    its(:original_image_url) { should == 'http://i1.pixiv.net/img1/img/sayoko/345.jpg' }
+    its(:num_pages) { should be_nil }
+    its(:illust?) { should be_true }
+    its(:manga?) { should be_false }
+  end
+
+  describe '.new', 'given attrs covers attrs extracted from doc' do
+    before do
+      @attrs = {
+        title: 'Illust #105',
+        illust_id: 105,
+        member_id: 13,
+        member_name: 'Duke',
+        tag_names: %w[target_1 target_2 target_3],
+        caption: 'The Professional',
+        views_count: 1300,
+        rated_count: 13,
+        score: 130,
+        small_image_url: 'http://i1.pixiv.net/img1/img/duke/105_s.jpg',
+      }
+    end
+    subject { Pixiv::Illust.new(illust_doc, @attrs) }
+    its(:title) { should == 'Illust #105' }
+    its(:illust_id) { should == 105 }
+    its(:member_id) { should == 13 }
+    its(:member_name) { should == 'Duke' }
+    its(:tag_names) { should == %w[target_1 target_2 target_3] }
+    its(:caption) { should == 'The Professional' }
+    its(:views_count) { should == 1300 }
+    its(:rated_count) { should == 13 }
+    its(:score) { should == 130 }
+    its(:small_image_url) { should == 'http://i1.pixiv.net/img1/img/duke/105_s.jpg' }
+    its(:medium_image_url) { should == 'http://i1.pixiv.net/img1/img/duke/105_m.jpg' }
+    its(:original_image_url) { should == 'http://i1.pixiv.net/img1/img/duke/105.jpg' }
+    its(:num_pages) { should be_nil }
+    its(:illust?) { should be_true }
+    its(:manga?) { should be_false }
+  end
+
+  describe '.url' do
+    it 'returns url for illust id' do
+      expect(Pixiv::Illust.url(345)).
+        to eq('http://www.pixiv.net/member_illust.php?mode=medium&illust_id=345')
+    end
+  end
+end

data/spec/pixiv/member_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Pixiv::Member do
+  describe '.new' do
+    subject { Pixiv::Member.new(fixture_as_doc('member_6.html')) }
+    its(:member_id) { should == 6 }
+    its(:pixiv_id) { should == 'sayoko' }
+    its(:name) { should == 'Sayoko' }
+  end
+
+  describe '.new', 'given attrs cover attrs extracted from doc' do
+    before do
+      @doc = fixture_as_doc('member_6.html')
+      @attrs = {
+        member_id: 13,
+        pixiv_id: 'duke',
+        name: 'Duke',
+      }
+    end
+    subject { Pixiv::Member.new(@doc, @attrs) }
+    its(:member_id) { should == 13 }
+    its(:pixiv_id) { should == 'duke' }
+    its(:name) { should == 'Duke' }
+  end
+
+  describe '.new', 'attr raises NodeNotFound if doc is wrong' do
+    subject { Pixiv::Member.new(fixture_as_doc('empty.html')) }
+    it { expect { subject.member_id }.to raise_error(Pixiv::Error::NodeNotFound) }
+    it { expect { subject.pixiv_id }.to raise_error(Pixiv::Error::NodeNotFound) }
+    it { expect { subject.name}.to raise_error(Pixiv::Error::NodeNotFound) }
+  end
+
+  describe '.url' do
+    it 'returns url for given member id' do
+      expect(Pixiv::Member.url(6)).to eq('http://www.pixiv.net/member.php?id=6')
+    end
+  end
+end

data/spec/pixiv/page_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Pixiv::Page do
+  let(:doc) { fixture_as_doc('empty.html') }
+  let(:doc_creator) { Proc.new { doc } }
+  let(:attrs) { {} }
+
+  describe '.lazy_new', 'with doc_creator' do
+    subject { Pixiv::Page.lazy_new(&doc_creator) }
+    its(:doc) { should == doc }
+  end
+
+  describe '.lazy_new', 'with attrs and doc_creator' do
+    subject { Pixiv::Page.lazy_new(attrs, &doc_creator) }
+    its(:doc) { should == doc }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require 'pixiv'
+require 'mechanize'
+require 'webmock/rspec'
+
+# Disable "should" syntax.
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
+def fixture_path
+  File.expand_path('../fixtures', __FILE__)
+end
+
+def fixture(filename)
+  open(File.join(fixture_path, filename))
+end
+
+def fixture_as_doc(filename)
+  Nokogiri::HTML::Document.parse(fixture(filename))
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixiv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -27,7 +27,55 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-description: A client library for Pixiv
+- !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
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.9'
+description: A client library for pixiv
 email:
 - uasi@uasi.jp
 executables: []
@@ -35,10 +83,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- console_helper.rb
 - lib/pixiv.rb
 - lib/pixiv/bookmark_list.rb
 - lib/pixiv/client.rb
@@ -49,6 +99,13 @@ files:
 - lib/pixiv/page_collection.rb
 - lib/pixiv/version.rb
 - pixiv.gemspec
+- spec/fixtures/empty.html
+- spec/fixtures/illust_345.html
+- spec/fixtures/member_6.html
+- spec/pixiv/illust_spec.rb
+- spec/pixiv/member_spec.rb
+- spec/pixiv/page_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/uasi/pixiv
 licenses: []
 post_install_message: 
@@ -61,17 +118,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1798318064021145738
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1798318064021145738
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A client library for Pixiv
-test_files: []
-has_rdoc: 
+summary: A client library for pixiv
+test_files:
+- spec/fixtures/empty.html
+- spec/fixtures/illust_345.html
+- spec/fixtures/member_6.html
+- spec/pixiv/illust_spec.rb
+- spec/pixiv/member_spec.rb
+- spec/pixiv/page_spec.rb
+- spec/spec_helper.rb