git_stats 1.0.14 → 1.0.15

data/lib/git_stats/git_data/commit.rb

@@ -41,7 +41,7 @@ module GitStats
       end
 
       def lines_count
-        @lines_count ||= repo.run("git diff --shortstat `git hash-object -t tree /dev/null` #{self.sha} -- #{repo.tree_path}").lines.map do |line|
+        @lines_count ||= repo.run("git diff --shortstat --no-renames `git hash-object -t tree /dev/null` #{self.sha} -- #{repo.tree_path}").lines.map do |line|
           line[/(\d+) insertions?/, 1].to_i
         end.sum
       end

data/lib/git_stats/git_data/repo.rb

@@ -39,6 +39,10 @@ module GitStats
         @tree ||= Tree.new(repo: self, relative_path: @tree_path)
       end
 
+      def command_memoization
+        @command_memoization_map ||= {}
+      end
+
       def authors
         @authors ||= run_and_parse("git shortlog -se #{commit_range} #{tree_path}").map do |author|
           Author.new(repo: self, name: author[:name], email: author[:email])
@@ -95,6 +99,44 @@ module GitStats
         }].fill_empty_days!(aggregated: true)
       end
 
+      def files_by_extension_by_date
+        file_counts_by_date_by_extension = {}
+        extensions_sums = {}
+        commits.map do |commit|
+          commit.files_by_extension_count.map do |ext, count|
+            extensions_sums[ext] ||= 0;
+            extensions_sums[ext] = count;
+            file_counts_by_date_by_extension[ext] ||= {};
+            file_counts_by_date_by_extension[ext][commit.date.to_date] = extensions_sums[ext]
+          end
+        end
+        @multi_data_file_counts_by_date ||=  file_counts_by_date_by_extension.map { |ext, data|
+          {
+            name: ext || "NO EXTENSION",
+            data: data.fill_empty_days!(aggregated:true)
+            }
+          }
+      end
+
+      def lines_by_extension_by_date
+        lines_by_date_by_extension = {}
+        extensions_sums = {}
+        commits.map do |commit|
+          commit.lines_by_extension.map do |ext, count|
+            extensions_sums[ext] ||= 0;
+            extensions_sums[ext] = count;
+            lines_by_date_by_extension[ext] ||= {};
+            lines_by_date_by_extension[ext][commit.date.to_date] = extensions_sums[ext]
+          end
+        end
+        @multi_data_lines_by_date ||=  lines_by_date_by_extension.map { |ext, data|
+          {
+            name: ext || "NO EXTENSION",
+            data: data.fill_empty_days!(aggregated:true)
+            }
+          }
+      end
+
       def last_commit
         commits.last
       end
@@ -124,9 +166,14 @@ module GitStats
       end
 
       def run(command)
-        result = command_runner.run(path, command)
-        invoke_command_observers(command, result)
-        result
+        if (command_memoization[command])
+          command_memoization[command]
+        else
+          result = command_runner.run(path, command)
+          invoke_command_observers(command, result)
+          command_memoization[command] = result
+          result
+        end
       end
 
       def run_and_parse(command)

data/lib/git_stats/git_data/short_stat.rb

@@ -19,7 +19,7 @@ module GitStats
 
       private
       def calculate_stat
-        stat_line = commit.repo.run("git show --shortstat --oneline #{commit.sha} -- #{commit.repo.tree_path}").lines.to_a[1]
+        stat_line = commit.repo.run("git show --shortstat --oneline --no-renames #{commit.sha} -- #{commit.repo.tree_path}").lines.to_a[1]
         if stat_line.blank?
           @files_changed = @insertions = @deletions = 0
         else

data/lib/git_stats/stats_view/charts/charts.rb

@@ -3,7 +3,7 @@ module GitStats
   module StatsView
     module Charts
       class All
-        delegate :files_by_extension, :lines_by_extension, :files_by_date, :lines_by_date, :comments_by_date, to: :repo_charts
+        delegate :files_by_extension, :files_by_extension_by_date, :lines_by_extension, :lines_by_extension_by_date, :files_by_date, :lines_by_date, :comments_by_date, to: :repo_charts
 
         delegate :commits_sum_by_author_by_date, :changed_lines_by_author_by_date,
                  :insertions_by_author_by_date, :deletions_by_author_by_date, to: :authors_charts

data/lib/git_stats/stats_view/charts/repo_charts.rb

@@ -27,6 +27,26 @@ module GitStats
           end
         end
 
