morrisjs-rails 0.4.2.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9182f5f02cde2b79e8672e49d333f51dad123e3
-  data.tar.gz: cf26a2a8303b43876e2e88438b2210ce557545d0
+  metadata.gz: 557908fc7a271ae63e08996d9431037e79544876
+  data.tar.gz: 59a397f9c96a4fd6cad0be9e5af25dd3500c6330
 SHA512:
-  metadata.gz: e0b3dd23491807f2bcd604f729ab18240e517cd333b07d78ec8af4c4acd017124a33905ffe7f3a6b0f51600ddad3d7b06829609997c3c9dabe87d1c97af15117
-  data.tar.gz: e93badd48d59bca294866fcbf5534189a18ceda052b30dc8534967d32aea826848d25649834ba1b3bd7dc205c1e2116e737c0d8ee8632fa6a67ecc9824e0ddbc
+  metadata.gz: 093630ae1057b764c4c1699cd23b05e504b65843d1083bd22fe97c2146345a6b3c18fd3a1af34e2fb19bc3aad350615e302eeae409103bfcf55a9361d5ae9836
+  data.tar.gz: 04b2169c8e6cb7934ae6c849fffb55622b538d91af1dfea6d3c10a424f550bce9a062d03ee5e5836bbb7cc558477c7658139f35d20d83b4cf6c5377b36322b33

data/lib/morrisjs-rails/version.rb

@@ -1,5 +1,5 @@
 module Morrisjs
   module Rails
-    VERSION = "0.4.2.1"
+    VERSION = "0.4.3"
   end
 end

data/vendor/assets/javascripts/morris.js

@@ -21,7 +21,8 @@
       if (this.handlers[name] == null) {
         this.handlers[name] = [];
       }
-      return this.handlers[name].push(handler);
+      this.handlers[name].push(handler);
+      return this;
     };
 
     EventEmitter.prototype.fire = function() {
@@ -125,8 +126,11 @@
       gridStrokeWidth: 0.5,
       gridTextColor: '#888',
       gridTextSize: 12,
+      gridTextFamily: 'sans-serif',
+      gridTextWeight: 'normal',
       hideHover: false,
       yLabelFormat: null,
+      xLabelAngle: 0,
       numLines: 5,
       padding: 25,
       parseTime: true,
@@ -147,6 +151,7 @@
       if (redraw == null) {
         redraw = true;
       }
+      this.options.data = data;
       if (!(data != null) || data.length === 0) {
         this.data = [];
         this.raphael.clear();
@@ -179,6 +184,9 @@
             }
           } else {
             ret.x = index;
+            if (this.options.xLabelFormat) {
+              ret.label = this.options.xLabelFormat(ret);
+            }
           }
           total = 0;
           ret.y = (function() {
@@ -341,7 +349,7 @@
     };
 
     Grid.prototype._calc = function() {
-      var gridLine, h, w, yLabelWidths;
+      var bottomOffsets, gridLine, h, i, w, yLabelWidths;
       w = this.el.width();
       h = this.el.height();
       if (this.elementWidth !== w || this.elementHeight !== h || this.dirty) {
@@ -359,12 +367,20 @@
             _results = [];
             for (_i = 0, _len = _ref.length; _i < _len; _i++) {
               gridLine = _ref[_i];
-              _results.push(this.measureText(this.yAxisFormat(gridLine), this.options.gridTextSize).width);
+              _results.push(this.measureText(this.yAxisFormat(gridLine)).width);
             }
             return _results;
           }).call(this);
           this.left += Math.max.apply(Math, yLabelWidths);
-          this.bottom -= 1.5 * this.options.gridTextSize;
+          bottomOffsets = (function() {
+            var _i, _ref, _results;
+            _results = [];
+            for (i = _i = 0, _ref = this.data.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+              _results.push(this.measureText(this.data[i].text, -this.options.xLabelAngle).height);
+            }
+            return _results;
+          }).call(this);
+          this.bottom -= Math.max.apply(Math, bottomOffsets);
         }
         this.width = Math.max(1, this.right - this.left);
         this.height = Math.max(1, this.bottom - this.top);
@@ -399,12 +415,12 @@
       }
     };
 
