Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit cebbd73

Browse files
author
jacobawenger
committed
Merged with release_0.8 branch
2 parents dff82f4 + d9a5d9d commit cebbd73

File tree

9 files changed

+359
-73
lines changed

9 files changed

+359
-73
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ addons:
66
install:
77
- git clone git://github.com/n1k0/casperjs.git ~/casperjs
88
- export PATH=$PATH:~/casperjs/bin
9-
- npm install -g grunt-cli
109
- npm install -g bower
1110
- npm install
1211
- bower install
1312
before_script:
1413
- phantomjs --version
1514
- casperjs --version
1615
script:
17-
- grunt travis
16+
- npm test
1817
env:
1918
global:
2019
- secure: mGHp1rQI11OvbBQn3PnBT5kuyo26gFl8U+nNq0Ot4opgSBX9JaHqS8Dx63uALWWU9qjy08/Mn68t/sKhayH1+XrPDIenOy/XEkkSAG60qAAowD9dRo3WaIMSOcWWYDeqdZOAWZ3LiXvjLO4Swagz5ejz7UtY/ws4CcTi2n/fp7c=

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
v0.8.0
2+
-------------
3+
Release Date: 2014-07-29
4+
5+
* NOTE: this release introduces several breaking changes as we works towards a stable 1.0.0 release.
6+
* Moved many roles of $firebase into $FirebaseObject. $firebase is now just an Angular array wrapper around the base Firebase API.
7+
* Introduced $FirebaseArray to provide better array support.
8+
* Added support for extending the base $FirebaseObject and $FirebaseArray factories.

