komic-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bf50bdb640316bafada1967d00f80fb0d3faab3
-  data.tar.gz: acbd5ed6910379f34b94ae3bec6552c4046a4365
+  metadata.gz: 272c4b6b05cf4ad6db1a421abf853bb144065c6b
+  data.tar.gz: 86a88c08620850b1fb30d1b7c4db5a96e6edbba4
 SHA512:
-  metadata.gz: 1ea45d1059dd60751a6a280bceead51aff6c32faf12eeedbbe470915b5294813e8990b8a3caa33815d79f3300eb220995de19f4035f2f268c6dac414cedf0b23
-  data.tar.gz: fde516f1ad7c49bf457953469d3043f730d02f9429c44bd8b6faf56dc394c1efa14a473365dc0f0dc3d4721aac5e273f7b7543959a509b22267b84ad9520fcc0
+  metadata.gz: 35701b86c150c6ac3f1387bbbf9bee381562208160adfc4749938ed50858a958dce199888b4007a0a95d1b58dcf8a320d3221bc04d17c30ff9cfa4095d063d36
+  data.tar.gz: 2a9bf66cb3e0fb1e0a292a0c972f4ac8976b4197757fb3e8dd998a265d721e1a7d2598f00a121caf0a369d1dc98f9e01d7c60f8cdb572ed82e3032d18d9f2dce

data/komic-cli.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'jbuilder', '~> 2.3'
   gem.add_runtime_dependency 'json-schema', '~> 2.5'
   gem.add_runtime_dependency 'ruby-progressbar', '~> 1.7'
+  gem.add_runtime_dependency 'rubyzip', '~> 1.1'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.8'

data/lib/komic/builder/douban_album.rb

@@ -0,0 +1,108 @@
+require 'mechanize'
+require 'fileutils'
+require 'mime/types'
+require 'tmpdir'
+require 'komic/utils'
+
+module Komic::Builder
+  class DoubanAlbum
+    attr_reader :images
+
+    def initialize(type_string, options)
+      @options = options
+      @url = type_string
+    end
+
+    def images
+      crawler = Crawler.new
+      title, images = crawler.get_crawled_result(@url)
+      images.map do |image_path|
+        image = MiniMagick::Image.open(image_path)
+        { src: image_path, width: image.width, height: image.height }
+      end
+    end
+  end
+
+  class DoubanAlbum::Crawler
+    def initialize
+      @mechanize = Mechanize.new
+      @file_index = 0
+      @tmpdir = Dir.mktmpdir
+      @willbe_downloaded = []
+    end
+
+    def get_crawled_result(album_home_url)
+      next_link_url = album_home_url
+      next_link = nil
+      album_title = nil
+
+      @mechanize.get(album_home_url) do |page|
+        album_title = page.at('title').text().strip!
+      end
+
+      loop do
+        begin
+          crawl_album_page(next_link_url)
+        rescue Exception => e
+          puts e.message
+          puts e.backtrace.inspect
+        end
+
+        @mechanize.get(next_link_url) do |page|
+          next_link = page.at('link[rel="next"]')
+        end
+        break if next_link.nil?
+        next_link_url = next_link["href"]
+      end
+
+      bar = Komic::Utils.create_progress("Download images from douban", \
+        @willbe_downloaded.size)
+
+      image_pathes = @willbe_downloaded.map do |url|
+        image_path = download_image url
+        bar.increment
+        image_path
+      end
+
+      return album_title, image_pathes
+    end
+
+    def crawl_album_page(album_page_url)
+      @mechanize.get(album_page_url) do |page|
+        page.search('.photolst_photo').each do |link|
+          crawl_photo_page(link['href'])
+        end
+      end
+    end
+
+    def crawl_photo_page(photo_page_url)
+      link_to_large = nil
+      thumb_photo_url = nil
+
+      @mechanize.get(photo_page_url) do |page|
+        link_to_large = page.at('a[title="查看原图"]')
+        thumb_photo_url = page.at('.image-show-inner img')["src"]
+      end
+
+      unless link_to_large.nil?
+        @mechanize.get(link_to_large['href']) do |page|
+          @willbe_downloaded.push(page.at('#pic-viewer img')["src"])
+        end
+      else
+        @willbe_downloaded.push(thumb_photo_url)
+      end
+    end
+
+    def download_image(photo_url)
+      resource = @mechanize.get(photo_url)
+      content_type = resource["content-type"]
+      mime_type = MIME::Types[resource["content-type"]].first
+      image_path = File.expand_path( \
+        [@file_index, mime_type.extensions.first].join('.'), @tmpdir)
+      resource.save(image_path)
+      @file_index = @file_index + 1
+      sleep 2
+      image_path
+    end
+  end
+end

