plasticine 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44e1f9baa53b72db44eee7a93478afdf5070dc05e79c8c817ec6ede7418a0ae5
-  data.tar.gz: ab33697ac7b1b6972c751dc046579542ecc9c251fed98498f625b5957db027bf
+  metadata.gz: 9e66d1f4b3fa8368311e58c898c0e09ade893daf8deb6df5ea147a14434bba66
+  data.tar.gz: b19a9dd56807f2437be8e0709711117eea5d9392c9b68409971e0d3305e960dd
 SHA512:
-  metadata.gz: 92201535eae094856fa130484e538b021aa0394177075fb09fb5ad8f4be6f73cfc968920fbdc90caded7a6bd945e3b91eb84a67548b3621a92b4f949e1273189
-  data.tar.gz: cf0afdda173ffb49fb0c6f0ca5c0b14091351228c5e905da6250f5d45fcd9c7c446f1e940fb5fce8f861de2cb0c14cb58f1aa15b67b9b62fef491b74aa377208
+  metadata.gz: 8d88313573087a2649edffe92cd0b8292206472d049a99991bd6d1f6ea431fd2ee335af3112bf486cb7ed30162d1a078afa85c09c6348e3784fde03496db5c56
+  data.tar.gz: 60c751b37114dc5744e252c536e7cccccc1bc6509f5ad2286631cde1e51a58e3f94930ec139edd36f7513bd227dd7171e8fad8d7841d804676e6f0ce044993ab

data/app/assets/javascripts/plasticine/column.coffee

@@ -114,9 +114,11 @@ class @PlasticineColumn
 
     switch @xAxisFormat
       when 'date' then @xAxis.tickFormat(d3.timeFormat('%b'))
+      when 'day' then @xAxis.tickFormat(d3.timeFormat('%e-%m'))
       when 'quarter' then @xAxis.tickFormat (d) => PlasticineHelpers.toQuarter(d, @quarterStartMonth)
       when 'year' then @xAxis.tickFormat (d) => PlasticineHelpers.toYear(d, @quarterStartMonth)
       when 'money' then @xAxis.tickFormat (d) => PlasticineHelpers.toPrice(d)
+      when 'numeric' then @xAxis.tickFormat (d) => PlasticineHelpers.toNumeric(d)
 
 
   setXScaleRange: () ->
@@ -124,7 +126,7 @@ class @PlasticineColumn
     columnsLeftPadding = @holder.data('columns-left-padding')
     columnsRightPadding = @holder.data('columns-right-padding')
     width = @holderWidth()
-    
+
     @xScale = @xScale.rangeRound([columnsLeftPadding, width - columnsRightPadding]).padding(columnsMargin);
 
 
@@ -135,7 +137,9 @@ class @PlasticineColumn
 
     switch @yAxisFormat
       when 'date' then @yAxis.tickFormat(d3.timeFormat('%b'))
+      when 'day' then @yAxis.tickFormat(d3.timeFormat('%e %b'))
       when 'money' then @yAxis.tickFormat (d) => PlasticineHelpers.toPrice(d)
+      when 'numeric' then @yAxis.tickFormat (d) => PlasticineHelpers.toNumeric(d)
 
 
   showTooltip: (bar, data) ->

data/app/assets/javascripts/plasticine/helpers.coffee

@@ -4,6 +4,7 @@
 PlasticineHelpers.parseValue = (value, format) ->
   switch format
     when 'date' then new Date(value)
+    when 'day' then new Date(value)
     else value
 
 PlasticineHelpers.setLocale = () ->
@@ -22,6 +23,18 @@ PlasticineHelpers.setLocale = () ->
     "shortMonths": ["Jan", "Fev", "Mar", "Avr", "Mai", "Jun", "Jul", "Aou", "Sep", "Oct", "Nov", "Dec"]
   )
 
+PlasticineHelpers.formatNumericString = (str) ->
+  str = String(str)
+  switch str.length
+    when 4 then [str.slice(0, 1), ' ', str.slice(1)].join('')
+    when 5 then [str.slice(0, 2), ' ', str.slice(2)].join('')
+    when 6 then [str.slice(0, 3), ' ', str.slice(3)].join('')
+    when 7 then [str.slice(0, 1), ' ', str.slice(1, 4), ' ', str.slice(4)].join('')
+    when 8 then [str.slice(0, 2), ' ', str.slice(2, 5), ' ', str.slice(4)].join('')
+    else str
+
+
+PlasticineHelpers.toNumeric = (value) -> @formatNumericString(value)
 
 PlasticineHelpers.toPrice = (amount) ->
   if amount is 0
@@ -30,16 +43,10 @@ PlasticineHelpers.toPrice = (amount) ->
     price = String(amount)[0..-3]
     price = "0" if price is ""
 
-    price = switch price.length
-      when 4 then [price.slice(0, 1), ' ', price.slice(1)].join('')
-      when 5 then [price.slice(0, 2), ' ', price.slice(2)].join('')
-      when 6 then [price.slice(0, 3), ' ', price.slice(3)].join('')
-      when 7 then [price.slice(0, 1), ' ', price.slice(1, 4), ' ', price.slice(4)].join('')
-      when 8 then [price.slice(0, 2), ' ', price.slice(2, 5), ' ', price.slice(4)].join('')
-      else price
+    price = @formatNumericString(value)
 
-    # Show decimals
-    #price += ',' + String(amount).slice(-2)
+    # TODO : Show decimals
+    # price += ',' + String(amount).slice(-2)
 
   price += ' $'
 

data/app/assets/javascripts/plasticine/line.coffee

@@ -128,9 +128,11 @@ class @PlasticineLine
 
     switch @xAxisFormat
       when 'date' then @xAxis.tickFormat(d3.timeFormat('%b'))
+      when 'day' then @xAxis.tickFormat(d3.timeFormat('%e %b'))
       when 'quarter' then @xAxis.tickFormat (d) => PlasticineHelpers.toQuarter(d, @quarterStartMonth)
       when 'year' then @xAxis.tickFormat (d) => PlasticineHelpers.toYear(d, @quarterStartMonth)
       when 'money' then @xAxis.tickFormat (d) => PlasticineHelpers.toPrice(d)
+      when 'numeric' then @xAxis.tickFormat (d) => PlasticineHelpers.toNumeric(d)
 
 
   setXScaleRange: () ->
@@ -149,4 +151,6 @@ class @PlasticineLine
 
     switch @yAxisFormat
       when 'date' then @yAxis.tickFormat(d3.timeFormat('%b'))
+      when 'day' then @yAxis.tickFormat(d3.timeFormat('%e %b'))
       when 'money' then @yAxis.tickFormat (d) => PlasticineHelpers.toPrice(d)
+      when 'numeric' then @yAxis.tickFormat (d) => PlasticineHelpers.toNumeric(d)

data/plasticine.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |gem|
   gem.description = "Data visualization toolkit for Rails App using D3.js"
   gem.summary     = "Data visualization toolkit for Rails App using D3.js"
   gem.homepage    = "https://github.com/alchimikweb/plasticine"
-  gem.version     = "1.2.1"
+  gem.version     = "1.2.2"
   gem.licenses    = ["MIT"]
 
   gem.authors     = ["Sebastien Rosa"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plasticine
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Sebastien Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails