Merge pull request #104 from afeld/next-release

afeld · afeld · commit 99c70bd41440 · 2014-01-28T16:24:30.000-08:00
v2.0.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Backbone-Nested [![Build Status](https://secure.travis-ci.org/afeld/backbone-nested.png?branch=master)](http://travis-ci.org/afeld/backbone-nested)
 
-A plugin to make [Backbone.js](http://documentcloud.github.com/backbone) keep track of nested attributes.  [Download minified version](https://github.com/afeld/backbone-nested/downloads).
+A plugin to make [Backbone.js](http://documentcloud.github.com/backbone) keep track of nested attributes.  Download the latest version and see the changelog/history/release notes on the [Releases](https://github.com/afeld/backbone-nested/releases) page.  **Supports Backbone 0.9.x and 1.x.**
 
 ## The Need
 
@@ -28,18 +28,35 @@ Wouldn't it be awesome if you could do this?
 user.bind('change:name.first', function(){ ... });
 ```
 
-## Usage
+## Installation
+
+### [Bower](http://bower.io/)
+
+Recommended.
+
+1. Install the latest version:
+
+    ```bash
+    bower install backbone backbone-nested-model jquery underscore --save
+    ```
 
-1. Download the latest version [here](https://github.com/afeld/backbone-nested/tags), and add `backbone-nested.js` to your HTML `<head>`, **after** `backbone.js` is included ([tested](http://afeld.github.com/backbone-nested/test/) against [jQuery](http://jquery.com/) v1.7.2, [Underscore](http://documentcloud.github.com/underscore/) v1.3.3 and [Backbone](http://documentcloud.github.com/backbone/) v0.9.2).
+2. Add `backbone-nested.js` to your HTML `<head>`:
 
     ```html
-    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-    <script type="text/javascript" src="underscore.js"></script>
-    <script type="text/javascript" src="backbone.js"></script>
-    <script type="text/javascript" src="backbone-nested.js"></script>
+    <!-- must loaded in this order -->
+    <script type="text/javascript" src="/bower_components/jquery/jquery.js"></script>
+    <script type="text/javascript" src="/bower_components/underscore/underscore.js"></script>
+    <script type="text/javascript" src="/bower_components/backbone/backbone.js"></script>
+    <script type="text/javascript" src="/bower_components/backbone-nested-model/backbone-nested.js"></script>
     ```
 
-2. Change your models to extend from `Backbone.NestedModel`, e.g.
+### Manual
+
+Download the latest [release](https://github.com/afeld/backbone-nested/releases) and the dependencies listed above, then include with script tags in your HTML.
+
+## Usage
+
+1. Change your models to extend from `Backbone.NestedModel`, e.g.
 
     ```javascript
     var Person = Backbone.Model.extend({ ... });
@@ -49,7 +66,7 @@ user.bind('change:name.first', function(){ ... });
     var Person = Backbone.NestedModel.extend({ ... });
     ```
 
-3. Change your getters and setters to not access nested attributes directly, e.g.
+2. Change your getters and setters to not access nested attributes directly, e.g.
 
     ```javascript
     user.get('name').first = 'Bob';
@@ -167,3 +184,5 @@ Pull requests are more than welcome - please add tests, which can be run by open
 
     $ npm install
     $ grunt
+
+See also: [live tests](http://afeld.github.com/backbone-nested/test/) for latest release.
diff --git a/backbone-nested.js b/backbone-nested.js
@@ -1,5 +1,5 @@
 /**
- * Backbone-Nested 1.1.2 - An extension of Backbone.js that keeps track of nested attributes
+ * Backbone-Nested 2.0.0 - An extension of Backbone.js that keeps track of nested attributes
  *
  * http://afeld.github.com/backbone-nested/
  *
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone-nested-model",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "dependencies": {
     "backbone": ">=0.9.2"
   },
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backbone-nested",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "description": "A plugin to make Backbone.js keep track of nested attributes.",
   "scripts": {
     "install": "bower install",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Backbone-Nested 1.1.2 - An extension of Backbone.js that keeps track of nested attributes`
	`2`	`+ * Backbone-Nested 2.0.0 - An extension of Backbone.js that keeps track of nested attributes`
`3`	`3`	`*`
`4`	`4`	`* http://afeld.github.com/backbone-nested/`
`5`	`5`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "backbone-nested-model",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "2.0.0",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"backbone": ">=0.9.2"`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "backbone-nested",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "2.0.0",`
`4`	`4`	`"description": "A plugin to make Backbone.js keep track of nested attributes.",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"install": "bower install",`