From f97a39f86a76fa7a4beb72cb8f186fce9ba5a1b9 Mon Sep 17 00:00:00 2001
From: Josantonius <info@josantonius.com>
Date: Sun, 9 Jul 2017 07:40:41 +0200
Subject: [PATCH] Updated to 1.1.3 version

---
 CHANGELOG.md                   |  3 ++
 README-ES.md                   |  2 +-
 README.md                      |  1 +
 composer.json                  |  2 +-
 src/Exception/UrlException.php |  4 +--
 src/Url.php                    | 60 +++++++++++++++++++---------------
 tests/UrlTest.php              |  2 +-
 7 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcd6f64..edeeced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 1.1.3 - 2017-07-09
+* Added option to analyze concrete urls in some methods.
+
 ## 1.1.2 - 2017-05-08
 * Now you can choose to place backslash at the beginning, end or both ends in the addBackslash() method.
 
diff --git a/README-ES.md b/README-ES.md
index 93ded70..90460a1 100644
--- a/README-ES.md
+++ b/README-ES.md
@@ -40,7 +40,7 @@ También puedes clonar el repositorio completo con Git:
 
 ### Requisitos
 
-Esta ĺibrería es soportada por versiones de PHP 5.6 o superiores y es compatible con versiones de HHVM 3.0 o superiores.
+Esta biblioteca es soportada por versiones de PHP 5.6 o superiores y es compatible con versiones de HHVM 3.0 o superiores.
 
 ### Cómo empezar y ejemplos
 
