waifu2x 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4470dbafba59b80455cbac8d5b1e704784fba5f3
-  data.tar.gz: a7135ee6ebc190dfbe34ef231b619f4cd0dc9e87
+  metadata.gz: 711f2a3a411fa50f68a4ac8287c0e0d879d8170b
+  data.tar.gz: 5642040d68b9a617c05c0d41e8028c4fe882fe90
 SHA512:
-  metadata.gz: 501949667feb47f21b7e648e916198a4aa09a25da0a523da9e149531701bf03e58c91a856964231c8a8142752320a3a41f75efceefeb710c1eeb92eded66688f
-  data.tar.gz: 88e8b65d9c265446b40857bc3e9384c743cd71188dbca4e2e51c67aa825730c5c6ae54fdd2d5db89b17f04ea41e264242fbe080d3fb118a3bd1d86b8f58f13d4
+  metadata.gz: 6d704a1e76c5e09e4aa913a59207517efa70f672e7e2cbd144d1df7d5defcd93637939f88cd34b0717991c5f1db48e91a8838c2a93eec3edb1bbf85f8e38e88a
+  data.tar.gz: 4583ef9d0705d18b6ae2c1eb90c894244caeb87407833f98fd1a03aa7184252b56714356af2e8052dcf805e8f2678b7552eca9f35b08cbc9f98cf7dd94d48c25

data/README.md

@@ -30,6 +30,9 @@ bundle install
 # convert image.png with 2x upscaling
 Waifu2x.convert('image.png', nil, { scale: 2 })
 
+# convert image.png from remote url
+Waifu2x.convert('http://example.net/image.png', nil, { scale: 2 })
+
 # convert image.png to converted.png without noise reduction and with 2x upscaling
 Waifu2x.convert('image.png', 'converted.png', { noise: 0, scale: 2 })
 ```
@@ -40,6 +43,9 @@ Waifu2x.convert('image.png', 'converted.png', { noise: 0, scale: 2 })
 # convert sample.jpg with 2x upscaling
 waifu2x sample.jpg -s 2
 
+# convert sample.jpg from remote url
+waifu2x http://example.net/sample.jpg -s 2
+
 # convert sample.jpg to output.jpg without noise reduction and with 2x upscaling
 waifu2x sample.jpg output.jpg -n 0 -s 2
 ```

data/lib/waifu2x.rb

@@ -6,38 +6,46 @@ module Waifu2x
   USER_AGENT = "Waifu2x Ruby Gem #{Waifu2x::VERSION}".freeze
   API_ENDPOINT = 'http://waifu2x.udp.jp/api'.freeze
 
-  # Creates a new image
+  # Converts image from a local file or URL
   #
-  # @param  [String] image Image filename to convert
-  # @param  [String, nil] filename Output image filename with extension
+  # @param  [String] source Source of image to convert (url or filename)
+  # @param  [String, nil] output_file Name of output image file (with extension)
   # @param  [Hash] options
   # @option options [Integer] :noise Noise reduction (0 - none, 1 - low, 2 - high), default: 2
   # @option options [Integer] :scale Upscaling (0 - none, 1 - 1.6x, 2 - 2x), default: 0
-  # @return [String] Output image filename
-  def self.convert(image, filename=nil, options={})
+  # @option options [Boolean] :raw When true will return a converted image in raw data (binary)
+  # @return [String] converted image in raw data (binary) or output filename
+  def self.convert(source, output_file=nil, options={})
     noise = options[:noise] || 2
     scale = options[:scale] || 0
 
     validate_options! noise, scale
 
-    begin
-      file = File.open(image)
-    rescue
-      raise InvalidImage, "Can't open image file: #{image}"
+    if source.start_with?('http', 'ftp')
+      source_params = { url: source }
+    else
+      begin
+        source_params = { file: File.open(source) }
+      rescue
+        raise InvalidImage, "Can't open image file: #{source}"
+      end
     end
 
     response = Typhoeus.post(API_ENDPOINT,
       headers: { 'User-Agent' => USER_AGENT },
-      body: { noise: noise.to_s, scale: scale.to_s, file: file }
+      body: { noise: noise, scale: scale }.merge(source_params)
     )
 
-    raise InvalidImage, response.body if response.body == 'ERROR: unsupported image format.'
+    raise InvalidImage, response.body if response.body.include?('ERROR')
     raise Waifu2x::ServerError, "Request to Waifu2x API failed with response code: #{response.code}" if response.code != 200
 
-    filename = output_filename(file) if filename.to_s.strip.empty?
-
-    File.write(filename, response.body)
-    filename
+    if options[:raw]
+      response.body
+    else
+      output_file = output_filename(source) if output_file.to_s.strip.empty?
+      File.write(output_file, response.body)
+      output_file
+    end
   end
 
   # @private

data/lib/waifu2x/version.rb

@@ -1,3 +1,3 @@
 module Waifu2x
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waifu2x
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper and CLI for waifu2x