Skip to content

Commit

Permalink
moved to rails 3
Browse files Browse the repository at this point in the history
  • Loading branch information
achamian committed Aug 30, 2010
1 parent 756d600 commit 06cc594
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 15 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
== Coming soon
== 0.2.0
* Rails 3.0.0 compatibility
* jRuby support with jdom

== 0.2.0.beta1
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
source "http://rubygems.org"

gem 'activeresource', '~> 3.0.0.rc2'
gem 'activesupport', '~> 3.0.0.rc2'
gem 'activeresource', '~> 3.0.0'
gem 'activesupport', '~> 3.0.0'
gem 'will_paginate', '~> 3.0.pre2'

group :test do
gem 'activerecord', '~> 3.0.0.rc2'
gem 'activerecord', '~> 3.0.0'
gem 'rspec', '~> 2.0.0.beta.20'
platforms :jruby do
gem 'jdbc-sqlite3'
gem 'activerecord-jdbcsqlite3-adapter'
gem 'jdbc-sqlite3', '~> 3.6.3.054'
gem 'activerecord-jdbcsqlite3-adapter', '~> 0.9.7'
end
platforms :ruby do
gem 'sqlite3-ruby', '~> 1.3.1'
Expand Down
8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
puts "Building on Ruby #{RUBY_VERSION}, #{RUBY_RELEASE_DATE}, #{RUBY_PLATFORM}"

require 'rubygems'
gem 'activesupport', '~> 3.0.0.rc2'
gem 'activesupport', '~> 3.0.0'
gem 'rspec', '~> 2.0.0.beta.20'

require 'rake'
Expand Down Expand Up @@ -34,11 +34,11 @@ begin
gemspec.files.exclude *['.gitignore']

gemspec.test_files.exclude *['.gitignore']
gemspec.add_dependency('activesupport', '~> 3.0.0.rc2')
gemspec.add_dependency('activeresource', '~> 3.0.0.rc2')
gemspec.add_dependency('activesupport', '~> 3.0.0')
gemspec.add_dependency('activeresource', '~> 3.0.0')
gemspec.add_dependency('will_paginate', '~> 3.0.pre2')
gemspec.add_development_dependency('rspec', '~> 2.0.0.beta.20')
gemspec.add_development_dependency('activerecord', '~> 3.0.0.rc2')
gemspec.add_development_dependency('activerecord', '~> 3.0.0')
gemspec.add_development_dependency('sqlite3-ruby', '~> 1.3.1')
gemspec.add_development_dependency('nokogiri', '~> 1.4.3.1')
gemspec.add_development_dependency('libxml-ruby', '~> 1.1.4')
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.0.beta1
0.2.0
4 changes: 0 additions & 4 deletions spec/pox_paginate/will_paginate/collection_extensions_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
Ooga.create!(:name => 'Woot')
end

it "should ooga" do
Ooga.count.should == 5
end

it "should serialize to xml with root node attributes containing pagination metadata" do
page = Ooga.paginate :page => 2, :per_page => 2
xml = page.to_xml
Expand Down

0 comments on commit 06cc594

Please sign in to comment.