pixiv 0.0.1 → 0.0.2

data/README.md

@@ -14,12 +14,16 @@ crawl the pixiv service. Do not abuse this library or you may be banned!
 
 Add this line to your application's Gemfile:
 
-    gem 'pixiv', github: 'uasi/pixiv'
+    gem 'pixiv'
 
 And then execute:
 
     $ bundle
 
+Or install it yourself as:
+
+    $ gem install pixiv
+
 ## Usage
 
 See [a sample script](https://gist.github.com/4362297)

data/lib/pixiv/bookmark_list.rb

@@ -10,6 +10,8 @@ module Pixiv
       "#{ROOT_URL}/bookmark.php?id=#{member_id}&rest=show&p=#{page_num}"
     end
 
+    # @return [Integer]
+    lazy_attr_reader(:bookmarks_count) { at!('a[href="/bookmark.php?type=illust_all"]').inner_text.match(/(\d+)/).to_a[1].to_i }
     # @return [Integer]
     lazy_attr_reader(:page_num) { at!('li.pages-current').inner_text.to_i }
     # @return [Boolean]
@@ -18,9 +20,9 @@ module Pixiv
     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 } }
-    # @return [Array<Hash{Symbol=>Object}>]
+    # @return [Array<Hash{Symbol=>Object}, nil>]
     lazy_attr_reader(:illust_hashes) {
-      search!('li[id^="li_"]').map {|node| illust_hash_from_bookmark_item(node) }.compact
+      search!('li[id^="li_"]').map {|node| illust_hash_from_bookmark_item(node) }
     }
 
     alias page_hashes illust_hashes

data/lib/pixiv/client.rb

@@ -4,6 +4,7 @@ module Pixiv
     # @return [Mechanize::HTTP::Agent]
     def self.new_agent
       agent = Mechanize.new
+      agent.max_history = 1
       agent.pluggable_parser['image/gif'] = Mechanize::Download
       agent.pluggable_parser['image/jpeg'] = Mechanize::Download
       agent.pluggable_parser['image/png'] = Mechanize::Download
@@ -40,12 +41,14 @@ module Pixiv
     # @param [String] pixiv_id
     # @param [String] password
     def login(pixiv_id, password)
-      form = agent.get("#{ROOT_URL}/index.php").forms_with(:class => 'login-form').first
-      raise Error::LoginFailed, 'login form is not available' unless form
+      doc = agent.get("#{ROOT_URL}/index.php")
+      return if doc && doc.body =~ /logout/
+      form = doc.forms_with(action: '/login.php').first
+      puts doc.body and raise Error::LoginFailed, 'login form is not available' unless form
       form.pixiv_id = pixiv_id
       form.pass = password
       doc = agent.submit(form)
-      raise Error::LoginFailed unless doc.body =~ /logout/
+      raise Error::LoginFailed unless doc && doc.body =~ /logout/
       @member_id = member_id_from_mypage(doc)
     end
 
@@ -72,11 +75,15 @@ module Pixiv
       BookmarkList.lazy_new(attrs) { agent.get(BookmarkList.url(member_id, page_num)) }
     end
 
-    # @param [Pixiv::Member, Integer] member_or_member_id
-    # @param [Integer] page_num
-    def bookmarks(member_or_member_id = member_id, page_num = 1)
-      list = bookmark_list(member_or_member_id, page_num)
-      PageCollection::Enumerator.new(self, list)
+    # @param [Pixiv::BookmarkList, Pixiv::Member, Integer] list_or_member
+    # @param [Hash] opts
+    # @option opts [Boolean] :include_deleted (false)
+    #   whether the returning enumerator yields deleted illust as +nil+ or not
+    # @return [Pixiv::PageCollection::Enumerator]
+    def bookmarks(list_or_member, opts = {})
+      list = list_or_member.is_a?(BookmarkList) ? list_or_member
+                                                : bookmark_list(list_or_member)
+      PageCollection::Enumerator.new(self, list, !!opts[:include_deleted])
     end
 
     # Downloads the image to +io_or_filename+
@@ -104,11 +111,19 @@ module Pixiv
     # @param [Pixiv::Illust] illust the manga to download
     # @param [Array<String, Symbol, #call>] pattern pattern (see {#filename_from_pattern})
     # @note +illust#manga?+ must be +true+
-    def download_manga(illust, pattern)
-      illust.original_image_urls.each do |url|
-        filename = filename_from_pattern(pattern, illust, url)
-        FileUtils.mkdir_p(File.dirname(filename))
-        @agent.download(url, filename, [], illust.original_image_referer)
+    # @todo Document +&block+
+    def download_manga(illust, pattern, &block)
+      action = DownloadActionRegistry.new(&block)
+      illust.original_image_urls.each_with_index do |url, n|
+        begin
+          action.before_each.call(url, n) if action.before_each
+          filename = filename_from_pattern(pattern, illust, url)
+          FileUtils.mkdir_p(File.dirname(filename))
+          @agent.download(url, filename, [], illust.original_image_referer)
+          action.after_each.call(url, n) if action.after_each
+        rescue
+          action.on_error ? action.on_error.call($!) : raise
+        end
       end
     end
 
@@ -154,4 +169,22 @@ module Pixiv
       }.join('')
     end
   end
+
+  class DownloadActionRegistry
+    def initialize(&block)
+      instance_eval(&block) if block
+    end
+
+    def before_each(&block)
+      block ? (@before_each = block) : @before_each
+    end
+
+    def after_each(&block)
+      block ? (@after_each = block) : @after_each
+    end
+
+    def on_error(&block)
+      block ? (@on_error = block) : @on_error
+    end
+  end
 end

data/lib/pixiv/page.rb

@@ -23,6 +23,13 @@ module Pixiv
       set_attrs!(attrs)
     end
 
+    # Whether +attr_name+ is fetched or not
+    # @param [String, Symbol] attr_name
+    # @return [Boolean]
+    def fetched?(attr_name = :doc)
+      instance_variable_get(:"@#{attr_name}") != nil
+    end
+
     # @return [Nokogiri::HTTP::Document]
     def doc
       @doc ||= begin

data/lib/pixiv/page_collection.rb

@@ -32,14 +32,16 @@ module Pixiv
   class PageCollection::Enumerator
     include Enumerable
 
-    def initialize(client, collection)
+    def initialize(client, collection, include_deleted_page = false)
       @client = client
       @collection = collection
+      @include_deleted_page = include_deleted_page
     end
 
     def each_page
       each_collection do |collection|
         pages_from_collection(collection).each do |page|
+          next if page.nil? && !@include_deleted_page
           yield page
         end
       end
@@ -56,7 +58,11 @@ module Pixiv
             yield pages_from_collection(collection)
           end
         else
-          ::Enumerator.new {|y| each_slice {|slice| y << slice } }
+          ::Enumerator.new {|y|
+            each_slice do |slice|
+              y << (@include_deleted_page ? slice.compact : slice)
+            end
+          }
         end
       end
     end
@@ -65,8 +71,10 @@ module Pixiv
 
     def pages_from_collection(collection)
       collection.page_hashes.map {|attrs|
-        url = attrs.delete(:url)
-        collection.page_class.lazy_new(attrs) { @client.agent.get(url) }
+        if attrs
+          url = attrs.delete(:url)
+          collection.page_class.lazy_new(attrs) { @client.agent.get(url) }
+        end
       }
     end
 
@@ -78,4 +86,4 @@ module Pixiv
       end
     end
   end
-end
+end

data/lib/pixiv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixiv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize