hubstats 0.3.4 → 0.3.5

data/spec/factories/pull_requests.rb

@@ -11,6 +11,17 @@ FactoryGirl.define do
     association :repository, factory: :repo_hash, strategy: :build
     id {Faker::Number.number(6).to_i}
     number {|n| "#{n}".to_i}
+    merged_by(:id => 202020)
+
+    initialize_with { attributes } 
+  end
+
+  factory :pull_request_hash_no_merge, class:Hash do
+    association :user, factory: :user_hash, strategy: :build
+    association :repository, factory: :repo_hash, strategy: :build
+    id {Faker::Number.number(6).to_i}
+    number {|n| "#{n}".to_i}
+    merged_by(nil)
 
     initialize_with { attributes } 
   end
@@ -20,6 +31,7 @@ FactoryGirl.define do
     type "PullRequestEvent"
     association :repository, factory: :repo_hash, strategy: :build
     association :pull_request, factory: :pull_request_hash, strategy: :build
+    merged_by(:id => 202020)
 
     initialize_with { attributes } 
   end 

data/spec/models/hubstats/comment_spec.rb

@@ -18,8 +18,8 @@ module Hubstats
       repo = Repo.create_or_update(github_repo)
       pull = PullRequest.create_or_update(pull_request)
       comment = Comment.create_or_update(github_comment)
-      expect(comment.id).to eq(github_comment[:id])
-      expect(comment.user_id).to eq(github_user[:id])
+      expect(comment.id).to eq(100)
+      expect(comment.user_id).to eq(10)
     end
   end
 end

data/spec/models/hubstats/deploy_spec.rb

@@ -7,13 +7,13 @@ module Hubstats
       deploy_hash = {git_revision: "c1a2b37", 
                      repo_id: repo.id,
                      deployed_at: "2009-02-03 03:00:00 -0500", 
-                     deployed_by: "emmasax1"}
+                     user_id: 202020}
       deploy = Deploy.create(deploy_hash)
       expect(Deploy.count).to eq(1)
-      expect(deploy.git_revision).to eq(deploy_hash[:git_revision])
-      expect(deploy.repo_id).to eq(deploy_hash[:repo_id])
-      expect(deploy.deployed_at).to eq(deploy_hash[:deployed_at])
-      expect(deploy.deployed_by).to eq(deploy_hash[:deployed_by])
+      expect(deploy.git_revision).to eq("c1a2b37")
+      expect(deploy.repo_id).to eq(repo.id)
+      expect(deploy.deployed_at).to eq("2009-02-03 03:00:00 -0500")
+      expect(deploy.user_id).to eq(202020)
     end
 
     it 'should order deploys based on timespan ASC' do
@@ -21,19 +21,19 @@ module Hubstats
       deploy1 = Deploy.create(git_revision: "c1a2b37",
                               repo_id: repo.id, 
                               deployed_at: "2009-12-03 23:00:00", 
-                              deployed_by: "emmasax1")
+                              user_id: 202020)
       deploy2 = Deploy.create(git_revision: "kd92h10",
                               repo_id: repo.id, 
                               deployed_at: "2010-05-26 22:00:00", 
-                              deployed_by: "odelltuttle")
+                              user_id: 202020)
       deploy3 = Deploy.create(git_revision: "k10d8as",
                               repo_id: repo.id, 
                               deployed_at: "2015-08-21 12:00:00", 
-                              deployed_by: "EvaMartinuzzi")
+                              user_id: 202020)
       deploy4 = Deploy.create(git_revision: "917d9ss",
                               repo_id: repo.id, 
                               deployed_at: "2014-12-19 08:00:00", 
-                              deployed_by: "panderson74")
+                              user_id: 202020)
       deploys_ordered = [deploy1, deploy2, deploy4, deploy3]
       new_ordered_deploys = Deploy.order_with_timespan(520.weeks, "ASC")
       expect(Deploy.count).to eq(4)
@@ -45,19 +45,19 @@ module Hubstats
       deploy1 = Deploy.create(git_revision: "c1a2b37",
                               repo_id: repo.id, 
                               deployed_at: "2009-12-03 23:00:00", 
-                              deployed_by: "emmasax1")
+                              user_id: 202020)
       deploy2 = Deploy.create(git_revision: "kd92h10",
                               repo_id: repo.id, 
                               deployed_at: "2010-05-26 22:00:00", 
-                              deployed_by: "odelltuttle")
+                              user_id: 202020)
       deploy3 = Deploy.create(git_revision: "k10d8as",
                               repo_id: repo.id, 
                               deployed_at: "2015-08-21 12:00:00", 
-                              deployed_by: "EvaMartinuzzi")
+                              user_id: 202020)
       deploy4 = Deploy.create(git_revision: "917d9ss",
                               repo_id: repo.id, 
                               deployed_at: "2014-12-19 08:00:00", 
-                              deployed_by: "panderson74")
+                              user_id: 202020)
       deploys_ordered = [deploy3, deploy4, deploy2, deploy1]
       new_ordered_deploys = Deploy.order_with_timespan(520.weeks, "DESC")
       expect(Deploy.count).to eq(4)