-    Grid.prototype.measureText = function(text, fontSize) {
+    Grid.prototype.measureText = function(text, angle) {
       var ret, tt;
-      if (fontSize == null) {
-        fontSize = 12;
+      if (angle == null) {
+        angle = 0;
       }
-      tt = this.raphael.text(100, 100, text).attr('font-size', fontSize);
+      tt = this.raphael.text(100, 100, text).attr('font-size', this.options.gridTextSize).attr('font-family', this.options.gridTextFamily).attr('font-weight', this.options.gridTextWeight).rotate(angle);
       ret = tt.getBBox();
       tt.remove();
       return ret;
@@ -485,7 +501,7 @@
     };
 
     Grid.prototype.drawYAxisLabel = function(xPos, yPos, text) {
-      return this.raphael.text(xPos, yPos, text).attr('font-size', this.options.gridTextSize).attr('fill', this.options.gridTextColor).attr('text-anchor', 'end');
+      return this.raphael.text(xPos, yPos, text).attr('font-size', this.options.gridTextSize).attr('font-family', this.options.gridTextFamily).attr('font-weight', this.options.gridTextWeight).attr('fill', this.options.gridTextColor).attr('text-anchor', 'end');
     };
 
     Grid.prototype.drawGridLine = function(path) {
@@ -599,7 +615,7 @@
       }
       return this.el.css({
         left: left + "px",
-        top: top + "px"
+        top: parseInt(top) + "px"
       });
     };
 
@@ -660,7 +676,7 @@
       smooth: true,
       xLabels: 'auto',
       xLabelFormat: null,
-      xLabelMargin: 50,
+      xLabelMargin: 24,
       continuousLine: true,
       hideHover: false
     };
