Changeset 1496

Timestamp:

04/04/08 22:57:25 (5 months ago)

Author:

mikey

Message:

allow file urls

Files:

• trunk/src/main/php/net/stubbles/peer/stubURL.php (modified) (17 diffs)
• trunk/src/test/php/net/stubbles/peer/stubURLTestCase.php (modified) (1 diff)

trunk/src/main/php/net/stubbles/peer/stubURL.php

@@ -37 +37 @@
-    {
-        $this->url = parse_url($url);
-
+=
-            $this->url['host'] = strtolower($this->url['host']);
-        }
@@ -44 +44 @@
-        // will lead to an unset $this->url['pass'] which is wrong
-        // due to RFC1738 3.1, it has to be an empty string
- true && isset($this->url['pass']) == false && $this->get(true) !
+= true && isset($this->url['pass']) === false && $this->get(true) !=
-            $this->url['pass'] = '';
-        }
-        
-
+=
-            parse_str($this->url['query'], $this->params);
-        }
@@ -62 +62 @@
-    public static function fromString($urlString)
-    {
-
+=
-            return null;
-        }
-        
-        $url = new self($urlString);
-
+=
-            throw new stubMalformedURLException('The URL ' . $urlString . ' is not a valid URL.');
-        }
@@ -81 +81 @@
-    public function isValid()
-    {
-
+=
-            return false;
-        }
-        
-
+=
-            return false;
-        }
-        
-
+=
-            if (ereg('([@:/])', $this->url['user']) == true) {
-                return false;
-            }
-            
-
+=
-                return false;
-            }
@@ -100 +100 @@
-        
-        // if host is set and seems to comply with host character rules or host is localhost syntax is ok
-
+
+
+
-            return true;
-        }
@@ -133 +135 @@
-        }
-        
- true || checkdnsrr($this->url['host'], 'MX') 
+= true || checkdnsrr($this->url['host'], 'MX') =
-            return true;
-        }
@@ -150 +152 @@
-        $url  = '';
-        $user = '';
-
+=
-            $user = $this->url['user'];
-
+=
-                $user .= ':' . $this->url['pass'];
-            }
@@ -159 +161 @@
-        }
-        
-
+=
-            $port =  ':' . $this->url['port'];
-        } else {
@@ -165 +167 @@
-        }
-        
-
-
-
+
+
+
+
+
+
+
-                $url .= $this->url['path'];
-            }
-        }
-        
-
+=
-            $url .= '?' . $this->url['query'];
-        }
@@ -190 +196 @@
-    public function getScheme()
-    {
-
+=
-            return $this->url['scheme'];
-        }
@@ -205 +211 @@
-    public function getUser($defaultUser = null)
-    {
-
+=
-            return $this->url['user'];
-        }
@@ -220 +226 @@
-    public function getPassword($defaultPassword = null)
-    {
-
+=
-            return $this->url['pass'];
-        }
@@ -235 +241 @@
-    public function getHost($defaultHost = null)
-    {
-
+=
-            return $this->url['host'];
-        }
@@ -250 +256 @@
-    public function getPort($defaultPort = null)
-    {
-
+=
-            return $this->url['port'];
-        }
@@ -274 +280 @@
-    public function getPath()
-    {
-
+=
-            return null;
-        }
-        
-
+=
-            return $this->url['path'] . '?' . $this->url['query'];
-        }
@@ -292 +298 @@
-    public function hasQuery()
-    {
-
+=
-    }
-
@@ -304 +310 @@
-    public function getParam($name, $defaultValue = null)
-    {
-
+=
-            return $defaultValue;
-        }

trunk/src/test/php/net/stubbles/peer/stubURLTestCase.php

@@ -214 +214 @@
-
-    /**
+     * assure that values are returned the expected way
+     *
+     * @test
+     */
+    public function valueIPNoPath()
+    {
+        $url = stubURL::fromString('http://127.0.0.1');
+        $this->assertTrue($url->isValid());
+        $this->assertEquals('http://127.0.0.1', $url->get());
+        $this->assertEquals('http', $url->getScheme());
+        $this->assertNull($url->getUser());
+        $this->assertEquals('foo', $url->getUser('foo'));
+        $this->assertNull($url->getPassword());
+        $this->assertEquals('foo', $url->getPassword('foo'));
+        $this->assertEquals('127.0.0.1', $url->getHost());
+        $this->assertNull($url->getPort());
+        $this->assertEquals(313, $url->getPort(313));
+        $this->assertNull($url->getPath());
+        $this->assertFalse($url->hasQuery());
+        $this->assertTrue($url->checkDNS());
+    }
+
+    /**
+     * assure that values are returned the expected way
+     *
+     * @test
+     */
+    public function fileURL()
+    {
+        $url = stubURL::fromString('file:///home');
+        $this->assertTrue($url->isValid());
+        $this->assertEquals('file:///home', $url->get());
+        $this->assertEquals('file', $url->getScheme());
+        $this->assertNull($url->getUser());
+        $this->assertEquals('foo', $url->getUser('foo'));
+        $this->assertNull($url->getPassword());
+        $this->assertEquals('foo', $url->getPassword('foo'));
+        $this->assertNull($url->getHost());
+        $this->assertEquals('127.0.0.1', $url->getHost('127.0.0.1'));
+        $this->assertNull($url->getPort());
+        $this->assertEquals(313, $url->getPort(313));
+        $this->assertEquals('/home', $url->getPath());
+        $this->assertFalse($url->hasQuery());
+        $this->assertFalse($url->checkDNS());
+    }
+
+    /**
-     * assure that wrong values trigger an exception
-     *