diff --git a/README.md b/README.md
index a0b6a95..03081bc 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ require __DIR__ . '/vendor/autoload.php';
 
 use Josantonius\Url\Url;
 ```
+
 ### Available Methods
 
 Available methods in this library:
diff --git a/composer.json b/composer.json
index 926335a..7bc26e5 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name":        "josantonius/url",
-    "version":     "1.1.2",
+    "version":     "1.1.3",
     "type":        "library",
     "description": "Library for urls manipulation.",
     "keywords": [
diff --git a/src/Exception/UrlException.php b/src/Exception/UrlException.php
index f2ec2eb..74b6f52 100644
--- a/src/Exception/UrlException.php
+++ b/src/Exception/UrlException.php
@@ -1,9 +1,9 @@
-<?php
+<?php 
 /**
  * Library for urls manipulation.
  * 
  * @author     Josantonius - hello@josantonius.com
- * @copyright  Copyright (c) 2017 JST PHP Framework
+ * @copyright  Copyright (c) 2017
  * @license    https://opensource.org/licenses/MIT - The MIT License (MIT)
  * @link       https://github.com/Josantonius/PHP-Url
  * @since      1.0.0
diff --git a/src/Url.php b/src/Url.php
index 8b2c6f9..d2af487 100644
--- a/src/Url.php
+++ b/src/Url.php
@@ -4,7 +4,7 @@
  * 
  * @author     Josantonius - hello@josantonius.com
  * @author     David Carr  - dave@simplemvcframework.com
- * @copyright  Copyright (c) 2017 JST PHP Framework
+ * @copyright  Copyright (c) 2017
  * @license    https://opensource.org/licenses/MIT - The MIT License (MIT)
  * @link       https://github.com/Josantonius/PHP-Url
  * @since      1.0.0
@@ -12,8 +12,6 @@
 
 namespace Josantonius\Url;
 
-# use Josantonius\Url\Exception\UrlException;
-
 /**
  * Url handler.
  *
@@ -21,15 +19,6 @@
  */
 class Url {
 
-    /**
-     * Directory separator.
-     *
-     * @since 1.1.2
-     *
-     * @var string
-     */
-    const DS = DIRECTORY_SEPARATOR;
-
     /**
      * Get url from the current page.
      *
@@ -49,7 +38,7 @@ public static function getCurrentPage() {
 
         $uri = self::getUri();
 
-        return $protocol . ':' . self::DS . self::DS . $host . $port . $uri;
+        return $protocol . '://' . $host . $port . $uri;
     }
 
     /**
@@ -65,9 +54,9 @@ public static function getBaseUrl() {
 
         $url = self::addBackslash(self::getCurrentPage());
 
-        if ($uri !== self::DS) {
+        if ($uri !== '/') {
             
-            $url = trim(str_replace($uri, '', $url), self::DS);
+            $url = trim(str_replace($uri, '', $url), '/');
         }
 
         return self::addBackslash($url);
@@ -78,13 +67,20 @@ public static function getBaseUrl() {
      *
      * @since 1.0.0
      *
+     * @param string $url
+     *
      * @return string → http|https
      */
-    public static function getProtocol() {
+    public static function getProtocol($url = false) {
+
+        if ($url) {
+
+            return (preg_match('/^https/', $url)) ? 'https' : 'http';
+        }
 
         $protocol = strtolower($_SERVER['SERVER_PROTOCOL']);
 
-        $protocol = substr($protocol, 0, strpos($protocol, self::DS));
+        $protocol = substr($protocol, 0, strpos($protocol, '/'));
 
         $ssl = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on');
 
@@ -96,11 +92,13 @@ public static function getProtocol() {
      *
      * @since 1.0.0
      *
+     * @param string $url
+     *
      * @return boolean
      */
-    public static function isSSL() {
+    public static function isSSL($url = false) {
 
-        return (self::getProtocol() === 'https');
+        return (self::getProtocol($url) === 'https');
     }
 
     /**
@@ -108,9 +106,18 @@ public static function isSSL() {
      *
      * @since 1.0.0
      *
-     * @return string → server name
+     * @param string $url
+     *
+     * @return string|false → server name
      */
-    public static function getDomain() {
+    public static function getDomain($url = false) {
+
+        if ($url) {
+
+            preg_match('/([\w]+[.]){1,}[a-z]+/', $url, $matches);
+
+            return isset($matches[0]) ? $matches[0] : false;
+        }
 
         return $_SERVER['SERVER_NAME'];
     }
@@ -138,9 +145,9 @@ public static function getUriMethods() {
 
         $root = str_replace($_SERVER["DOCUMENT_ROOT"], '', getcwd());
 
-        $subfolder = trim($root, self::DS);
+        $subfolder = trim($root, '/');
 
-        return trim(str_replace($subfolder, '', self::getUri()), self::DS);
+        return trim(str_replace($subfolder, '', self::getUri()), '/');
     }
 
     /**
@@ -171,11 +178,11 @@ public static function addBackslash($uri, $position = 'end') {
 
             case 'top':
 
-                return (substr($uri, 1) === self::DS) ? $uri : self::DS.$uri;
+                return (substr($uri, 1) === '/') ? $uri : '/' . $uri;
             
             case 'end':
                 
-                return (substr($uri, -1) === self::DS) ? $uri : $uri.self::DS;
+                return (substr($uri, -1) === '/') ? $uri : $uri . '/';
 
             case 'both':
 
@@ -240,7 +247,6 @@ public static function autoLink($url, $custom = null) {
     /**
      * This function converts and url segment to an safe one.
      * For example: `test name @132` will be converted to `test-name--123`.
-     * Replace every character that isn't an letter or an number to an dash sign.
      * It will also return all letters in lowercase
      *
      * @since 1.0.0
@@ -272,7 +278,7 @@ public static function segment($uri = null) {
 
         $uri = (!is_null($uri)) ? $uri : $_SERVER['REQUEST_URI'];
  
-        return explode(self::DS, trim($uri, self::DS));
+        return explode('/', trim($uri, '/'));
     }
 
     /**
diff --git a/tests/UrlTest.php b/tests/UrlTest.php
index 8a5190c..9cde4dd 100644
--- a/tests/UrlTest.php
+++ b/tests/UrlTest.php
@@ -3,7 +3,7 @@
  * Library for urls manipulation.
  * 
  * @author     Josantonius - hello@josantonius.com
- * @copyright  Copyright (c) 2017 JST PHP Framework
+ * @copyright  Copyright (c) 2017
  * @license    https://opensource.org/licenses/MIT - The MIT License (MIT)
  * @link       https://github.com/Josantonius/PHP-Url
  * @since      1.0.0