Version v1.1.0

* Populate functionality now includes object notation like so:
  ```js
  {path: '/todos', populates: [{ child: 'owner', root: 'users' }]
  ```
* `reactReduxFirebase` function now passes through `enhancer` argument of `createStore`
* email now included in default user profile with external providers
* `onAuthStateChanged` function exposed in config (for setting auth info to other libraries such as [`react-ga`](https://www.npmjs.com/package/react-ga))
* Coverage Calculation fixed (now using `istanbul` directly)
* Tests added for utils
* Multiple internal optimizations
* `firebase` and `lodash` dependencies updated
* `no-console` rule added to `.eslintrc` to keep `console` out of src
* README updated with `redux-observable` integration

Author: prescottprue

.eslintrc

@@ -19,5 +19,6 @@
   },
   "rules": {
     "semi" : [2, "never"],
+    "no-console": "error"
   }
 }

README.md

@@ -26,7 +26,8 @@ View deployed version of Material Example [here](https://redux-firebasev3.fireba
 - queries support ( `orderByChild`, `orderByKey`, `orderByValue`, `orderByPriority`, `limitToLast`, `limitToFirst`, `startAt`, `endAt`, `equalTo` right now )
 - Automatic binding/unbinding
 - Declarative decorator syntax for React components
-- [`redux-thunk`](https://github.com/gaearon/redux-thunk) Integration
+- [`redux-thunk`](https://github.com/gaearon/redux-thunk) and [redux-observable](https://redux-observable.js.org/) integrations
+- Action Types and other Constants exported for external use (such as in redux-observable)
 - Firebase v3+ support
 
 ## Install
@@ -78,7 +79,7 @@ Include reduxFirebase in your store compose function:
 
 ```javascript
 import { createStore, combineReducers, compose } from 'redux'
-import { reduxFirebase, firebaseStateReducer } from 'react-redux-firebase'
+import { reactReduxFirebase, firebaseStateReducer } from 'react-redux-firebase'
 
 // Add Firebase to reducers
 const rootReducer = combineReducers({
@@ -95,7 +96,7 @@ const config = {
 
 // Add redux Firebase to compose
 const createStoreWithFirebase = compose(
-  reduxFirebase(config, { userProfile: 'users' }),
+  reactReduxFirebase(config, { userProfile: 'users' }),
 )(createStore)
 
 // Create store with reducers and initial state
@@ -106,21 +107,16 @@ In components:
 ```javascript
 import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
-import { firebase, helpers } from 'react-redux-firebase'
+import { firebaseConnect, helpers } from 'react-redux-firebase'
 const { isLoaded, isEmpty, dataToJS } = helpers
 
-// Can be used if firebase is used elsewhere
-// import { firebaseConnect } from 'react-redux-firebase'
-// @firebaseConnect( [
-//   '/todos'
-// ])
-
-@firebase( [
+@firebaseConnect( [
   '/todos'
   // { type: 'once', path: '/todos' } // for loading once instead of binding
 ])
 @connect(
-  ({firebase}) => ({
+  ({ firebase }) => ({
+    // Connect todos prop to firebase todos
     todos: dataToJS(firebase, '/todos'),
   })
 )
@@ -172,7 +168,7 @@ Alternatively, if you choose not to use decorators:
 
 ```javascript
 
-const wrappedTodos = firebase([
+const wrappedTodos = firebaseConnect([
   '/todos'
 ])(Todos)
 export default connect(
@@ -201,14 +197,14 @@ The simple example implemented using decorators built from the output of [create
 An example that user Material UI built on top of the output of [create-react-app](https://github.com/facebookincubator/create-react-app)'s eject command.  Shows a list of todo items and allows you to add to them. This is what is deployed to [react-redux-firebase.firebaseapp.com](https://react-redux-firebase.firebaseapp.com/).
 
 ## Using with `redux-thunk`
-If you user using `redux-thunk`, make sure to set up your thunk middleware using it's redux-thunk's `withExtraArgument` method so that firebase is available within your actions. Here is an example `createStore` function that adds `getFirebase` as third argument along with a thunk that uses it:
+If you are using `redux-thunk`, make sure to set up your thunk middleware using it's redux-thunk's `withExtraArgument` method so that firebase is available within your actions. Here is an example `createStore` function that adds `getFirebase` as third argument along with a thunk that uses it:
 
 createStore:
 
 ```javascript
 import { applyMiddleware, compose, createStore } from 'redux';
 import thunk from 'redux-thunk';
-import { reduxReactFirebase, getFirebase } from 'react-redux-firebase';
+import { reactReduxFirebase, getFirebase } from 'react-redux-firebase';
 import makeRootReducer from './reducers';
 
 const fbConfig = {} // your firebase config
@@ -220,7 +216,7 @@ const store = createStore(
     applyMiddleware([
       thunk.withExtraArgument(getFirebase) // Pass getFirebase function as extra argument
     ]),
-    reduxReactFirebase(fbConfig, { userProfile: 'users', enableLogging: false })
+    reactReduxFirebase(fbConfig, { userProfile: 'users', enableLogging: false })
   )
 );
 
@@ -244,6 +240,24 @@ export const addTodo = (newTodo) =>
 
 ```
 
+## Using with `redux-observable`
+If you are using `redux-observable`, make sure to set up your redux-observable middleware so that firebase is available within your epics. Here is an example `combineEpics` function that adds `getFirebase` as third argument along with an epic that uses it:
+
+```javascript
+import { getFirebase } from 'react-redux-firebase'
+import { combineEpics } from 'redux-observable'
+
+const rootEpic = (...args) =>
+  combineEpics(somethingEpic, epic2)(..args, getFirebase)
+
+// then later in your epics
+const somethingEpic = (action$, store, getFirebase) =>
+  action$.ofType(SOMETHING)
+    .map(() =>
+      getFirebase().push('somePath/onFirebase', { some: 'data' })
+    )
+```
+
 ## Generator
 
 [generator-react-firebase](https://github.com/prescottprue/generator-react-firebase) uses react-redux-firebase when opting to include redux
@@ -256,22 +270,21 @@ export const addTodo = (newTodo) =>
   * [populate functionality](https://prescottprue.gitbooks.io/react-redux-firebase/content/populate.html) (similar to mongoDB or SQL JOIN)
   * [`profileDecorator`](https://prescottprue.gitbooks.io/react-redux-firebase/content/config.html) - change format of profile stored on Firebase
   * [`getFirebase`](https://prescottprue.gitbooks.io/react-redux-firebase/content/thunks.html) - access to firebase instance that fires actions when methods are called
-  * [capability for thunk integration](https://prescottprue.gitbooks.io/react-redux-firebase/content/thunks.html) - using `getFirebase` and `thunk.withExtraArgument`
+  * [integrations](https://prescottprue.gitbooks.io/react-redux-firebase/content/thunks.html) for [`redux-thunk`](https://github.com/gaearon/redux-thunk) and [`redux-observable`](https://redux-observable.js.org) - using `getFirebase`
   * [access to firebase's `storage`](https://prescottprue.gitbooks.io/react-redux-firebase/content/storage.html) method
   * `uniqueSet` method helper for only setting if location doesn't already exist
+  * Object or String notation for paths (`[{ path: '/todos' }]` equivalent to `['/todos']`)
+  * Action Types and other Constants are exposed for external usage (such as `redux-observable`)
 
   #### Well why not combine?
-  I am in the process of writing up an article comparing the two, including the difference in defaults/utils. Maybe a section should be included in the docs as well?
-
-  Also, I have been talking to the author of redux-react-firebase about combining, but we are not sure that the users of both want that at this point. Join us on [the redux-firebase gitter](https://gitter.im/redux-firebase/Lobby) if you haven't already since a ton of this type of discussion goes on there.
+  I have been talking to the author of [redux-react-firebase]() about combining, but we are not sure that the users of both want that at this point. Join us on [the redux-firebase gitter](https://gitter.im/redux-firebase/Lobby) if you haven't already since a ton of this type of discussion goes on there.
 
   **Bottom line:** The author of redux-react-firebase was absent when functionality was needed by me and others, so this library was created.
 
 2. Why use redux if I have Firebase to store state?
 
   This isn't a super quick answer, so I wrote up [a medium article to explain](https://medium.com/@prescottprue/firebase-with-redux-82d04f8675b9)
 
-
 ## Contributors
 - [Prescott Prue](https://github.com/prescottprue)
 - [Tiberiu Craciun](https://github.com/tiberiuc)
@@ -281,7 +294,7 @@ export const addTodo = (newTodo) =>
 
 ## Thanks
 
-Special thanks to [Tiberiu Craciun](https://github.com/tiberiuc) for creating [redux-react-firebase](https://github.com/tiberiuc/redux-react-firebase), which this project is heavily based on.
+Special thanks to [Tiberiu Craciun](https://github.com/tiberiuc) for creating [redux-react-firebase](https://github.com/tiberiuc/redux-react-firebase), which this project was originally based on.
 
 [npm-image]: https://img.shields.io/npm/v/react-redux-firebase.svg?style=flat-square
 [npm-url]: https://npmjs.org/package/react-redux-firebase

examples/decorators/src/store.js

@@ -1,13 +1,16 @@
 import { createStore, compose } from 'redux'
 import rootReducer from './reducer'
 import { firebase as fbConfig } from './config'
-import { reduxReactFirebase } from 'react-redux-firebase'
-// import { reduxFirebase } from 'redux-firebase' // >= v0.1.1
+import { reactReduxFirebase } from 'react-redux-firebase'
 
 export default function configureStore (initialState, history) {
   const createStoreWithMiddleware = compose(
-    reduxReactFirebase(fbConfig, { userProfile: 'users', enableLogging: false }),
-    // reduxFirebase(fbConfig, { userProfile: 'users', enableLogging: false })  // >= v0.1.1
+    reactReduxFirebase(fbConfig,
+      {
+        userProfile: 'users',
+        enableLogging: false
+      }
+    ),
     typeof window === 'object' && typeof window.devToolsExtension !== 'undefined' ? window.devToolsExtension() : f => f
   )(createStore)
   const store = createStoreWithMiddleware(rootReducer)

examples/material/src/store/configureStore.dev.js

@@ -2,13 +2,18 @@ import { createStore, applyMiddleware, compose } from 'redux'
 import rootReducer from '../reducers'
 import { firebase as fbConfig } from '../config'
 import { syncHistory } from 'react-router-redux'
-import { reduxFirebase } from 'react-redux-firebase' // >= v0.1.1
+import { reactReduxFirebase } from 'react-redux-firebase' // >= v0.1.1
 
 export default function configureStore (initialState, history) {
   const reduxRouterMiddleware = syncHistory(history)
   const createStoreWithMiddleware = compose(
     applyMiddleware(reduxRouterMiddleware),
-    reduxFirebase(fbConfig, { userProfile: 'users', enableLogging: false }),
+    reactReduxFirebase(fbConfig,
+      {
+        userProfile: 'users',
+        enableLogging: false
+      }
+    ),
     typeof window === 'object' && typeof window.devToolsExtension !== 'undefined' ? window.devToolsExtension() : f => f
   )(createStore)
   const store = createStoreWithMiddleware(rootReducer, initialState)

examples/material/src/store/configureStore.prod.js

@@ -1,13 +1,16 @@
 import { createStore, compose } from 'redux'
 import rootReducer from '../reducers'
 import { firebase as fbConfig } from '../config'
-import { reduxReactFirebase } from 'react-redux-firebase' // >= v0.1.0
-// import { reduxFirebase } from 'redux-firebase' // >= v0.1.1
+import { reduxReactFirebase } from 'react-redux-firebase'
 
 export default function configureStore (initialState, history) {
   const createStoreWithMiddleware = compose(
-    reduxReactFirebase(fbConfig, { userProfile: 'users' }) // >= v0.1.0
-    // reduxFirebase(fbConfig, { userProfile: 'users' })  // >= v0.1.1
+    reactReduxFirebase(fbConfig,
+      {
+        userProfile: 'users',
+        enableLogging: false
+      }
+    ),
   )(createStore)
   const store = createStoreWithMiddleware(rootReducer, initialState)
 

examples/simple/src/App.js

@@ -5,7 +5,7 @@ import TodoItem from './TodoItem'
 
 // redux/firebase
 import { connect } from 'react-redux'
-import { firebase, helpers } from 'react-redux-firebase'
+import { firebaseConnect, helpers } from 'react-redux-firebase'
 const { isLoaded, isEmpty, pathToJS, dataToJS } = helpers
 
 class App extends Component {
@@ -15,14 +15,18 @@ class App extends Component {
       push: PropTypes.func.isRequired
     })
   }
+
+  handleAdd = () => {
+    const { firebase } = this.props
+    const { newTodo } = this.refs
+    firebase.push('/todos', { text: newTodo.value, done: false })
+    newTodo.value = ''
+  }
+
   render () {
-    const { firebase, todos } = this.props
+    const { todos } = this.props
 
-    const handleAdd = () => {
-      const { newTodo } = this.refs
-      firebase.push('/todos', { text: newTodo.value, done: false })
-      newTodo.value = ''
-    }
+    console.log('todos;', todos)
 
     const todosList = (!isLoaded(todos))
                         ? 'Loading'
@@ -50,22 +54,25 @@ class App extends Component {
           {todosList}
           <h4>New Todo</h4>
           <input type='text' ref='newTodo' />
-          <button onClick={handleAdd}>Add</button>
+          <button onClick={this.handleAdd}>
+            Add
+          </button>
         </div>
       </div>
     )
   }
 }
-const fbWrappedComponent = firebase([
-  '/todos'
+const fbWrappedComponent = firebaseConnect([
+  // '/todos'
   // { type: 'once', path: '/todos' } // for loading once instead of binding
   // '/todos#populate=owner:displayNames' // for populating owner parameter from id into string loaded from /displayNames root
-  // '/todos#populate=owner:users' // for populating owner parameter from id to user object loaded from /users root
+  // '/todos#populate=collaborators:users' // for populating owner parameter from id to user object loaded from /users root
+  { path: 'todos', populates: [{ child: 'collaborators', root: 'users' }] } // object notation
   // '/todos#populate=owner:users:displayName' // for populating owner parameter from id within to displayName string from user object within users root
 ])(App)
 
 export default connect(
-  ({firebase}) => ({
+  ({ firebase }) => ({
     todos: dataToJS(firebase, 'todos'),
     profile: pathToJS(firebase, 'profile'),
     auth: pathToJS(firebase, 'auth')

examples/simple/src/config.js

@@ -1,7 +1,9 @@
 export const firebase = {
   apiKey: 'AIzaSyCTUERDM-Pchn_UDTsfhVPiwM4TtNIxots',
-  authDomain: 'react-redux-firebase.firebaseapp.com',
-  databaseURL: 'https://react-redux-firebase.firebaseio.com'
+  authDomain: 'redux-firebasev3.firebaseapp.com',
+  databaseURL: 'https://redux-firebasev3.firebaseio.com',
+  storageBucket: 'redux-firebasev3.appspot.com',
+  messagingSenderId: '823357791673'
 }
 
 export default { firebase }

examples/simple/src/store.js

@@ -1,11 +1,16 @@
 import { createStore, compose } from 'redux'
 import rootReducer from './reducer'
 import { firebase as fbConfig } from './config'
-import { reduxFirebase } from 'react-redux-firebase'
+import { reactReduxFirebase } from 'react-redux-firebase'
 
 export default function configureStore (initialState, history) {
   const createStoreWithMiddleware = compose(
-    reduxFirebase(fbConfig, { userProfile: 'users' }),
+    reactReduxFirebase(fbConfig,
+      {
+        userProfile: 'users',
+        enableLogging: false
+      }
+    ),
     typeof window === 'object' && typeof window.devToolsExtension !== 'undefined' ? window.devToolsExtension() : f => f
   )(createStore)
   const store = createStoreWithMiddleware(rootReducer)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-redux-firebase",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Redux integration for Firebase. Comes with a Higher Order Component for use with React.",
   "main": "dist/index.js",
   "module": "src/index.js",
@@ -14,7 +14,7 @@
     "lint": "eslint src/**",
     "lint:fix": "npm run lint -- --fix",
     "test": "mocha -R spec --compilers js:babel-core/register ./test/setup.js ./test/**/*.spec.js",
-    "test:cov": "babel-node $(npm bin)/isparta cover --report lcov ./node_modules/mocha/bin/_mocha -- ./test/** --recursive",
+    "test:cov": "istanbul cover ./node_modules/mocha/bin/_mocha -- ./test/** --recursive --report lcov --compilers js:babel-register --require babel-polyfill",
     "codecov": "cat coverage/*/lcov.info | codecov",
     "prepush": "npm run lint:fix"
   },
@@ -39,10 +39,10 @@
     }
   ],
   "dependencies": {
-    "firebase": "^3.5.3",
+    "firebase": "^3.6.1",
     "immutable": "^3.8.1",
     "jwt-decode": "^2.1.0",
-    "lodash": "^4.16.6"
+    "lodash": "^4.17.2"
   },
   "peerDependencies": {
     "react": "^0.14.6 || ^15.0.0",
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
-    "babel-core": "^6.18.0",
+    "babel-core": "^6.18.2",
     "babel-eslint": "^7.1.0",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-es6-promise": "^1.0.0",
@@ -62,18 +62,18 @@
     "babel-preset-stage-1": "^6.16.0",
     "chai": "^3.5.0",
     "codecov": "^1.0.1",
-    "eslint": "^3.9.0",
+    "eslint": "^3.10.2",
     "eslint-config-standard": "^6.2.1",
     "eslint-config-standard-react": "^4.2.0",
-    "eslint-plugin-babel": "^3.3.0",
+    "eslint-plugin-babel": "^4.0.0",
     "eslint-plugin-promise": "^3.0.0",
-    "eslint-plugin-react": "^6.4.1",
+    "eslint-plugin-react": "^6.7.1",
     "eslint-plugin-standard": "^2.0.1",
-    "isparta": "^4.0.0",
+    "istanbul": "^1.1.0-alpha.1",
     "jsdom": "^9.8.3",
     "mocha": "^3.1.2",
-    "react-addons-test-utils": "^15.3.2",
-    "react-dom": "^15.3.2",
+    "react-addons-test-utils": "^15.4.0",
+    "react-dom": "^15.4.0",
     "rimraf": "^2.5.4"
   },
   "license": "MIT",