komic-cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf54643b2a545b009d0a7c0e6ca61a958678c5d4
-  data.tar.gz: e52321f905f7a397454b71b5f3e37597ebce1179
+  metadata.gz: 0cd975971ff6b6728935ed9b6e5f1f3f004a692c
+  data.tar.gz: a85bc5db65253ff21f0b28eebe5f30810acdcc73
 SHA512:
-  metadata.gz: 3ef217ce390697eb1f43bd7bbe11c6fc690a7a61d884f16f6b416f45e405fb0a9601d4635131d1fb31081ea0598c75d711d982d952aed93afae600cc230cd5df
-  data.tar.gz: f9c14012a4db735458833e73bc0f5f4571c424465d30b2d99ea0f538c8c9ddae8c128a350bdcf0f606658fdc7623cf4ec04c0baffc5eb13c71afe5e1cd4e407a
+  metadata.gz: a290cbccea8dce6d1072238758e6baf86f6eb3947f4c0aed2d3cef51709643aa2eaab094edb683fde81423f876a905bd4a046f6dafb4bc1b45ba5de913057e3c
+  data.tar.gz: 147b794d19b32f8be2c0e2141ce07d84f6a791dab51ce665394f6d4ad844e905d33942736e32dbf5da405b2825f8bb370232c3db44758bbdde2f703f33a11c47

data/komic-cli.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   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_runtime_dependency 'uglifier', '~> 2.7.1'
 
   gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_development_dependency 'rake', '~> 0.8'

data/lib/komic/builder/directory.rb

@@ -0,0 +1,29 @@
+require 'tempfile'
+require 'komic/utils'
+require 'zip'
+
+module Komic::Builder
+  class Directory
+    attr_reader :images
+
+    def initialize(type_string, options)
+      @options = options
+      @path = File.join(Dir.pwd, type_string)
+    end
+
+    def images
+      images = []
+      Dir.glob(File.join(@path, FNMATCH_FOR_IMAGE)).
+        sort_by { |x| File.basename(x).split('.')[0].to_i }.
+        each_with_index do |entry_path, index|
+          will_be_write = Tempfile.new("#{ File.basename(entry_path) }")
+          image = MiniMagick::Image.open(entry_path)
+          image.write will_be_write.path
+          images.push({
+            width: image.width, height: image.height, src: will_be_write
+          })
+        end
+      return images
+    end
+  end
+end

data/lib/komic/builder/zip.rb

@@ -0,0 +1,34 @@
+require 'tempfile'
+require 'komic/utils'
+require 'zip'
+
+
+module Komic::Builder
+  class Zip
+    attr_reader :images
+
+    def initialize(type_string, options)
+      @options = options
+      @zip_path = File.join(Dir.pwd, type_string)
+    end
+
+    def images
+      images = []
+      ::Zip::File.open(@zip_path) do |zip_file|
+        zip_file.
+          sort_by { |x| File.basename(x.name).split('.')[0].to_i }.
+          select { |x| File.fnmatch?(FNMATCH_FOR_IMAGE, x.name, File::FNM_EXTGLOB) }.
+          each do |entry|
+            p entry.name
+            will_be_write = Tempfile.new("#{ entry.name }")
+            image = MiniMagick::Image.read(entry.get_input_stream.read)
+            image.write will_be_write.path
+            images.push({
+              width: image.width, height: image.height, src: will_be_write
+            })
+          end
+      end
+      return images
+    end
+  end
+end

data/lib/komic/builder.rb

@@ -1,8 +1,12 @@
 require 'komic/builder/pdf'
+require 'komic/builder/directory'
+require 'komic/builder/zip'
 require 'komic/builder/douban_album'
 require 'uri'
 
 module Komic::Builder
+  IMAGE_SUFFIXES = ['png', 'jpg', 'jpeg', 'webp', 'bmp', 'gif']
+  FNMATCH_FOR_IMAGE = "**.{#{IMAGE_SUFFIXES.join(',')}}"
   class Factory
     class << self
       def detect_type(string)
@@ -14,8 +18,13 @@ module Komic::Builder
         end
 
         if File.exists?(path)
-          if File.extname(path) == '.pdf'
+          file_extname = File.extname(path)
+          if file_extname == '.pdf'
             return 'pdf'
+          elsif file_extname == '.zip'
+            return 'zip'
+          elsif File.directory?(path)
+            return 'directory'
           end
         end
         raise "Builder can't be found."
@@ -24,6 +33,8 @@ module Komic::Builder
       def get_builder(type_string, options)
         case detect_type(type_string)
         when 'pdf' then PDF.new(type_string, options)
+        when 'zip' then Zip.new(type_string, options)
+        when 'directory' then Directory.new(type_string, options)
         when 'douban_album' then DoubanAlbum.new(type_string, options)
         end
       end

data/lib/komic/cli.rb

@@ -32,6 +32,7 @@ module Komic
 
     desc "dev", '生成 dev 的数据'
     option :name, default: "dev", desc: "设定文件夹名"
+    option :debug, default: true, desc: "开启 debug 模式"
     def dev(type_string)
       generator = Komic::Generator.new
       pdf_builder = Builder::Factory.get_builder(type_string, options)

data/lib/komic/generator/content.schema.json

@@ -11,6 +11,10 @@
       "id": "komic_version",
       "type": "string"
     },