Gruntfile.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ module.exports = function(grunt) {
55
grunt.initConfig({
66
pkg: grunt.file.readJSON('package.json'),
77
meta: {
8-
banner: '/*!\n <%= pkg.title || pkg.name %> v<%= pkg.version %> <%= grunt.template.today("yyyy-mm-dd") %>\n' +
9-
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
10-
'* Copyright (c) <%= grunt.template.today("yyyy") %> Firebase, Inc.\n' +
11-
'* MIT LICENSE: http://firebase.mit-license.org/\n*/\n\n'
8+
banner: '/*!\n * <%= pkg.title || pkg.name %> <%= pkg.version %> <%= grunt.template.today("yyyy-mm-dd") %>\n' +
9+
'<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' +
10+
' * Copyright (c) <%= grunt.template.today("yyyy") %> Firebase, Inc.\n' +
11+
' * MIT LICENSE: http://firebase.mit-license.org/\n */\n\n'
1212
},
1313

1414
// merge files from src/ into angularfire.js
@@ -51,6 +51,9 @@ module.exports = function(grunt) {
5151

5252
// Minify JavaScript
5353
uglify : {
54+
options: {
55+
preserveComments: 'some'
56+
},
5457
app : {
5558
files : {
5659
'dist/angularfire.min.js' : ['dist/angularfire.js']

README.md

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,73 @@
1-
AngularFire
2-
===========
3-
AngularFire is an officially supported [AngularJS](http://angularjs.org/) binding
4-
for [Firebase](http://www.firebase.com/?utm_medium=web&utm_source=angularFire).
5-
Firebase is a full backend so you don't need servers to build your Angular app!
61

7-
*Please visit the
8-
[Firebase + Angular Quickstart guide](https://www.firebase.com/quickstart/angularjs.html)
9-
for more information*.
2+
# AngularFire
103

11-
We also have a [tutorial](https://www.firebase.com/tutorial/#tutorial/angular/0),
12-
[documentation](https://www.firebase.com/docs/angular/index.html) and an
13-
[API reference](https://www.firebase.com/docs/angular/reference.html).
4+
[![Build Status](https://travis-ci.org/firebase/angularfire.svg)](https://travis-ci.org/firebase/angularfire)
5+
[![Version](https://badge.fury.io/gh/firebase%2Fangularfire.svg)](http://badge.fury.io/gh/firebase%2Fangularfire)
146

15-
Join our [Firebase + Angular Google Group](https://groups.google.com/forum/#!forum/firebase-angular) to ask questions, provide feedback, and share apps you've built with Firebase and Angular.
7+
AngularFire is the officially supported [AngularJS](http://angularjs.org/) binding
8+
for [Firebase](http://www.firebase.com/?utm_medium=web&utm_source=angularfire).
9+
Firebase is a full backend so you don't need servers to build your Angular app. AngularFire provides you with the `$firebase` service which allows you to easily keep your `$scope` variables in sync with your Firebase backend.
1610

17-
Development
18-
-----------
19-
[![Build Status](https://travis-ci.org/firebase/angularFire.png)](https://travis-ci.org/firebase/angularFire)
20-
[![Bower version](https://badge.fury.io/bo/angularfire.png)](http://badge.fury.io/bo/angularfire)
21-
[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
11+
## Downloading AngularFire
2212

23-
If you'd like to hack on AngularFire itself, you'll need
24-
[node.js](http://nodejs.org/download/) and [Bower](http://bower.io).
13+
In order to use AngularFire in your project, you need to include the following files in your HTML:
2514

26-
You can also start hacking on AngularFire in a matter of seconds on
27-
[Nitrous.IO](https://www.nitrous.io/?utm_source=github.com&utm_campaign=angularFire&utm_medium=hackonnitrous)
15+
```html
16+
<!-- AngularJS -->
17+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.17/angular.min.js"></script>
18+
19+
<!-- Firebase -->
20+
<script src="https://cdn.firebase.com/js/client/1.0.18/firebase.js"></script>
21+
22+
<!-- AngularFire -->
23+
<script src="https://cdn.firebase.com/libs/angularfire/0.8.0/angularfire.min.js"></script>
24+
```
2825

29-
[![Hack firebase/angularFire on
30-
Nitrous.IO](https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png)](https://www.nitrous.io/hack_button?source=embed&runtime=nodejs&repo=firebase%2FangularFire&file_to_open=README.md)
26+
Use the URL above to download both the minified and non-minified versions of AngularFire from the Firebase CDN. You can also download them from the root of this GitHub repository. [Firebase](https://www.firebase.com/docs/web-quickstart.html?utm_medium=web&utm_source=angularfire) and [AngularJS](http://angularjs.org/) can be downloaded directly from their respective websites.
3127

32-
To get your dev environment set up, run the following commands:
28+
You can also install AngularFire via Bower and the dependencies will be downloaded automatically:
3329

3430
```bash
35-
git clone https://github.com/firebase/angularfire.git # clones this repository
36-
npm install # installs node dependencies
37-
bower install # installs JavaScript dependencies
38-
grunt install # installs selenium server for e2e tests
31+
$ bower install angularfire --save
3932
```
4033

41-
Use grunt to build and test the code:
34+
Once you've included AngularFire and its dependencies into your project, you will have access to the `$firebase` service.
4235

43-
```bash
44-
# Validates source with jshint, minifies source, and then runs unit and e2e tests
45-
grunt
36+
You can also start hacking on AngularFire in a matter of seconds on
37+
[Nitrous.IO](https://www.nitrous.io/?utm_source=github.com&utm_campaign=angularfire&utm_medium=hackonnitrous):
4638

47-
# Watches for changes and runs only unit tests after each change
48-
grunt watch
39+
[![Hack firebase/angularfire on
40+
Nitrous.IO](https://d3o0mnbgv6k92a.cloudfront.net/assets/hack-l-v1-3cc067e71372f6045e1949af9d96095b.png)](https://www.nitrous.io/hack_button?source=embed&runtime=nodejs&repo=firebase%2Fangularfire&file_to_open=README.md)
4941

50-
# Runs all tests
51-
grunt test
42+
## Getting Started with Firebase
5243

53-
# Minifies source
54-
grunt build
55-
```
44+
AngularFire requires Firebase in order to sync data. You can [sign up here](https://www.firebase.com/docs/web-quickstart.html?utm_medium=web&utm_source=angularfire) for a free account.
5645

57-
In addition to the automated test suite, there is an additional manual test suite that ensures that the
58-
$firebaseSimpleLogin service is working properly with auth providers. These tests are run using karma with the following command:
46+
## Documentation
47+
48+
The Firebase docs have a [quickstart](https://www.firebase.com/docs/web/bindings/angular/quickstart.html), [guide](https://www.firebase.com/docs/web/bindings/angular/guide.html), and [full API reference](https://www.firebase.com/docs/web/bindings/angular/api.html) for AngularFire.
49+
50+
We also have a [tutorial](https://www.firebase.com/tutorial/#tutorial/angular/0) to help you get started with AngularFire.
51+
52+
Join our [Firebase + Angular Google Group](https://groups.google.com/forum/#!forum/firebase-angular) to ask questions, provide feedback, and share apps you've built with Firebase and Angular.
53+
54+
## Contributing
55+
56+
If you'd like to contribute to AngularFire, you'll need to run the following commands to get your environment set up:
5957

6058
```bash
61-
karma start tests/manual_karma.conf.js
59+
$ git clone https://github.com/firebase/angularfire.git
60+
$ cd angularfire # go to the angularfire directory
61+
$ npm install -g grunt # globally install grunt task runner
62+
$ npm install -g bower # globally install Bower package manager
63+
$ npm install # install local npm build / test dependencies
64+
$ bower install # install local JavaScript dependencies
65+
$ grunt install # install Selenium server for end-to-end tests
66+
$ grunt watch # watch for source file changes
6267
```
6368

64-
Note that you must click "Close this window", login to Twitter, etc. when
65-
prompted in order for these tests to complete successfully.
69+
`grunt watch` will watch for changes in the `/src/` directory and lint, concatenate, and minify the source files when a change occurs. The output files - `angularfire.js` and `angularfire.min.js` - are written to the `/dist/` directory. `grunt watch` will also re-run the unit tests every time you update any source files.
70+
71+
You can run the entire test suite via the command line using `grunt test`. To only run the unit tests, run `grunt test:unit`. To only run the end-to-end [Protractor](https://github.com/angular/protractor/) tests, run `grunt test:e2e`.
6672

67-
License
68-
-------
69-
[MIT](http://firebase.mit-license.org).
73+
In addition to the automated test suite, there is an additional manual test suite that ensures that the `$firebaseSimpleLogin` service is working properly with the authentication providers. These tests can be run with `grunt test:manual`. Note that you must click "Close this window", login to Twitter, etc. when prompted in order for these tests to complete successfully.

bower.json

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
{
22
"name": "angularfire",
3-
"description": "An officially supported AngularJS binding for Firebase.",
4-
"version": "0.7.1",
5-
"main": "dist/angularfire.js",
3+
"description": "The officially supported AngularJS binding for Firebase",
4+
"version": "0.8.0",
5+
"authors": [
6+
"Firebase <support@firebase.com> (https://www.firebase.com/)"
7+
],
8+
"homepage": "https://github.com/firebase/angularFire",
9+
"repository": {
10+
"type": "git",
11+
"url": "https://github.com/firebase/angularfire.git"
12+
},
13+
"license": "MIT",
14+
"keywords": [
15+
"angular",
16+
"angularjs",
17+
"firebase",
18+
"realtime"
19+
],
20+
"main": "dist/angularfire.min.js",
621
"ignore": [
7-
"Gruntfile.js",
8-
"bower_components",
22+
"**/.*",
23+
"src",
24+
"tests",
925
"node_modules",
26+
"bower_components",
27+
"firebase.json",
1028
"package.json",
11-
"tests",
12-
"README.md",
13-
"LICENSE",
14-
".travis.yml",
15-
".jshintrc",
16-
".gitignore"
29+
"Gruntfile.js",
30+
"release.sh"
1731
],
1832
"dependencies": {
19-
"angular": "~1.2.18",
33+
"angular": "1.2.21",
2034
"firebase": "1.0.x",
2135
"firebase-simple-login": "1.6.x"
2236
},

dist/angularfire.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
/*!
2+
<<<<<<< HEAD
23
angularfire v0.8.0-pre2 2014-07-29
34
* https://github.com/firebase/angularFire
45
* Copyright (c) 2014 Firebase, Inc.
56
* MIT LICENSE: http://firebase.mit-license.org/
67
*/
8+
=======
9+
* angularfire 0.8.0 2014-07-28
10+
* https://github.com/firebase/angularFire
11+
* Copyright (c) 2014 Firebase, Inc.
12+
* MIT LICENSE: http://firebase.mit-license.org/
13+
*/
14+
>>>>>>> release_0.8
715

816
// AngularFire is an officially supported AngularJS binding for Firebase.
917
// The bindings let you associate a Firebase URL with a model (or set of

dist/angularfire.min.js

Lines changed: 11 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,40 @@
11
{
22
"name": "angularfire",
3-
"version": "0.8.0-pre2",
4-
"description": "An officially supported AngularJS binding for Firebase.",
5-
"main": "dist/angularfire.js",
3+
"description": "The officially supported AngularJS binding for Firebase",
4+
"version": "0.8.0",
5+
"author": "Firebase <support@firebase.com> (https://www.firebase.com/)",
66
"homepage": "https://github.com/firebase/angularFire",
77
"repository": {
88
"type": "git",
9-
"url": "https://github.com/firebase/angularFire.git"
9+
"url": "https://github.com/firebase/angularfire.git"
1010
},
1111
"bugs": {
12-
"url": "https://github.com/firebase/angularFire/issues"
12+
"url": "https://github.com/firebase/angularfire/issues"
13+
},
14+
"licenses": [
15+
{
16+
"type": "MIT",
17+
"url": "http://firebase.mit-license.org/"
18+
}
19+
],
20+
"keywords": [
21+
"angular",
22+
"angularjs",
23+
"firebase",
24+
"realtime"
25+
],
26+
"main": "dist/angularfire.min.js",
27+
"files": [
28+
"dist/**",
29+
"LICENSE",
30+
"README.md",
31+
"CHANGELOG.md",
32+
"package.json"
33+
],
34+
"dependencies": {
35+
"firebase": "1.0.x"
1336
},
14-
"dependencies": {},
1537
"devDependencies": {
16-
"firebase": "1.0.x",
1738
"grunt": "~0.4.1",
1839
"grunt-contrib-concat": "^0.4.0",
1940
"grunt-contrib-connect": "^0.7.1",
@@ -33,5 +54,8 @@
3354
"karma-failed-reporter": "0.0.2",
3455
"jasmine-spec-reporter": "^0.4.0",
3556
"karma-spec-reporter": "0.0.13"
57+
},
58+
"scripts": {
59+
"test": "grunt travis"
3660
}
3761
}

0 commit comments

Comments
 (0)