+        def files_by_extension_by_date
+          Chart.new do |f|
+            f.multi_date_chart(
+                data: @repo.files_by_extension_by_date,
+                title: :files_by_extension_by_date.t,
+                y_text: :files.t
+            )
+          end
+        end
+
+        def lines_by_extension_by_date
+          Chart.new do |f|
+            f.multi_date_chart(
+                data: @repo.lines_by_extension_by_date,
+                title: :lines_by_extension_by_date.t,
+                y_text: :files.t
+            )
+          end
+        end
+
         def files_by_date
           Chart.new do |f|
             f.date_chart(

data/lib/git_stats/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module GitStats
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

data/spec/git_data/short_stat_spec.rb

@@ -14,7 +14,7 @@ describe GitStats::GitData::ShortStat do
           {content: '', expect: [0, 0, 0]},
       ].each do |test|
         it "#{test[:content]} parsing" do
-          commit.repo.should_receive(:run).with("git show --shortstat --oneline abc -- .").and_return("abc some commit\n#{test[:content]}")
+          commit.repo.should_receive(:run).with("git show --shortstat --oneline --no-renames abc -- .").and_return("abc some commit\n#{test[:content]}")
 
 
           commit.short_stat.should be_a(GitStats::GitData::ShortStat)

data/templates/assets/export-csv.js

