washi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9681b843b1c430cdffe28ceb433d4d10916d9dc8
-  data.tar.gz: f429efcb2ae6dc415414f15088cf2d17cf3517f5
+  metadata.gz: a438f0fc570d286f3aa0e810ef7a09f36effcd67
+  data.tar.gz: 7e1a88bcbbbd0ba9e9c9f8076a287a33773559ff
 SHA512:
-  metadata.gz: 6c10cbe413d45e8759c53bd6cd84cc9a82a491fdb10dc16a1d15c0f2dd3bf751f6393948d1fce89f3471a66e516c567da36f8b65f2569603ed85ba469229de27
-  data.tar.gz: 7b224ba0620234943b6cffbfd62ea554b7ea0cea474f164239aa2950b012f1f8b21838e02c28ef9a4dddecbeee637e1b2c25e094e06cb7a60488ac6dcd394658
+  metadata.gz: a34e96479d6b6b75898d0bc968da6cefea0cb48a864bf023a28f8ed2632bdd13d9f67a7ff2c47876eb7b293df735e37dbd78af477582b062b4d1b2cb1d12096e
+  data.tar.gz: 69474be1aacde8a0111404c0744338aa8ab17a3df86aa87c2171e515c8990ba2e245d412efa572e3668a298077732053a9a85ab855a311105b3413470b8026f3

data/lib/washi.rb

@@ -1,10 +1 @@
-module Washi
-  class Tiler
-    def self.call(input_path, output_path, options={})
-      unless tile_size = options[:tile_size]
-        fail "Need pass :tile_size"
-      end
-      `vips dzsave #{input_path} #{output_path} --tile-size #{tile_size} --overlap 0 --vips-progress --vips-leak`
-    end
-  end
-end
+require 'washi/tiler'

data/lib/washi/config.rb

@@ -0,0 +1,15 @@
+module Washil
+  @@config = Class.new {
+    attr_accessor :overlap, :binapath, :options
+
+    def initialize
+      @overlap  = 0
+      @binapath = 'vips dzsave'
+      @options  = %w|--vips-progress --vips-leak|
+    end
+  }.new
+
+  def self.config
+    @@config
+  end
+end

data/lib/washi/mini_dzt/file_storage.rb

@@ -0,0 +1,28 @@
+module DZT
+  class FileStorage
+    #
+    # @param destination: Full directory in which to output tiles, defaults to 'tiles' in the current dir.
+    #
+    def initialize(options = {})
+      @store_path = options[:destination] || File.join(Dir.pwd, 'tiles')
+    end
+
+    def exists?
+      File.directory?(@store_path) && !Dir['@{@store_path}/*'].empty?
+    end
+
+    def storage_location(level)
+      File.join(@store_path, level.to_s)
+    end
+
+    def mkdir(path)
+      FileUtils.mkdir_p(path)
+    end
+
+    def write(file, dest, options = {})
+      quality = options[:quality]
+      file.quality quality
+      file.write(dest)
+    end
+  end
+end

data/lib/washi/mini_dzt/s3_storage.rb

@@ -0,0 +1,61 @@
+module DZT
+  class S3Storage
+    DEFAULT_ACL = 'public-read'
+    DEFAULT_KEY = ''
+    #
+    # @param s3_acl: ACL to use for storing, defaults to 'public-read'.
+    # @param s3_bucket: Bucket to store tiles.
+    # @param s3_key: Key to prefix stored files.
+    # @param aws_id: AWS Id.
+    # @param aws_secret: AWS Secret.
+    #
+    def initialize(options = {})
+      @s3_acl = options[:s3_acl] || DEFAULT_ACL
+      @s3_bucket = options[:s3_bucket]
+      @s3_key = options[:s3_key] || DEFAULT_KEY
+      @s3_id = options[:aws_id]
+      @s3_secret = options[:aws_secret]
+    end
+
+    def s3
+      @s3 ||= begin
+        require_fog!
+        Fog::Storage.new(
+          provider: 'AWS',
+          aws_access_key_id: @s3_id,
+          aws_secret_access_key: @s3_secret
+        )
+      end
+    end
+
+    # Currently does not supporting checking S3 fo overwritten files
+    def exists?
+      false
+    end
+
+    def storage_location(level)
+      "#{@s3_key}/#{level}"
+    end
+
+    # no-op
+    def mkdir(_path)
+    end
+
+    def write(file, dest, options = {})
+      quality = options[:quality]
+      s3.put_object(@s3_bucket, dest, file.to_blob { @quality = quality if quality },
+                    'Content-Type' => file.mime_type,
+                    'x-amz-acl' => @s3_acl
+                   )
+    end
+
+    private
+
+    def require_fog!
+      require 'fog'
+    rescue LoadError => e
+      STDERR.puts 'Fog is required for storing data in S3, run `gem install fog`.'
+      raise e
+    end
+  end
+end

data/lib/washi/mini_dzt/tiler.rb

