owo 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7ea7249271b04538e746273c02f31900772f4db
-  data.tar.gz: 13d193c9b9da46c37039da7b19cf83bb5dbf1696
+  metadata.gz: ca1e08a5e54f9dd371a76883c245b11e827011cf
+  data.tar.gz: 225324af52d912ea4735cc8d840b3f377f3c2680
 SHA512:
-  metadata.gz: 3ed821d013f84b4b9dbfa96fbf69177087d024521d5dc6263ccee4b6e2c3b61df0183aad88d0c5d24421deaae31a43fdc21be88b89a79289aaeb1c249d714f59
-  data.tar.gz: c9201ecd0b74a21b14717a8cc3386ebdbc7bb278033a4d3c7a1675ceba6c2ece70309f8044e8b0bfc6d83c3db4b50a18af36afde3102f227c6c5a3be9a7494a3
+  metadata.gz: 5cfd7c0eff2c14e6fda5daf9481cadeb055af4e2ae4f7ef910c2c6c9cb17244e94bf8d27953da4cbeed6abeccd064e2a8a61630b5f7ee7b644249a54f54a5179
+  data.tar.gz: ddd779bd56dc7819668dd222503d08d9c22f8430694bdcefc7034d4a3ea4f89605074178689866552d3770620a9272a60da05c4dce943d8961b0610d26d0365b

data/lib/owo.rb

@@ -1,71 +1,71 @@
-require 'owo/err'
-require 'owo/api'
-require 'rest-client'
-
-# OwO base module
-module OwO
-  # The main module for interaction
-  class WhatsThis
-      # The token to the module
-      attr_accessor :token
-
-      # The domain to use when returning upload URLs
-      attr_accessor :upload_url
-
-      # 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')
-        @token = token
-        @upload_url = upload_url
-        @shorten_url = shorten_url
-      end
-
-      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)
-        ogfiles = files
-        if not files.empty?
-          if files.is_a?(String)
-            files = [files]
-          end
-          files = files.map do |x|
-            if x.is_a?(String)
-              File.new(File.absolute_path(x), 'rb')
-            else
-              x
-            end
-          end
-          result = OwO::API.upload(opts, files)
-          result.shift
-          result = result['files'].map do |x|
-            "https://#{@upload_url}/#{x['url']}"
-          end
-          result = result[0] unless ogfiles.is_a?(Array)
-          result
-        else
-          raise OwO::Err::NoContent, 'Theres no files provided!'
-        end
-      end
-
-      # Shortens a link with OwO.
-      # @param urls [String, Array<String>] URLs to sharten
-      # @return [String, Array<String>] Returns the URLs of the shortened URLs
-      def shorten(urls)
-        if not urls.length == 0
-          if urls.is_a?(Array)
-            urls.map { |x| OwO::API.shorten(opts(), x) }
-          else
-            OwO::API.shorten(opts, urls)
-          end
-        else
-          raise OwO::Err::NoContent, 'Theres no URL provided!'
-        end
-      end
-  end
-end
+require 'owo/err'
+require 'owo/api'
+require 'rest-client'
+
+# OwO base module
+module OwO
+  # The main module for interaction
+  class WhatsThis
+    # The token to the module
+    attr_accessor :token
+
+    # The domain to use when returning upload URLs
+    attr_accessor :upload_url
+
+    # 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')
+      @token = token
+      @upload_url = upload_url
+      @shorten_url = shorten_url
+    end
+
+    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)
+      ogfiles = files
+      raise OwO::Err::NoContent, 'Theres no files provided!' if files.empty?
+      files = [files] if files.is_a?(String)
+      files = files.map do |x|
+        return x unless x.is_a?(String)
+        begin
+          File.new(File.absolute_path(x), 'rb')
+        rescue Errno::ENOENT, Errno::EACCES, Errno::ENAMETOOLONG => e
+          errstring = 'Unknown'
+          case e.class.name
+          when 'Errno::ENOENT'
+            errstring = 'File Not Found'
+          when 'Errno::EACCES'
+            errstring = 'Permission Denied'
+          when 'Errno::ENAMETOOLONG'
+            errstring = 'Name Too Long'
+          end
+          raise OwO::Err::FileError, "#{errstring} | #{e.class.name}"
+        end
+      end
+      result = OwO::API.upload(opts, files)
+      result.shift
+      result = result['files'].map { |x| "https://#{@upload_url}/#{x['url']}" }
+      result = result[0] unless ogfiles.is_a?(Array)
+      result
+    end
+
+    # Shortens a link with OwO.
+    # @param urls [String, Array<String>] URLs to sharten
+    # @return [String, Array<String>] Returns the URLs of the shortened URLs
+    def shorten(urls)
+      raise OwO::Err::NoContent, 'Theres no URL provided!' if urls.empty?
+      if urls.is_a?(Array)
+        urls.map { |x| OwO::API.shorten(opts, x) }
+      else
+        OwO::API.shorten(opts, urls)
+      end
+    end
+  end
+end

data/lib/owo/api.rb

@@ -1,71 +1,60 @@
-require 'owo/err'
-require 'owo/ver'
-require 'uri'
-require 'rest-client'
-
-module OwO
-  # List of methods representing endpoints in OwO's API
-  module API
-    UPLOAD_URL = "https://api.awau.moe/upload/pomf"
-    SHORTEN_URL = "https://api.awau.moe/shorten/polr"
-
-    module_function
-
-    def request(type, *attributes)
-      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!'
-    rescue RestClient::Unauthorized
-      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!'
-        end
-      else
-        if raw == 'invalid URL'
-          raise OwO::Err::BadURL, 'Your URL is invalid!'
-        end
-      end
-      err = if json.is_a?(Hash)
-              json['description']
-            else
-              raw
-            end
-
-      raise err
-    rescue RestClient::InternalServerError
-      raise OwO::Err::ServerFail, 'Server Error!'
-    rescue RuntimeError => e
-      raise e
-    end
-
-    def parse_json(raw)
-      JSON.parse(raw)
-    rescue JSON::ParserError
-      raw
-    end
-
-    def upload(opts, files)
-      # "https://#{opts['u']}/" + 
-      request(
-        :post,
-        "#{UPLOAD_URL}?key=#{opts['t']}",
-        "files".to_sym() => files
-      )
-    end
-
-    def shorten(opts, url)
-      request(
-        :get,
-        "#{SHORTEN_URL}?action=shorten&url=#{URI.escape(url)}&key=#{opts['t']}"
-      ).sub(/awau\.moe/, opts['s'])
-    end
-  end
-end
-
-# gem build owo.gemspec && gem install owo-1.0.0.gem && ruby test/upload.rb
+require 'owo/err'
+require 'owo/ver'
+require 'uri'
+require 'rest-client'
+
+module OwO
+  # List of methods representing endpoints in OwO's API
+  module API
+    UPLOAD_URL = 'https://api.awau.moe/upload/pomf'.freeze
+    SHORTEN_URL = 'https://api.awau.moe/shorten/polr'.freeze
+
+    module_function
+
+    def request(type, *attributes)
+      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!'
+    rescue RestClient::Unauthorized
+      raise OwO::Err::BadToken, 'Token is invalid!'
+    rescue RestClient::BadRequest => e
+      raw = e.response
+      json = parse_json(raw)
+      raise OwO::Err::TooManyFiles, 'You requested too many files!' if json.is_a?(Hash) && json['description'] == 'too many files'
+      raise OwO::Err::BadURL, 'Your URL is invalid!' if !json.is_a?(Hash) && raw == 'invalid URL'
+      err = if json.is_a?(Hash)
+              json['description']
+            else
+              raw
+            end
+      raise err
+    rescue RestClient::InternalServerError
+      raise OwO::Err::ServerFail, 'Server Error!'
+    rescue RuntimeError => e
+      raise e
+    end
+
+    def parse_json(raw)
+      JSON.parse(raw)
+    rescue JSON::ParserError
+      raw
+    end
+
+    def upload(opts, files)
+      request(
+        :post,
+        "#{UPLOAD_URL}?key=#{opts['t']}",
+        'files'.to_sym => files
+      )
+    end
+
+    def shorten(opts, url)
+      request(
+        :get,
+        "#{SHORTEN_URL}?action=shorten&url=#{URI.escape(url)}&key=#{opts['t']}"
+      ).sub(/awau\.moe/, opts['s'])
+    end
+  end
+end

data/lib/owo/err.rb

@@ -1,61 +1,68 @@
-module OwO
-  # Custom errors raised in various places
-  module Err
-
-    # Raised when a token is invalid or incorrect.
-    class BadToken < RuntimeError
-      # Default message for this exception
-      def message
-        'Token invalid'
-      end
-    end
-
-    # Raised when too many files were uploaded.
-    class TooManyFiles < RuntimeError
-      # Default message for this exception
-      def message
-        'Too many files requested!'
-      end
-    end
-
-    # Raised when no files were sent.
-    class NoContent < RuntimeError
-      # Default message for this exception
-      def message
-        'No content found!'
-      end
-    end
-
-    # Raised when requested URL is bad.
-    class BadURL < RuntimeError
-      # Default message for this exception
-      def message
-        'Your URL is invalid!'
-      end
-    end
-
-    # Raised when requested file(s) have too much bytes.
-    class TooLarge < RuntimeError
-      # Default message for this exception
-      def message
-        'File(s) are too large!'
-      end
-    end
-
-    # Raised when a server error occurs
-    class ServerFail < RuntimeError
-      # Default message for this exception
-      def message
-        'Server tried to do a thing and borked!'
-      end
-    end
-
-    # Raised when the error is unhandled
-    class Unhandled < RuntimeError
-      # Default message for this exception
-      def message
-        'Unhandled'
-      end
-    end
-  end
-end
+module OwO
+  # Custom errors raised in various places
+  module Err
+    # Raised when a token is invalid or incorrect.
+    class BadToken < RuntimeError
+      # Default message for this exception
+      def message
+        'Token invalid'
+      end
+    end
+
+    # Raised when too many files were uploaded.
+    class TooManyFiles < RuntimeError
+      # Default message for this exception
+      def message
+        'Too many files requested!'
+      end
+    end
+
+    # Raised when no files were sent.
+    class NoContent < RuntimeError
+      # Default message for this exception
+      def message
+        'No content found!'
+      end
+    end
+
+    # Raised when requested URL is bad.
+    class BadURL < RuntimeError
+      # Default message for this exception
+      def message
+        'Your URL is invalid!'
+      end
+    end
+
+    # Raised when requested file(s) have too much bytes.
+    class TooLarge < RuntimeError
+      # Default message for this exception
+      def message
+        'File(s) are too large!'
+      end
+    end
+
+    # Raised when a server error occurs
+    class ServerFail < RuntimeError
+      # Default message for this exception
+      def message
+        'Server tried to do a thing and borked!'
+      end
+    end
+
+    # Raised when the error is unhandled
+    class Unhandled < RuntimeError
+      # Default message for this exception
+      def message
+        'Unhandled'
+      end
+    end
+
+    # Raised when loading a file recieves an error
+    class FileError < RuntimeError
+      # Default message for this exception
+      def message
+        'Unknown'
+      end
+    end
+  end
+end

data/lib/owo/ver.rb

@@ -0,0 +1,3 @@
+module OwO
+  VERSION = '1.2.1'.freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: owo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Snazzah
@@ -61,6 +61,7 @@ files:
 - lib/owo.rb
 - lib/owo/api.rb
 - lib/owo/err.rb
+- lib/owo/ver.rb
 homepage: https://github.com/whats-this/owo.rb
 licenses:
 - MIT