@@ -0,0 +1,392 @@
+/**
+ * A Highcharts plugin for exporting data from a rendered chart as CSV, XLS or HTML table
+ *
+ * Author:   Torstein Honsi
+ * Licence:  MIT
+ * Version:  1.4.7
+ */
+/*global Highcharts, window, document, Blob */
+(function (factory) {
+    if (typeof module === 'object' && module.exports) {
+        module.exports = factory;
+    } else {
+        factory(Highcharts);
+    }
+})(function (Highcharts) {
+
+    'use strict';
+
+    var each = Highcharts.each,
+        pick = Highcharts.pick,
+        seriesTypes = Highcharts.seriesTypes,
+        downloadAttrSupported = document.createElement('a').download !== undefined;
+
+    Highcharts.setOptions({
+        lang: {
+            downloadCSV: 'Download CSV',
+            downloadXLS: 'Download XLS',
+            viewData: 'View data table'
+        }
+    });
+
+
+    /**
+     * Get the data rows as a two dimensional array
+     */
+    Highcharts.Chart.prototype.getDataRows = function () {
+        var options = (this.options.exporting || {}).csv || {},
+            xAxis,
+            xAxes = this.xAxis,
+            rows = {},
+            rowArr = [],
+            dataRows,
+            names = [],
+            i,
+            x,
+            xTitle,
+            // Options
+            dateFormat = options.dateFormat || '%Y-%m-%d %H:%M:%S',
+            columnHeaderFormatter = options.columnHeaderFormatter || function (item, key, keyLength) {
+                if (item instanceof Highcharts.Axis) {
+                    return (item.options.title && item.options.title.text) ||
+                        (item.isDatetimeAxis ? 'DateTime' : 'Category');
+                }
+                return item ? 
+                    item.name + (keyLength > 1 ? ' ('+ key + ')' : '') :
+                    'Category';
+            },
+            xAxisIndices = [];
+
+        // Loop the series and index values
+        i = 0;
+        each(this.series, function (series) {
+            var keys = series.options.keys,
+                pointArrayMap = keys || series.pointArrayMap || ['y'],
+                valueCount = pointArrayMap.length,
+                requireSorting = series.requireSorting,
+                categoryMap = {},
+                xAxisIndex = Highcharts.inArray(series.xAxis, xAxes),
+                j;
+
+            // Map the categories for value axes
+            each(pointArrayMap, function (prop) {
+                categoryMap[prop] = (series[prop + 'Axis'] && series[prop + 'Axis'].categories) || [];
+            });
+
+            if (series.options.includeInCSVExport !== false && series.visible !== false) { // #55
+
+                // Build a lookup for X axis index and the position of the first
+                // series that belongs to that X axis. Includes -1 for non-axis
+                // series types like pies.
+                if (!Highcharts.find(xAxisIndices, function (index) {
+                    return index[0] === xAxisIndex;
+                })) {
+                    xAxisIndices.push([xAxisIndex, i]);
+                }
+
+                // Add the column headers, usually the same as series names
+                j = 0;
+                while (j < valueCount) {
+                    names.push(columnHeaderFormatter(series, pointArrayMap[j], pointArrayMap.length));
+                    j = j + 1;
+                }
+
+                each(series.points, function (point, pIdx) {
+                    var key = requireSorting ? point.x : pIdx,
+                        prop,
+                        val;
+
+                    j = 0;
+
+                    if (!rows[key]) {
+                        // Generate the row
+                        rows[key] = [];
+                        // Contain the X values from one or more X axes
+                        rows[key].xValues = [];
+                    }
+                    rows[key].x = point.x;
+                    rows[key].xValues[xAxisIndex] = point.x;
+                    
+                    // Pies, funnels, geo maps etc. use point name in X row
+                    if (!series.xAxis || series.exportKey === 'name') {
+                        rows[key].name = point.name;
+                    }
+
+                    while (j < valueCount) {
+                        prop = pointArrayMap[j]; // y, z etc
+                        val = point[prop];
+                        rows[key][i + j] = pick(categoryMap[prop][val], val); // Pick a Y axis category if present
+                        j = j + 1;
+                    }
+
+                });
+                i = i + j;
+            }
+        });
+
+        // Make a sortable array
+        for (x in rows) {
+            if (rows.hasOwnProperty(x)) {
+                rowArr.push(rows[x]);
+            }
+        }
+
+        var binding, xAxisIndex, column;
+        dataRows = [names];
+
+        i = xAxisIndices.length;
+        while (i--) { // Start from end to splice in
+            xAxisIndex = xAxisIndices[i][0];
+            column = xAxisIndices[i][1];
+            xAxis = xAxes[xAxisIndex];
+
+            // Sort it by X values
+            rowArr.sort(function (a, b) {
+                return a.xValues[xAxisIndex] - b.xValues[xAxisIndex];
+            });
+
+            // Add header row
+            xTitle = columnHeaderFormatter(xAxis);
+            //dataRows = [[xTitle].concat(names)];
+            dataRows[0].splice(column, 0, xTitle);
+
+            // Add the category column
+            each(rowArr, function (row) {
+
+                var category = row.name;
+                if (!category) {
+                    if (xAxis.isDatetimeAxis) {
+                        if (row.x instanceof Date) {
+                            row.x = row.x.getTime();
+                        }
+                        category = Highcharts.dateFormat(dateFormat, row.x);
+                    } else if (xAxis.categories) {
+                        category = pick(
+                            xAxis.names[row.x],
+                            xAxis.categories[row.x],
+                            row.x
+                        )
+                    } else {
+                        category = row.x;
+                    }
+                }
+
+                // Add the X/date/category
+                row.splice(column, 0, category);
+            });
+        }
+        dataRows = dataRows.concat(rowArr);
+
+        return dataRows;
+    };
+
+    /**
+     * Get a CSV string
+     */
+    Highcharts.Chart.prototype.getCSV = function (useLocalDecimalPoint) {
+        var csv = '',
+            rows = this.getDataRows(),
+            options = (this.options.exporting || {}).csv || {},
+            itemDelimiter = options.itemDelimiter || ',', // use ';' for direct import to Excel
+            lineDelimiter = options.lineDelimiter || '\n'; // '\n' isn't working with the js csv data extraction
+
+        // Transform the rows to CSV
+        each(rows, function (row, i) {
+            var val = '',
+                j = row.length,
+                n = useLocalDecimalPoint ? (1.1).toLocaleString()[1] : '.';
+            while (j--) {
+                val = row[j];
+                if (typeof val === "string") {
+                    val = '"' + val + '"';
+                }
+                if (typeof val === 'number') {
+                    if (n === ',') {
+                        val = val.toString().replace(".", ",");
+                    }
+                }
+                row[j] = val;
+            }
+            // Add the values
+            csv += row.join(itemDelimiter);
+
+            // Add the line delimiter
+            if (i < rows.length - 1) {
+                csv += lineDelimiter;
+            }
+        });
+        return csv;
+    };
+
+    /**
+     * Build a HTML table with the data
+     */
+    Highcharts.Chart.prototype.getTable = function (useLocalDecimalPoint) {
+        var html = '<table><thead>',
+            rows = this.getDataRows();
+
+        // Transform the rows to HTML
+        each(rows, function (row, i) {
+            var tag = i ? 'td' : 'th',
+                val,
+                j,
+                n = useLocalDecimalPoint ? (1.1).toLocaleString()[1] : '.';
+
+            html += '<tr>';
+            for (j = 0; j < row.length; j = j + 1) {
+                val = row[j];
+                // Add the cell
+                if (typeof val === 'number') {
+                    val = val.toString();
+                    if (n === ',') {
+                        val = val.replace('.', n);
+                    }
+                    html += '<' + tag + ' class="number">' + val + '</' + tag + '>';
+
+                } else {
+                    html += '<' + tag + '>' + (val === undefined ? '' : val) + '</' + tag + '>';
+                }
+            }
+
+            html += '</tr>';
+
+            // After the first row, end head and start body
+            if (!i) {
+                html += '</thead><tbody>';
+            }
+            
+        });
+        html += '</tbody></table>';
+
+        return html;
+    };
+
+    function getContent(chart, href, extension, content, MIME) {
+        var a,
+            blobObject,
+            name,
+            options = (chart.options.exporting || {}).csv || {},
+            url = options.url || 'http://www.highcharts.com/studies/csv-export/download.php';
+
+        if (chart.options.exporting.filename) {
+            name = chart.options.exporting.filename;
+        } else if (chart.title) {
+            name = chart.title.textStr.replace(/ /g, '-').toLowerCase();
+        } else {
+            name = 'chart';
+        }
+
+        // MS specific. Check this first because of bug with Edge (#76)
+        if (window.Blob && window.navigator.msSaveOrOpenBlob) {
+            // Falls to msSaveOrOpenBlob if download attribute is not supported
+            blobObject = new Blob([content]);
+            window.navigator.msSaveOrOpenBlob(blobObject, name + '.' + extension);
+
+        // Download attribute supported
+        } else if (downloadAttrSupported) {
+            a = document.createElement('a');
+            a.href = href;
+            a.target = '_blank';
+            a.download = name + '.' + extension;
+            chart.container.append(a); // #111
+            a.click();
+            a.remove();
+
+        } else {
+            // Fall back to server side handling
+            Highcharts.post(url, {
+                data: content,
+                type: MIME,
+                extension: extension
+            });
+        }
+    }
+
+    /**
+     * Call this on click of 'Download CSV' button
+     */
+    Highcharts.Chart.prototype.downloadCSV = function () {
+        var csv = this.getCSV(true);
+        getContent(
+            this,
+            'data:text/csv,\uFEFF' + encodeURIComponent(csv),
+            'csv',
+            csv,
+            'text/csv'
+        );
+    };
+
+    /**
+     * Call this on click of 'Download XLS' button
+     */
+    Highcharts.Chart.prototype.downloadXLS = function () {
+        var uri = 'data:application/vnd.ms-excel;base64,',
+            template = '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40">' +
+                '<head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>' +
+                '<x:Name>Ark1</x:Name>' +
+                '<x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->' +
+                '<style>td{border:none;font-family: Calibri, sans-serif;} .number{mso-number-format:"0.00";}</style>' +
+                '<meta name=ProgId content=Excel.Sheet>' +
+                '<meta charset=UTF-8>' +
+                '</head><body>' +
+                this.getTable(true) +
+                '</body></html>',
+            base64 = function (s) { 
+                return window.btoa(unescape(encodeURIComponent(s))); // #50
+            };
+        getContent(
+            this,
+            uri + base64(template),
+            'xls',
+            template,
+            'application/vnd.ms-excel'
+        );
+    };
+
+    /**
+     * View the data in a table below the chart
+     */
+    Highcharts.Chart.prototype.viewData = function () {
+        if (!this.dataTableDiv) {
+            this.dataTableDiv = document.createElement('div');
+            this.dataTableDiv.className = 'highcharts-data-table';
+            
+            // Insert after the chart container
+            this.renderTo.parentNode.insertBefore(
+                this.dataTableDiv,
+                this.renderTo.nextSibling
+            );
+        }
+
+        this.dataTableDiv.innerHTML = this.getTable();
+    };
+
+
+    // Add "Download CSV" to the exporting menu. Use download attribute if supported, else
+    // run a simple PHP script that returns a file. The source code for the PHP script can be viewed at
+    // https://raw.github.com/highslide-software/highcharts.com/master/studies/csv-export/csv.php
+    if (Highcharts.getOptions().exporting) {
+        Highcharts.getOptions().exporting.buttons.contextButton.menuItems.push({
+            textKey: 'downloadCSV',
+            onclick: function () { this.downloadCSV(); }
+        }, {
+            textKey: 'downloadXLS',
+            onclick: function () { this.downloadXLS(); }
+        }, {
+            textKey: 'viewData',
+            onclick: function () { this.viewData(); }
+        });
+    }
+
+    // Series specific
+    if (seriesTypes.map) {
+        seriesTypes.map.prototype.exportKey = 'name';
+    }
+    if (seriesTypes.mapbubble) {
+        seriesTypes.mapbubble.prototype.exportKey = 'name';
+    }
+    if (seriesTypes.treemap) {
+        seriesTypes.treemap.prototype.exportKey = 'name';
+    }
+
+});