@@ -121,7 +121,7 @@ module Integrity get "/:project/commits/:commit" do login_required unless current_project.public? - show :build, :title => ["projects", current_project.permalink, current_commit.short_commit_identifier] + show :build, :title => ["projects", current_project.permalink, current_commit.short_identifier] end get "/:project/builds/:commit" do lib/integrity/app.rb @@ -47,45 +47,5 @@ module Integrity def complete!(time=Time.now) self.completed_at = time end - - # - # Deprecated methods - # - def short_commit_identifier - warn "Build#short_commit_identifier is deprecated, use Commit#short_identifier (#{caller[0]})" - commit.short_identifier - end - - def commit_identifier - warn "Build#commit_identifier is deprecated, use Commit#identifier (#{caller[0]})" - commit.identifier - end - - def commit_author - warn "Build#commit_author is deprecated, use Commit#author (#{caller[0]})" - commit.author - end - - def commit_message - warn "Build#commit_message is deprecated, use Commit#message (#{caller[0]})" - commit.message - end - - def commited_at - warn "Build#commited_at is deprecated, use Commit#committed_at (#{caller[0]})" - commit.committed_at - end - - def project_id - warn "Build#project_id is deprecated, use Commit#project_id (#{caller[0]})" - commit.project_id - end - - def commit_metadata - warn "Build#commit_metadata is deprecated, use the different methods in Commit instead (#{caller[0]})" - { :message => commit.message, - :author => commit.author, - :date => commit.committed_at } - end end end lib/integrity/build.rb @@ -52,12 +52,5 @@ module Integrity def output build && build.output end - - # Deprecation layer - alias :short_commit_identifier :short_identifier - alias :commit_identifier :identifier - alias :commit_author :author - alias :commit_message :message - alias :commited_at :committed_at end end lib/integrity/commit.rb @@ -1,12 +1,10 @@ require "integrity/project/notifiers" require "integrity/project/push" -require "integrity/project/deprecated" module Integrity class Project include DataMapper::Resource - include Helpers::Deprecated include Helpers::Notifiers include Helpers::Push lib/integrity/project.rb @@ -36,20 +36,6 @@ class BuildTest < Test::Unit::TestCase @build.successful = false @build.status.should be(:failed) end - - test "deprecated properties" do - pending do - silence_warnings { - @build.short_commit_identifier.should == @build.commit.short_identifier - @build.commit_identifier.should == @build.commit.identifier - @build.commit_author.should == @build.commit.author - @build.commit_message.should == @build.commit.message - @build.commited_at.should == @build.commit.committed_at - @build.project_id.should == @build.commit.project_id - @build.should respond_to(:commit_metadata) - } - end - end end describe "Pending builds" do test/unit/build_test.rb @@ -110,13 +110,6 @@ class ProjectTest < Test::Unit::TestCase project = Project.gen(:commits => commits) project.last_commit.should == commits.sort_by {|c| c.committed_at }.last end - - test "deprecated properties" do - silence_warnings { - @project.last_build.should == @project.last_commit - @project.previous_builds.should == @project.previous_commits - } - end end describe "Validation" do test/unit/project_test.rb @@ -12,7 +12,7 @@ %span.who< &== by: #{commit.author.name} | - %span.when{ :title => commit.commited_at }< + %span.when{ :title => commit.committed_at }< &= pretty_date commit.committed_at | %span.what< views/_commit_info.haml lib/integrity/project/deprecated.rb 591a006551b96396fe3c0f08930fef8d72e598cf Simon Rozet simon@rozet.name http://github.com/foca/integrity/commit/5390f5adacd82c92b948bf42e2c57a09e0b2b81a 5390f5adacd82c92b948bf42e2c57a09e0b2b81a 2009-04-05T08:08:29-07:00 2009-04-05T07:07:17-07:00 Get rid of deprecation code, except on Notifier::Base 851e94f9189d219538a4390b1d3245d6b7db29e4 Simon Rozet simon@rozet.name