Merge pull request #2 from talis/TENT-949-MinorMaterialType

90% - TENT-949 minor material type
techfromsage · Apr 14, 2015 · c0245b0 · c0245b0
2 parents eb9ab52 + 8bc945f
commit c0245b0
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,5 @@
 .idea/
 vendor/
 atlassian-ide-plugin.xml
-
 composer.lock
+composer.phar
diff --git a/src/OpenURL/Entity.php b/src/OpenURL/Entity.php
@@ -207,5 +207,44 @@ public function toKev($abbr)
         }
         return(implode("&", $kevs));
     }
+
+    /**
+     * Unsets either a single value or all values from a given key.
+     *
+     * @param string $key The key whose value(s) we want to unset.
+     * @param null $value If specified, only removes the gives value from the key otherwise unsets all values.
+     */
+    public function unsetValue($key, $value=null)
+    {
+        if ($value == null)
+        {
+            if (isset($this->values[$key]))
+            {
+                unset($this->values[$key]);
+            }
+        }
+        else
+        {
+            if (isset($this->values[$key]))
+            {
+                $values = $this->values[$key];
+                if (is_array($values))
+                {
+                    $valueKey = array_search($value, $values);
+                    if ($valueKey !== FALSE)
+                    {
+                        unset($this->values[$key][$valueKey]);
+
+                        // Reindex the array to remove the empty entry...
+                        $this->values[$key] = array_values($this->values[$key]);
+                    }
+                }
+                else
+                {
+                    unset($this->values[$key]);
+                }
+            }
+        }
+    }
 }
 ?>
diff --git a/test/unit/OpenURLTest.php b/test/unit/OpenURLTest.php
@@ -35,4 +35,52 @@ public function testLoadKev() {
         $this->assertEquals("info:sid/ebookco.com:bookreader", $ctx->getReferrer()->getIdentifier());
     }
 
+    public function testEntityUnsetForAllValues()
+    {
+        $entity = new \OpenURL\Entity();
+        $entity->setValue('key1', 'val1');
+        $entity->setValue('key2', 'val2');
+
+        $entity->unsetValue('key2');
+
+        $key2Values = $entity->getValue('key2');
+        $this->assertNull($key2Values);
+        $this->assertEquals('val1', $entity->getValue('key1'));
+        $this->assertEquals(array('key1'=>'val1'), $entity->getValues());
+    }
+
+    public function testEntityUnsetValueForSingleValue()
+    {
+        $entity = new \OpenURL\Entity();
+        $entity->setValue('key1', array('val1a', 'val1b'));
+        $entity->setValue('key2', 'val2');
+
+        $entity->unsetValue('key1', 'val1a');
+
+        $this->assertEquals(array('key1'=>array('val1b'), 'key2'=>'val2'), $entity->getValues());
+    }
+
+    public function testEntityUnsetValueWithNonExistentValue()
+    {
+        $entity = new \OpenURL\Entity();
+        $entity->setValue('key1', array('val1a', 'val1b'));
+        $entity->setValue('key2', 'val2');
+
+        $entity->unsetValue('key1', 'foo');
+
+        $this->assertEquals(array('key1'=>array('val1a', 'val1b'), 'key2'=>'val2'), $entity->getValues());
+    }
+
+    public function testEntityUnsetValueWithNonExistentKey()
+    {
+        $entity = new \OpenURL\Entity();
+        $entity->setValue('key1', 'val1');
+        $entity->setValue('key2', 'val2');
+        $entity->unsetValue('keyFoo');
+
+        $this->assertEquals(array('key1'=>'val1', 'key2'=>'val2'), $entity->getValues());
+    }
+
+
+
 }