Skip to content

Commit e66b5db

Browse files
committed
remove ORM support, Use ActiveRecord directly
1 parent 42c9137 commit e66b5db

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

lib/orm/active_record.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/public_uid.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'orm_adapter'
1+
require 'active_record'
22
require "public_uid/version"
33
require "public_uid/set_public_uid"
44
require "public_uid/model"
@@ -8,4 +8,4 @@
88
require "public_uid/generators/hex_string_secure_random"
99
require 'public_uid/tasks' if defined?(Rails)
1010

11-
require 'orm/active_record' if defined?(ActiveRecord::Base)
11+
ActiveRecord::Base.send(:include, PublicUid::Model)

lib/public_uid/tasks/generate.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require 'rake'
33
namespace :public_uid do
44
desc "Generate public_uid on Models that have public_uid column on records that have nil value"
55
task :generate => :environment do
6-
Rails.application.eager_load!
6+
Rails.application.eager_load! if defined?(Rails)
77
ActiveRecord::Base.descendants.each do |model|
88
model.connection # establish conection
99

public_uid.gemspec

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
1818
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1919
spec.require_paths = ["lib"]
2020

21-
spec.add_dependency "orm_adapter", "~> 0.5"
21+
spec.add_dependency "activerecord", '> 4.2' # ensures compatibility for ruby 2.0.0+ to head
2222
spec.add_development_dependency "bundler", "~> 1.3"
2323
spec.add_development_dependency "rake"
2424
spec.add_development_dependency "minitest", "~> 5"
2525
spec.add_development_dependency "rr", "~> 1.1.2"
26-
spec.add_development_dependency "sqlite3"
27-
spec.add_development_dependency "activerecord", '~> 4.2' # ensures compatibility for ruby 2.0.0+ to head
26+
spec.add_development_dependency "sqlite3", "~> 1.4.1"
2827
end

0 commit comments

Comments
 (0)