@@ -69,7 +69,7 @@ module Hubstats
       expect(Deploy.create(git_revision: nil, 
                            repo_id: repo.id, 
                            deployed_at: "2009-02-03 03:00:00 -0500", 
-                           deployed_by: "emmasax1")).not_to be_valid
+                           user_id: 202020)).not_to be_valid
     end
 
     it 'should NOT create a deploy without a repo_id' do
@@ -77,16 +77,16 @@ module Hubstats
       expect(Deploy.create(git_revision: "c1a2b37", 
                            repo_id: nil, 
                            deployed_at: "2009-02-03 03:00:00 -0500", 
-                           deployed_by: "emmasax1")).not_to be_valid
+                           user_id: 202020)).not_to be_valid
     end
 
 
-    it 'should NOT create a deploy without a deployed_by' do
+    it 'should create a deploy without a user_id' do
       repo = build(:repo)
       expect(Deploy.create(git_revision: "c1a2b37", 
                            repo_id: repo.id, 
                            deployed_at: "2009-02-03 03:00:00 -0500", 
-                           deployed_by: nil)).not_to be_valid
+                           user_id: nil)).to be_valid
     end
 
     it 'should create a deploy wihtout a deployed_at because nil time turns into current time' do
@@ -94,17 +94,17 @@ module Hubstats
       expect(Deploy.create(git_revision: "c1a2b37", 
                            repo_id: repo.id, 
                            deployed_at: nil, 
-                           deployed_by: "emmasax1")).to be_valid
+                           user_id: 202020)).to be_valid
     end
 
-    it 'should NOT create a deploy without an already valid repo_id' do
+    it 'should NOT create a deploy with an invalid repo_id' do
       repo = build(:repo, :id => nil,
                           :name => nil,
                           :full_name => nil)
       expect(Deploy.create(git_revision: "c1a2b37", 
                            repo_id: repo.id, 
                            deployed_at: "2009-02-03 03:00:00 -0500", 
-                           deployed_by: "emmasax1")).not_to be_valid
+                           user_id: 202020)).not_to be_valid
     end
   end
 end

data/spec/models/hubstats/label_spec.rb

@@ -8,9 +8,9 @@ module Hubstats
                     url: "https://api.github.com/repos/sportngin/ngin/labels/feature-request"}
       label = Label.create(label_hash)
       expect(Label.count).to eq(1)
-      expect(label.name).to eq(label_hash[:name])
-      expect(label.color).to eq(label_hash[:color])
-      expect(label.url).to eq(label_hash[:url])
+      expect(label.name).to eq("Feature request")
+      expect(label.color).to eq("FCEC7F")
+      expect(label.url).to eq("https://api.github.com/repos/sportngin/ngin/labels/feature-request")
     end
   end
 end

data/spec/models/hubstats/pull_request_spec.rb

@@ -2,13 +2,44 @@ require 'spec_helper'
 
 module Hubstats
   describe PullRequest, :type => :model do
-    it 'should create and return a Pull Request' do
+    it 'should create and return a pull request with a merge' do
       pull = build(:pull_request_hash)
       pull_request = PullRequest.create_or_update(pull)
       expect(pull_request.id).to eq(pull[:id])
       expect(pull_request.user_id).to eq(pull[:user][:id])
       expect(pull_request.repo_id).to eq(pull[:repository][:id])
       expect(pull_request.number).to eq(pull[:number])