data/lib/komic/builder/pdf.rb

@@ -0,0 +1,29 @@
+require 'tempfile'
+require 'komic/utils'
+
+module Komic::Builder
+  class PDF
+    attr_reader :images
+
+    def initialize(type_string, options)
+      @options = options
+      @pdf_path = File.join(Dir.pwd, type_string)
+    end
+
+    def images
+      pdf = MiniMagick::Image.new(@pdf_path)
+
+      bar = Komic::Utils.create_progress("Extract images from pdf", pdf.pages.size)
+
+      pdf.pages.each_with_index.map do |page, idx|
+        will_be_write = Tempfile.new("#{idx}").path
+        page.write will_be_write
+        image = MiniMagick::Image.open(will_be_write)
+        image.format('jpg')
+        image.write Tempfile.new(["#{idx}", '.jpg']).path
+        bar.increment
+        { width: image.width, height: image.height, src: image.path }
+      end
+    end
+  end
+end

data/lib/komic/builder.rb

@@ -0,0 +1,32 @@
+require 'komic/builder/pdf'
+require 'komic/builder/douban_album'
+require 'uri'
+
+module Komic::Builder
+  class Factory
+    class << self
+      def detect_type(string)
+        path = File.join(Dir.pwd, string)
+        r_douban_album = Regexp.new "www.douban.com/photos/album/"
+
+        if string =~ URI::regexp and string =~ r_douban_album
+          return 'douban_album'
+        end
+
+        if File.exists?(path)
+          if File.extname(path) == '.pdf'
+            return 'pdf'
+          end
+        end
+        raise "Builder can't be found."
+      end
+
+      def get_builder(type_string, options)
+        case detect_type(type_string)
+        when 'pdf' then PDF.new(type_string, options)
+        when 'douban_album' then DoubanAlbum.new(type_string, options)
+        end
+      end
+    end
+  end
+end

data/lib/komic/cli.rb

@@ -1,25 +1,16 @@
 require 'thor'
-require 'komic/crawler/douban'
 require 'komic/generator/generator'
+require 'komic/builder'
 require 'mini_magick'
 
 module Komic
   # This module handles the Komic executables .
   class Cli < Thor
 
-    map '-d' => :download
-
     desc "download URL", "从 url 下载画册数据 (* 目前只支持豆瓣相册)"
     option :name, default: "crawled_from_douban", desc: "设定文件夹名"
     def download(url)
-      crawler = Komic::Crawler::Douban.new
-      title, images = crawler.get_crawled_result(url)
-      images = images.map do |image_path|
-        image = MiniMagick::Image.open(image_path)
-        { src: image_path, width: image.width, height: image.height }
-      end
-      generator = Komic::Generator.new
-      generator.create_package({ images: images, meta: { name: title } }, options)
+      dev(url)
     end
 
     desc "version", "显示版本"
@@ -38,5 +29,21 @@ module Komic
       mocks = generator.generate_mocks options
       generator.create_package({ images: mocks }, options)
     end
+
+    desc "dev", '生成 dev 的数据'
+    option :name, default: "dev", desc: "设定文件夹名"
+    def dev(type_string)
+      generator = Komic::Generator.new
+      pdf_builder = Builder::Factory.get_builder(type_string, options)
+      generator.create_package({ images: pdf_builder.images }, options)
+    end
+
+    desc "create", '生成网站'
+    option :name, default: "dev", desc: "设定文件夹名"
+    def create(type_string)
+      generator = Komic::Generator.new
+      builder = Builder::Factory.get_builder(type_string, options)
+      generator.create_website({ images: builder.images }, options)
+    end
   end
 end

