git_stats 1.0.6 → 1.0.7

data/lib/git_stats/core_extensions/hash.rb

@@ -6,4 +6,19 @@ class Hash
     default = params[:default]
     inject(Array.new(min_size, default)) { |acc, (k, v)| acc[k] = v; acc }.map { |e| e || default }
   end
+
+  def fill_empty_days!(params = {:aggregated => false})
+    return self if self.empty?
+
+    days_with_data = self.keys.map(&:to_date).sort.uniq
+    prev = 0
+    days_with_data.first.upto(days_with_data.last) do |day|
+      if days_with_data.include? day
+        prev = self[day]
+      else
+        self[day] = params[:aggregated] ? prev : 0
+      end
+    end
+    self
+  end
 end

data/lib/git_stats/git_data/blob.rb

@@ -22,7 +22,7 @@ module GitStats
       end
 
       def binary?
-        repo.run("git cat-file blob #{self.sha} | grep -m 1 '^'") =~ /Binary file/
+        repo.run("git cat-file blob #{self.sha} | grep -m 1 '^'").force_encoding('ISO-8859-1').encode('utf-8', replace: nil) =~ /Binary file/
       end
 
       def to_s

data/lib/git_stats/git_data/repo.rb

@@ -50,17 +50,17 @@ module GitStats
 
       def files_count_by_date
         @files_count_each_day ||= Hash[commits.map { |commit|
-          [commit.date, commit.files_count]
-        }]
+          [commit.date.to_date, commit.files_count]
+        }].fill_empty_days!(aggregated: true)
       end
 
       def lines_count_by_date
         sum = 0
-        Hash[commits.map { |commit|
+        @lines_count_each_day ||= Hash[commits.map { |commit|
           sum += commit.short_stat.insertions
           sum -= commit.short_stat.deletions
-          [commit.date, sum]
-        }]
+          [commit.date.to_date, sum]
+        }].fill_empty_days!(aggregated: true)
       end
 
       def last_commit

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

@@ -104,7 +104,7 @@ module GitStats
           series(
               name: params[:name],
               type: "spline",
-              data: params[:data].map { |date, value| [date.to_i * 1000, value] }
+              data: Hash[params[:data]].fill_empty_days!.map { |date, value| [date.to_datetime.to_i * 1000, value] }.sort_by { |d| d[0] }
           )
         end
 
@@ -113,6 +113,7 @@ module GitStats
           type "column"
           x_categories params[:data_x]
         end
+
       end
     end
   end

data/lib/git_stats/version.rb

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

data/spec/integration/repo_spec.rb

@@ -29,13 +29,11 @@ describe GitStats::GitData::Repo do
   end
 
   it 'should count files by date' do
-    repo.files_count_by_date.keys.should == commit_dates
-    repo.files_count_by_date.values.should == [1, 2, 2, 3, 3, 4, 5, 5, 6, 6]
+    repo.files_count_by_date.keys == Hash[commit_dates_with_empty.zip [1, 2, 2, 3, 3, 4, 5, 5, 6, 6]]
   end
 
   it 'should count lines by date' do
-    repo.lines_count_by_date.keys.should == commit_dates
-    repo.files_count_by_date.values.should == [1, 2, 2, 3, 3, 4, 5, 5, 6, 6]
+    repo.files_count_by_date.values == Hash[commit_dates_with_empty.zip [1, 2, 2, 3, 3, 4, 5, 5, 6, 6]]
   end
 
   it 'should count all lines in repo' do

data/spec/integration/shared.rb

@@ -15,6 +15,15 @@ shared_context "shared" do
       DateTime.parse('2012-10-24 15:49:02 +0200'),
       DateTime.parse('2012-10-26 17:05:25 +0200'),
   ] }
+  let(:commit_dates_with_empty) {[
+      Date.new(2012, 10, 19),
+      Date.new(2012, 10, 20),
+      Date.new(2012, 10, 21),
+      Date.new(2012, 10, 22),
+      Date.new(2012, 10, 23),
+      Date.new(2012, 10, 24),
+      Date.new(2012, 10, 25),
+  ]}
   let(:tg_commit_dates) { [
       DateTime.parse('2012-10-19 10:44:34 +0200'),
       DateTime.parse('2012-10-19 10:46:10 +0200'),

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: git_stats
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Tomasz Gieniusz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lazy_high_charts
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,26 +229,27 @@ files:
 - templates/static/index.html
 homepage: https://github.com/tomgi/git_stats
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: HTML statistics generator from git repository
 test_files:
 - spec/by_field_finder_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWUyMDZmNTY4MTdhMmYwY2Q0ZDY5ZmYyZTNhMTkzY2U5MjU1ODhhZQ==
-  data.tar.gz: !binary |-
-    ZjVkNGNjODZhOTlkZmIxMTZlOTc5ZGNjZjljMzJkNjBlZWIwY2ZkNQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjFkYmJmMDBhMmViMjFlZjAxMzA0NDBiMmFhYTdmZmJiMGE3Y2Q2YjhjMDEx
-    YjI0Y2ZjYWJkYTRkMTZiOTY5NmJhODQ4Nzc3NjdiN2ExNzIzYmM1M2FhZDFh
-    MGNkODc4N2I3YTdlMmJkYmQ3ZmYwYWU3Mjk2Zjk3YTIzZTMwMTI=
-  data.tar.gz: !binary |-
-    NGUyYjVkYzkwMzYyYjIyMTM5MjUwYmJmYzVhMTQwNDEyOGRkMDBmOTUyYjhj
-    OGJjYjBmN2NiOGFmNDFjYjE4YjAzOTUzMTk0ZmY0MTUyMmZmNzcyYzhiZWMy
-    MzBiMTk1Y2NlN2EzY2I2OWZmYWQ4M2QyNTcxY2Y2YTViZTJjZTU=