plasticine 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec28eb39afbe68a7d8736bb19f20e372e005d0bc22134d07996e3ec45641440e
-  data.tar.gz: f143b3e121fb0986a4396103a1be0b39ee3d30df173f5c531b11a7e1de92cea3
+  metadata.gz: 622f4435b4c85728ba586bd87bb722c134c440d5afe78d628860745ccad9d8dd
+  data.tar.gz: 73e6646931aabe61bf7bd2f7c6ea0a5d759b5d50a7ec987976fcc1dc31a2c4bc
 SHA512:
-  metadata.gz: f4117b65a69e027ae9950a7afe3430e8de657584f504534d36770e936e9e471359600fcf860597c384956d52db76d79c23ff394116cc4feeb5ade5850340acb2
-  data.tar.gz: bad51faaaa94cd35e34c2c0cd50d239f613e1e4548c42313d6c02037dab4433e0173a8b5d5245f64e97082a3330498d79a49dc9e686f3556d5670f6accfdccd5
+  metadata.gz: 2b7672a93c63e6342253f9d4f6ae7837c95b42e4783367470aed43c4195588fb19348a89333e6cb18823f7d8480515a20d565f597b3a98e38a1c423199f771c0
+  data.tar.gz: 83a0d23568412d127554b0b74e395d3ae56b80ddbacdc299df78e039411c4aded93035f4e1159fc24ef702cc18cad0fa4868fb6281ec55165646c90a982c0f5a

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

@@ -112,13 +112,7 @@ class @PlasticineColumn
     @xAxis = d3.axisBottom(@xScale)
     @xAxis.tickSize -@holder.height()
 
-    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)
+    PlasticineHelpers.setAxisFormat @xAxis, @xAxisFormat
 
 
   setXScaleRange: () ->
@@ -135,11 +129,7 @@ class @PlasticineColumn
     @yAxis.tickSize -@holderWidth()
     @yAxis.ticks @yAxisTickCount
 
-    switch @yAxisFormat
-      when 'date' then @yAxis.tickFormat(d3.timeFormat('%b'))
-      when 'day' then @yAxis.tickFormat(d3.timeFormat('%e-%m'))
-      when 'money' then @yAxis.tickFormat (d) => PlasticineHelpers.toPrice(d)
-      when 'numeric' then @yAxis.tickFormat (d) => PlasticineHelpers.toNumeric(d)
+    PlasticineHelpers.setAxisFormat @yAxis, @yAxisFormat
 
 
   showTooltip: (bar, data) ->

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

@@ -3,8 +3,7 @@
 
 PlasticineHelpers.parseValue = (value, format) ->
   switch format
-    when 'date' then new Date(value)
-    when 'day' then new Date(value)
+    when 'date', 'day', 'daytext' then new Date(value)
     else value
 
 PlasticineHelpers.setLocale = () ->
@@ -34,6 +33,20 @@ PlasticineHelpers.formatNumericString = (str) ->
     else str
 
 
+PlasticineHelpers.setAxisFormat = (axis, format) ->
+  switch format
+    when 'date'     then axis.tickFormat(d3.timeFormat('%b'))
+    when 'day'      then axis.tickFormat(d3.timeFormat('%e-%m'))
+    when 'daytext'  then axis.tickFormat(d3.timeFormat('%e %b'))
+    when 'hours'    then axis.tickFormat (d) => @toHours(d)
+    when 'money'    then axis.tickFormat (d) => @toPrice(d)
+    when 'numeric'  then axis.tickFormat (d) => @toNumeric(d)
+    when 'quarter'  then axis.tickFormat (d) => @toQuarter(d, @quarterStartMonth)
+    when 'year'     then axis.tickFormat (d) => @toYear(d, @quarterStartMonth)
+
+
+PlasticineHelpers.toHours = (value) -> @formatNumericString(value) + 'h'
+
 PlasticineHelpers.toNumeric = (value) -> @formatNumericString(value)
 
 PlasticineHelpers.toPrice = (amount) ->
@@ -43,7 +56,7 @@ PlasticineHelpers.toPrice = (amount) ->
     price = String(amount)[0..-3]
     price = "0" if price is ""
 
-    price = @formatNumericString(value)
+    price = @formatNumericString(amount)
 
     # TODO : Show decimals
     # price += ',' + String(amount).slice(-2)

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

@@ -1,14 +1,13 @@
 class @PlasticineLine
   constructor: (@holder) ->
     @holder = $('.plasticine-line')
+    @holder.on('resize', (e) => @resizeX())
 
     PlasticineHelpers.setLocale()
-    #@drawTooltip()
 
     @xScale = d3.scaleBand()
     @setXScaleRange()
-
-    @yScale = d3.scaleLinear().range([@holder.height(),50])
+    @yScale = d3.scaleLinear().range([@holder.height(), @holder.data('lines-top-padding')])
 
     @setXAxis()
     @setYAxis()
