Permalink
Browse files

Units passing!

* Upgrading to latest clearance with filter_params fixes
* Upgrading to new delayed_job that doesn't whine
* Upgrading to Sinatra 1.0, it's about time
* Use as_json as much as possible
* Converted mailer to new action mailer api
* Fixed bad references to Pusher.server_path
* Remove having from Rubygem.search
* Changed a bunch of scope hiding methods to use arel
* Use #to_a to avoid json circular dependency errors in api payloads
* before_validation_on_update => before_validation ;on => :update
* Created an Version.indexed scope
* Fixed app layout from a bad rebasing off master
* Lots of shoulda macro deprecation fixes
* Reloading models in a few tests to make sure changes persist
* Checking ids of models for assert_equal instead of objects in tests
  • Loading branch information...
1 parent ac8ad14 commit 7731b16f639d28cd71548f995c4a4367adf604c6 @qrush qrush committed Jul 18, 2010
View
@@ -4,8 +4,7 @@ gem "rails", "3.0.0.beta4"
gem "rack", "1.1.0"
gem "aws-s3", "0.6.2", :require => "aws/s3"
-gem "clearance", "0.9.0.rc2"
-gem "delayed_job", "2.0.3"
+gem "clearance", "0.9.0.rc4"
gem "gchartrb", "0.8", :require => "google_chart"
gem "gravtastic", "2.1.3"
gem "high_voltage", "0.9.0"
@@ -14,11 +13,13 @@ gem "json", "1.2.0"
gem "rack-maintenance", "0.3.0", :require => "rack/maintenance"
gem "redis", "2.0.1"
gem "rest-client", "1.0.3", :require => "rest_client"
-gem "sinatra", "0.9.4"
+gem "sinatra", "1.0"
gem "system_timer", "1.0"
gem "will_paginate", "2.3.11"
gem "xml-simple", "1.0.12"
+gem 'delayed_job', :git => 'git://github.com/pvdb/delayed_job.git', :branch => 'rails3'
+
gem "pg", "0.8.0"
# gem "mysql", "2.8.1"
View
@@ -8,110 +8,108 @@ dependencies:
group:
- :test
version: = 1.2.6
- ddollar-pacecar:
- group:
- - :default
- version: = 1.1.6
- require:
- - pacecar
- system_timer:
- group:
- - :default
- version: = 1.0
rails:
group:
- :default
- version: = 2.3.5
+ version: = 3.0.0.beta4
gravtastic:
group:
- :default
version: = 2.1.3
+ system_timer:
+ group:
+ - :default
+ version: = 1.0
pg:
group:
- :default
version: = 0.8.0
treetop:
group:
- :test
- version: = 1.4.3
+ version: = 1.4.5
+ high_voltage:
+ group:
+ - :default
+ version: = 0.9.0
shoulda:
group:
- :test
- version: = 2.10.2
- rack:
+ version: = 2.11.1
+ delayed_job:
group:
- :default
- version: = 1.0.1
- rest-client:
+ version: ">= 0"
+ rack:
group:
- :default
- version: = 1.0.3
- require:
- - rest_client
- json:
+ version: = 1.1.0
+ cucumber-rails:
+ group:
+ - :test
+ version: = 0.3.2
+ will_paginate:
group:
- :default
- version: = 1.2.0
+ version: = 2.3.11
sinatra:
group:
- :default
- version: = 0.9.4
- will_paginate:
+ version: = 1.0
+ json:
group:
- :default
- version: = 2.3.11
- factory_girl:
+ version: = 1.2.0
+ rest-client:
group:
- - :test
- version: = 1.2.3
+ - :default
+ version: = 1.0.3
+ require:
+ - rest_client
webrat:
group:
- :test
version: = 0.5.3
- rack-maintenance:
- group:
- - :default
- version: = 0.3.0
- require:
- - rack/maintenance
gchartrb:
group:
- :default
version: = 0.8
require:
- google_chart
+ rack-maintenance:
+ group:
+ - :default
+ version: = 0.3.0
+ require:
+ - rack/maintenance
redgreen:
group:
- :test
version: = 1.2.2
rack-test:
group:
- :test
- version: = 0.5.0
+ version: = 0.5.4
require:
- rack/test
- cucumber:
+ clearance:
group:
- - :test
- version: = 0.3.101
+ - :default
+ version: = 0.9.0.rc4
hoptoad_notifier:
group:
- :default
version: = 2.2.0
- clearance:
+ redis:
group:
- :default
- version: = 0.8.2
+ version: = 2.0.1
aws-s3:
group:
- :default
version: = 0.6.2
require:
- aws/s3
- redis:
- group:
- - :default
- version: = 2.0.1
webmock:
group:
- :test
@@ -120,57 +118,102 @@ dependencies:
group:
- :default
version: = 1.0.12
+ factory_girl_rails:
+ group:
+ - :test
+ version: = 1.0
nokogiri:
group:
- :test
version: = 1.4.1
specs:
- rake:
version: 0.8.7
+- abstract:
+ version: 1.0.0
- activesupport:
- version: 2.3.5
+ version: 3.0.0.beta4
+- builder:
+ version: 2.1.2
+- i18n:
+ version: 0.4.1
+- activemodel:
+ version: 3.0.0.beta4
+- erubis:
+ version: 2.6.6
- rack:
- version: 1.0.1
+ version: 1.1.0
+- rack-mount:
+ version: 0.6.9
+- rack-test:
+ version: 0.5.4
+- tzinfo:
+ version: 0.3.22
- actionpack:
- version: 2.3.5
+ version: 3.0.0.beta4
+- mime-types:
+ version: "1.16"
+- polyglot:
+ version: 0.3.1
+- treetop:
+ version: 1.4.5
+- mail:
+ version: 2.2.5
- actionmailer:
- version: 2.3.5
+ version: 3.0.0.beta4
+- arel:
+ version: 0.4.0
- activerecord:
- version: 2.3.5
+ version: 3.0.0.beta4
- activeresource:
- version: 2.3.5
+ version: 3.0.0.beta4
- addressable:
version: 2.1.2
-- builder:
- version: 2.1.2
-- mime-types:
- version: "1.16"
- xml-simple:
version: 1.0.12
- aws-s3:
version: 0.6.2
+- bundler:
+ version: 0.9.26
+- thor:
+ version: 0.13.8
+- railties:
+ version: 3.0.0.beta4
+- rails:
+ version: 3.0.0.beta4
- clearance:
- version: 0.8.2
+ version: 0.9.0.rc4
- diff-lcs:
version: 1.1.2
-- polyglot:
- version: 0.3.1
+- trollop:
+ version: 1.16.2
+- gherkin:
+ version: 2.1.5
+- json_pure:
+ version: 1.4.3
- term-ansicolor:
version: 1.0.5
-- treetop:
- version: 1.4.3
- cucumber:
- version: 0.3.101
-- ddollar-pacecar:
- version: 1.1.6
+ version: 0.8.5
+- cucumber-rails:
+ version: 0.3.2
+- daemons:
+ version: 1.1.0
+- delayed_job:
+ version: 2.1.0.pre
+ source: 0
- factory_girl:
- version: 1.2.3
+ version: 1.3.1
+- factory_girl_rails:
+ version: "1.0"
- fakeweb:
version: 1.2.6
- gchartrb:
version: "0.8"
- gravtastic:
version: 2.1.3
+- high_voltage:
+ version: 0.9.0
- hoptoad_notifier:
version: 2.2.0
- json:
@@ -181,10 +224,6 @@ specs:
version: 0.8.0
- rack-maintenance:
version: 0.3.0
-- rack-test:
- version: 0.5.0
-- rails:
- version: 2.3.5
- redgreen:
version: 1.2.2
- redis:
@@ -194,9 +233,9 @@ specs:
- rr:
version: 0.10.11
- shoulda:
- version: 2.10.2
+ version: 2.11.1
- sinatra:
- version: 0.9.4
+ version: "1.0"
- system_timer:
version: "1.0"
- webmock:
@@ -205,7 +244,12 @@ specs:
version: 0.5.3
- will_paginate:
version: 2.3.11
-hash: 7375232cf842731b51a89012a68f12e57787be64
+hash: cb9df21844fa9dc006e710a942a2bb89146bced5
sources:
+- Git:
+ uri: git://github.com/pvdb/delayed_job.git
+ branch: rails3
+ git: git://github.com/pvdb/delayed_job.git
+ ref: 9d6367ba87040af6562e870618786b944a2f20d8
- Rubygems:
uri: http://gemcutter.org
View
@@ -8,7 +8,7 @@ def self.local
def serve
if Hostess.local
- send_file(Gemcutter.server_path(request.path_info))
+ send_file(Pusher.server_path(request.path_info))
else
yield
end
View
@@ -24,8 +24,8 @@ def payload
}
end
- def to_json(options = {})
- payload.to_json(options)
+ def as_json(options = {})
+ payload
end
def to_xml(options = {})
View
@@ -2,11 +2,11 @@ class Mailer < ActionMailer::Base
default_url_options[:host] = HOST
def email_reset(user)
- from ClearanceMailer::DO_NOT_REPLY
- recipients user.email
- subject I18n.t(:confirmation,
- :scope => [:clearance, :models, :clearance_mailer],
- :default => "Email address confirmation")
- body :user => user
+ @user = user
+ mail :from => Clearance.configuration.mailer_sender,
+ :to => user.email,
+ :subject => I18n.t(:confirmation,
+ :scope => [:clearance, :models, :clearance_mailer],
+ :default => "Email address confirmation")
end
end
View
@@ -82,7 +82,7 @@ def find
end
def self.server_path(*more)
- File.expand_path(File.join(File.dirname(__FILE__), '..', 'server', *more))
+ File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'server', *more))
end
# Overridden so we don't get megabytes of the raw data printing out
@@ -126,9 +126,9 @@ def enqueue_web_hook_jobs
end
def self.indexer
- @indexer ||=
+ @indexer ||=
begin
- indexer = Gem::Indexer.new(Gemcutter.server_path, :build_legacy => false)
+ indexer = Gem::Indexer.new(server_path, :build_legacy => false)
def indexer.say(message) end
indexer
end
Oops, something went wrong.

0 comments on commit 7731b16

Please sign in to comment.