Merge pull request #37 from mispy/rails-4-compatibility

Rails 4 compatibility

Author: cbeer

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
 
@@ -60,15 +60,15 @@ def find(selector, options={})
       conditions = sql_conditions(options)
 
       if :all == selector
-        total = model.count(:id, :conditions => conditions)
+        total = model.where(conditions).count
         if @limit && total > @limit
           select_partial(
             ResumptionToken.new(options.merge({:last => 0})))
         else
-          model.find(:all, :conditions => conditions)
+          model.where(conditions)
         end
       else
-        model.find(selector, :conditions => conditions)
+        model.where(conditions).find(selector)
       end
     end
 
@@ -78,7 +78,7 @@ def next_set(token_string)
       raise ResumptionTokenException.new unless @limit
 
       token = ResumptionToken.parse(token_string)
-      total = model.count(:id, :conditions => token_conditions(token))
+      total = model.where(token_conditions(token)).count
 
       if token.last * @limit + @limit < total
         select_partial(token)
@@ -91,7 +91,7 @@ def next_set(token_string)
     # resumption token to get the next subset
     def select_partial(token)
       if 0 == token.last
-        oaitoken = OaiToken.find_or_create_by_token(token.to_s)
+        oaitoken = OaiToken.find_or_create_by(token: token.to_s)
         if oaitoken.new_record_before_save?
           OaiToken.connection.execute("insert into " +
             "#{OaiEntry.table_name} (oai_token_id, record_id) " +
@@ -104,8 +104,9 @@ def select_partial(token)
       raise ResumptionTokenException.new unless oaitoken
 
       PartialResult.new(
-        hydrate_records(oaitoken.entries.find(:all, :limit => @limit,
-          :offset => token.last * @limit)), token.next(token.last + 1)
+        hydrate_records(
+          oaitoken.entries.limit(@limit).offset(token.last * @limit)),
+        token.next(token.last + 1)
       )
     end
 

lib/oai/provider/model/activerecord_wrapper.rb

@@ -25,12 +25,12 @@ def initialize(model, options={})
     end
 
     def earliest
-      earliest_obj = model.find(:first, :order => "#{timestamp_field} asc")
+      earliest_obj = model.order("#{timestamp_field} asc").first
       earliest_obj.nil? ? Time.at(0) : earliest_obj.send(timestamp_field)
     end
 
     def latest
-      latest_obj = model.find(:first, :order => "#{timestamp_field} desc")
+      latest_obj = model.order("#{timestamp_field} desc").first
       latest_obj.nil? ? Time.now : latest_obj.send(timestamp_field)
     end
     # A model class is expected to provide a method Model.sets that
@@ -46,15 +46,15 @@ def find(selector, options={})
         options[:resumption_token]) if options[:resumption_token]
       conditions = sql_conditions(options)
       if :all == selector
-        total = find_scope.count(:id, :conditions => conditions)
+        total = find_scope.where(conditions).count
         if @limit && total > @limit
           select_partial(find_scope,
             ResumptionToken.new(options.merge({:last => 0})))
         else
-          find_scope.find(:all, :conditions => conditions)
+          find_scope.where(conditions)
         end
       else
-        find_scope.find(selector, :conditions => conditions)
+        find_scope.where(conditions).find(selector)
       end
     end
 
@@ -90,19 +90,19 @@ def find_scope(options)
 
       # Find the set or return an empty scope
       set = find_set_by_spec(options[:set])
-      return model.scoped(:limit => 0) if set.nil?
+      return model.limit(0) if set.nil?
 
       # If the set has a backward relationship, we'll use it
       if set.class.respond_to?(:reflect_on_all_associations)
         set.class.reflect_on_all_associations.each do |assoc|
-          return set.send(assoc.name).scoped if assoc.klass == model
+          return set.send(assoc.name) if assoc.klass == model
         end
       end
 
       # Search the attributes for 'set'
       if model.column_names.include?('set')
         # Scope using the set attribute as the spec
-        model.scoped(:conditions => {:set => options[:set]})
+        model.where(set: options[:set])
       else
         # Default to empty set, as we've tried everything else
         model.scoped(:limit => 0)
@@ -122,24 +122,23 @@ def next_set(find_scope, token_string)
       raise OAI::ResumptionTokenException.new unless @limit
 
       token = ResumptionToken.parse(token_string)
-      total = find_scope.count(:id, :conditions => token_conditions(token))
+      total = find_scope.where(token_conditions(token)).count
 
       if @limit < total
         select_partial(find_scope, token)
       else # end of result set
-        find_scope.find(:all,
-          :conditions => token_conditions(token),
-          :limit => @limit, :order => "#{model.primary_key} asc")
+        find_scope.where(token_conditions(token))
+          .limit(@limit)
+          .order("#{model.primary_key} asc")
       end
     end
 
     # select a subset of the result set, and return it with a
     # resumption token to get the next subset
     def select_partial(find_scope, token)
-      records = find_scope.find(:all,
-        :conditions => token_conditions(token),
-        :limit => @limit,
-        :order => "#{model.primary_key} asc")
+      records = find_scope.where(token_conditions(token))
+        .limit(@limit)
+        .order("#{model.primary_key} asc")
       raise OAI::ResumptionTokenException.new unless records
       offset = records.last.send(model.primary_key.to_sym)
 

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/helpers/set_provider.rb

@@ -3,7 +3,7 @@ class SetModel < OAI::Provider::ActiveRecordWrapper
 
   # Return all available sets
   def sets
-    DCSet.scoped
+    DCSet.all
   end
 
 end
