Skip to content

Commit 8d3f9f8

Browse files
jmdobryjmdobry
committed
Stable Version 0.4.2.
1 parent 88dd299 commit 8d3f9f8

File tree

9 files changed

+80
-47
lines changed

9 files changed

+80
-47
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
##### 0.4.2 - 01 October 2014
2+
3+
###### Other
4+
- Improved checking for dependencies
5+
16
##### 0.4.1 - 28 September 2014
27

38
###### Backwards compatible bugfixes

‎Gruntfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = function (grunt) {
4242
'* @copyright (c) 2014 Jason Dobry\n' +
4343
'* @license MIT <https://github.com/js-data/js-data-firebase/blob/master/LICENSE>\n' +
4444
'*\n' +
45-
'* @overview My Adapter.\n' +
45+
'* @overview Firebase adapter for js-data.\n' +
4646
'*/\n'
4747
},
4848
files: {
@@ -115,7 +115,7 @@ module.exports = function (grunt) {
115115
'* @copyright (c) 2014 Jason Dobry \n' +
116116
'* @license MIT <https://github.com/js-data/js-data-firebase/blob/master/LICENSE>\n' +
117117
'*\n' +
118-
'* @overview My Adapter.\n' +
118+
'* @overview Firebase adapter for js-data.\n' +
119119
'*/\n';
120120

121121
file = banner + file;

‎bower.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-firebase",
33
"description": "Firebase adapter for js-data.",
4-
"version": "0.4.1",
4+
"version": "0.4.2",
55
"homepage": "http://www.js-data.io/js-data-firebase",
66
"repository": {
77
"type": "git",
@@ -32,9 +32,5 @@
3232
"dependencies": {
3333
"js-data": "~0.4.x",
3434
"firebase": "~1.0.x"
35-
},
36-
"devDependencies": {
37-
"firebase": "~1.0.x",
38-
"js-data": "~0.4.x"
3935
}
4036
}

‎dist/js-data-firebase.js‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
22
* @author Jason Dobry <jason.dobry@gmail.com>
33
* @file js-data-firebase.js
4-
* @version 0.4.1 - Homepage <http://www.js-data.iojs-data-firebase/>
4+
* @version 0.4.2 - Homepage <http://www.js-data.iojs-data-firebase/>
55
* @copyright (c) 2014 Jason Dobry
66
* @license MIT <https://github.com/js-data/js-data-firebase/blob/master/LICENSE>
77
*
8-
* @overview My Adapter.
8+
* @overview Firebase adapter for js-data.
99
*/
1010
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.DSFirebaseAdapter=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
1111
var hasOwn = require('./hasOwn');
@@ -140,12 +140,25 @@ var forOwn = require('./forOwn');
140140

141141
},{"./forOwn":2}],5:[function(require,module,exports){
142142
var JSData, Firebase;
143-
if (!window && typeof module !== 'undefined' && module.exports) {
143+
144+
try {
144145
JSData = require('js-data');
145146
Firebase = require('firebase');
146-
} else {
147-
JSData = window.JSData;
148-
Firebase = window.Firebase;
147+
} catch (e) {
148+
}
149+
150+
if (!JSData) {
151+
try {
152+
JSData = window.JSData;
153+
Firebase = window.Firebase;
154+
} catch (e) {
155+
}
156+
}
157+
158+
if (!JSData) {
159+
throw new Error('js-data must be loaded!');
160+
} else if (!Firebase) {
161+
throw new Error('firebase must be loaded!');
149162
}
150163

151164
var emptyStore = new JSData.DS();

‎dist/js-data-firebase.min.js‎

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

‎example/example.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
(function () {
2-
var adapter = new DSFirebaseAdapter({
3-
basePath: 'https://js-data-firebase.firebaseio.com'
4-
});
5-
6-
var store = new JSData.DS();
7-
store.registerAdapter('firebase', adapter, { default: true });
8-
9-
var User = store.defineResource('user');
10-
112
angular.module('firebase-example', [])
12-
.controller('firebaseCtrl', function ($scope, $timeout) {
3+
.factory('store', function () {
4+
var store = new JSData.DS();
5+
store.registerAdapter('firebase', new DSFirebaseAdapter({
6+
basePath: 'https://js-data-firebase.firebaseio.com'
7+
}), { default: true });
8+
return store;
9+
})
10+
.factory('User', function (store) {
11+
return store.defineResource('user');
12+
})
13+
.controller('firebaseCtrl', function ($scope, $timeout, User) {
1314
var fCtrl = this;
15+
User.findAll().then(function () {
16+
$scope.$apply();
17+
});
1418

1519
$scope.add = function (user) {
1620
$scope.creating = true;

‎example/index.html‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
77
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.25/angular.min.js"></script>
88
<script src="https://cdn.firebase.com/js/client/1.0.21/firebase.js"></script>
9-
<script src="https://github.com/js-data/js-data/releases/download/0.4.0/js-data-0.4.0.min.js"></script>
9+
<script src="https://github.com/js-data/js-data/releases/download/0.4.1/js-data-0.4.1.min.js"></script>
1010
<script
11-
src="https://github.com/js-data/js-data-firebase/releases/download/0.4.1/js-data-firebase-0.4.1.min.js"></script>
11+
src="https://github.com/js-data/js-data-firebase/releases/download/0.4.2/js-data-firebase-0.4.2.min.js"></script>
1212
<script src="./example.js"></script>
1313
</head>
1414
<body data-ng-controller="firebaseCtrl as fCtrl">
@@ -43,18 +43,22 @@ <h3 class="panel-title">Users</h3>
4343
</div>
4444
<div>
4545
<pre><code>
46-
var adapter = new DSFirebaseAdapter({
47-
basePath: 'https://js-data-firebase.firebaseio.com'
48-
});
49-
50-
var store = new JSData.DS();
51-
store.registerAdapter('firebase', adapter, { default: true });
52-
53-
var User = store.defineResource('user');
54-
5546
angular.module('firebase-example', [])
56-
.controller('firebaseCtrl', function ($scope, $timeout) {
47+
.factory('store', function () {
48+
var store = new JSData.DS();
49+
store.registerAdapter('http', new DSHttpAdapter({
50+
basePath: 'https://js-data-firebase.firebaseio.com'
51+
}, { default: true });
52+
return store;
53+
})
54+
.factory('User', function (store) {
55+
return store.defineResource('user');
56+
})
57+
.controller('firebaseCtrl', function ($scope, $timeout, User) {
5758
var fCtrl = this;
59+
User.findAll().then(function () {
60+
$scope.$apply();
61+
});
5862

5963
$scope.add = function (user) {
6064
$scope.creating = true;

‎package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "js-data-firebase",
33
"description": "Firebase adapter for js-data.",
4-
"version": "0.4.1",
4+
"version": "0.4.2",
55
"homepage": "http://www.js-data.io/js-data-firebase",
66
"repository": {
77
"type": "git",
@@ -26,6 +26,7 @@
2626
"adapter",
2727
"firebase"
2828
],
29+
"main": "./src/index.js",
2930
"devDependencies": {
3031
"grunt": "0.4.5",
3132
"grunt-browserify": "3.0.1",
@@ -53,12 +54,9 @@
5354
"scripts": {
5455
"test": "grunt test"
5556
},
56-
"peerDependencies": {
57-
"js-data": "~0.4.x",
58-
"firebase": "~1.0.x"
59-
},
6057
"dependencies": {
6158
"mout": "0.10.0",
59+
"js-data": "~0.4.x",
6260
"firebase": "~1.0.x"
6361
}
6462
}

‎src/index.js‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
var JSData, Firebase;
2-
if (!window && typeof module !== 'undefined' && module.exports) {
2+
3+
try {
34
JSData = require('js-data');
45
Firebase = require('firebase');
5-
} else {
6-
JSData = window.JSData;
7-
Firebase = window.Firebase;
6+
} catch (e) {
7+
}
8+
9+
if (!JSData) {
10+
try {
11+
JSData = window.JSData;
12+
Firebase = window.Firebase;
13+
} catch (e) {
14+
}
15+
}
16+
17+
if (!JSData) {
18+
throw new Error('js-data must be loaded!');
19+
} else if (!Firebase) {
20+
throw new Error('firebase must be loaded!');
821
}
922

1023
var emptyStore = new JSData.DS();

0 commit comments

Comments
 (0)