Permalink
Browse files

Updates for Rails 3.2

  • Loading branch information...
1 parent fb1c923 commit 0aaef6514227ac9b2217b2be9fb56bc852f3ad6c @dim dim committed Jan 23, 2012
View
@@ -1,7 +1,6 @@
rvm:
- 1.9.2
- 1.9.3
- - ree
gemfile:
- Gemfile
- - Gemfile.activerecord-3.0.x
+ - Gemfile.activerecord-3.1.x
@@ -1,84 +0,0 @@
-PATH
- remote: .
- specs:
- pivotable (0.1.0)
- abstract
- activerecord (>= 3.0.0, < 3.2.0)
-
-GEM
- remote: http://rubygems.org/
- specs:
- abstract (1.0.0)
- actionpack (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.10)
- activesupport (= 3.0.10)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.10)
- activemodel (= 3.0.10)
- activesupport (= 3.0.10)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activesupport (3.0.10)
- arel (2.0.10)
- builder (2.1.2)
- diff-lcs (1.1.3)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- i18n (0.5.0)
- json (1.6.1)
- rack (1.2.4)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
- rack (>= 1.0)
- railties (3.0.10)
- actionpack (= 3.0.10)
- activesupport (= 3.0.10)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.4)
- rake (0.9.2)
- rdoc (3.11)
- json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
- shoulda-matchers (1.0.0.beta3)
- sqlite3 (1.3.4)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
- thor (0.14.6)
- tzinfo (0.3.30)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- actionpack (>= 3.0.0, < 3.2.0)
- activerecord (~> 3.0.0)
- pivotable!
- rake
- rspec
- rspec-rails
- shoulda-matchers
- sqlite3-ruby
@@ -1,4 +1,4 @@
source "http://rubygems.org"
gemspec
-gem "activerecord", "~> 3.0.0"
+gem "activerecord", "~> 3.1.0"
@@ -0,0 +1,97 @@
+PATH
+ remote: .
+ specs:
+ pivotable (0.2.0)
+ abstract
+ activerecord (>= 3.1.0)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ abstract (1.0.0)
+ actionpack (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.3)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activesupport (3.1.3)
+ multi_json (~> 1.0)
+ arel (2.2.1)
+ builder (3.0.0)
+ diff-lcs (1.1.3)
+ erubis (2.7.0)
+ hike (1.2.1)
+ i18n (0.6.0)
+ json (1.6.5)
+ multi_json (1.0.4)
+ rack (1.3.6)
+ rack-cache (1.1)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
+ rack (>= 1.0.0)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ railties (3.1.3)
+ actionpack (= 3.1.3)
+ activesupport (= 3.1.3)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
+ shoulda-matchers (1.0.0)
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.5)
+ sqlite3-ruby (1.3.3)
+ sqlite3 (>= 1.3.3)
+ thor (0.14.6)
+ tilt (1.3.3)
+ tzinfo (0.3.31)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ actionpack (>= 3.1.0)
+ activerecord (~> 3.1.0)
+ pivotable!
+ rake
+ rspec
+ rspec-rails
+ shoulda-matchers
+ sqlite3-ruby
View
@@ -1,93 +1,91 @@
PATH
remote: .
specs:
- pivotable (0.1.0)
+ pivotable (0.2.0)
abstract
- activerecord (>= 3.0.0, < 3.2.0)
+ activerecord (>= 3.1.0)
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionpack (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
+ actionpack (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.2)
+ journey (~> 1.0.0)
+ rack (~> 1.4.0)
rack-cache (~> 1.1)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.2)
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.0)
+ activesupport (= 3.2.0)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
- arel (~> 2.2.1)
+ activerecord (3.2.0)
+ activemodel (= 3.2.0)
+ activesupport (= 3.2.0)
+ arel (~> 3.0.0)
tzinfo (~> 0.3.29)
- activesupport (3.1.1)
+ activesupport (3.2.0)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- arel (2.2.1)
+ arel (3.0.0)
builder (3.0.0)
diff-lcs (1.1.3)
erubis (2.7.0)
hike (1.2.1)
i18n (0.6.0)
- json (1.6.1)
- multi_json (1.0.3)
- rack (1.3.5)
+ journey (1.0.0)
+ json (1.6.5)
+ multi_json (1.0.4)
+ rack (1.4.1)
rack-cache (1.1)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- railties (3.1.1)
- actionpack (= 3.1.1)
- activesupport (= 3.1.1)
+ railties (3.2.0)
+ actionpack (= 3.2.0)
+ activesupport (= 3.2.0)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2)
- rdoc (3.11)
+ rake (0.9.2.2)
+ rdoc (3.12)
json (~> 1.4)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- rspec-rails (2.7.0)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- railties (~> 3.0)
- rspec (~> 2.7.0)
- shoulda-matchers (1.0.0.beta3)
- sprockets (2.0.3)
+ rspec-mocks (2.8.0)
+ rspec-rails (2.8.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec (~> 2.8.0)
+ shoulda-matchers (1.0.0)
+ sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
thor (0.14.6)
tilt (1.3.3)
- tzinfo (0.3.30)
+ tzinfo (0.3.31)
PLATFORMS
ruby
DEPENDENCIES
- actionpack (>= 3.0.0, < 3.2.0)
+ actionpack (>= 3.1.0)
pivotable!
rake
rspec
View
@@ -1,13 +1,13 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
- s.required_ruby_version = '>= 1.8.7'
+ s.required_ruby_version = '>= 1.9.2'
s.required_rubygems_version = ">= 1.3.6"
s.name = "pivotable"
s.summary = "Build pivotable data tables with ActiveRecord"
s.description = "Great for building APIs & reports"
- s.version = '0.1.0'
+ s.version = '0.2.0'
s.authors = ["Dimitrij Denissenko"]
s.email = "dimitrij@blacksquaremedia.com"
@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
s.files = Dir['LICENSE', 'README.markdown', 'lib/**/*']
s.add_dependency "abstract"
- s.add_dependency "activerecord", ">= 3.0.0", "< 3.2.0"
- s.add_development_dependency "actionpack", ">= 3.0.0", "< 3.2.0"
+ s.add_dependency "activerecord", ">= 3.1.0"
+ s.add_development_dependency "actionpack", ">= 3.1.0"
s.add_development_dependency "rake"
s.add_development_dependency "rspec"
s.add_development_dependency "rspec-rails"
View
@@ -65,11 +65,11 @@ class Page < ActiveRecord::Base
end
class Period < ActiveRecord::Base
- set_primary_key :period
+ self.primary_key = :period
end
class Stat < ActiveRecord::Base
- set_primary_key :period
+ self.primary_key = :period
belongs_to :website
belongs_to :page

0 comments on commit 0aaef65

Please sign in to comment.