Permalink
Browse files

Rails 3 RC2

  • Loading branch information...
1 parent 1c808c5 commit 6c2defd832586b4d55259afa6719bfbdb522b6ee @jgdavey committed Aug 25, 2010
Showing with 31 additions and 32 deletions.
  1. +1 −1 .rvmrc
  2. +3 −3 Gemfile
  3. +25 −25 Gemfile.lock
  4. +2 −3 lib/tabletastic/table_builder.rb
View
2 .rvmrc
@@ -1 +1 @@
-rvm use --create 1.8.7@tabletastic
+rvm use --create 1.9.2@tabletastic
View
@@ -7,9 +7,9 @@ group :test do
gem 'diff-lcs'
gem 'rspec_tag_matchers'
- gem 'activesupport', '3.0.0.rc'
- gem 'actionpack', '3.0.0.rc'
- gem 'activerecord', '3.0.0.rc'
+ gem 'activesupport', '3.0.0.rc2'
+ gem 'actionpack', '3.0.0.rc2'
+ gem 'activerecord', '3.0.0.rc2'
gem 'autotest'
end
View
@@ -2,27 +2,27 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionpack (3.0.0.rc)
- activemodel (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
+ actionpack (3.0.0.rc2)
+ activemodel (= 3.0.0.rc2)
+ activesupport (= 3.0.0.rc2)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.4.1)
rack (~> 1.2.1)
- rack-mount (~> 0.6.9)
+ rack-mount (~> 0.6.12)
rack-test (~> 0.5.4)
- tzinfo (~> 0.3.22)
- activemodel (3.0.0.rc)
- activesupport (= 3.0.0.rc)
+ tzinfo (~> 0.3.23)
+ activemodel (3.0.0.rc2)
+ activesupport (= 3.0.0.rc2)
builder (~> 2.1.2)
i18n (~> 0.4.1)
- activerecord (3.0.0.rc)
- activemodel (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
- arel (~> 0.4.0)
- tzinfo (~> 0.3.22)
- activesupport (3.0.0.rc)
- arel (0.4.0)
+ activerecord (3.0.0.rc2)
+ activemodel (= 3.0.0.rc2)
+ activesupport (= 3.0.0.rc2)
+ arel (~> 1.0.0.rc1)
+ tzinfo (~> 0.3.23)
+ activesupport (3.0.0.rc2)
+ arel (1.0.0.rc1)
activesupport (>= 3.0.0.beta)
autotest (4.3.2)
builder (2.1.2)
@@ -32,18 +32,18 @@ GEM
i18n (0.4.1)
nokogiri (1.4.3.1)
rack (1.2.1)
- rack-mount (0.6.11)
+ rack-mount (0.6.12)
rack (>= 1.0.0)
rack-test (0.5.4)
rack (>= 1.0)
- rspec (2.0.0.beta.19)
- rspec-core (= 2.0.0.beta.19)
- rspec-expectations (= 2.0.0.beta.19)
- rspec-mocks (= 2.0.0.beta.19)
- rspec-core (2.0.0.beta.19)
- rspec-expectations (2.0.0.beta.19)
+ rspec (2.0.0.beta.20)
+ rspec-core (= 2.0.0.beta.20)
+ rspec-expectations (= 2.0.0.beta.20)
+ rspec-mocks (= 2.0.0.beta.20)
+ rspec-core (2.0.0.beta.20)
+ rspec-expectations (2.0.0.beta.20)
diff-lcs (>= 1.1.2)
- rspec-mocks (2.0.0.beta.19)
+ rspec-mocks (2.0.0.beta.20)
rspec-rails (1.3.2)
rack (>= 1.0.0)
rspec (>= 1.3.0)
@@ -57,9 +57,9 @@ PLATFORMS
ruby
DEPENDENCIES
- actionpack (= 3.0.0.rc)
- activerecord (= 3.0.0.rc)
- activesupport (= 3.0.0.rc)
+ actionpack (= 3.0.0.rc2)
+ activerecord (= 3.0.0.rc2)
+ activesupport (= 3.0.0.rc2)
autotest
diff-lcs
nokogiri (~> 1.4.3)
@@ -22,7 +22,6 @@ def initialize(collection, klass, template)
# * With a block, which assumes you will use +cell+ method to build up
# the table
#
- #
def data(*args, &block) # :yields: tablebody
options = args.extract_options!
if block_given?
@@ -60,8 +59,8 @@ def cell(*args, &proc)
options.merge!(:klass => klass)
args << options
@table_fields << TableField.new(*args, &proc)
- # Since this will likely be called with <%= %> (aka 'concat'), explicitly return an empty string
- # This suppresses unwanted output
+ # Since this will likely be called with <%= %> (aka 'concat'), explicitly return an
+ # empty string; this suppresses unwanted output
return ""
end

0 comments on commit 6c2defd

Please sign in to comment.