Merge branch 'master' into gh-pages

Conflicts:
	CHANGELOG.md
	package.json

Author: pughpugh

CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## 1.0.7 - Aug 7, 2016
+
+  * Weight of circle can now be configured. Thanks @rutan.
+
+## 1.0.6 - Feb 18, 2016
+
+  * Added licence
+
 ## 1.0.5 - Dec 22, 2015
 
   * Removed React into peerDependencies
+  * Removed Shrinkwrap
 
 ## 1.0.5 - Dec 21, 2015
 

LICENSE.md

@@ -0,0 +1,13 @@
+Copyright (c) 2016, Hugh Gallagher
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

README.md

@@ -30,6 +30,7 @@ npm install react-countdown-clock
 * `color` you'd like it to be as a hex/css colour code
 * `alpha` transparency for component
 * `size` for height and width of canvas element, in pixels.
+* `weight` for weight of circle, in pixels.
 * `onComplete` callback when timer completes
 
 ## Bugs

RELEASE_PROCESS.md

@@ -0,0 +1,26 @@
+Just to remind myself of my own release process for this repo
+
+1. Make some changes / merge PR
+2. Bump version in `package.json`
+3. Update `README.md` if needed
+4. Update `CHANGELOG.md`
+5. Webpack build
+        ```
+        webpack -p
+        ```
+6. Test it all works
+        ```
+        serve
+        open index.html -a 'Google Chrome'
+        ```
+7. Tag and push the release
+        ```
+        git tag 1.0.x
+        git push
+        git push --tags
+        ```
+8. Publish on NPM
+        ```
+        npm publish
+        ```
+9. Cup of tea

build/react-countdown-clock.js

@@ -9,10 +9,11 @@ module.exports = React.createClass
   _timeoutIds: []
 
   displayName: 'ReactCountdownClock'
-  
+
   propTypes:
     seconds: React.PropTypes.number
     size: React.PropTypes.number
+    weight: React.PropTypes.number
     color: React.PropTypes.string
     alpha: React.PropTypes.number
     onComplete: React.PropTypes.func
@@ -44,9 +45,14 @@ module.exports = React.createClass
     @_drawTimer()
 
   _setScale: ->
-    @_radius     = @props.size / 2
-    @_fraction   = 2 / @_seconds
-    @_tickPeriod = @_seconds * 1.8
+    @_radius      = @props.size / 2
+    @_fraction    = 2 / @_seconds
+    @_tickPeriod  = @_seconds * 1.8
+    @_innerRadius =
+      if @props.weight
+        @_radius - @props.weight
+      else
+        @_radius / 1.8
 
   _setupCanvas: ->
     @_canvas  = @refs.canvas
@@ -89,8 +95,8 @@ module.exports = React.createClass
   _drawBackground: ->
     @_context.beginPath()
     @_context.globalAlpha = @props.alpha / 3
-    @_context.arc @_radius, @_radius, @_radius,     0,           Math.PI * 2, false
-    @_context.arc @_radius, @_radius, @_radius/1.8, Math.PI * 2, 0,           true
+    @_context.arc @_radius, @_radius,      @_radius,           0, Math.PI * 2, false
+    @_context.arc @_radius, @_radius, @_innerRadius, Math.PI * 2,           0, true
     @_context.fill()
 
   _drawTimer: ->
@@ -100,8 +106,8 @@ module.exports = React.createClass
     @_context.fillStyle = @props.color
     @_context.fillText @_seconds.toFixed(decimals), @_radius, @_radius
     @_context.beginPath()
-    @_context.arc @_radius, @_radius, @_radius,     Math.PI * 1.5,     Math.PI * percent, false
-    @_context.arc @_radius, @_radius, @_radius/1.8, Math.PI * percent, Math.PI * 1.5,     true
+    @_context.arc @_radius, @_radius,      @_radius,     Math.PI * 1.5, Math.PI * percent, false
+    @_context.arc @_radius, @_radius, @_innerRadius, Math.PI * percent,     Math.PI * 1.5, true
     @_context.fill()
 
   render: ->