From 2ea5da52b36beb0cd2aed1fa29e47bd5341a55d1 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 21:37:48 -0700 Subject: [PATCH 01/20] Fixed first test for "no profile" * stub the image_tag method * add an improved description --- refactor-this/helper_spec.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index b82e40e..72a2526 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -14,8 +14,15 @@ @helper = Helper.new end describe "display_photo" do - it "should return the wrench if there is no profile" do - @helper.display_photo(nil, "100x100", {}, {}, true).should == "wrench.png" + describe "If the profile is not set" do + before do + @helper.stub!(:image_tag) do |img| + img + end + end + it "return the wrench" do + @helper.display_photo(nil, "100x100", {}, {}, true).should == "wrench.png" + end end describe "With a profile, user and photo requesting a link" do From 6423bede61ab8f999ec9ada605099ed73e5288c1 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 21:42:06 -0700 Subject: [PATCH 02/20] Second test passing for "With a profile, user and photo requesting a link" * added require for Rails reverse_merge library file * added stub methods for profile_path, url_for_file_column, image_tag, and link_to * change to_s to to_str in Photo class --- refactor-this/helper_spec.rb | 7 +++++++ refactor-this/photo.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 72a2526..95fb6b6 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -8,6 +8,7 @@ require 'helper' require 'user' require 'photo' +require 'active_support/core_ext/hash/reverse_merge' describe "Helper" do before(:each) do @@ -33,7 +34,13 @@ @profile.user = @user @photo = Photo.new @user.photo = @photo + @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} + + @helper.stub!(:profile_path).with(@profile).and_return("profile_path") @profile.stub!(:has_valid_photo?).and_return(true) + @helper.stub!(:url_for_file_column).with("user", "photo", "100x100").and_return("imagefile") + @helper.stub!(:image_tag).with("imagefile", @html).and_return("image_tag") + @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("this link") end it "should return a link" do @helper.display_photo(@profile, "100x100", {}, {}, true).should == "this link" diff --git a/refactor-this/photo.rb b/refactor-this/photo.rb index 88ea4c5..6407399 100644 --- a/refactor-this/photo.rb +++ b/refactor-this/photo.rb @@ -1,5 +1,5 @@ class Photo - def to_s + def to_str "photo.rb" end end \ No newline at end of file From ba0ae5e88e1fdcccc4581cedcbe767c5daf43b5a Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 21:48:53 -0700 Subject: [PATCH 03/20] Third test passing "With a profile, user and photo not requesting a link" * refactored test methods & descriptions, and created common before block --- refactor-this/helper_spec.rb | 44 +++++++++++++++++------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 95fb6b6..f841aa9 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -26,8 +26,8 @@ end end - describe "With a profile, user and photo requesting a link" do - before(:each) do + describe "With a profile, user" do + before do @profile = UserProfile.new @profile.name = "Clayton" @user = User.new @@ -36,30 +36,28 @@ @user.photo = @photo @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} - @helper.stub!(:profile_path).with(@profile).and_return("profile_path") @profile.stub!(:has_valid_photo?).and_return(true) @helper.stub!(:url_for_file_column).with("user", "photo", "100x100").and_return("imagefile") - @helper.stub!(:image_tag).with("imagefile", @html).and_return("image_tag") - @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("this link") - end - it "should return a link" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "this link" - end - end - - describe "With a profile, user and photo not requesting a link" do - before(:each) do - @profile = UserProfile.new - @profile.name = "Clayton" - @user = User.new - @profile.user = @user - @photo = Photo.new - @user.photo = @photo - @profile.stub!(:has_valid_photo?).and_return(true) - end - it "should just an image" do - @helper.display_photo(@profile, "100x100", {}, {}, false).should == "just image" + @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end + describe "and a user and photo requesting a link" do + before(:each) do + @helper.stub!(:image_tag).with("imagefile", @html).and_return("image_tag") + @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("this link") + end + it "return a link" do + @helper.display_photo(@profile, "100x100", {}, {}, true).should == "this link" + end + end + + describe "and photo not requesting a link" do + before(:each) do + @helper.stub!(:image_tag).with("imagefile", @html).and_return("just image") + end + it "return just an image" do + @helper.display_photo(@profile, "100x100", {}, {}, false).should == "just image" + end + end end describe "Without a user, but requesting a link" do From 865f56f1e1381e42ab956472002d0f89dc4a42b4 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 22:15:10 -0700 Subject: [PATCH 04/20] Fouth test passing: "With a profile and user without a photo and the user is a rep user" * replaced code in helper.rb with call to has_valid_photo?, which exists in user_profile.rb, and is already stubbed * regroup tests again, update describe strings, and consolidate stuff in before blocks --- refactor-this/helper.rb | 3 +- refactor-this/helper_spec.rb | 169 +++++++++++++++++------------------ 2 files changed, 84 insertions(+), 88 deletions(-) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index 6ef273b..599bce5 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -34,8 +34,7 @@ def display_photo(profile, size, html = {}, options = {}, link = true) html.reverse_merge!(:class => 'thumbnail', :size => size, :title => "Link to #{profile.name}") if profile && profile.user - if profile.user && profile.user.photo && File.exists?(profile.user.photo) - @user = profile.user + if profile.has_valid_photo? if link return link_to(image_tag(url_for_file_column("user", "photo", size), html), profile_path(profile) ) else diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index f841aa9..18dea0d 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -26,106 +26,103 @@ end end - describe "With a profile, user" do + describe "With a profile" do before do @profile = UserProfile.new @profile.name = "Clayton" - @user = User.new - @profile.user = @user - @photo = Photo.new - @user.photo = @photo - @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} - - @profile.stub!(:has_valid_photo?).and_return(true) - @helper.stub!(:url_for_file_column).with("user", "photo", "100x100").and_return("imagefile") - @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end - describe "and a user and photo requesting a link" do - before(:each) do - @helper.stub!(:image_tag).with("imagefile", @html).and_return("image_tag") - @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("this link") - end - it "return a link" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "this link" + describe "and user" do + before do + @user = User.new + @profile.user = @user + @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} + + @profile.stub!(:has_valid_photo?).and_return(true) + @helper.stub!(:url_for_file_column).with("user", "photo", "100x100").and_return("imagefile") + @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end - end + describe "and photo" do + before do + @photo = Photo.new + @user.photo = @photo + end + describe "requesting a link" do + before(:each) do + @helper.stub!(:image_tag).with("imagefile", @html).and_return("image_tag") + @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("this link") + end + it "return a link" do + @helper.display_photo(@profile, "100x100", {}, {}, true).should == "this link" + end + end + + describe "not requesting a link" do + before(:each) do + @helper.stub!(:image_tag).with("imagefile", @html).and_return("just image") + end + it "return just an image" do + @helper.display_photo(@profile, "100x100", {}, {}, false).should == "just image" + end + end + end - describe "and photo not requesting a link" do - before(:each) do - @helper.stub!(:image_tag).with("imagefile", @html).and_return("just image") - end - it "return just an image" do - @helper.display_photo(@profile, "100x100", {}, {}, false).should == "just image" - end - end + + describe "without a photo" do + before(:each) do + @profile.stub!(:has_valid_photo?).and_return(false) + end + describe "and the user is a rep user" do + before(:each) do + @user.stub!(:rep?).and_return(true) + @helper.stub!(:image_tag).with("user190x119.jpg", {}).and_return("image_tag") + @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("default link 190x119") + end + it "return a default link" do + @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 190x119" + end + end + + describe "and the user is a regular user" do + before(:each) do + @user.stub!(:rep?).and_return(false) + end + it "return a default link" do + @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" + end + end + + describe "and we don't want to display the default" do + before(:each) do + @profile.stub!(:has_valid_photo?).and_return(false) + end + describe "and the user is a rep user" do + before(:each) do + @user.stub!(:rep?).and_return(true) + end + it "return a default link" do + @helper.display_photo(@profile, "100x100", {}, {:show_default => false}, true).should == "NO DEFAULT" + end + end + + describe "and the user is a regular user" do + before(:each) do + @user.stub!(:rep?).and_return(false) + end + it "return a default link" do + @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" + end + end + end + end + end end - describe "Without a user, but requesting a link" do before(:each) do - @profile = UserProfile.new - @profile.name = "Clayton" end it "return a default" do @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" end end - describe "When the user doesn't have a photo" do - before(:each) do - @profile = UserProfile.new - @profile.name = "Clayton" - @user = User.new - @profile.user = @user - @profile.stub!(:has_valid_photo?).and_return(false) - end - describe "With a rep user" do - before(:each) do - @user.stub!(:rep?).and_return(true) - end - it "return a default link" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 190x119" - end - - end - - describe "With a regular user" do - before(:each) do - @user.stub!(:rep?).and_return(false) - end - it "return a default link" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" - end - end - end - - describe "When the user doesn't have a photo and we don't want to display the default" do - before(:each) do - @profile = UserProfile.new - @profile.name = "Clayton" - @user = User.new - @profile.user = @user - @profile.stub!(:has_valid_photo?).and_return(false) - end - describe "With a rep user" do - before(:each) do - @user.stub!(:rep?).and_return(true) - end - it "return a default link" do - @helper.display_photo(@profile, "100x100", {}, {:show_default => false}, true).should == "NO DEFAULT" - end - - end - - describe "With a regular user" do - before(:each) do - @user.stub!(:rep?).and_return(false) - end - it "return a default link" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" - end - end - end - - end end \ No newline at end of file From 47e10b64339eed0728e03b1503eb10dc41a9dda1 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 22:19:07 -0700 Subject: [PATCH 05/20] Fifth test passing: "With a profile and user without a photo and the user is a regular user" * add stub methods to get test to pass --- refactor-this/helper_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 18dea0d..b537970 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -85,6 +85,8 @@ describe "and the user is a regular user" do before(:each) do @user.stub!(:rep?).and_return(false) + @helper.stub!(:image_tag).with("user100x100.jpg", {}).and_return("image_tag") + @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("default link 100x100") end it "return a default link" do @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" From a245512febb47a5bf3752c45f65205b4ed14c780 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 22:22:58 -0700 Subject: [PATCH 06/20] Two more tests passing for 'NO DEFAULT' case * modified code to return 'NO DEFAULT' instead of empty string * changed test to check for 'NO DEFAULT' for both types of users * removed useless line from code --- refactor-this/helper.rb | 4 +--- refactor-this/helper_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index 599bce5..57d7901 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -41,11 +41,9 @@ def display_photo(profile, size, html = {}, options = {}, link = true) return image_tag(url_for_file_column("user", "photo", size), html) end else - show_default_image ? default_photo(profile, size, {}, link) : '' + show_default_image ? default_photo(profile, size, {}, link) : 'NO DEFAULT' end end - - show_default_image ? default_photo(profile, size, {}, link) : '' end def default_photo(profile, size, html={}, link = true) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index b537970..c2e8042 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -95,14 +95,14 @@ describe "and we don't want to display the default" do before(:each) do - @profile.stub!(:has_valid_photo?).and_return(false) + @options = {:show_default => false} end describe "and the user is a rep user" do before(:each) do @user.stub!(:rep?).and_return(true) end it "return a default link" do - @helper.display_photo(@profile, "100x100", {}, {:show_default => false}, true).should == "NO DEFAULT" + @helper.display_photo(@profile, "100x100", {}, @options, true).should == "NO DEFAULT" end end @@ -111,7 +111,7 @@ @user.stub!(:rep?).and_return(false) end it "return a default link" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" + @helper.display_photo(@profile, "100x100", {}, @options, true).should == "NO DEFAULT" end end end From 0553afcd2640a18f9f80c9007444cf263831e8b5 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 22:43:33 -0700 Subject: [PATCH 07/20] Final test passing: "With a profile, no user, but requesting a link" * fix placement of final test to be inside proper describe block * initialize the @html attribute and stub 'profile_path' when the @profile is created * add else section to if block in code for case with profile but no user * stub image_tag, link_to methods --- refactor-this/helper.rb | 2 ++ refactor-this/helper_spec.rb | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index 57d7901..92b233e 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -43,6 +43,8 @@ def display_photo(profile, size, html = {}, options = {}, link = true) else show_default_image ? default_photo(profile, size, {}, link) : 'NO DEFAULT' end + else + link_to(image_tag("user#{size}.jpg", html), profile_path(profile)) end end diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index c2e8042..0c592dc 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -26,20 +26,21 @@ end end - describe "With a profile" do + describe "With a profile," do before do @profile = UserProfile.new @profile.name = "Clayton" + @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} + + @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end describe "and user" do before do @user = User.new @profile.user = @user - @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} @profile.stub!(:has_valid_photo?).and_return(true) @helper.stub!(:url_for_file_column).with("user", "photo", "100x100").and_return("imagefile") - @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end describe "and photo" do before do @@ -117,14 +118,15 @@ end end end - end - describe "Without a user, but requesting a link" do - before(:each) do - end - it "return a default" do - @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" + describe "no user, but requesting a link" do + before(:each) do + @helper.stub!(:image_tag).with("user100x100.jpg", @html).and_return("image_tag") + @helper.stub!(:link_to).with("image_tag", "profile_path").and_return("default link 100x100") + end + it "return a default link" do + @helper.display_photo(@profile, "100x100", {}, {}, true).should == "default link 100x100" + end end end - end end \ No newline at end of file From 6d9d4055ae6e513aadf63ea140236924711dc91c Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 23:02:05 -0700 Subject: [PATCH 08/20] Refactor 'display_photo' code to make it simpler & more readable * remove default_photo method * url_for_file_column, image_tag, profile_path, and link_to only appear once in the code * remove comment about 'this should not happen' - if that were the case there would be an exception/error, instead of a test --- refactor-this/helper.rb | 43 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index 92b233e..92e3155 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -28,39 +28,24 @@ def display_huge_photo(profile, html = {}, options = {}, link = true) end def display_photo(profile, size, html = {}, options = {}, link = true) - return image_tag("wrench.png") unless profile # this should not happen + return image_tag("wrench.png") unless profile show_default_image = !(options[:show_default] == false) - html.reverse_merge!(:class => 'thumbnail', :size => size, :title => "Link to #{profile.name}") - - if profile && profile.user - if profile.has_valid_photo? - if link - return link_to(image_tag(url_for_file_column("user", "photo", size), html), profile_path(profile) ) - else - return image_tag(url_for_file_column("user", "photo", size), html) - end - else - show_default_image ? default_photo(profile, size, {}, link) : 'NO DEFAULT' + html.reverse_merge!(:class => 'thumbnail', :size => size, :title => "Link to #{profile.name}") + + if profile.has_valid_photo? + imagefile = url_for_file_column("user", "photo", size) + else + if show_default_image && profile.user + size = '190x119' if profile.user.rep? + html = {} + elsif profile.user + return 'NO DEFAULT' end - else - link_to(image_tag("user#{size}.jpg", html), profile_path(profile)) + imagefile = "user#{size}.jpg" end - end - def default_photo(profile, size, html={}, link = true) - if link - if profile.user.rep? - link_to(image_tag("user190x119.jpg", html), profile_path(profile) ) - else - link_to(image_tag("user#{size}.jpg", html), profile_path(profile) ) - end - else - if profile.user.rep? - image_tag("user190x119.jpg", html) - else - image_tag("user#{size}.jpg", html) - end - end + img = image_tag(imagefile, html) + return link ? link_to(img, profile_path(profile)) : img end end \ No newline at end of file From 09579b9c869400dbeaeb0da571e20faad5b09f64 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 23:16:01 -0700 Subject: [PATCH 09/20] Add tests for display_X_photo methods, where X = small, medium, large, or huge * only testing the 'regular' user case so far --- refactor-this/helper_spec.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 0c592dc..9a917f4 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -117,6 +117,22 @@ end end end + + # test the display_X_photo methods + {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| + describe "display_#{name}_photo" do + before do + args = [@profile, size, {}, {}] + args << true if /large|huge/.match(name.to_s) + @helper.stub!(:display_photo).with(*args).and_return("photo") + @user.stub!(:rep?).and_return(false) + end + it "should return a #{name} photo" do + @helper.send("display_#{name}_photo", @profile, {}, {}).should == "photo" + end + end + end + end describe "no user, but requesting a link" do before(:each) do @@ -128,5 +144,8 @@ end end end + + + end end \ No newline at end of file From 28dfe12f51f3e79ce00e700d6af36de83c4a261d Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 23:50:29 -0700 Subject: [PATCH 10/20] Remove the individual display_X_photo methods and declare them using a loop * restructure the test code so the test strings are more consistent * combined 'image_size' method in to new method * removed static "foo" method that seemed useless --- refactor-this/helper.rb | 36 ++++++++++-------------------------- refactor-this/helper_spec.rb | 36 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 44 deletions(-) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index 92e3155..bc8f308 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -1,32 +1,16 @@ class Helper - def self.foo - "foo" - end - - def image_size(profile, non_rep_size) - if profile.user.rep? - '190x114' - else - non_rep_size + + # Define methods for display_X_photo, where X can be small, medium, large, or huge + {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| + send :define_method, "display_#{name}_photo" do |*args| + profile = args[0] + size '190x119' if profile.user && profile.user.rep? + args = [profile, size, args[1], args[2]] + args << true if /large|huge/.match(name.to_s) + display_photo(*args) end end - - def display_small_photo(profile, html = {}, options = {}) - display_photo(profile, image_size(profile, "32x32"), html, options) - end - - def display_medium_photo(profile, html = {}, options = {}) - display_photo(profile, image_size(profile, "48x48"), html, options) - end - - def display_large_photo(profile, html = {}, options = {}, link = true) - display_photo(profile, image_size(profile, "64x64"), html, options, link) - end - - def display_huge_photo(profile, html = {}, options = {}, link = true) - display_photo(profile, image_size(profile, "200x200"), html, options, link) - end - + def display_photo(profile, size, html = {}, options = {}, link = true) return image_tag("wrench.png") unless profile diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 9a917f4..88f74e8 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -117,22 +117,6 @@ end end end - - # test the display_X_photo methods - {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| - describe "display_#{name}_photo" do - before do - args = [@profile, size, {}, {}] - args << true if /large|huge/.match(name.to_s) - @helper.stub!(:display_photo).with(*args).and_return("photo") - @user.stub!(:rep?).and_return(false) - end - it "should return a #{name} photo" do - @helper.send("display_#{name}_photo", @profile, {}, {}).should == "photo" - end - end - end - end describe "no user, but requesting a link" do before(:each) do @@ -144,8 +128,24 @@ end end end + end - - + # test the display_X_photo methods + {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| + describe "display_#{name}_photo" do + before do + @profile = UserProfile.new + @user = User.new + @profile.user = @user + + args = [@profile, size, {}, {}] + args << true if /large|huge/.match(name.to_s) + @helper.stub!(:display_photo).with(*args).and_return("photo") + @user.stub!(:rep?).and_return(false) + end + it "should return a #{name} photo" do + @helper.send("display_#{name}_photo", @profile, {}, {}).should == "photo" + end + end end end \ No newline at end of file From 173cdb4b0a2da26c0159ce7e48bbe2b2dd3869ae Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 23:53:44 -0700 Subject: [PATCH 11/20] Removed 'profile.rb' - wasn't being used --- refactor-this/profile.rb | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 refactor-this/profile.rb diff --git a/refactor-this/profile.rb b/refactor-this/profile.rb deleted file mode 100644 index b7525df..0000000 --- a/refactor-this/profile.rb +++ /dev/null @@ -1,3 +0,0 @@ -class Profile - attr_accessor :photo -end \ No newline at end of file From 51bc597b1fdc1aa4b72cc539edd5fc4839a71359 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Sun, 16 Jan 2011 23:58:34 -0700 Subject: [PATCH 12/20] Added missing profile_path method and put in FIXME; missing test to define behavior --- refactor-this/helper.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index bc8f308..d642fc0 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -1,5 +1,10 @@ class Helper + def profile_path(profile) + # FIXME: figure what this should actually be + "/path/to/profiles/#{profile.name}" + end + # Define methods for display_X_photo, where X can be small, medium, large, or huge {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| send :define_method, "display_#{name}_photo" do |*args| From 816c3348a3b8401118cf4e4dd7d0cb0f6b17151f Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 00:25:56 -0700 Subject: [PATCH 13/20] Added 'rails-commits.rb' script for Github challenge Get the commits for Ruby on Rails from Github using the JSON API and print the results in HTML format using and ERB template. --- github-challenge/rails-commits.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 github-challenge/rails-commits.rb diff --git a/github-challenge/rails-commits.rb b/github-challenge/rails-commits.rb new file mode 100644 index 0000000..df76105 --- /dev/null +++ b/github-challenge/rails-commits.rb @@ -0,0 +1,24 @@ +require 'net/http' +require 'uri' +require 'rubygems' +require 'json' +require 'erb' + +# REST URI for Ruby on Rails Github repository most recent commits +url = "http://github.com/api/v2/json/commits/list/rails/rails/master"; + +# Get the commits from the URL using JSON and group them by author +data = JSON.parse(Net::HTTP.get(URI.parse(url)))['commits'].group_by { |commit| commit['author'] } + +# Print the HTML using the embedded ERB template +puts ERB.new(DATA.read).result(binding) + +__END__ +<% data.each do |author, commits| %> +

<%= author['name']%> (<%= author['email'] %>)

+
    + <% commits.each do |commit| %> +
  • <%= commit['id'] %>
    <%= commit['message'] %>
    • + <% end %> +
+<% end %> \ No newline at end of file From 4f0b5d564e256398b9c50296bc12863a038b57ec Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 00:32:00 -0700 Subject: [PATCH 14/20] Added resume in PDF format to 'resume' directory --- resume/Matt_Kopala_resume.pdf | Bin 0 -> 20805 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 resume/Matt_Kopala_resume.pdf diff --git a/resume/Matt_Kopala_resume.pdf b/resume/Matt_Kopala_resume.pdf new file mode 100755 index 0000000000000000000000000000000000000000..0b0133000d2cb22a28bdf690b8d8ee84e624092f GIT binary patch literal 20805 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 Date: Mon, 17 Jan 2011 00:42:26 -0700 Subject: [PATCH 15/20] Added a PHP version of the Github script as well --- github-challenge/rails-commits.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 github-challenge/rails-commits.php diff --git a/github-challenge/rails-commits.php b/github-challenge/rails-commits.php new file mode 100644 index 0000000..fb90d6e --- /dev/null +++ b/github-challenge/rails-commits.php @@ -0,0 +1,18 @@ +commits as $commit) { + $data[$commit->author->email][] = $commit; + } + ksort($data); +?> + $commits): ?> +

