owo 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585fc1f562fad3300dc85f0cf0373d8ab12b3c86
-  data.tar.gz: 2a762e3e984685823bd4d3b0b51e90c905cbf5c1
+  metadata.gz: a7ea7249271b04538e746273c02f31900772f4db
+  data.tar.gz: 13d193c9b9da46c37039da7b19cf83bb5dbf1696
 SHA512:
-  metadata.gz: 4286f5eb4ca34cab8e0a9ca64522c36174fdd28ef0cd28a507bdac4932b4702d19d59c2839f69ff5d6dae74822b213ef24e2b0cd48adae830f2cae41616687e1
-  data.tar.gz: c18f85c6e465ae3b3eff088664210941cdea66c64fed5039c119e2ca9ae2cdbdd02c91ac77df114d63d95b430c006c7649847854feb15df28a3547c33d62af9a
+  metadata.gz: 3ed821d013f84b4b9dbfa96fbf69177087d024521d5dc6263ccee4b6e2c3b61df0183aad88d0c5d24421deaae31a43fdc21be88b89a79289aaeb1c249d714f59
+  data.tar.gz: c9201ecd0b74a21b14717a8cc3386ebdbc7bb278033a4d3c7a1675ceba6c2ece70309f8044e8b0bfc6d83c3db4b50a18af36afde3102f227c6c5a3be9a7494a3

data/lib/owo.rb

@@ -15,25 +15,24 @@ module OwO
       # The domain to use when returning shortener URLs
       attr_accessor :shorten_url
 
-      def initialize(token, upload_url: "owo.whats-th.is", shorten_url: "uwu.whats-th.is")
+      def initialize(token, upload_url: 'owo.whats-th.is', shorten_url: 'uwu.whats-th.is')
         @token = token
         @upload_url = upload_url
         @shorten_url = shorten_url
       end
 
-      def opts()
-        {'t' => @token, 'u' => @upload_url, 's' => @shorten_url}
+      def opts
+        { 't' => @token, 'u' => @upload_url, 's' => @shorten_url }
       end
 
       # Upload a single file or multiple files to OwO.
       # @param files [File, String, Array<File, String>] Files to upload, can be either String or File
       # @return [String, Array<String>] Returns the URLs of the uploaded files
       def upload(files)
-        if not files.length == 0
-          was_string = false
+        ogfiles = files
+        if not files.empty?
           if files.is_a?(String)
-            files = [ files ]
-            was_string = true
+            files = [files]
           end
           files = files.map do |x|
             if x.is_a?(String)
@@ -42,17 +41,15 @@ module OwO
               x
             end
           end
-          result = OwO::API.upload(opts(), files)
+          result = OwO::API.upload(opts, files)
           result.shift
-          result = result["files"].map.with_index do |x, i|
+          result = result['files'].map do |x|
             "https://#{@upload_url}/#{x['url']}"
           end
-          if not files.is_a?(Array)
-            result = result[0]
-          end
-          return result
+          result = result[0] unless ogfiles.is_a?(Array)
+          result
         else
-          raise OwO::Err::NoContent, "Theres no files provided!"
+          raise OwO::Err::NoContent, 'Theres no files provided!'
         end
       end
 
@@ -62,12 +59,12 @@ module OwO
       def shorten(urls)
         if not urls.length == 0
           if urls.is_a?(Array)
-            return urls.map { |x| OwO::API.shorten(opts(), x) }
+            urls.map { |x| OwO::API.shorten(opts(), x) }
           else
-            return OwO::API.shorten(opts(), urls)
+            OwO::API.shorten(opts, urls)
           end
         else
-          raise OwO::Err::NoContent, "Theres no URL provided!"
+          raise OwO::Err::NoContent, 'Theres no URL provided!'
         end
       end
   end

data/lib/owo/api.rb

@@ -1,4 +1,5 @@
 require 'owo/err'
+require 'owo/ver'
 require 'uri'
 require 'rest-client'
 
@@ -11,23 +12,23 @@ module OwO
     module_function
 
     def request(type, *attributes)
-      raw = RestClient.send(type, *attributes, :'User-Agent' => "OwO.rb (https://github.com/whats-this/owo.rb)")
+      raw = RestClient.send(type, *attributes, :'User-Agent' => "OwO.rb v#{OwO::VERSION} (https://github.com/whats-this/owo.rb)")
       json = parse_json(raw);
       return json
     rescue RestClient::RequestEntityTooLarge
-      raise OwO::Err::TooLarge, "Requested files are too large!"
+      raise OwO::Err::TooLarge, 'Requested files are too large!'
     rescue RestClient::Unauthorized
-      raise OwO::Err::BadToken, "Token is invalid!"
+      raise OwO::Err::BadToken, 'Token is invalid!'
     rescue RestClient::BadRequest => e
       raw = e.response
       json = parse_json(raw)
       if json.is_a?(Hash)
         if json['description'] == 'too many files'
-          raise OwO::Err::TooManyFiles, "You requested too many files!"
+          raise OwO::Err::TooManyFiles, 'You requested too many files!'
         end
       else
         if raw == 'invalid URL'
-          raise OwO::Err::BadURL, "Your URL is invalid!"
+          raise OwO::Err::BadURL, 'Your URL is invalid!'
         end
       end
       err = if json.is_a?(Hash)
@@ -38,7 +39,7 @@ module OwO
 
       raise err
     rescue RestClient::InternalServerError
-      raise OwO::Err::ServerFail, "Server Error!"
+      raise OwO::Err::ServerFail, 'Server Error!'
     rescue RuntimeError => e
       raise e
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: owo
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Snazzah