Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,11 @@
+##### 1.2.0 - 20 September 2013
+
+###### Backwards compatible API changes
+- Added AngularCache#info(key) #43
+
+###### Backwards compatible bug fixes
+- Fixed #39, #44, #49, #50
+
 ##### 1.1.0 - 03 September 2013
 
 ###### Backwards compatible API changes

Gruntfile.js

@@ -13,7 +13,7 @@ module.exports = function (grunt) {
         pkg: grunt.file.readJSON('package.json'),
         clean: ['dist/', 'docs/'],
         jshint: {
-            all: ['Gruntfile.js', 'src/**/*.js', 'test/angular-cacheSpec.js'],
+            all: ['Gruntfile.js', 'src/**/*.js', 'test/*.js'],
             jshintrc: '.jshintrc'
         },
         copy: {
@@ -37,7 +37,7 @@ module.exports = function (grunt) {
         },
         karma: {
             options: {
-                configFile: 'test/karma.conf.js',
+                configFile: './karma.conf.js',
                 singleRun: true,
                 autoWatch: false
             },

README.md

@@ -1,13 +1,15 @@
-angular-cache (1.1.0)
-=====================
-angular-cache is a caching system that improves upon the capabilities of the $cacheFactory provided by AngularJS. Check out the [demo](http://jmdobry.github.io/angular-cache/demo/) for a quick introduction, or continue on down for more detailed information.
+### angular-cache (1.2.0) is a very useful replacement for Angular's $cacheFactory.
+
+Check out the [demo](http://jmdobry.github.io/angular-cache/demo/) for a quick introduction, or continue on down for more detailed information.
 
 The goal of the project is to solve a general problem, not satisfy a specific scenario.
 
 ### Quick Introduction
 
 #### [View the Demo](http://jmdobry.github.io/angular-cache/demo/)
 
+#### [Mailing List](https://groups.google.com/forum/#!forum/angular-cache)
+
 ##### $cacheFactory
 ```javascript
 // Angular's provided $cacheFactory
@@ -233,18 +235,18 @@ $angularCacheFactory.get('someCache').setOptions({ capacity: 4500 });
 ## Status
 | Version | Branch  | Build status                                                                                                                                                              | Test Coverage |
 | ------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| 1.1.0   | [master](https://github.com/jmdobry/angular-cache)  | [![Build Status](https://travis-ci.org/jmdobry/angular-cache.png?branch=master)](https://travis-ci.org/jmdobry/angular-cache) | [Test Coverage](http://jmdobry.github.io/angular-cache/coverage/) |
-| 1.1.0   | [develop](https://github.com/jmdobry/angular-cache/tree/develop) | [![Build Status](https://travis-ci.org/jmdobry/angular-cache.png?branch=develop)](https://travis-ci.org/jmdobry/angular-cache) | |
-| 1.1.0   | [all](https://drone.io/github.com/jmdobry/angular-cache) | [![Build Status](https://drone.io/github.com/jmdobry/angular-cache/status.png)](https://drone.io/github.com/jmdobry/angular-cache/latest)
+| 1.2.0   | [master](https://github.com/jmdobry/angular-cache)  | [![Build Status](https://travis-ci.org/jmdobry/angular-cache.png?branch=master)](https://travis-ci.org/jmdobry/angular-cache) | [Test Coverage](http://jmdobry.github.io/angular-cache/coverage/) |
+| 1.2.0   | [develop](https://github.com/jmdobry/angular-cache/tree/develop) | [![Build Status](https://travis-ci.org/jmdobry/angular-cache.png?branch=develop)](https://travis-ci.org/jmdobry/angular-cache) | |
+| 1.2.0   | [all](https://drone.io/github.com/jmdobry/angular-cache) | [![Build Status](https://drone.io/github.com/jmdobry/angular-cache/status.png)](https://drone.io/github.com/jmdobry/angular-cache/latest)
 
 <a name='download'></a>
 ## Download
 
 #### Latest Stable Version
 | Type          | File | Size |
 | ------------- | ----------------- | ------------------- | ---- |
-| Production    | [angular-cache-1.1.0.min.js](https://raw.github.com/jmdobry/angular-cache/master/dist/angular-cache-1.1.0.min.js) | 6 KB |
-| Development   | [angular-cache-1.1.0.js](https://raw.github.com/jmdobry/angular-cache/master/dist/angular-cache-1.1.0.js) | 34 KB |
+| Production    | [angular-cache-1.2.0.min.js](https://raw.github.com/jmdobry/angular-cache/master/dist/angular-cache-1.2.0.min.js) | 6 KB |
+| Development   | [angular-cache-1.2.0.js](https://raw.github.com/jmdobry/angular-cache/master/dist/angular-cache-1.2.0.js) | 34 KB |
 
 <a name='installation'></a>
 ## Installation
@@ -595,6 +597,9 @@ app.service('myService', function ($angularCacheFactory) {
 
     cache.info(); // { ..., size: 30, cacheFlushInterval: 5500,
                   //   capacity: 1.7976931348623157e+308, maxAge: null, ... }
+
+    cache.put('someItem', 'someValue', { maxAge: 12000, aggressiveDelete: true });
+    cache.info('someItem'); // { timestamp: 12345678978, maxAge: 12000, aggressiveDelete: true, isExpired: false }
 });
 ```
 See [AngularCache#setOptions](http://jmdobry.github.io/angular-cache/docs/Cache.html#setOptions)
@@ -696,6 +701,14 @@ See [AngularCache#info](http://jmdobry.github.io/angular-cache/docs/Cache.html#i
 <a name='changelog'></a>
 ## Changelog
 
+##### 1.2.0 - 20 September 2013
+
+###### Backwards compatible API changes
+- Added AngularCache#info(key) #43
+
+###### Backwards compatible bug fixes
+- Fixed #39, #44, #49, #50
+
 ##### 1.1.0 - 03 September 2013
 
 ###### Backwards compatible API changes
@@ -809,4 +822,4 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
 FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bower.json

@@ -2,7 +2,7 @@
     "author": "Jason Dobry",
     "name": "angular-cache",
     "description": "angular-cache is a very useful replacement for Angular's $cacheFactory.",
-    "version": "1.1.0",
+    "version": "1.2.0",
     "homepage": "http://jmdobry.github.io/angular-cache/",
     "repository": {
         "type": "git",

coverage/index.html

@@ -183,16 +183,16 @@
     <h1>Code coverage report for <span class="entity">All files</span></h1>
     <h2>
 
-        Statements: <span class="metric">96.05% <small>(316 / 329)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Statements: <span class="metric">96.44% <small>(325 / 337)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Branches: <span class="metric">91.09% <small>(225 / 247)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Branches: <span class="metric">91.95% <small>(240 / 261)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
         Functions: <span class="metric">100% <small>(44 / 44)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        Lines: <span class="metric">96.05% <small>(316 / 329)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
+        Lines: <span class="metric">96.44% <small>(325 / 337)</small></span> &nbsp;&nbsp;&nbsp;&nbsp;
 
     </h2>
     <div class="path"></div>
@@ -215,24 +215,24 @@ <h2>
 </tr>
 </thead>
 <tbody><tr>
-	<td class="file high" data-value="src/"><a href="src/index.html">src/</a></td>
-	<td data-value="96.05" class="pic high"><span class="cover-fill" style="width: 96px;"></span><span class="cover-empty" style="width:4px;"></span></td>
-	<td data-value="96.05" class="pct high">96.05%</td>
-	<td data-value="329" class="abs high">(316&nbsp;/&nbsp;329)</td>
-	<td data-value="91.09" class="pct high">91.09%</td>
-	<td data-value="247" class="abs high">(225&nbsp;/&nbsp;247)</td>
+	<td class="file high" data-value="./src\"><a href="./src/index.html">./src\</a></td>
+	<td data-value="96.44" class="pic high"><span class="cover-fill" style="width: 96px;"></span><span class="cover-empty" style="width:4px;"></span></td>
+	<td data-value="96.44" class="pct high">96.44%</td>
+	<td data-value="337" class="abs high">(325&nbsp;/&nbsp;337)</td>
+	<td data-value="91.95" class="pct high">91.95%</td>
+	<td data-value="261" class="abs high">(240&nbsp;/&nbsp;261)</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="44" class="abs high">(44&nbsp;/&nbsp;44)</td>
-	<td data-value="96.05" class="pct high">96.05%</td>
-	<td data-value="329" class="abs high">(316&nbsp;/&nbsp;329)</td>
+	<td data-value="96.44" class="pct high">96.44%</td>
+	<td data-value="337" class="abs high">(325&nbsp;/&nbsp;337)</td>
 	</tr>
 
 </tbody>
 </table>
 </div>
 </div>
 <div class="footer">
-    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Sep 03 2013 12:54:31 GMT-0600 (MDT)</div>
+    <div class="meta">Generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Sat Sep 21 2013 10:34:02 GMT-0600 (Mountain Daylight Time)</div>
 </div>
 
 <script src="prettify.js"></script>