+      expect(pull_request.merged_by).to eq(202020)
+    end
+
+    it 'should create and return a pull request without a merge' do
+      pull = build(:pull_request_hash_no_merge)
+      pull_request = PullRequest.create_or_update(pull)
+      expect(pull_request.id).to eq(pull[:id])
+      expect(pull_request.user_id).to eq(pull[:user][:id])
+      expect(pull_request.repo_id).to eq(pull[:repository][:id])
+      expect(pull_request.number).to eq(pull[:number])
+      expect(pull_request.merged_by).to eq(nil)
+    end
+
+    it "should create a pull request and update the deploy's user_id" do
+      pull = build(:pull_request_hash)
+      pull_request = PullRequest.create_or_update(pull)
+      dep_hash = {git_revision: "c1a2b37", 
+                  repo_id: 303030,
+                  deployed_at: "2009-02-03 03:00:00 -0500", 
+                  user_id: nil,
+                  pull_request_ids: pull[:id]}
+      deploy = Hubstats::Deploy.create!(dep_hash)
+      pull_request.deploy = deploy
+      pull_request = PullRequest.create_or_update(pull)
+      expect(pull_request.id).to eq(pull[:id])
+      expect(pull_request.user_id).to eq(pull[:user][:id])
+      expect(pull_request.repo_id).to eq(pull[:repository][:id])
+      expect(pull_request.number).to eq(pull[:number])
+      expect(pull_request.merged_by).to eq(202020)
+      expect(deploy.user_id).to eq(nil)
+      expect(pull_request.deploy.user_id).to eq(202020)
     end
   end
 end

data/spec/models/hubstats/repo_spec.rb

@@ -11,13 +11,13 @@ module Hubstats
   		             created_at: "2009-05-27 06:27:04 -0500",
   		             updated_at: "2015-03-26 16:17:19 -0500"}
   		repo = Repo.create(repo_hash)
-  		expect(repo.id).to eq(repo_hash[:id])
-  		expect(repo.owner).to eq(repo_hash[:owner])
-  		expect(repo.name).to eq(repo_hash[:name])
-  		expect(repo.full_name).to eq(repo_hash[:full_name])
-  		expect(repo.pushed_at).to eq(repo_hash[:pushed_at])
-  		expect(repo.created_at).to eq(repo_hash[:created_at])
-  		expect(repo.updated_at).to eq(repo_hash[:updated_at])
+  		expect(repo.id).to eq(131242)
+  		expect(repo.owner_id).to eq(3728684)
+  		expect(repo.name).to eq("example_name")
+  		expect(repo.full_name).to eq("sportngin/example_name")
+  		expect(repo.pushed_at).to eq("2015-05-27 13:51:21 -0500")
+  		expect(repo.created_at).to eq("2009-05-27 06:27:04 -0500")
+  		expect(repo.updated_at).to eq("2015-03-26 16:17:19 -0500")
     end
   end
 end

data/spec/models/hubstats/user_spec.rb

@@ -16,7 +16,7 @@ module Hubstats
       user2 = User.create_or_update(build(:user_hash, login: 'johndoe', id: 10))
       expect(user1).to eq(user2)
       expect(user2.login).to eq("johndoe")
-      expect(user2.login).not_to eq("johnapplesdeed")
+      expect(user1.login).not_to eq("johnapplesdeed")
     end
   end
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150602210153) do
+ActiveRecord::Schema.define(:version => 20150605190628) do
 
   create_table "hubstats_comments", :force => true do |t|
     t.string   "kind"
@@ -40,7 +40,6 @@ ActiveRecord::Schema.define(:version => 20150602210153) do
     t.string   "git_revision"
     t.integer  "repo_id"
     t.datetime "deployed_at"
-    t.string   "deployed_by"
     t.integer  "user_id"
   end
 
@@ -85,6 +84,7 @@ ActiveRecord::Schema.define(:version => 20150602210153) do
     t.string   "merged"
     t.string   "mergeable"
     t.integer  "deploy_id"
+    t.integer  "merged_by"
   end
 
   add_index "hubstats_pull_requests", ["repo_id"], :name => "index_hubstats_pull_requests_on_repo_id"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -188,6 +188,7 @@ files:
 - app/views/hubstats/partials/_header.html.erb
 - app/views/hubstats/partials/_pull-condensed.html.erb
 - app/views/hubstats/partials/_pull.html.erb
+- app/views/hubstats/partials/_quick_addition_stats.html.erb
 - app/views/hubstats/partials/_quick_stats.html.erb
 - app/views/hubstats/partials/_repo.html.erb
 - app/views/hubstats/partials/_user-condensed.html.erb
@@ -220,6 +221,8 @@ files:
 - db/migrate/20140703200752_create_hubstats_labels_pull_requests.rb
 - db/migrate/20150526154850_create_hubstats_deploys.rb
 - db/migrate/20150602205308_add_deploy_column_to_pullrequest.rb
+- db/migrate/20150605184015_add_user_id_delete_deployed_by_to_deploy.rb
+- db/migrate/20150605190549_add_merged_by_column_to_pull_request.rb
 - db/seeds.rb
 - hubstats.gemspec
 - lib/generators/hubstats/install_generator.rb