Rails 4 compatibility

Author: Mispy

Gemfile

@@ -5,7 +5,7 @@ gemspec
 gem 'jruby-openssl', :platform => :jruby
 
 group :test do
-  gem 'activerecord', '~> 3.2.8'
+  gem 'activerecord', '~> 4.0.0'
   gem 'activerecord-jdbcsqlite3-adapter', :platform => [:jruby]
   gem 'libxml-ruby', :platform => [:ruby, :mswin]
   gem 'rake'

lib/oai/provider/model/activerecord_caching_wrapper.rb

@@ -4,8 +4,8 @@ module OAI::Provider
 
   # ActiveRecord model class in support of the caching wrapper.
   class OaiToken < ActiveRecord::Base
-    has_many :entries, :class_name => 'OaiEntry',
-      :order => "record_id", :dependent => :destroy
+    has_many :entries, -> { order("record_id ASC") },
+      :class_name => 'OaiEntry', :dependent => :destroy
 
     validates_uniqueness_of :token
 

ruby-oai.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
     s.bindir = 'bin'
     s.executables = 'oai'
 
-    s.add_dependency('builder', '>=2.0.0')
+    s.add_dependency('builder', '>=3.1.0')
     s.add_dependency('faraday')
     s.add_dependency('faraday_middleware')
 

test/activerecord_provider/database/0001_oaipmh_tables.rb

@@ -48,7 +48,7 @@ def self.up
       t.column :description,    :string
     end
 
-    add_index :oai_tokens, [:token], :uniq => true
+    add_index :oai_tokens, [:token], :unique => true
     add_index :oai_tokens, :created_at
     add_index :oai_entries, [:oai_token_id]
     add_index :dc_fields, :updated_at

test/activerecord_provider/models/dc_field.rb

@@ -1,5 +1,5 @@
 class DCField < ActiveRecord::Base
-  inheritance_column = 'DONOTINHERIT'
+  self.inheritance_column = 'DONOTINHERIT'
   has_and_belongs_to_many :sets,
     :join_table => "dc_fields_dc_sets",
     :foreign_key => "dc_field_id",

test/activerecord_provider/models/exclusive_set_dc_field.rb

@@ -1,5 +1,5 @@
 class ExclusiveSetDCField < ActiveRecord::Base
-  inheritance_column = 'DONOTINHERIT'
+  self.inheritance_column = 'DONOTINHERIT'
 
   def self.sets
     klass = Struct.new(:name, :spec)

test/activerecord_provider/tc_ar_sets_provider.rb

@@ -150,9 +150,11 @@ def load_fixtures
     )
     disable_logging do
       fixtures.keys.sort.each do |key|
+        p key
+        p fixtures[key]
         ExclusiveSetDCField.create(fixtures[key])
       end
     end
   end
 
-end
+end