+    "content_json_uuid": {
+      "id": "content_json_uuid",
+      "type": "string"
+    },
     "name": {
       "id": "name",
       "type": "string"
@@ -51,6 +55,34 @@
           "id": "0",
           "type": "object",
           "properties": {
+            "web": {
+              "id": "web",
+              "type": "object",
+              "properties": {
+                "src": {
+                  "id": "src",
+                  "type": "object",
+                  "properties": {
+                    "default": {
+                      "id": "default",
+                      "type": "string"
+                    },
+                    "jpg": {
+                      "id": "jpg",
+                      "type": "string"
+                    }
+                  }
+                },
+                "width": {
+                  "id": "width",
+                  "type": "integer"
+                },
+                "height": {
+                  "id": "height",
+                  "type": "integer"
+                }
+              }
+            },
             "src": {
               "id": "src",
               "type": "string"

data/lib/komic/generator/generator.rb

@@ -7,6 +7,8 @@ require 'mini_magick'
 require 'base64'
 require 'open-uri'
 require 'zip'
+require 'uglifier'
+require 'securerandom'
 
 require 'komic/version'
 require 'komic/utils'
@@ -70,16 +72,17 @@ module Komic
       end
     end
 
-    def to_build
+    def to_build(options)
       content_builder = Jbuilder.new do |json|
         json.komic_cli_version Komic::VERSION
         json.content_json_version Komic::CONTENT_JSON_VERSION
+        json.content_json_uuid SecureRandom.uuid
         json.(@meta, :name, :author, :description, :thumbnails)
         json.images @images
       end
       data = content_builder.target!
       validate_json(data)
-      return data
+      return options[:debug] ? JSON.pretty_generate(JSON.parse(data)) : data
     end
   end
 
@@ -127,7 +130,7 @@ module Komic
 
       images = data[:images]
 
-      images.map.with_index do |image, index|
+      images.map!.with_index do |image, index|
         # dirty but work
         if image[:src].instance_of? Tempfile
           will_be_open = image[:src].path
@@ -137,6 +140,7 @@ module Komic
 
         manager = MiniMagick::Image.open(will_be_open)
 
+        image_type = manager.type.downcase
         image_path = File.join(image_dir,
           [index, manager.type.downcase].join('.'))
 
@@ -144,7 +148,19 @@ module Komic
         manager.strip() unless manager.type.downcase == 'svg'
         manager.write image_path
         image[:src] = image_path
-        image
+
+        manager.format 'webp'
+        webp_path = File.join(image_dir,
+          [[index, 'webp'].join('-'), manager.type.downcase].join('.'))
+        manager.write webp_path
+
+        src = {}
+        src[:default] = image_type
+        src[image_type] = image_path
+        src[:webp] = webp_path
+
+        web = Utils.deep_merge_hashes(image, { src: src })
+        Utils.deep_merge_hashes(image, { web: web })
       end
 
       thumbnails_builder = ThumbnailsBuilder.new(images)
@@ -153,7 +169,7 @@ module Komic
         file.write thumbnails_builder.to_build
       end
 
-      images.map do |image, index|
+      images.map do |image|
         image[:src] = Utils.get_relative_path(image[:src], root_dir)
         if options[:'remote-url']
           image[:src] = "https://placeimg.com/#{image[:width]}/#{image[:height]}/any"
@@ -177,7 +193,7 @@ module Komic
 
       content_builder = ContentBuilder.new(meta, images)
       File.open(File.join(root_dir, './content.json'), 'w') do |file|
-        file.write content_builder.to_build
+        file.write content_builder.to_build(options)
       end
     end
 
@@ -188,12 +204,18 @@ module Komic
       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.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
+      Dir.glob("#{root_dir}/**/*.js") do |path|
+        uglified = Uglifier.compile(File.read(path))
+        File.open(path, 'w') do |file|
+          file.write uglified
+        end
+      end
     end
   end
 end

data/lib/komic/version.rb

@@ -1,4 +1,4 @@
 module Komic
-  VERSION = '0.1.5'
-  CONTENT_JSON_VERSION = '0.1.0'
+  VERSION = '0.1.6'
+  CONTENT_JSON_VERSION = '0.1.1'
 end

data/spec/builder_spec.rb

@@ -5,9 +5,19 @@ 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')
+
+    context "detect type" do
+      before { allow(File).to receive(:directory?).and_return(true) }
+      it "detect type" do
+        expect( subject.detect_type('test.pdf') ).to be_eql('pdf')
+        expect( subject.detect_type('test.zip') ).to be_eql('zip')
+        expect( subject.detect_type('test') ).to be_eql('directory')
+      end
+    end
+
+    it "detect file throw error" do
       expect{ subject.detect_type('.pdf') }.to raise_error RuntimeError
+      expect{ subject.detect_type('.zip') }.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.5
+  version: 0.1.6
 platform: ruby
 authors:
 - hxgdzyuyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,8 +225,10 @@ files:
 - komic-cli.gemspec
 - lib/komic.rb
 - lib/komic/builder.rb
+- lib/komic/builder/directory.rb
 - lib/komic/builder/douban_album.rb
 - lib/komic/builder/pdf.rb
+- lib/komic/builder/zip.rb
 - lib/komic/cli.rb
 - lib/komic/generator/content.schema.json
 - lib/komic/generator/generator.rb