@@ -0,0 +1,99 @@
+require 'mini_magick'
+
+module MiniDzt
+  class Tiler
+    # Defaults
+    DEFAULT_TILE_SIZE      = 512
+    DEFAULT_TILE_OVERLAP   = 0
+    DEFAULT_QUALITY        = 75
+    DEFAULT_TILE_FORMAT    = 'jpg'
+    DEFAULT_OVERWRITE_FLAG = false
+
+    # Generates the DZI-formatted tiles and sets necessary metadata on this object.
+    #
+    # @param [Hash] options
+    # @option source Magick::Image, or filename of image to be used for tiling
+    # @option quality Image compression quality (default: 75)
+    # @option format Format for output tiles (default: "jpg")
+    # @option size Size, in pixels, for tile squares (default: 512)
+    # @option overlap Size, in pixels, of the overlap between tiles (default: 2)
+    # @option overwrite Whether or not to overwrite if the destination exists (default: false)
+    def initialize(options)
+      fail 'Missing options[:source].' unless options[:source]
+
+      @tile_source  = MiniMagick::Image.open(options[:source])
+      @tile_size    = options[:size]      || DEFAULT_TILE_SIZE
+      @tile_overlap = options[:overlap]   || DEFAULT_TILE_OVERLAP
+      @tile_format  = options[:format]    || DEFAULT_TILE_FORMAT
+      @tile_quality = options[:quality]   || DEFAULT_QUALITY
+      @overwrite    = options[:overwrite] || DEFAULT_OVERWRITE_FLAG
+
+      @max_tiled_height = @tile_source.height
+      @max_tiled_width = @tile_source.width
+    end
+
+    def slice!(output_dir)
+      @tmp_working_dir = Pathname(@tile_source.path).dirname + "mini_dzt_#{SecureRandom.hex}"
+      FileUtils.mkdir_p @tmp_working_dir
+
+      orig_width = @tile_source.width
+      orig_height = @tile_source.height
+
+      max_level(orig_width, orig_height).downto(0) do |level|
+        puts "Level #{level}..."
+        current_level_storage_dir = "#{@tmp_working_dir}/#{level}"
+        FileUtils.mkdir_p current_level_storage_dir
+
+        width = @tile_source.width
+        height = @tile_source.height
+
+        manuscripts = get_manuscripts(width, height, current_level_storage_dir)
+
+        manuscripts.each do |dest_path, geometry_arg|
+          crope_image(@tile_source, dest_path, geometry_arg, @tile_quality)
+        end
+
+        @tile_source.resize("50%")
+      end
+      FileUtils.mv @tmp_working_dir, output_dir
+    end
+
+    private
+      def tile_counts(length)
+        return 1 if length <= @tile_size
+        (length / @tile_size.to_f).ceil
+      end
+
+      def get_manuscripts(width, height, current_level_storage_dir)
+        manuscripts = []
+
+        overlapping_tile_size = @tile_size + @tile_overlap
+        col_counts = tile_counts(width)
+        row_counts = tile_counts(height)
+        x, y = [0, 0]
+
+        row_counts.times do |row_count|
+          col_counts.times do |col_count|
+            manuscripts << [
+              File.join(current_level_storage_dir, "#{col_count}_#{row_count}.#{@tile_format}"),
+              "#{overlapping_tile_size}x#{overlapping_tile_size}+#{x}+#{y}"
+            ]
+            x += @tile_size
+          end
+          x = 0
+          y += @tile_size
+        end
+        manuscripts
+      end
+
+      def max_level(width, height)
+        (Math.log([width, height].max) / Math.log(2)).ceil
+      end
+
+      def crope_image(image, dest_path, geometry_arg, quality = 75)
+        puts geometry_arg
+        cmd = "convert -crop #{geometry_arg} #{image.path} #{dest_path}"
+        system(cmd)
+      end
+  end
+end

data/lib/washi/tiler.rb

@@ -0,0 +1,12 @@
+require 'washi/config'
+
+module Washi
+  class Tiler
+    def self.call(input_path, output_path, options={})
+      unless tile_size = options[:tile_size]
+        fail "Need pass :tile_size"
+      end
+      `#{Washil.config.binapath} #{input_path} #{output_path} --tile-size #{tile_size} --overlap #{Washil.config.overlap} #{Washil.config.options.join(" ")}`
+    end
+  end
+end

data/lib/washi/version.rb

@@ -1,3 +1,3 @@
 module Washi
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: washi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,11 @@ files:
 - bin/setup
 - exe/washi
 - lib/washi.rb
+- lib/washi/config.rb
+- lib/washi/mini_dzt/file_storage.rb
+- lib/washi/mini_dzt/s3_storage.rb
+- lib/washi/mini_dzt/tiler.rb
+- lib/washi/tiler.rb
 - lib/washi/version.rb
 - test/fixtures/img1.jpg
 - test/fixtures/img2.jpg