author->name . " (" . $email . ")"?>

+
    + +
  • id ?>
    message ?>
    • + +
+ + \ No newline at end of file From 43614468385906c761824c3193404f9e4ae5fc2c Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 00:42:46 -0700 Subject: [PATCH 16/20] Added a README file for the github challenge directory --- github-challenge/README | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 github-challenge/README diff --git a/github-challenge/README b/github-challenge/README new file mode 100644 index 0000000..5ff171e --- /dev/null +++ b/github-challenge/README @@ -0,0 +1,15 @@ +This directory contains script for fetching the most recent Ruby on Rails commits from Github. + +Ruby: + + Usage: ruby rails-commits.rb + Prerequisites: + - gem install json + +PHP: + + Usage: php rails-commits.php + Prerequisites: + - json extension installed & enabled + - short tags enabled + From 4750faa02c3f660efaeaad759d8551bd79830d4c Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 00:48:44 -0700 Subject: [PATCH 17/20] Minor tweaks to the describe strings in 'helper_spec.rb' --- refactor-this/helper_spec.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 88f74e8..0be7473 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -34,7 +34,7 @@ @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end - describe "and user" do + describe "user" do before do @user = User.new @profile.user = @user @@ -42,7 +42,7 @@ @profile.stub!(:has_valid_photo?).and_return(true) @helper.stub!(:url_for_file_column).with("user", "photo", "100x100").and_return("imagefile") end - describe "and photo" do + describe "and photo," do before do @photo = Photo.new @user.photo = @photo @@ -68,7 +68,7 @@ end - describe "without a photo" do + describe "without a photo," do before(:each) do @profile.stub!(:has_valid_photo?).and_return(false) end @@ -94,7 +94,7 @@ end end - describe "and we don't want to display the default" do + describe "we don't want to display the default," do before(:each) do @options = {:show_default => false} end @@ -102,7 +102,7 @@ before(:each) do @user.stub!(:rep?).and_return(true) end - it "return a default link" do + it "return 'NO DEFAULT'" do @helper.display_photo(@profile, "100x100", {}, @options, true).should == "NO DEFAULT" end end @@ -111,7 +111,7 @@ before(:each) do @user.stub!(:rep?).and_return(false) end - it "return a default link" do + it "return 'NO DEFAULT'" do @helper.display_photo(@profile, "100x100", {}, @options, true).should == "NO DEFAULT" end end From cec360ee36e89ca16adf5f4a64048527b658642d Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 00:56:32 -0700 Subject: [PATCH 18/20] Add four extra tests for the display_X_photo methods, for the 'rep' user case * fixed bug with missing = in code --- refactor-this/helper.rb | 2 +- refactor-this/helper_spec.rb | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/refactor-this/helper.rb b/refactor-this/helper.rb index d642fc0..7b2edd0 100644 --- a/refactor-this/helper.rb +++ b/refactor-this/helper.rb @@ -9,7 +9,7 @@ def profile_path(profile) {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| send :define_method, "display_#{name}_photo" do |*args| profile = args[0] - size '190x119' if profile.user && profile.user.rep? + size = '190x119' if profile.user && profile.user.rep? args = [profile, size, args[1], args[2]] args << true if /large|huge/.match(name.to_s) display_photo(*args) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 0be7473..93e3dcd 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -137,15 +137,29 @@ @profile = UserProfile.new @user = User.new @profile.user = @user - - args = [@profile, size, {}, {}] - args << true if /large|huge/.match(name.to_s) - @helper.stub!(:display_photo).with(*args).and_return("photo") - @user.stub!(:rep?).and_return(false) end - it "should return a #{name} photo" do - @helper.send("display_#{name}_photo", @profile, {}, {}).should == "photo" - end + describe "With a regular user" do + before do + args = [@profile, size, {}, {}] + args << true if /large|huge/.match(name.to_s) + @helper.stub!(:display_photo).with(*args).and_return("photo") + @user.stub!(:rep?).and_return(false) + end + it "return a #{name} photo" do + @helper.send("display_#{name}_photo", @profile, {}, {}).should == "photo" + end + end + describe "With a rep user" do + before do + args = [@profile, "190x119", {}, {}] + args << true if /large|huge/.match(name.to_s) + @helper.stub!(:display_photo).with(*args).and_return("photo") + @user.stub!(:rep?).and_return(true) + end + it "return a fixed-size photo" do + @helper.send("display_#{name}_photo", @profile, {}, {}).should == "photo" + end + end end end end \ No newline at end of file From c43ca3520171ee004176e6f09f09abaedc3e1567 Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 01:01:33 -0700 Subject: [PATCH 19/20] Removed unnecessary 'require' statements from 'helper_spec.rb' * Not needed for running spec from the command line --- refactor-this/helper_spec.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 93e3dcd..5018bd6 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -1,9 +1,5 @@ -require 'rubygems' require 'factory_girl' require 'factories' -require 'spec' -require 'spec/autorun' -require 'redgreen' require 'user_profile' require 'helper' require 'user' From db8f03e7b64200c88c53417f84b26493d1e29ebc Mon Sep 17 00:00:00 2001 From: Matt Kopala Date: Mon, 17 Jan 2011 09:57:29 -0700 Subject: [PATCH 20/20] Replaced object creation in tests with fixtures using Factory_girl * Not that important or useful right now, but README seemed to indicate it was desired --- refactor-this/factories.rb | 4 ++++ refactor-this/helper_spec.rb | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/refactor-this/factories.rb b/refactor-this/factories.rb index 9685df6..9ec3a0c 100644 --- a/refactor-this/factories.rb +++ b/refactor-this/factories.rb @@ -7,6 +7,10 @@ u.email Factory.next(:email) end +Factory.define(:user_profile) do |p| + p.name "Clayton" +end + Factory.define(:photo) do |p| end \ No newline at end of file diff --git a/refactor-this/helper_spec.rb b/refactor-this/helper_spec.rb index 5018bd6..f9efccd 100644 --- a/refactor-this/helper_spec.rb +++ b/refactor-this/helper_spec.rb @@ -24,15 +24,14 @@ describe "With a profile," do before do - @profile = UserProfile.new - @profile.name = "Clayton" + @profile = Factory.build(:user_profile) @html = {:class => 'thumbnail', :size => "100x100", :title => "Link to #{@profile.name}"} @helper.stub!(:profile_path).with(@profile).and_return("profile_path") end describe "user" do before do - @user = User.new + @user = Factory.build(:user) @profile.user = @user @profile.stub!(:has_valid_photo?).and_return(true) @@ -40,7 +39,7 @@ end describe "and photo," do before do - @photo = Photo.new + @photo = Factory.build(:photo) @user.photo = @photo end describe "requesting a link" do @@ -130,8 +129,8 @@ {:small => '32x32', :medium => '48x48', :large => '64x64', :huge => '200x200'}.each do |name, size| describe "display_#{name}_photo" do before do - @profile = UserProfile.new - @user = User.new + @profile = Factory.build(:user_profile) + @user = Factory.build(:user) @profile.user = @user end describe "With a regular user" do