@@ -21,4 +21,4 @@ class ARExclusiveSetProvider < OAI::Provider::Base
   record_prefix = 'oai:test'
   source_model OAI::Provider::ActiveRecordWrapper.new(
     ExclusiveSetDCField, :timestamp_field => 'date')
-end
+end

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_provider.rb

@@ -13,7 +13,7 @@ def test_metadata_formats
   end
 
   def test_metadata_formats_for_record
-    record_id = DCField.find(:first).id
+    record_id = DCField.first.id
     assert_nothing_raised { REXML::Document.new(@provider.list_metadata_formats(:identifier => "oai:test/#{record_id}")) }
     doc =  REXML::Document.new(@provider.list_metadata_formats)
     assert doc.elements['/OAI-PMH/ListMetadataFormats/metadataFormat/metadataPrefix'].text == 'oai_dc'
@@ -35,7 +35,7 @@ def test_list_identifiers
   end
 
   def test_get_record
-    record_id = DCField.find(:first).id
+    record_id = DCField.first.id
     assert_nothing_raised do
       REXML::Document.new(@provider.get_record(
         :identifier => "oai:test/#{record_id}", :metadata_prefix => 'oai_dc'))
@@ -46,7 +46,7 @@ def test_get_record
   end
 
   def test_deleted
-    record = DCField.find(:first)
+    record = DCField.first
     record.deleted = true;
     record.save
     doc = REXML::Document.new(@provider.get_record(
@@ -56,19 +56,19 @@ def test_deleted
   end
 
   def test_from
-    first_id = DCField.find(:first, :order => "id asc").id
-    DCField.update_all(['updated_at = ?', Time.parse("January 1 2005")],
-      "id < #{first_id + 90}")
-    DCField.update_all(['updated_at = ?', Time.parse("June 1 2005")],
-      "id < #{first_id + 10}")
+    first_id = DCField.order("id asc").first.id
+    DCField.where("id < #{first_id + 90}").update_all(updated_at: Time.parse("January 1 2005"))
+
+    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
+
 
     from_param = Time.parse("January 1 2006")
 
     doc = REXML::Document.new(
       @provider.list_records(
         :metadata_prefix => 'oai_dc', :from => from_param)
     )
-    assert_equal DCField.find(:all, :conditions => ["updated_at >= ?", from_param]).size,
+    assert_equal DCField.where(["updated_at >= ?", from_param]).size,
       doc.elements['OAI-PMH/ListRecords'].size
 
     doc = REXML::Document.new(
@@ -79,9 +79,8 @@ def test_from
   end
 
   def test_until
-    first_id = DCField.find(:first, :order => "id asc").id
-    DCField.update_all(['updated_at = ?', Time.parse("June 1 2005")],
-      "id < #{first_id + 10}")
+    first_id = DCField.order("id asc").first.id
+    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 1 2005"))
 
     doc = REXML::Document.new(
       @provider.list_records(
@@ -91,12 +90,10 @@ def test_until
   end
 
   def test_from_and_until
-    first_id = DCField.find(:first, :order => "id asc").id
-    DCField.update_all(['updated_at = ?', Time.parse("June 1 2005")])
-    DCField.update_all(['updated_at = ?', Time.parse("June 15 2005")],
-      "id < #{first_id + 50}")
-    DCField.update_all(['updated_at = ?', Time.parse("June 30 2005")],
-      "id < #{first_id + 10}")
+    first_id = DCField.order("id asc").first.id
+    DCField.update_all(updated_at: Time.parse("June 1 2005"))
+    DCField.where("id < #{first_id + 50}").update_all(updated_at: Time.parse("June 15 2005"))
+    DCField.where("id < #{first_id + 10}").update_all(updated_at: Time.parse("June 30 2005"))
 
     doc = REXML::Document.new(
       @provider.list_records(

test/activerecord_provider/tc_ar_sets_provider.rb

@@ -28,7 +28,7 @@ def test_set_ab
   end
 
   def test_record_with_multiple_sets
-    record = DCSet.find(:first, :conditions => "spec = 'C'").dc_fields.first
+    record = DCSet.where("spec = 'C'").first.dc_fields.first
     assert_equal 2, record.sets.size
   end
 
@@ -51,22 +51,22 @@ def define_sets
     set_ab = DCSet.create(:name => "Set A:B", :spec => "A:B")
 
     next_id = 0
-    DCField.find(:all, :limit => 10, :order => "id asc").each do |record|
+    DCField.limit(10).order("id asc").each do |record|
       set_a.dc_fields << record
       next_id = record.id
     end
 
-    DCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
       set_b.dc_fields << record
       next_id = record.id
     end
 
-    DCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
       set_ab.dc_fields << record
       next_id = record.id
     end
 
-    DCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+    DCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
       set_a.dc_fields << record
       set_c.dc_fields << record
       next_id = record.id
@@ -117,25 +117,25 @@ def setup
   def define_sets
     next_id = 0
 
-    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc").each do |record|
+    ExclusiveSetDCField.limit(10).order("id asc").each do |record|
       record.set = "A"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
       record.set = "B"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
       record.set = "A:B"
       record.save!
       next_id = record.id
     end
 
-    ExclusiveSetDCField.find(:all, :limit => 10, :order => "id asc", :conditions => "id > #{next_id}").each do |record|
+    ExclusiveSetDCField.where("id > #{next_id}").limit(10).order("id asc").each do |record|
       record.set = "A"
       record.save!
       next_id = record.id
@@ -155,4 +155,4 @@ def load_fixtures
     end
   end
 
-end
+end