data/lib/komic/generator/generator.rb

@@ -5,6 +5,8 @@ require 'json'
 require 'json-schema'
 require 'mini_magick'
 require 'base64'
+require 'open-uri'
+require 'zip'
 
 require 'komic/version'
 require 'komic/utils'
@@ -123,24 +125,28 @@ module Komic
 
       [root_dir, image_dir].each { |path| FileUtils.mkdir_p path }
 
-      files = data[:images]
+      images = data[:images]
 
-      files.map.with_index do |image, index|
-        image_manager = MiniMagick::Image.open(image[:src])
+      images.map.with_index do |image, index|
+        manager = MiniMagick::Image.open(image[:src])
 
-        image_path = File.join(image_dir, [index, image_manager.type.downcase].join('.'))
-        FileUtils.mv image[:src], image_path
+        image_path = File.join(image_dir,
+          [index, manager.type.downcase].join('.'))
+
+        manager.quality(60)
+        manager.strip()
+        manager.write image_path
         image[:src] = image_path
         image
       end
 
-      thumbnails_builder = ThumbnailsBuilder.new(files)
+      thumbnails_builder = ThumbnailsBuilder.new(images)
       thumbnail_path = File.join(image_dir, './thumbnail.svg')
       File.open(thumbnail_path, 'w') do |file|
         file.write thumbnails_builder.to_build
       end
 
-      files.map do |image, index|
+      images.map do |image, index|
         image[:src] = Utils.get_relative_path(image[:src], root_dir)
         if options[:'remote-url']
           image[:src] = "https://placeimg.com/#{image[:width]}/#{image[:height]}/any"
@@ -162,11 +168,25 @@ module Komic
         meta = Utils.deep_merge_hashes(meta, data[:meta])
       end
 
-      content_builder = ContentBuilder.new(meta, files)
+      content_builder = ContentBuilder.new(meta, images)
       File.open(File.join(root_dir, './content.json'), 'w') do |file|
         file.write content_builder.to_build
       end
+    end
 
+    def create_website(data, options)
+      root_dir = File.join(Dir.pwd, options[:name])
+      create_package(data, options)
+      dist_project = "komic-web-dist"
+      dist_branch = "master"
+      uri = "https://github.com/komic-awesome/#{dist_project}/archive/#{dist_branch}.zip"
+      source = open(uri)
+      Zip::File.open(source.path) do |zip_file|
+        zip_file.each do |entry|
+          entry.extract(File.join(root_dir, File.basename(entry.name))) \
+            if File.fnmatch("#{dist_project}-#{dist_branch}/?*", entry.name)
+        end
+      end
     end
   end
 end

data/lib/komic/utils.rb

@@ -45,5 +45,19 @@ module Komic
           Pathname.new(root)
         ))
     end
+
+    def create_progress(title, total)
+      # green background
+      color_code = "\e[0m\e[32m\e[7m\e[1m"
+      reset_code = "\e[0m"
+      progress_status = "#{color_code} %p%% #{reset_code}"
+
+      ProgressBar.create( :format         => "%a %bᗧ%i #{progress_status} %t",
+                          :title          => title,
+                          :progress_mark  => ' ',
+                          :remainder_mark => '･',
+                          :total => total,
+                          :starting_at    => 0 )
+    end
   end
 end

data/lib/komic/version.rb

@@ -1,4 +1,4 @@
 module Komic
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
   CONTENT_JSON_VERSION = '0.1.0'
 end

data/spec/builder_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'komic/builder'
+
+describe Komic::Builder do
+  subject { Komic::Builder::Factory }
+  context "detect file" do
+    before { allow(File).to receive(:exists?).and_return(true) }
+    it "detect pdf type" do
+      expect( subject.detect_type('test.pdf') ).to be_eql('pdf')
+      expect{ subject.detect_type('.pdf') }.to raise_error RuntimeError
+    end
+  end
+
+  it "detect douban_album type" do
+    douban_album = "www.douban.com/photos/album/118525984/"
+
+    expect( subject.detect_type("http://#{douban_album}")).to \
+      be_eql('douban_album')
+    expect( subject.detect_type("https://#{douban_album}")).to \
+      be_eql('douban_album')
+
+    expect{ subject.detect_type("#{douban_album}") }.to raise_error RuntimeError
+    expect{ subject.detect_type('w.pdf') }.to raise_error RuntimeError
+    expect{ subject.detect_type('http://www.douban.com') }.to raise_error RuntimeError
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: komic-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - hxgdzyuyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,12 +210,15 @@ files:
 - bin/komic
 - komic-cli.gemspec
 - lib/komic.rb