@@ -735,7 +751,7 @@
     };
 
     Line.prototype.onHoverOut = function() {
-      if (this.options.hideHover === 'auto') {
+      if (this.options.hideHover !== false) {
         return this.displayHoverForRow(null);
       }
     };
@@ -822,15 +838,28 @@
     };
 
     Line.prototype.drawXAxis = function() {
-      var drawLabel, l, labels, prevLabelMargin, row, ypos, _i, _len, _results,
+      var drawLabel, l, labels, prevAngleMargin, prevLabelMargin, row, ypos, _i, _len, _results,
         _this = this;
-      ypos = this.bottom + this.options.gridTextSize * 1.25;
+      ypos = this.bottom + this.options.padding / 2;
       prevLabelMargin = null;
+      prevAngleMargin = null;
       drawLabel = function(labelText, xpos) {
-        var label, labelBox;
+        var label, labelBox, margin, offset, textBox;
         label = _this.drawXAxisLabel(_this.transX(xpos), ypos, labelText);
+        textBox = label.getBBox();
+        label.transform("r" + (-_this.options.xLabelAngle));
         labelBox = label.getBBox();
-        if ((!(prevLabelMargin != null) || prevLabelMargin >= labelBox.x + labelBox.width) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < _this.el.width()) {
+        label.transform("t0," + (labelBox.height / 2) + "...");
+        if (_this.options.xLabelAngle !== 0) {
+          offset = -0.5 * textBox.width * Math.cos(_this.options.xLabelAngle * Math.PI / 180.0);
+          label.transform("t" + offset + ",0...");
+        }
+        labelBox = label.getBBox();
+        if ((!(prevLabelMargin != null) || prevLabelMargin >= labelBox.x + labelBox.width || (prevAngleMargin != null) && prevAngleMargin >= labelBox.x) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < _this.el.width()) {
+          if (_this.options.xLabelAngle !== 0) {
+            margin = 1.25 * _this.options.gridTextSize / Math.sin(_this.options.xLabelAngle * Math.PI / 180.0);
+            prevAngleMargin = labelBox.x - margin;
+          }
           return prevLabelMargin = labelBox.x - _this.options.xLabelMargin;
         } else {
           return label.remove();
@@ -997,7 +1026,7 @@
     };
 
     Line.prototype.drawXAxisLabel = function(xPos, yPos, text) {
-      return this.raphael.text(xPos, yPos, text).attr('font-size', this.options.gridTextSize).attr('fill', this.options.gridTextColor);
+      return this.raphael.text(xPos, yPos, text).attr('font-size', this.options.gridTextSize).attr('font-family', this.options.gridTextFamily).attr('font-weight', this.options.gridTextWeight).attr('fill', this.options.gridTextColor);
     };
 
     Line.prototype.drawLinePath = function(path, lineColor) {
@@ -1238,7 +1267,7 @@
     Area.prototype.fillForSeries = function(i) {
       var color;
       color = Raphael.rgb2hsl(this.colorFor(this.data[i], i, 'line'));
-      return Raphael.hsl(color.h, Math.min(255, this.options.behaveLikeLine ? color.s * 0.9 : color.s * 0.75), Math.min(255, this.options.behaveLikeLine ? color.l * 1.2 : color.l * 1.25));
+      return Raphael.hsl(color.h, this.options.behaveLikeLine ? color.s * 0.9 : color.s * 0.75, Math.min(0.98, this.options.behaveLikeLine ? color.l * 1.2 : color.l * 1.25));
     };
 
     Area.prototype.drawFilledPath = function(path, fill) {
@@ -1327,15 +1356,27 @@
     };
 
     Bar.prototype.drawXAxis = function() {
-      var i, label, labelBox, prevLabelMargin, row, ypos, _i, _ref, _results;
-      ypos = this.bottom + this.options.gridTextSize * 1.25;
+      var i, label, labelBox, margin, offset, prevAngleMargin, prevLabelMargin, row, textBox, ypos, _i, _ref, _results;
+      ypos = this.bottom + this.options.padding / 2;
       prevLabelMargin = null;
+      prevAngleMargin = null;
       _results = [];
       for (i = _i = 0, _ref = this.data.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
         row = this.data[this.data.length - 1 - i];
         label = this.drawXAxisLabel(row._x, ypos, row.label);
+        textBox = label.getBBox();
+        label.transform("r" + (-this.options.xLabelAngle));
         labelBox = label.getBBox();
-        if ((!(prevLabelMargin != null) || prevLabelMargin >= labelBox.x + labelBox.width) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < this.el.width()) {
+        label.transform("t0," + (labelBox.height / 2) + "...");
+        if (this.options.xLabelAngle !== 0) {
+          offset = -0.5 * textBox.width * Math.cos(this.options.xLabelAngle * Math.PI / 180.0);
+          label.transform("t" + offset + ",0...");
+        }
+        if ((!(prevLabelMargin != null) || prevLabelMargin >= labelBox.x + labelBox.width || (prevAngleMargin != null) && prevAngleMargin >= labelBox.x) && labelBox.x >= 0 && (labelBox.x + labelBox.width) < this.el.width()) {
+          if (this.options.xLabelAngle !== 0) {
+            margin = 1.25 * this.options.gridTextSize / Math.sin(this.options.xLabelAngle * Math.PI / 180.0);
+            prevAngleMargin = labelBox.x - margin;
+          }
           _results.push(prevLabelMargin = labelBox.x - this.options.xLabelMargin);
         } else {
           _results.push(label.remove());
@@ -1433,7 +1474,7 @@
     };
 
     Bar.prototype.onHoverOut = function() {
-      if (this.options.hideHover === 'auto') {
+      if (this.options.hideHover !== false) {
         return this.hover.hide();
       }
     };
@@ -1456,7 +1497,7 @@
 
     Bar.prototype.drawXAxisLabel = function(xPos, yPos, text) {
       var label;
-      return label = this.raphael.text(xPos, yPos, text).attr('font-size', this.options.gridTextSize).attr('fill', this.options.gridTextColor);
+      return label = this.raphael.text(xPos, yPos, text).attr('font-size', this.options.gridTextSize).attr('font-family', this.options.gridTextFamily).attr('font-weight', this.options.gridTextWeight).attr('fill', this.options.gridTextColor);
     };
 
     Bar.prototype.drawBar = function(xPos, yPos, width, height, barColor) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: morrisjs-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.2.1
+  version: 0.4.3
 platform: ruby
 authors:
 - beanie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -41,10 +41,10 @@ files:
 - lib/morrisjs-rails.rb
 - vendor/assets/javascripts/morris.js
 - vendor/assets/stylesheets/morris.css
-- vendor/assets/stylesheets/untitled
 - README.md
 homepage: https://github.com/beanieboi/morrisjs-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -62,8 +62,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: morris.js for the Rails Asset Pipeline
 test_files: []
+has_rdoc: 

data/vendor/assets/stylesheets/untitled

@@ -1,14 +0,0 @@
-path = File.join(Rails.root, 'config', 'action_mailer.yml')
-options = YAML.load_file(path)[Rails.env]
-
-ActionMailer::Base.delivery_method = Rails.env.test? ? :test : :smtp
-
-ActionMailer::Base.smtp_settings = {
-   :host           => options['host'],
-   :address        => options['address'],
-   :port           => options['port'],
-   :domain         => options['domain'],
-   :user_name      => options['user_name'],
-   :password       => options['password'],
-   :authentication => options['authentication']
-}