owo 1.2.2 → 1.3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe203eb93b393250b771e3943189ec1c2591ac2
-  data.tar.gz: 12f07ca21399f391a2096b2f00efbadfcfdf796d
+  metadata.gz: c622fa50671d197b6eb0c96859f19024ebe4ca6d
+  data.tar.gz: b6681af8a15fa995018d287884baf99c64a403af
 SHA512:
-  metadata.gz: 8bef383c38dec27b3ca9c404846aef436fc2a7524a080a3fbc8c62a81ccf99e392558ea7f4b8b9d398662463fcfd468a1039105c1102532aa294a6a30a91b55c
-  data.tar.gz: dc42359d52c0e5b54a5d0918759b3edf8171c9b4520c4340268aca6fd49a57ad03a29b0baf0936c11e2be6b1f69abfb550a69cf3944a867199de3cb502a275ed
+  metadata.gz: 1ffadc940761314f1bfa11339b352db28b72d1ebc9bababd2f1b7430768e1abd83e94c7161771b430a17bbfe9656a8f4aa45af5ca3ac5eb1b769baff94c08d09
+  data.tar.gz: a71eab6cc22124094f9dd570c7bff3e2e80409d70e790542f51c719d80192833b4a7bc13bcc4032e03dd41c0dfddd4c9d4327b48ea86f683aa5197a37dee87c6

data/lib/owo.rb

@@ -1,71 +1,80 @@
-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 shorten
-    # @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
+require 'owo/err'
+require 'owo/api'
+require 'rest-client'
+
+# OwO base module
+module OwO
+  # The main module for interaction
+  class WhatsThis
+    # @return [String] the token used for OwO.
+    attr_accessor :token
+
+    # @return [String] the domain to use when returning URLs.
+    attr_accessor :url
+
+    # @return [String] the url being used to use the OwO API.
+    attr_accessor :api_url
+
+    # Create a class to upload files and shorten URLs with OWO.
+    # @param token [String] the token required to use OwO.
+    # @param url [String] the domain to use when returning URLs.
+    # @param api_url [String] the url to use when using the OwO API. (This requires https:// or http://)
+    def initialize(token, url: 'owo.whats-th.is', api_url: 'https://api.awau.moe')
+      @token = token
+      @url = url
+      @api_url = api_url
+
+      raise OwO::Err::BadToken, 'Token is empty!' if token.empty?
+      raise OwO::Err::BadToken, 'Input your OwO token to test the client.' if token == 'TOKEN'
+    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
+      files = files.flatten
+      raise OwO::Err::NoContent, 'There is a empty string in your arguments!' if files.include? ''
+      raise OwO::Err::NoContent, 'Theres no files provided!' if files.empty?
+      files = files.map do |x|
+        return x if x.respond_to? :read
+        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, "Error initializing file '${x}' | #{errstring} | #{e.class.name}"
+        end
+      end
+      result = OwO::API.upload(opts, files)['files'].map { |x| "https://#{@url}/#{x['url']}" }
+      result[0] if ogfiles.length == 1 || !ogfiles.first.is_a?(Array)
+    end
+
+    # Shortens a link with OwO.
+    # @param urls [String, Array<String>] URLs to shorten
+    # @return [String, Array<String>] Returns the URLs of the shortened URLs
+    def shorten(*urls)
+      urls = urls.flatten
+      raise OwO::Err::NoContent, 'There is a empty string in your arguments!' if urls.include? ''
+      raise OwO::Err::NoContent, 'Theres no URLs provided!' if urls.empty?
+      result = urls.flatten.map { |x| OwO::API.shorten(opts, x) }
+      result[0] if urls.length == 1 || !urls.first.is_a?(Array)
+    end
+
+    private
+
+    def opts
+      { 't' => @token, 'u' => @url, 'a' => @api_url }
+    end
+  end
+
+  # Alias for the class {WhatsThis}
+  Client = WhatsThis
+end

data/lib/owo/api.rb

@@ -1,60 +1,65 @@
-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
+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 = '/upload/pomf'.freeze
+    SHORTEN_URL = '/shorten/polr'.freeze
+
+    module_function
+
+    # Handles requests given by the client
+    def request(type, *attributes)
+      raw = RestClient.send(type, *attributes, :'User-Agent' => "WhatsThisClient (https://github.com/whats-this/owo.rb, v#{OwO::VERSION})")
+      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
+
+    # Requests a file(s) to be uploaded
+    def upload(opts, files)
+      request(
+        :post,
+        "#{opts['a']}#{UPLOAD_URL}?key=#{opts['t']}",
+        'files'.to_sym => files
+      )
+    end
+
+    # Requests a url to be shortened
+    def shorten(opts, url)
+      request(
+        :get,
+        "#{opts['a']}#{SHORTEN_URL}?action=shorten&url=#{URI.escape(url)}&key=#{opts['t']}"
+      ).sub(/awau\.moe/, opts['u'])
+    end
+
+    private
+
+    def parse_json(raw)
+      JSON.parse(raw)
+    rescue JSON::ParserError
+      raw
+    end
+  end
+end

data/lib/owo/err.rb

@@ -1,68 +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
-
-    # Raised when loading a file recieves an error
-    class FileError < RuntimeError
-      # Default message for this exception
-      def message
-        'Unknown'
-      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

@@ -1,3 +1,3 @@
-module OwO
-  VERSION = '1.2.2'.freeze
-end
+module OwO
+  VERSION = '1.3.0.1'.freeze
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: owo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0.1
 platform: ruby
 authors:
 - Snazzah
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem that utilizes the OwO API.