+- lib/komic/builder.rb
+- lib/komic/builder/douban_album.rb
+- lib/komic/builder/pdf.rb
 - lib/komic/cli.rb
-- lib/komic/crawler/douban.rb
 - lib/komic/generator/content.schema.json
 - lib/komic/generator/generator.rb
 - lib/komic/utils.rb
 - lib/komic/version.rb
+- spec/builder_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb
 homepage: https://rubygems.org/gems/komic-cli
@@ -229,5 +246,6 @@ signing_key:
 specification_version: 4
 summary: komic-cli
 test_files:
+- spec/builder_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb

data/lib/komic/crawler/douban.rb

@@ -1,101 +0,0 @@
-require 'mechanize'
-require 'fileutils'
-require 'mime/types'
-require 'tmpdir'
-require 'ruby-progressbar'
-
-module Komic
-  module Crawler
-    class Douban
-      def initialize
-        @mechanize = Mechanize.new
-        @file_index = 0
-        @tmpdir = Dir.mktmpdir
-        @willbe_downloaded = []
-      end
-
-      def get_crawled_result(album_home_url)
-        next_link_url = album_home_url
-        next_link = nil
-        album_title = nil
-
-        @mechanize.get(album_home_url) do |page|
-          album_title = page.at('title').text().strip!
-        end
-
-        loop do
-          begin
-            crawl_album_page(next_link_url)
-          rescue Exception => e
-            puts e.message
-            puts e.backtrace.inspect
-          end
-
-          @mechanize.get(next_link_url) do |page|
-            next_link = page.at('link[rel="next"]')
-          end
-          break if next_link.nil?
-          next_link_url = next_link["href"]
-        end
-
-        # green background
-        color_code = "\e[0m\e[32m\e[7m\e[1m"
-        reset_code = "\e[0m"
-        progress_status = "#{color_code} %p%% #{reset_code}"
-
-        bar = ProgressBar.create( :format         => "%a %bᗧ%i #{progress_status} %t",
-                                  :title          => 'Download image from douban',
-                                  :progress_mark  => ' ',
-                                  :remainder_mark => '･',
-                                  :total => @willbe_downloaded.size,
-                                  :starting_at    => 0 )
-
-        image_pathes = @willbe_downloaded.map do |url|
-          image_path = download_image url
-          bar.increment
-          image_path
-        end
-
-        return album_title, image_pathes
-      end
-
-      def crawl_album_page(album_page_url)
-        @mechanize.get(album_page_url) do |page|
-          page.search('.photolst_photo').each do |link|
-            crawl_photo_page(link['href'])
-          end
-        end
-      end
-
-      def crawl_photo_page(photo_page_url)
-        link_to_large = nil
-        thumb_photo_url = nil
-
-        @mechanize.get(photo_page_url) do |page|
-          link_to_large = page.at('a[title="查看原图"]')
-          thumb_photo_url = page.at('.image-show-inner img')["src"]
-        end
-
-        unless link_to_large.nil?
-          @mechanize.get(link_to_large['href']) do |page|
-            @willbe_downloaded.push(page.at('#pic-viewer img')["src"])
-          end
-        else
-          @willbe_downloaded.push(thumb_photo_url)
-        end
-      end
-
-      def download_image(photo_url)
-        resource = @mechanize.get(photo_url)
-        content_type = resource["content-type"]
-        mime_type = MIME::Types[resource["content-type"]].first
-        image_path = File.expand_path( \
-          [@file_index, mime_type.extensions.first].join('.'), @tmpdir)
-        resource.save(image_path)
-        @file_index = @file_index + 1
-        sleep 2
-        image_path
-      end
-    end
-  end
-end