Merge branch 'Laravel4' of github.com:syntaxerrors/Steam into Laravel4

Author: Travis Blasingame

src/Syntax/SteamApi/Containers/Player/Level.php

@@ -1,46 +1,33 @@
 <?php namespace Syntax\SteamApi\Containers\Player;
 
-class Level {
-	public $playerXp;
+class Level
+{
 
-	public $playerLevel;
+    public $playerXp;
 
-	public $xpToLevelUp;
+    public $playerLevel;
 
-	public $xpForCurrentLevel;
+    public $xpToLevelUp;
 
-	public $currentLevelFloor;
+    public $xpForCurrentLevel;
 
-	public $currentLevelCeiling;
+    public $currentLevelFloor;
 
-	public $percentThroughLevel;
+    public $currentLevelCeiling;
 
-	public function __construct($levelDetails)
-	{
-		$this->playerXp          = $levelDetails->player_xp;
-		$this->playerLevel       = $levelDetails->player_level;
-		$this->xpToLevelUp       = $levelDetails->player_xp_needed_to_level_up;
-		$this->xpForCurrentLevel = $levelDetails->player_xp_needed_current_level;
+    public $percentThroughLevel;
 
-		$this->currentLevelFloor    = $this->xpForCurrentLevel;
-		$this->currentLevelCeiling = $this->playerXp + $this->xpToLevelUp;
+    public function __construct($levelDetails)
+    {
+        $this->playerXp          = $levelDetails->player_xp;
+        $this->playerLevel       = $levelDetails->player_level;
+        $this->xpToLevelUp       = $levelDetails->player_xp_needed_to_level_up;
+        $this->xpForCurrentLevel = $levelDetails->player_xp_needed_current_level;
 
-		$levelRange = $this->currentLevelCeiling - $this->currentLevelFloor;
-
-		$this->percentThroughLevel = $this->percent($this->xpToLevelUp, $levelRange);
-	}
-
-	private function percent ($num_amount, $num_total)
-	{
-		if($num_amount == 0 || $num_total == 0){
-			return 0;
-		}
-		else {
-			$count1 = $num_amount / $num_total;
-			$count2 = $count1 * 100;
-			$count = number_format($count2, 0);
-			return $count;
-		}
-	}
+        $this->currentLevelFloor   = $this->xpForCurrentLevel;
+        $this->currentLevelCeiling = $this->playerXp + $this->xpToLevelUp;
 
+        // arbitrary range formula. n = value in the middle ( n - min ) / ( max - min ) * 100
+        $this->percentThroughLevel = ($this->playerXp - $this->currentLevelFloor) / ($this->currentLevelCeiling - $this->currentLevelFloor) * 100;
+    }
 }

tests/NewsTest.php

@@ -18,7 +18,7 @@ public function it_gets_news_by_app_id()
         ];
         $this->assertObjectHasAttributes($attributes, $newsArticle->newsitems[0]);
 
-        $this->assertEquals(23, strlen(strip_tags($newsArticle->newsitems[0]->contents)));
+        $this->assertTrue(strlen(strip_tags($newsArticle->newsitems[0]->contents)) <= 23);
     }
 
     /** @test */
@@ -40,7 +40,11 @@ public function it_gets_more_than_1_news_article_by_app_id()
      */
     public function it_has_full_news_article_by_app_id($defaultNewsCall)
     {
-        $this->assertGreaterThan(23, strlen(strip_tags($defaultNewsCall->newsitems[0]->contents)));
+        foreach ($defaultNewsCall->newsitems as $newsItem) {
+            if (strlen(strip_tags($newsItem->contents)) > 0) {
+                $this->assertGreaterThan(23, strlen(strip_tags($newsItem->contents)));
+            }
+        }
     }
 
 }