@@ -52,13 +51,13 @@ class @PlasticineLine
       stack = d3.stack().keys(stackedKeys)
       series = stack(stackedDataset);
 
-      @chartPath = d3.area().curve(d3.curveCardinal)
+      @chartPath = d3.area().curve(d3.curveMonotoneX)
         .x( (d,i) => @xScale(stackedDataset[i].x) )
         .y0( (d) => @yScale(d[0]) )
         .y1( (d) => @yScale(d[1]) )
     else
       series = data['lines']
-      @chartPath = d3.line().curve(d3.curveCardinal)
+      @chartPath = d3.line().curve(d3.curveMonotoneX)
         .x( (d) => @xScale(d.x))
         .y( (d) => @yScale(d.y))
 
@@ -71,6 +70,8 @@ class @PlasticineLine
 
 
   refreshLines: () ->
+    self = this
+
     $('g.element').remove()
 
     element = @lines.enter().append('g').attr('class', "element")
@@ -84,6 +85,7 @@ class @PlasticineLine
       @legend.append('li').html('<span></span>' + line.label)
 
 
+
   drawXAxis: () ->
     height = @holder.height()
     @svg.append('g').attr('class', 'x axis')
@@ -126,13 +128,11 @@ class @PlasticineLine
     @xAxis = d3.axisBottom(@xScale)
     @xAxis.tickSize -@holder.height()
 
-    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)
+  setXAxis: () ->
+    @xAxis = d3.axisBottom(@xScale)
+    @xAxis.tickSize -@holder.height()
+
+    PlasticineHelpers.setAxisFormat @xAxis, @xAxisFormat
 
 
   setXScaleRange: () ->
@@ -149,8 +149,4 @@ class @PlasticineLine
     @yAxis.tickSize -@holderWidth()
     @yAxis.ticks @yAxisTickCount
 
-    switch @yAxisFormat
-      when 'date' then @yAxis.tickFormat(d3.timeFormat('%b'))
-      when 'day' then @yAxis.tickFormat(d3.timeFormat('%e-%m'))
-      when 'money' then @yAxis.tickFormat (d) => PlasticineHelpers.toPrice(d)
-      when 'numeric' then @yAxis.tickFormat (d) => PlasticineHelpers.toNumeric(d)
+    PlasticineHelpers.setAxisFormat @yAxis, @yAxisFormat

data/lib/plasticine/builder/line.rb

@@ -4,7 +4,7 @@ class Plasticine::Builder::Line < Plasticine::Builder::Base
   def initialize(id, options={})
     super
 
-    @visual.merge! lines: [], nature: 'line', axis_x_format: :string, axis_y_format: :number, axis_y_tick_count: 10, chart_layout: 'line', order: nil, quarter_start_month: 1
+    @visual.merge! lines: [], nature: 'line', axis_x_format: :string, axis_y_format: :number, axis_y_tick_count: 10, chart_layout: 'line', max_y_ratio: 1, order: nil, quarter_start_month: 1
     @lines = {}
   end
 
@@ -25,6 +25,10 @@ class Plasticine::Builder::Line < Plasticine::Builder::Base
     @visual[:chart_layout] = clayout
   end
 
+  def max_y_ratio=(max_y_ratio)
+    @visual[:max_y_ratio] = max_y_ratio
+  end
+
   def quarter_start_month=(month)
     @visual[:quarter_start_month] = month
   end
@@ -69,8 +73,12 @@ class Plasticine::Builder::Line < Plasticine::Builder::Base
       end
     end
 
-    @visual[:max_y_stack] = stacks.max_by{|k,v| v}[1] # Return the highest stacked value for a specific X
-    @visual[:max_y] = max_y
+    if max_y == 0
+      @visual[:max_y_stack] = 0
+      @visual[:max_y] = 0
+    else
+      @visual[:max_y_stack] = stacks.max_by{|k,v| v}[1] # Return the highest stacked value for a specific X
+      @visual[:max_y] = max_y * @visual[:max_y_ratio]
+    end
   end
-
 end

data/lib/plasticine/helpers.rb

@@ -41,11 +41,12 @@ module Plasticine::Helpers
     end
 
     def line(options={})
-      options.reverse_merge! lines_left_padding: 20, lines_right_padding: 20, lines_margin: 1, y_spacing_ratio: 1.10
+      options.reverse_merge! lines_left_padding: 20, lines_right_padding: 20, lines_top_padding: 50, lines_margin: 1, y_spacing_ratio: 1.10
 
       options[:data] = {
         lines_left_padding: options.delete(:lines_left_padding),
         lines_right_padding: options.delete(:lines_right_padding),
+        lines_top_padding: options.delete(:lines_top_padding),
         lines_margin: options.delete(:lines_margin),
         y_spacing_ratio: options.delete(:y_spacing_ratio)
       }

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.3"
+  gem.version     = "1.2.4"
   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.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Sebastien Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails